Merge branch 'ms-resolution'

src/datasource-zabbix/datasource.js

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

src/datasource-zabbix/responseHandler.js

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