IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-18 09:05:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into thuck-influxdb_alias_columns

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-08-10 09:11:19 +02:00
parent e7fc72067a 696f8451cf
commit 4b849243ce
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/datasources/influxdb.md
+1
View File
@@ -62,6 +62,7 @@ You can switch to raw query mode by pressing the pen icon.
- $m = replaced with measurement name - $m = replaced with measurement name
- $measurement = replaced with measurement name - $measurement = replaced with measurement name
- $col = replaced with column name
- $tag_hostname = replaced with the value of the hostname tag - $tag_hostname = replaced with the value of the hostname tag
- You can also use [[tag_hostname]] pattern replacement syntax - You can also use [[tag_hostname]] pattern replacement syntax
public/app/plugins/datasource/influxdb/influxSeries.js
+3 -2
View File
@@ -35,7 +35,7 @@ function (_) {
} }
if (self.alias) { if (self.alias) {
seriesName = self._getSeriesName(series); seriesName = self._getSeriesName(series, j);
} else if (series.tags) { } else if (series.tags) {
seriesName = seriesName + ' {' + tags.join(', ') + '}'; seriesName = seriesName + ' {' + tags.join(', ') + '}';
} }
@@ -54,13 +54,14 @@ function (_) {
return output; return output;
}; };
p._getSeriesName = function(series) { p._getSeriesName = function(series, index) {
var regex = /\$(\w+)|\[\[([\s\S]+?)\]\]/g; var regex = /\$(\w+)|\[\[([\s\S]+?)\]\]/g;
return this.alias.replace(regex, function(match, g1, g2) { return this.alias.replace(regex, function(match, g1, g2) {
var group = g1 || g2; var group = g1 || g2;
if (group === 'm' || group === 'measurement') { return series.name; } if (group === 'm' || group === 'measurement') { return series.name; }
if (group === 'col') { return series.columns[index]; }
if (group.indexOf('tag_') !== 0) { return match; } if (group.indexOf('tag_') !== 0) { return match; }
var tag = group.replace('tag_', ''); var tag = group.replace('tag_', '');
public/app/plugins/datasource/influxdb/partials/query.editor.html
+1
View File
@@ -212,6 +212,7 @@
<ul> <ul>
<li>$m = replaced with measurement name</li> <li>$m = replaced with measurement name</li>
<li>$measurement = replaced with measurement name</li> <li>$measurement = replaced with measurement name</li>
<li>$col = replaced with column name</li>
<li>$tag_hostname = replaced with the value of the hostname tag</li> <li>$tag_hostname = replaced with the value of the hostname tag</li>
<li>You can also use [[tag_hostname]] pattern replacement syntax</li> <li>You can also use [[tag_hostname]] pattern replacement syntax</li>
</ul> </ul>