Merge branch 'prometheus_annotation_deduplication' of…

Merge branch 'prometheus_annotation_deduplication' of https://github.com/mtanda/grafana into mtanda-prometheus_annotation_deduplication

public/app/plugins/datasource/prometheus/datasource.ts

@@ -355,10 +355,11 @@ export class PrometheusDatasource implements DataSourceApi<PromQuery> {
           })
           })
           .value();
           .value();
 
 
+        const dupCheck = {};
         for (const value of series.values) {
         for (const value of series.values) {
           const valueIsTrue = value[1] === '1'; // e.g. ALERTS
           const valueIsTrue = value[1] === '1'; // e.g. ALERTS
           if (valueIsTrue || annotation.useValueForTime) {
           if (valueIsTrue || annotation.useValueForTime) {
-            const event = {
+            const event: any = {
               annotation: annotation,
               annotation: annotation,
               title: self.resultTransformer.renderTemplate(titleFormat, series.metric),
               title: self.resultTransformer.renderTemplate(titleFormat, series.metric),
               tags: tags,
               tags: tags,
@@ -366,9 +367,14 @@ export class PrometheusDatasource implements DataSourceApi<PromQuery> {
             };
             };
 
 
             if (annotation.useValueForTime) {
             if (annotation.useValueForTime) {
-              event['time'] = Math.floor(parseFloat(value[1]));
+              const timestampValue = Math.floor(parseFloat(value[1]));
+              if (dupCheck[timestampValue]) {
+                continue;
+              }
+              dupCheck[timestampValue] = true;
+              event.time = timestampValue;
             } else {
             } else {
-              event['time'] = Math.floor(parseFloat(value[0])) * 1000;
+              event.time = Math.floor(parseFloat(value[0])) * 1000;
             }
             }
 
 
             eventList.push(event);
             eventList.push(event);