IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-03-22 12:45:46 +01:00
commit c7c0ba5a5a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/datasource/prometheus/datasource.ts
View File

@ -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);