Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix annotations with full day/week/month intervals, closes #680

Browse Source
This commit is contained in:
Alexander Zobnin
2019-03-01 14:00:15 +03:00
parent 55158de311
commit 6449b8b255
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/datasource-zabbix/datasource.js
View File

@@ -470,8 +470,9 @@ export class ZabbixDatasource {
///////////////// /////////////////
annotationQuery(options) { annotationQuery(options) {
var timeFrom = Math.ceil(dateMath.parse(options.rangeRaw.from) / 1000); const timeRange = options.range || options.rangeRaw;
var timeTo = Math.ceil(dateMath.parse(options.rangeRaw.to) / 1000); const timeFrom = Math.ceil(dateMath.parse(timeRange.from) / 1000);
const timeTo = Math.ceil(dateMath.parse(timeRange.to) / 1000);
var annotation = options.annotation; var annotation = options.annotation;
var showOkEvents = annotation.showOkEvents ? c.SHOW_ALL_EVENTS : c.SHOW_OK_EVENTS; var showOkEvents = annotation.showOkEvents ? c.SHOW_ALL_EVENTS : c.SHOW_OK_EVENTS;