From 5b200a315f099032d85d10b314edb6df244a8be4 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Thu, 26 Jan 2017 11:07:34 -0800
Subject: [PATCH] Include support for tags

---
 ui/spec/utils/timeSeriesToDygraphSpec.js | 26 ++++++++++--------------
 ui/src/utils/timeSeriesToDygraph.js      | 14 +++++++++----
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ui/spec/utils/timeSeriesToDygraphSpec.js b/ui/spec/utils/timeSeriesToDygraphSpec.js
index 941680935..3db41e5e2 100644
--- a/ui/spec/utils/timeSeriesToDygraphSpec.js
+++ b/ui/spec/utils/timeSeriesToDygraphSpec.js
@@ -16,6 +16,10 @@ describe('timeSeriesToDygraph', () => {
                   "name":"m1",
                   "columns": ["time","f1"],
                   "values": [[1000, 1],[2000, 2]],
+                  "tags": {
+                    tk1: "tv1",
+                    tk2: "tv2",
+                  },
                 },
               ]
             },
@@ -25,6 +29,9 @@ describe('timeSeriesToDygraph', () => {
                   "name":"m1",
                   "columns": ["time","f2"],
                   "values": [[2000, 3],[4000, 4]],
+                  "tags": {
+                    tk3: "tv3",
+                  },
                 },
               ]
             },
@@ -33,24 +40,13 @@ describe('timeSeriesToDygraph', () => {
       }
     ];
 
-    //  dygraphSeries: {
-    //    'm1.f1': {
-    //      axis: 'y',
-    //      strokeWidth,
-    //    },
-    //    'm1.f2': {
-    //      axis: 'y',
-    //      strokeWidth,
-    //    },
-    //  },
-
     const actual = timeSeriesToDygraph(influxResponse);
 
     const expected = {
       labels: [
         'time',
-        `m1.f1`,
-        `m1.f2`,
+        `m1.f1[tk1=tv1][tk2=tv2]`,
+        `m1.f2[tk3=tv3]`,
       ],
       timeSeries: [
         [new Date(1000), 1, null],
@@ -58,11 +54,11 @@ describe('timeSeriesToDygraph', () => {
         [new Date(4000), null, 4],
       ],
       dygraphSeries: {
-        'm1.f1': {
+        'm1.f1[tk1=tv1][tk2=tv2]': {
           axis: 'y',
           strokeWidth,
         },
-        'm1.f2': {
+        'm1.f2[tk3=tv3]': {
           axis: 'y',
           strokeWidth,
         },
diff --git a/ui/src/utils/timeSeriesToDygraph.js b/ui/src/utils/timeSeriesToDygraph.js
index 59defcd8d..59bdd8224 100644
--- a/ui/src/utils/timeSeriesToDygraph.js
+++ b/ui/src/utils/timeSeriesToDygraph.js
@@ -20,7 +20,7 @@ export default function timeSeriesToDygraph(raw = [], activeQueryIndex, isInData
   }, []);
 
   // convert series into cells with rows and columns
-  const cells = serieses.reduce((acc, {name, columns, values, index, responseIndex}) => {
+  const cells = serieses.reduce((acc, {name, columns, values, index, responseIndex, tags = {}}) => {
     const rows = values.map((vals) => ({
       name,
       columns,
@@ -28,12 +28,18 @@ export default function timeSeriesToDygraph(raw = [], activeQueryIndex, isInData
       index,
     }));
 
-    rows.forEach(({vals, columns: cols, name: n, index: seriesIndex}) => {
+    // tagSet is each tag key and value for a series
+    const tagSet = Object.keys(tags).map((tag) => {
+      return `[${tag}=${tags[tag]}]`;
+    }).sort().join('');
+
+    rows.forEach(({vals, columns: cols, name: measurement, index: seriesIndex}) => {
       const [time, ...rowValues] = vals;
+
       rowValues.forEach((value, i) => {
-        const column = cols[i + 1];
+        const field = cols[i + 1];
         acc.push({
-          label: `${n}.${column}`,
+          label: `${measurement}.${field}${tagSet}`,
           value,
           time,
           seriesIndex,