Support ms resolution.

Patch from Jay Dawes <ajaxous@gmail.com>

dist/datasource-zabbix/dataProcessor.js

@@ -126,6 +126,14 @@ System.register(['lodash', './utils'], function (_export, _context) {
     } else {
       return sortedTimeseries.slice(-n);
     }
+  }function SUM(values) {
+    var sum = 0;
+    _.each(values, function (value) {
+      sum += value;
+    });
+    return sum;
+  }function COUNT(values) {
+    return values.length;
   }function AVERAGE(values) {
     var sum = 0;
     _.each(values, function (value) {
@@ -250,6 +258,8 @@ System.register(['lodash', './utils'], function (_export, _context) {
         min: _.partial(aggregateWrapper, MIN),
         max: _.partial(aggregateWrapper, MAX),
         median: _.partial(aggregateWrapper, MEDIAN),
+        sum: _.partial(aggregateWrapper, SUM),
+        count: _.partial(aggregateWrapper, COUNT),
         sumSeries: sumSeries,
         top: _.partial(limit, 'top'),
         bottom: _.partial(limit, 'bottom'),
@@ -261,7 +271,9 @@ System.register(['lodash', './utils'], function (_export, _context) {
         avg: AVERAGE,
         min: MIN,
         max: MAX,
-        median: MEDIAN
+        median: MEDIAN,
+        sum: SUM,
+        count: COUNT
       };
 
       _export('default', {
@@ -271,6 +283,8 @@ System.register(['lodash', './utils'], function (_export, _context) {
         MIN: MIN,
         MAX: MAX,
         MEDIAN: MEDIAN,
+        SUM: SUM,
+        COUNT: COUNT,
         unShiftTimeSeries: unShiftTimeSeries,
 
         get aggregationFunctions() {

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/metricFunctions.js

@@ -85,7 +85,7 @@ System.register(['lodash', 'jquery'], function (_export, _context) {
       addFuncDef({
         name: 'groupBy',
         category: 'Transform',
-        params: [{ name: 'interval', type: 'string' }, { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'median'] }],
+        params: [{ name: 'interval', type: 'string' }, { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }],
         defaultParams: ['1m', 'avg']
       });
 
@@ -140,10 +140,24 @@ System.register(['lodash', 'jquery'], function (_export, _context) {
         defaultParams: ['1m']
       });
 
+      addFuncDef({
+        name: 'sum',
+        category: 'Aggregate',
+        params: [{ name: 'interval', type: 'string' }],
+        defaultParams: ['1m']
+      });
+
+      addFuncDef({
+        name: 'count',
+        category: 'Aggregate',
+        params: [{ name: 'interval', type: 'string' }],
+        defaultParams: ['1m']
+      });
+
       addFuncDef({
         name: 'aggregateBy',
         category: 'Aggregate',
-        params: [{ name: 'interval', type: 'string' }, { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'median'] }],
+        params: [{ name: 'interval', type: 'string' }, { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }],
         defaultParams: ['1m', 'avg']
       });
 
@@ -152,14 +166,14 @@ System.register(['lodash', 'jquery'], function (_export, _context) {
       addFuncDef({
         name: 'top',
         category: 'Filter',
-        params: [{ name: 'number', type: 'int' }, { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'median'] }],
+        params: [{ name: 'number', type: 'int' }, { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }],
         defaultParams: [5, 'avg']
       });
 
       addFuncDef({
         name: 'bottom',
         category: 'Filter',
-        params: [{ name: 'number', type: 'int' }, { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'median'] }],
+        params: [{ name: 'number', type: 'int' }, { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }],
         defaultParams: [5, 'avg']
       });
 
@@ -168,7 +182,7 @@ System.register(['lodash', 'jquery'], function (_export, _context) {
       addFuncDef({
         name: 'trendValue',
         category: 'Trends',
-        params: [{ name: 'type', type: 'string', options: ['avg', 'min', 'max'] }],
+        params: [{ name: 'type', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count'] }],
         defaultParams: ['avg']
       });
 

dist/datasource-zabbix/query.controller.js

@@ -139,7 +139,7 @@ System.register(['app/plugins/sdk', 'angular', 'lodash', './utils', './metricFun
 
             if (target.mode === 0 || target.mode === 2) {
 
-              this.downsampleFunctionList = [{ name: "avg", value: "avg" }, { name: "min", value: "min" }, { name: "max", value: "max" }];
+              this.downsampleFunctionList = [{ name: "avg", value: "avg" }, { name: "min", value: "min" }, { name: "max", value: "max" }, { name: "sum", value: "sum" }, { name: "count", value: "count" }];
 
               this.initFilters();
             } else if (target.mode === 1) {

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) {
@@ -86,6 +86,12 @@ System.register(['lodash'], function (_export, _context) {
       case "avg":
         value = point.value_avg;
         break;
+      case "sum":
+        value = point.value_sum;
+        break;
+      case "count":
+        value = point.value_count;
+        break;
       default:
         value = point.value_avg;
     }