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

Merge branch 'ms-resolution'

Browse Source
This commit is contained in:
Alexander Zobnin
2017-03-28 19:49:20 +03:00
parent 59fa345927 682be45901
commit d5c4ad783c
8 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/test/datasource-zabbix/datasource.js vendored
View File

@@ -304,7 +304,7 @@ var ZabbixAPIDatasource = function () {
value = extractText(point.value, target.textFilter, target.useCaptureGroups);
}
return [value, point.clock * 1000];
return [value, point.clock * 1000 + Math.round(point.ns / 1000000)];
});
});
} else {

2
dist/test/datasource-zabbix/responseHandler.js vendored
View File

@@ -80,7 +80,7 @@ function handleSLAResponse(itservice, slaProperty, slaObject) {
function convertHistoryPoint(point) {
// Value must be a number for properly work
return [Number(point.value), point.clock * 1000];
return [Number(point.value), point.clock * 1000 + Math.round(point.ns / 1000000)];
}
function convertTrendPoint(valueType, point) {