From 3a3272e225c986cdeb762197a82f84b84b9e769f Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 12 Dec 2017 09:35:57 +0100
Subject: [PATCH] annotations: allows template variables to be used in tag
 filter

When filtering built in annotations by tag, interpolates the tag with
template variables. Fixes #9587
---
 .../plugins/datasource/grafana/datasource.ts  |  7 +-
 .../grafana/specs/datasource.jest.ts          | 65 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 public/app/plugins/datasource/grafana/specs/datasource.jest.ts

diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index 5ca3c433476..9eb9862094a 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -3,7 +3,7 @@ import _ from 'lodash';
 class GrafanaDatasource {
 
   /** @ngInject */
-  constructor(private backendSrv, private $q) {}
+  constructor(private backendSrv, private $q, private templateSrv) {}
 
   query(options) {
     return this.backendSrv
@@ -58,6 +58,11 @@ class GrafanaDatasource {
       if (!_.isArray(options.annotation.tags) || options.annotation.tags.length === 0) {
         return this.$q.when([]);
       }
+      const tags = [];
+      for (let t of params.tags) {
+        tags.push(this.templateSrv.replace(t));
+      }
+      params.tags = tags;
     }
 
     return this.backendSrv.get('/api/annotations', params);
diff --git a/public/app/plugins/datasource/grafana/specs/datasource.jest.ts b/public/app/plugins/datasource/grafana/specs/datasource.jest.ts
new file mode 100644
index 00000000000..544b04056ac
--- /dev/null
+++ b/public/app/plugins/datasource/grafana/specs/datasource.jest.ts
@@ -0,0 +1,65 @@
+import {GrafanaDatasource} from "../datasource";
+import q from 'q';
+import moment from 'moment';
+
+describe('grafana data source', () => {
+  describe('when executing an annotations query', () => {
+    let calledBackendSrvParams;
+    const backendSrvStub = {
+      get: (url, options) => {
+        calledBackendSrvParams = options;
+        return q.resolve([]);
+      }
+    };
+
+    const templateSrvStub = {
+      replace: val => val.replace('$var', 'replaced')
+    };
+
+    const ds = new GrafanaDatasource(backendSrvStub, q, templateSrvStub);
+
+    describe('with tags that have template variables', () => {
+      const options = setupAnnotationQueryOptions(
+        {tags: ['tag1:$var']}
+      );
+
+      beforeEach(() => {
+        return ds.annotationQuery(options);
+      });
+
+      it('should interpolate template variables in tags in query options', () => {
+        expect(calledBackendSrvParams.tags[0]).toBe('tag1:replaced');
+      });
+    });
+
+    describe('with type dashboard', () => {
+      const options = setupAnnotationQueryOptions(
+        {
+          type: 'dashboard',
+          tags: ['tag1']
+        },
+        {id: 1}
+      );
+
+      beforeEach(() => {
+        return ds.annotationQuery(options);
+      });
+
+      it('should remove tags from query options', () => {
+        expect(calledBackendSrvParams.tags).toBe(undefined);
+      });
+    });
+  });
+});
+
+function setupAnnotationQueryOptions(annotation, dashboard?) {
+  return {
+    annotation: annotation,
+    dashboard: dashboard,
+    range: {
+      from: moment(1432288354),
+      to: moment(1432288401)
+    },
+    rangeRaw: {from: "now-24h", to: "now"}
+  };
+}