IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 20:24:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix, assign by event.time

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2019-03-21 16:39:37 +09:00
parent e868475c5b
commit 38457fabc1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,7 +358,7 @@ export class PrometheusDatasource implements DataSourceApi<PromQuery> {
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,
@ -371,9 +371,9 @@ export class PrometheusDatasource implements DataSourceApi<PromQuery> {
continue; continue;
} }
dupCheck[timestampValue] = true; dupCheck[timestampValue] = true;
event['time'] = timestampValue; 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);