From eccc6adfde6f910fb49c26b763fe58a3510ed9f1 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Mon, 9 Sep 2019 21:58:34 -0700
Subject: [PATCH] TimeSeries: datasources with labels should export tags (not
 labels) (#18977)

* merge master

* export prometheus tags
---
 .../datasource/prometheus/result_transformer.ts      |  2 +-
 .../prometheus/specs/result_transformer.test.ts      | 12 ++++++------
 public/app/plugins/datasource/testdata/datasource.ts |  7 ++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index e365041bd98..50c8d95e375 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -76,7 +76,7 @@ export class ResultTransformer {
       datapoints: dps,
       query: options.query,
       target: metricLabel,
-      labels: metricData.metric,
+      tags: metricData.metric,
     };
   }
 
diff --git a/public/app/plugins/datasource/prometheus/specs/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/specs/result_transformer.test.ts
index 5f7d2176377..dd451e439f5 100644
--- a/public/app/plugins/datasource/prometheus/specs/result_transformer.test.ts
+++ b/public/app/plugins/datasource/prometheus/specs/result_transformer.test.ts
@@ -151,19 +151,19 @@ describe('Prometheus Result Transformer', () => {
           target: '1',
           query: undefined,
           datapoints: [[10, 1445000010000], [10, 1445000020000], [0, 1445000030000]],
-          labels: { __name__: 'test', job: 'testjob', le: '1' },
+          tags: { __name__: 'test', job: 'testjob', le: '1' },
         },
         {
           target: '2',
           query: undefined,
           datapoints: [[10, 1445000010000], [0, 1445000020000], [30, 1445000030000]],
-          labels: { __name__: 'test', job: 'testjob', le: '2' },
+          tags: { __name__: 'test', job: 'testjob', le: '2' },
         },
         {
           target: '3',
           query: undefined,
           datapoints: [[10, 1445000010000], [0, 1445000020000], [10, 1445000030000]],
-          labels: { __name__: 'test', job: 'testjob', le: '3' },
+          tags: { __name__: 'test', job: 'testjob', le: '3' },
         },
       ]);
     });
@@ -225,7 +225,7 @@ describe('Prometheus Result Transformer', () => {
           target: 'test{job="testjob"}',
           query: undefined,
           datapoints: [[10, 0], [10, 1000], [0, 2000]],
-          labels: { job: 'testjob' },
+          tags: { job: 'testjob' },
         },
       ]);
     });
@@ -256,7 +256,7 @@ describe('Prometheus Result Transformer', () => {
           target: 'test{job="testjob"}',
           query: undefined,
           datapoints: [[null, 0], [10, 1000], [0, 2000]],
-          labels: { job: 'testjob' },
+          tags: { job: 'testjob' },
         },
       ]);
     });
@@ -287,7 +287,7 @@ describe('Prometheus Result Transformer', () => {
           target: 'test{job="testjob"}',
           query: undefined,
           datapoints: [[null, 0], [null, 2000], [10, 4000], [null, 6000], [10, 8000]],
-          labels: { job: 'testjob' },
+          tags: { job: 'testjob' },
         },
       ]);
     });
diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/testdata/datasource.ts
index 38a5acc39a6..2605e779678 100644
--- a/public/app/plugins/datasource/testdata/datasource.ts
+++ b/public/app/plugins/datasource/testdata/datasource.ts
@@ -81,7 +81,12 @@ export class TestDataDataSource extends DataSourceApi<TestDataQuery> {
           }
 
           for (const series of results.series || []) {
-            data.push({ target: series.name, datapoints: series.points, refId: query.refId });
+            data.push({
+              target: series.name,
+              datapoints: series.points,
+              refId: query.refId,
+              tags: series.tags,
+            });
           }
         }