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

Merge branch 'bug/show_multiple_tags_with_influxdb' of https://github.com/adrianlzt/grafana into adrianlzt-bug/show_multiple_tags_with_influxdb

Browse Source
This commit is contained in:
bergquist 2016-12-12 13:30:27 +01:00
commit d599f45707
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/influxdb/influx_series.js
View File

@ -81,7 +81,7 @@ function (_, TableModel) {
_.each(this.series, function (series) { _.each(this.series, function (series) {
var titleCol = null; var titleCol = null;
var timeCol = null; var timeCol = null;
var tagsCol = null; var tagsCol = [];
var textCol = null; var textCol = null;
_.each(series.columns, function(column, index) { _.each(series.columns, function(column, index) {
@ -89,7 +89,7 @@ function (_, TableModel) {
if (column === 'sequence_number') { return; } if (column === 'sequence_number') { return; }
if (!titleCol) { titleCol = index; } if (!titleCol) { titleCol = index; }
if (column === self.annotation.titleColumn) { titleCol = index; return; } if (column === self.annotation.titleColumn) { titleCol = index; return; }
if (column === self.annotation.tagsColumn) { tagsCol = index; return; } if (_.contains(tagsColumn.split(","), column)) { tagsCol.push(index); return; }
if (column === self.annotation.textColumn) { textCol = index; return; } if (column === self.annotation.textColumn) { textCol = index; return; }
}); });
@ -98,7 +98,7 @@ function (_, TableModel) {
annotation: self.annotation, annotation: self.annotation,
time: + new Date(value[timeCol]), time: + new Date(value[timeCol]),
title: value[titleCol], title: value[titleCol],
tags: value[tagsCol], tags: tagsCol.map(function(t) { return value[t]; }),
text: value[textCol] text: value[textCol]
}; };