Merge branch 'ms-resolution'

dist/datasource-zabbix/datasource.js

@@ -446,7 +446,7 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
                       value = extractText(point.value, target.textFilter, target.useCaptureGroups);
                     }
 
-                    return [value, point.clock * 1000];
+                    return [value, point.clock * 1000 + Math.round(point.ns / 1000000)];
                   });
                 });
               } else {

dist/datasource-zabbix/responseHandler.js

@@ -71,7 +71,7 @@ System.register(['lodash'], function (_export, _context) {
     }
   }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) {

dist/test/datasource-zabbix/datasource.js

@@ -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 {

dist/test/datasource-zabbix/responseHandler.js

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