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

fix(): fixed problems in last commit

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-09-04 07:41:50 +02:00
parent ead451a979
commit 5beced458c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -26,7 +26,7 @@ it allows you to add queries of differnet data source types & instances to the s
- [Issue #2564](https://github.com/grafana/grafana/issues/2564). Templating: Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url) - [Issue #2564](https://github.com/grafana/grafana/issues/2564). Templating: Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url)
- [Issue #2620](https://github.com/grafana/grafana/issues/2620). Graph: multi series tooltip did no highlight correct point when stacking was enabled and series were of different resolution - [Issue #2620](https://github.com/grafana/grafana/issues/2620). Graph: multi series tooltip did no highlight correct point when stacking was enabled and series were of different resolution
- [Issue #2636](https://github.com/grafana/grafana/issues/2636). InfluxDB: Do no show template vars in dropdown for tag keys and group by keys - [Issue #2636](https://github.com/grafana/grafana/issues/2636). InfluxDB: Do no show template vars in dropdown for tag keys and group by keys
- [Issue #2599](https://github.com/grafana/grafana/issues/2599). InfluxDB: More alias options, can now use `$[0-9]` syntax to reference part of a measurement name (seperated by dots) - [Issue #2604](https://github.com/grafana/grafana/issues/2604). InfluxDB: More alias options, can now use `$[0-9]` syntax to reference part of a measurement name (seperated by dots)
**Breaking Changes** **Breaking Changes**
- Notice to makers/users of custom data sources, there is a minor breaking change in 2.2 that - Notice to makers/users of custom data sources, there is a minor breaking change in 2.2 that

2
public/app/plugins/datasource/influxdb/influxSeries.js
View File

@@ -60,7 +60,7 @@ function (_) {
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;
var segIndex = parseInt(group, 10) var segIndex = parseInt(group, 10);
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 === 'col') { return series.columns[index]; }