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(influxdb): fixes extra semi colon due to hidden series

Browse Source 
closes #5005
This commit is contained in:
bergquist 2016-05-13 13:26:57 +02:00
parent ac674bd405
commit c3f1d1a647
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
* **Templating**: Fixed issue mixing row repeat and panel repeats, fixes [#4988](https://github.com/grafana/grafana/issues/4988)
* **Templating**: Fixed issue detecting dependencies in nested variables, fixes [#4987](https://github.com/grafana/grafana/issues/4987), fixes [#4986](https://github.com/grafana/grafana/issues/4986)
* **Graph**: Fixed broken PNG rendering in graph panel, fixes [#5025](https://github.com/grafana/grafana/issues/5025)
* **Influxdb**: Fixes crash when hiding middle serie, fixes [#5005](https://github.com/grafana/grafana/issues/5005)
# 3.0.1 Stable (2016-05-11)

10
public/app/plugins/datasource/influxdb/datasource.ts
View File

@ -45,7 +45,7 @@ export default class InfluxDatasource {
var i, y;
var allQueries = _.map(options.targets, (target) => {
if (target.hide) { return []; }
if (target.hide) { return ""; }
queryTargets.push(target);
@ -54,8 +54,12 @@ export default class InfluxDatasource {
var query = queryModel.render(true);
query = query.replace(/\$interval/g, (target.interval || options.interval));
return query;
}).join(";");
}).reduce((acc, current) => {
if (current !== "") {
acc += ";" + current;
}
return acc;
});
// replace grafana variables
allQueries = allQueries.replace(/\$timeFilter/g, timeFilter);