public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some changes to influxdb alias pattern expansions, removed as it was to confusion, added help text to influxdb metric editor view, need to polish a litle more, #525

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-07-02 15:50:57 +02:00
parent 1dbbfbbba6
commit 6c93dc6a4c
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/partials/influxdb/editor.html
+13
View File
@@ -153,5 +153,18 @@
</div>
</div>
</div>
<div class="pull-left" style="margin-top: 30px;">
<div class="span6">
<span>
<i class="icon-question-sign"></i> alias patterns:
<ul>
<li>$s = seriesName</li>
<li>$g = group by value</li>
<li>$[0-9] part of series name for series names seperated by dots.</li>
<ul>
</span>
</div>
</div>
</div>
src/app/partials/metrics.html
+1 -1
View File
@@ -1,7 +1,7 @@
<div ng-include src="datasource.editorSrc"></div>
<div class="editor-row" style="margin-top: 20px">
<div class="editor-row" style="margin-top: 30px">
<button class="btn btn-success pull-right" ng-click="add_target(panel.target)">Add query</button>
<div class="btn-group pull-right" style="margin-right: 10px;">
src/app/services/influxdb/influxSeries.js
+4 -5
View File
@@ -52,10 +52,10 @@ function (_) {
datapoints[i] = [metricValue, groupPoints[i][timeCol]];
}
seriesName = series.name + '.' + key;
seriesName = series.name;
if (self.alias) {
seriesName = self.createNameForSeries(series.name, series.columns[valueCol], key);
seriesName = self.createNameForSeries(series.name, key);
}
output.push({ target: seriesName, datapoints: datapoints });
@@ -65,10 +65,9 @@ function (_) {
return output;
};
p.createNameForSeries = function(seriesName, columnName, groupByColValue) {
p.createNameForSeries = function(seriesName, groupByColValue) {
var name = this.alias
.replace('$s', seriesName)
.replace('$c', columnName);
.replace('$s', seriesName);
var segments = seriesName.split('.');
for (var i = 0; i < segments.length; i++) {
src/test/specs/influxSeries-specs.js
+8 -8
View File
@@ -25,13 +25,13 @@ define([
it('should generate two time series', function() {
expect(result.length).to.be(2);
expect(result[0].target).to.be('prod.server1.cpu.mean');
expect(result[0].target).to.be('prod.server1.cpu');
expect(result[0].datapoints[0][0]).to.be(10);
expect(result[0].datapoints[0][1]).to.be(1402596000);
expect(result[0].datapoints[1][0]).to.be(12);
expect(result[0].datapoints[1][1]).to.be(1402596001);
expect(result[1].target).to.be('prod.server2.cpu.mean');
expect(result[1].target).to.be('prod.server2.cpu');
expect(result[1].datapoints[0][0]).to.be(15);
expect(result[1].datapoints[0][1]).to.be(1402596000);
expect(result[1].datapoints[1][0]).to.be(16);
@@ -49,13 +49,13 @@ define([
points: [[1402596000, 10, 1], [1402596001, 12, 2]]
}
],
alias: '$s.$c'
alias: '$s.testing'
});
var result = series.getTimeSeries();
it('should generate correct series name', function() {
expect(result[0].target).to.be('prod.server1.cpu.mean');
expect(result[0].target).to.be('prod.server1.cpu.testing');
});
});
@@ -69,13 +69,13 @@ define([
points: [[1402596000, 10, 1], [1402596001, 12, 2]]
}
],
alias: '$1'
alias: '$1.mean'
});
var result = series.getTimeSeries();
it('should generate correct series name', function() {
expect(result[0].target).to.be('server1');
expect(result[0].target).to.be('server1.mean');
});
});
@@ -122,13 +122,13 @@ define([
it('should generate two time series', function() {
expect(result.length).to.be(2);
expect(result[0].target).to.be('prod.cpu.A');
expect(result[0].target).to.be('prod.cpu');
expect(result[0].datapoints[0][0]).to.be(10);
expect(result[0].datapoints[0][1]).to.be(1402596000);
expect(result[0].datapoints[1][0]).to.be(11);
expect(result[0].datapoints[1][1]).to.be(1402596001);
expect(result[1].target).to.be('prod.cpu.B');
expect(result[1].target).to.be('prod.cpu');
expect(result[1].datapoints[0][0]).to.be(5);
expect(result[1].datapoints[0][1]).to.be(1402596000);
expect(result[1].datapoints[1][0]).to.be(6);