Skip to content

N
nexpie-grafana-theme
Commit 8308d95e by Torkel Ödegaard
Options

small changes / fixes to target editing

parent f090c79d
Showing with 63 additions and 235 deletions
src/app/components/require.config.js
......@@ -102,7 +102,6 @@ require.config({
elasticjs: ['angular', '../vendor/elasticjs/elastic'],
'ts-widget': ['jquery', 'jquery.flot', 'jquery.flot.selection', 'jquery.flot.stack', 'jquery.flot.time', 'ts-graphite-helpers']
},
waitSeconds: 60,
});
src/app/controllers/graphiteTarget.js
......@@ -19,10 +19,12 @@ function (angular, _, config, graphiteFunctions, Parser) {
var parser = new Parser($scope.target.target);
var astNode = parser.getAst();
console.log('GraphiteTargetCtrl:init -> target', $scope.target.target);
console.log('GraphiteTargetCtrl:init -> ast', astNode);
parseTargetExpression(astNode);
parseTargetExpression(astNode);
checkOtherSegments($scope.segments.length);
};
function parseTargetExpression(astNode, func, index) {
......@@ -62,7 +64,7 @@ function (angular, _, config, graphiteFunctions, Parser) {
return _.reduce(arr, function(result, segment) {
return result ? (result + "." + segment.val) : segment.val;
}, null);
}, "");
}
function graphiteMetricQuery(query) {
......@@ -71,6 +73,11 @@ function (angular, _, config, graphiteFunctions, Parser) {
}
function checkOtherSegments(fromIndex) {
if (fromIndex === 0) {
$scope.segments.push({html: 'select metric'});
return;
}
var path = getSegmentPathUpTo(fromIndex + 1);
return graphiteMetricQuery(path)
.then(function(result) {
......@@ -126,7 +133,10 @@ function (angular, _, config, graphiteFunctions, Parser) {
$scope.getAltSegments = function (index) {
$scope.altSegments = [];
return graphiteMetricQuery(getSegmentPathUpTo(index) + '.*')
var query = index === 0 ?
'*' : getSegmentPathUpTo(index) + '.*';
return graphiteMetricQuery(query)
.then(function(result) {
var altSegments = _.map(result.data, function(altSegment) {
return {
......
src/app/panels/graphite/editor.html
......@@ -22,9 +22,23 @@
</ul>
</li>
</ul>
<span class="grafana-target-controls">
<i class="icon-remove"></i>
</span>
<ul class="grafana-target-controls">
<li>
<a class="pointer" tabindex="1" ng-click="enableTextEditor()">
<i class="icon-pencil"></i>
</a>
</li>
<li>
<a class="pointer" tabindex="1" ng-click="enableTextEditor()">
<i class="icon-cog"></i>
</a>
</li>
<li>
<a class="pointer" tabindex="1" ng-click="removeTarget(target)">
<i class="icon-remove"></i>
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
......@@ -32,11 +46,12 @@
<div class="grafana-target-func-panel-wrapper">
<div class="grafana-target-func-panel">
<span class="grafana-target-func-panel-icon">
</span>
<ul>
<li ng-repeat="func in functions">
<a bs-popover="'app/panels/graphite/funcEditor.html'" data-placement="top">{{func.text}}</a>
<i class="icon-long-arrow-right"></i>
</li>
<li class="dropdown">
<a class="dropdown-toggle"
......
src/app/panels/graphite/module.html
......@@ -97,7 +97,7 @@
</span>
</div>
<div class="fluid-row panel-full-edit-controls" ng-show="inEditMode">
<div class="panel-full-edit-tabs" ng-show="inEditMode">
<div ng-model="editor.index" bs-tabs>
<div ng-repeat="tab in setEditorTabs(panelMeta)" data-title="{{tab}}">
</div>
......
src/app/panels/graphite/module.js
......@@ -245,6 +245,11 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv, RQ) {
}
};
$scope.removeTarget = function (target) {
$scope.panel.targets = _.without($scope.panel.targets, target);
$scope.get_data();
};
$scope.closeEditMode = function() {
$rootScope.$emit('fullEditMode', false);
};
......
src/css/bootstrap.dark.min.css
This source diff could not be displayed because it is too large. You can view the blob instead.
src/vendor/bootstrap/less/grafana.less
......@@ -79,7 +79,7 @@
bottom: 25px;
outline: 1px solid #101214;
border-top: 1px solid #3e444c;
padding: 0 10px 10px 10px;
padding: 0 10px;
background: #202328;
}
......@@ -87,8 +87,7 @@
text-align: center;
}
.panel-full-edit-controls {
margin: 11px;
.panel-full-edit-tabs {
.nav-tabs > li > a {
line-height: 15px;
padding-top: 6px;
......@@ -98,6 +97,9 @@
}
/* Graphite Target Editor */
.grafana-target {
}
.grafana-target-inner-wrapper {
border-top: 1px solid #444444;
border-bottom: 1px solid #444444;
......@@ -139,7 +141,18 @@
.grafana-target-controls {
float: right;
padding: 5px 7px;
list-style: none;
margin: 0;
>li {
float: left;
}
a {
padding: 5px 7px;
position: relative;
top: 5px;
}
}
.grafana-target .dropdown {
......@@ -160,18 +173,21 @@
list-style: none;
margin: 0;
>li {
>li, li.dropdown {
float: left;
padding: 2px 8px;
border-right: 1px solid black;
padding: 2px 5px;
>i {
padding-left: 5px;
postition: relative;
}
}
}
}
.grafana-target-func-panel-icon {
float: left;
padding: 10px 15px;
border-right: 1px solid black;
padding: 12px 14px;
}
input[type=text].func-param {
......
src/vendor/timeserieswidget/graphite_helpers.js deleted 100644 → 0
String.prototype.graphiteGlob = function(glob) {
var regex = '^';
for (var i = 0; i < glob.length; i++ ) {
var c = glob.charAt(i);
switch (c) {
case '*':
regex += '[^\.]+';
break;
case '.':
regex += '\\.';
break;
default:
regex += c;
}
}
regex += '$';
return this.match(regex);
}
/*
if (!"stats.dfs4.timer".graphiteGlob('stats.*.timer')) {
console.log('fail 1');
}
if ("stats.dfs4.timer".graphiteGlob('statsd.*.timer')) {
console.log('fail 2');
}
if ("stats.dfs4.foo.timer".graphiteGlob('stats.*.timer')) {
console.log('fail 3');
}
*/
src/vendor/timeserieswidget/jquery.flot.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/vendor/timeserieswidget/jquery.flot.stack.js deleted 100644 → 0
/* Flot plugin for stacking data sets rather than overlyaing them.
Copyright (c) 2007-2013 IOLA and Ole Laursen.
Licensed under the MIT license.
The plugin assumes the data is sorted on x (or y if stacking horizontally).
For line charts, it is assumed that if a line has an undefined gap (from a
null point), then the line above it should have the same gap - insert zeros
instead of "null" if you want another behaviour. This also holds for the start
and end of the chart. Note that stacking a mix of positive and negative values
in most instances doesn't make sense (so it looks weird).
Two or more series are stacked when their "stack" attribute is set to the same
key (which can be any number or string or just "true"). To specify the default
stack, you can set the stack option like this:
series: {
stack: null/false, true, or a key (number/string)
}
You can also specify it for a single series, like this:
$.plot( $("#placeholder"), [{
data: [ ... ],
stack: true
}])
The stacking order is determined by the order of the data series in the array
(later series end up on top of the previous).
Internally, the plugin modifies the datapoints in each series, adding an
offset to the y value. For line series, extra data points are inserted through
interpolation. If there's a second y value, it's also adjusted (e.g for bar
charts or filled areas).
*/
(function ($) {
var options = {
series: { stack: null } // or number/string
};
function init(plot) {
function findMatchingSeries(s, allseries) {
var res = null;
for (var i = 0; i < allseries.length; ++i) {
if (s == allseries[i])
break;
if (allseries[i].stack == s.stack)
res = allseries[i];
}
return res;
}
function stackData(plot, s, datapoints) {
if (s.stack == null || s.stack === false)
return;
var other = findMatchingSeries(s, plot.getData());
if (!other)
return;
var ps = datapoints.pointsize,
points = datapoints.points,
otherps = other.datapoints.pointsize,
otherpoints = other.datapoints.points,
newpoints = [],
px, py, intery, qx, qy, bottom,
withlines = s.lines.show,
horizontal = s.bars.horizontal,
withbottom = ps > 2 && (horizontal ? datapoints.format[2].x : datapoints.format[2].y),
withsteps = withlines && s.lines.steps,
fromgap = true,
keyOffset = horizontal ? 1 : 0,
accumulateOffset = horizontal ? 0 : 1,
i = 0, j = 0, l, m;
while (true) {
if (i >= points.length)
break;
l = newpoints.length;
if (points[i] == null) {
// copy gaps
for (m = 0; m < ps; ++m)
newpoints.push(points[i + m]);
i += ps;
}
else if (j >= otherpoints.length) {
// for lines, we can't use the rest of the points
if (!withlines) {
for (m = 0; m < ps; ++m)
newpoints.push(points[i + m]);
}
i += ps;
}
else if (otherpoints[j] == null) {
// oops, got a gap
for (m = 0; m < ps; ++m)
newpoints.push(null);
fromgap = true;
j += otherps;
}
else {
// cases where we actually got two points
px = points[i + keyOffset];
py = points[i + accumulateOffset];
qx = otherpoints[j + keyOffset];
qy = otherpoints[j + accumulateOffset];
bottom = 0;
if (px == qx) {
for (m = 0; m < ps; ++m)
newpoints.push(points[i + m]);
newpoints[l + accumulateOffset] += qy;
bottom = qy;
i += ps;
j += otherps;
}
else if (px > qx) {
// we got past point below, might need to
// insert interpolated extra point
if (withlines && i > 0 && points[i - ps] != null) {
intery = py + (points[i - ps + accumulateOffset] - py) * (qx - px) / (points[i - ps + keyOffset] - px);
newpoints.push(qx);
newpoints.push(intery + qy);
for (m = 2; m < ps; ++m)
newpoints.push(points[i + m]);
bottom = qy;
}
j += otherps;
}
else { // px < qx
if (fromgap && withlines) {
// if we come from a gap, we just skip this point
i += ps;
continue;
}
for (m = 0; m < ps; ++m)
newpoints.push(points[i + m]);
// we might be able to interpolate a point below,
// this can give us a better y
if (withlines && j > 0 && otherpoints[j - otherps] != null)
bottom = qy + (otherpoints[j - otherps + accumulateOffset] - qy) * (px - qx) / (otherpoints[j - otherps + keyOffset] - qx);
newpoints[l + accumulateOffset] += bottom;
i += ps;
}
fromgap = false;
if (l != newpoints.length && withbottom)
newpoints[l + 2] += bottom;
}
// maintain the line steps invariant
if (withsteps && l != newpoints.length && l > 0
&& newpoints[l] != null
&& newpoints[l] != newpoints[l - ps]
&& newpoints[l + 1] != newpoints[l - ps + 1]) {
for (m = 0; m < ps; ++m)
newpoints[l + ps + m] = newpoints[l + m];
newpoints[l + 1] = newpoints[l - ps + 1];
}
}
datapoints.points = newpoints;
}
plot.hooks.processDatapoints.push(stackData);
}
$.plot.plugins.push({
init: init,
options: options,
name: 'stack',
version: '1.2'
});
})(jQuery);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment