From 2926725bab128b7bced9ce4f03b8ae368107423c Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Tue, 1 May 2018 12:49:18 +0900
Subject: [PATCH] add annotation option to treat series value as timestamp

---
 .../datasource/prometheus/datasource.ts       | 10 ++++-
 .../partials/annotations.editor.html          | 11 +++++-
 .../prometheus/specs/datasource.test.ts       | 39 +++++++++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index 9332a73caca..a60882e0470 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -487,15 +487,21 @@ export class PrometheusDatasource {
           .value();
 
         for (const value of series.values) {
-          if (value[1] === '1') {
+          const valueIsTrue = value[1] === '1'; // e.g. ALERTS
+          if (valueIsTrue || annotation.useValueForTime) {
             const event = {
               annotation: annotation,
-              time: Math.floor(parseFloat(value[0])) * 1000,
               title: self.resultTransformer.renderTemplate(titleFormat, series.metric),
               tags: tags,
               text: self.resultTransformer.renderTemplate(textFormat, series.metric),
             };
 
+            if (annotation.useValueForTime) {
+              event['time'] = Math.floor(parseFloat(value[1]));
+            } else {
+              event['time'] = Math.floor(parseFloat(value[0])) * 1000;
+            }
+
             eventList.push(event);
           }
         }
diff --git a/public/app/plugins/datasource/prometheus/partials/annotations.editor.html b/public/app/plugins/datasource/prometheus/partials/annotations.editor.html
index 09ee52bda45..6e5982123fd 100644
--- a/public/app/plugins/datasource/prometheus/partials/annotations.editor.html
+++ b/public/app/plugins/datasource/prometheus/partials/annotations.editor.html
@@ -10,7 +10,7 @@
 </div>
 
 <div class="gf-form-group">
-	<h5 class="section-heading">Field formats</h6>
+	<h5 class="section-heading">Field formats</h5>
 	<div class="gf-form-inline">
 		<div class="gf-form">
 			<span class="gf-form-label width-5">Title</span>
@@ -27,4 +27,13 @@
 			</div>
 		</div>
 	</div>
+
+	<h5 class="section-heading">Other options</h5>
+	<div class="gf-form-inline">
+		<div class="gf-form">
+			<gf-form-switch class="gf-form" label="Series value as timestamp" label-class="width-14" checked="ctrl.annotation.useValueForTime"
+			 tooltip="The unit of timestamp is milliseconds. If the unit of the series value is seconds, multiply its range vector by 1000.">
+			</gf-form-switch>
+		</div>
+	</div>
 </div>
diff --git a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
index ae91e6647e0..980574624ad 100644
--- a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
@@ -630,6 +630,45 @@ describe('PrometheusDatasource', () => {
       expect(results[0].text).toBe('testinstance');
       expect(results[0].time).toBe(123 * 1000);
     });
+
+    it('should return annotation list with seriesValueAsTiemstamp', () => {
+      const options = {
+        annotation: {
+          expr: 'timestamp_seconds',
+          tagKeys: 'job',
+          titleFormat: '{{job}}',
+          textFormat: '{{instance}}',
+          useValueForTime: true,
+        },
+        range: {
+          from: new Date('2014-04-10T05:20:10Z'),
+          to: new Date('2014-05-20T03:10:22Z'),
+        },
+      };
+      ctx.backendSrvMock.datasourceRequest.mockReturnValue(
+        Promise.resolve({
+          status: 'success',
+          data: {
+            resultType: 'matrix',
+            result: [
+              {
+                metric: {
+                  __name__: 'timestamp_milliseconds',
+                  instance: 'testinstance',
+                  job: 'testjob',
+                },
+                values: [[1443454528, '1500000000000']],
+              },
+            ],
+          },
+        })
+      );
+      ctx.ds = new PrometheusDatasource(instanceSettings, q, ctx.backendSrvMock, ctx.templateSrvMock, ctx.timeSrvMock);
+      ctx.ds.annotationQuery(options).then(function (results) {
+        expect(results[0].time).toEqual(1500000000000);
+        ctx.backendSrvMock.datasourceRequest.mockReset();
+      });
+    });
   });
 
   describe('When resultFormat is table and instant = true', () => {