IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Made regex match work for per series overrides, #425, #700

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-08-20 08:35:17 +02:00
parent 062fe72030
commit 939e957fda
5 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/directives/grafanaGraph.js
View File

@@ -183,6 +183,16 @@ function (angular, $, kbn, moment, _) {
}
}
function matchSeriesOverride(aliasOrRegex, seriesAlias) {
if (aliasOrRegex[0] === '/') {
var match = aliasOrRegex.match(new RegExp('^/(.*?)/(g?i?m?y?)$'));
var regex = new RegExp(match[1], match[2]);
return seriesAlias.match(regex) != null;
}
return aliasOrRegex === seriesAlias;
}
function applySeriesOverrideOptions(series) {
series.lines = {};
series.points = {};
@@ -191,7 +201,7 @@ function (angular, $, kbn, moment, _) {
for (var i = 0; i < scope.panel.seriesOverrides.length; i++) {
var override = scope.panel.seriesOverrides[i];
if (override.alias !== series.info.alias) {
if (!matchSeriesOverride(override.alias, series.info.alias)) {
continue;
}
if (override.lines !== void 0) { series.lines.show = override.lines; }

6
src/app/panels/graph/seriesOverridesCtrl.js
View File

@@ -47,13 +47,13 @@ define([
$scope.updateCurrentOverrides = function() {
$scope.currentOverrides = [];
_.each($scope.overrideMenu, function(option) {
if (!_.isUndefined($scope.override[option.propertyName])) {
var value = $scope.override[option.propertyName];
if (_.isUndefined(value)) { return; }
$scope.currentOverrides.push({
name: option.text,
propertyName: option.propertyName,
value: String($scope.override[option.propertyName])
value: String(value)
});
}
});
};

2
src/app/panels/graph/styleEditor.html
View File

@@ -65,7 +65,7 @@
<div class="editor-row">
<div class="section">
<h5>Series specific overrides</h5>
<h5>Series specific overrides <tip>Regex match example: /server[0-3]/i </tip></h5>
<div class="grafana-target" ng-repeat="override in panel.seriesOverrides" ng-controller="SeriesOverridesCtrl">
<div class="grafana-target-inner-wrapper">

14
src/test/specs/grafanaGraph-specs.js
View File

@@ -143,7 +143,21 @@ define([
});
});
graphScenario('override match on regex', function(ctx) {
ctx.setup(function(scope, data) {
scope.panel.lines = true;
scope.panel.seriesOverrides = [
{ alias: '/.*01/', lines: false }
];
data[1].info.alias = 'test_01';
});
it('should match second series and set pointradius, and set steppedLine', function() {
expect(ctx.plotData[0].lines.show).to.be(undefined);
expect(ctx.plotData[1].lines.show).to.be(false);
});
});
});
});

8
src/test/specs/seriesOverridesCtrl-specs.js
View File

@@ -37,6 +37,14 @@ define([
});
});
describe('When removing overide', function() {
it('click should include option and value index', function() {
ctx.scope.setOverride(1,0);
ctx.scope.removeOverride({ propertyName: 'lines' });
expect(ctx.scope.currentOverrides.length).to.be(0);
});
});
});
});