Merge branch 'master' into backend

docs/sources/reference/functions.md

@@ -105,6 +105,19 @@ calculates moving average over 60 points (if metric has 1 second resolution it m
 ```
 ---
 
+### _percentile_
+```
+percentile(interval, N)
+```
+Takes a series of values and a window size and consolidate all its points fallen in the given _interval_ into one point by Nth percentile.
+
+Examples:
+```
+percentile(1h, 99)
+percentile($__range_series, 95) - 95th percentile over all series values
+```
+---
+
 ### _removeAboveValue_
 ```
 removeAboveValue(N)
@@ -159,16 +172,16 @@ This will add metrics together and return the sum at each datapoint. This method
 
 ---
 
-### _percentile_
+### _percentileAgg_
 ```
-percentile(interval, N)
+percentileAgg(interval, N)
 ```
 Takes all timeseries and consolidate all its points fallen in the given _interval_ into one point by Nth percentile.
 
 Examples:
 ```
-percentile(1h, 99)
+percentileAgg(1h, 99)
-percentile($__range_series, 95) - 95th percentile over all values
+percentileAgg($__range_series, 95) - 95th percentile over all values
 ```
 
 ---

package.json

@@ -30,10 +30,10 @@
     "@babel/preset-env": "^7.8.3",
     "@babel/preset-react": "^7.8.3",
     "@emotion/core": "^10.0.27",
-    "@grafana/data": "canary",
+    "@grafana/data": "^6.5.3",
-    "@grafana/runtime": "canary",
+    "@grafana/runtime": "^6.5.3",
-    "@grafana/toolkit": "canary",
+    "@grafana/toolkit": "^6.5.3",
-    "@grafana/ui": "canary",
+    "@grafana/ui": "^6.5.3",
     "@types/classnames": "^2.2.9",
     "@types/grafana": "github:CorpGlory/types-grafana",
     "@types/jest": "^23.1.1",

src/datasource-zabbix/components/ZabbixInput.tsx

@@ -1,6 +1,6 @@
 import React, { FC } from 'react';
 import { css, cx } from 'emotion';
-import { Themeable, withTheme, Input, EventsWithValidation, ValidationEvents } from '@grafana/ui';
+import { withTheme, Input, EventsWithValidation, ValidationEvents, Themeable } from '@grafana/ui';
 import { GrafanaTheme } from '@grafana/data';
 import { isRegex, variableRegex } from '../utils';
 

src/datasource-zabbix/dataProcessor.js

@@ -2,6 +2,14 @@ import _ from 'lodash';
 import * as utils from './utils';
 import ts, { groupBy_perf as groupBy } from './timeseries';
 
+let SUM = ts.SUM;
+let COUNT = ts.COUNT;
+let AVERAGE = ts.AVERAGE;
+let MIN = ts.MIN;
+let MAX = ts.MAX;
+let MEDIAN = ts.MEDIAN;
+let PERCENTILE = ts.PERCENTILE;
+
 let downsampleSeries = ts.downsample;
 let groupBy_exported = (interval, groupFunc, datapoints) => groupBy(datapoints, interval, groupFunc);
 let sumSeries = ts.sumSeries;
@@ -11,14 +19,7 @@ let scale = (factor, datapoints) => ts.scale_perf(datapoints, factor);
 let offset = (delta, datapoints) => ts.offset(datapoints, delta);
 let simpleMovingAverage = (n, datapoints) => ts.simpleMovingAverage(datapoints, n);
 let expMovingAverage = (a, datapoints) => ts.expMovingAverage(datapoints, a);
-
+let percentile = (interval, n, datapoints) => groupBy(datapoints, interval, _.partial(PERCENTILE, n));
-let SUM = ts.SUM;
-let COUNT = ts.COUNT;
-let AVERAGE = ts.AVERAGE;
-let MIN = ts.MIN;
-let MAX = ts.MAX;
-let MEDIAN = ts.MEDIAN;
-let PERCENTILE = ts.PERCENTILE;
 
 function limit(order, n, orderByFunc, timeseries) {
   let orderByCallback = aggregationFunctions[orderByFunc];
@@ -120,7 +121,7 @@ function aggregateWrapper(groupByCallback, interval, datapoints) {
   return groupBy(sortedPoints, interval, groupByCallback);
 }
 
-function percentile(interval, n, datapoints) {
+function percentileAgg(interval, n, datapoints) {
   const flattenedPoints = ts.flattenDatapoints(datapoints);
   // groupBy_perf works with sorted series only
   const sortedPoints = ts.sortByTime(flattenedPoints);
@@ -153,10 +154,11 @@ let metricFunctions = {
   rate: rate,
   movingAverage: simpleMovingAverage,
   exponentialMovingAverage: expMovingAverage,
+  percentile: percentile,
   transformNull: transformNull,
   aggregateBy: aggregateByWrapper,
   // Predefined aggs
-  percentile: percentile,
+  percentileAgg: percentileAgg,
   average: _.partial(aggregateWrapper, AVERAGE),
   min: _.partial(aggregateWrapper, MIN),
   max: _.partial(aggregateWrapper, MAX),

src/datasource-zabbix/metricFunctions.js

@@ -85,6 +85,16 @@ addFuncDef({
   defaultParams: [0.2],
 });
 
+addFuncDef({
+  name: 'percentile',
+  category: 'Transform',
+  params: [
+    { name: 'interval', type: 'string' },
+    { name: 'percent', type: 'float', options: [25, 50, 75, 90, 95, 99, 99.9] }
+  ],
+  defaultParams: ['1m', 95],
+});
+
 addFuncDef({
   name: 'removeAboveValue',
   category: 'Transform',
@@ -140,7 +150,7 @@ addFuncDef({
 });
 
 addFuncDef({
-  name: 'percentile',
+  name: 'percentileAgg',
   category: 'Aggregate',
   params: [
     { name: 'interval', type: 'string' },

src/test-setup/jest-setup.js

@@ -82,6 +82,10 @@ jest.mock('grafana/app/core/config', () => {
 
 jest.mock('jquery', () => 'module not found', {virtual: true});
 
+// jest.mock('@grafana/ui', () => {
+//   return {};
+// }, {virtual: true});
+
 // Required for loading angularjs
 let dom = new JSDOM('<html><head><script></script></head><body></body></html>');
 // Setup jsdom

webpack/webpack.base.conf.js

@@ -27,8 +27,8 @@ module.exports = {
   },
   externals: [
     // remove the line below if you don't want to use builtin versions
-    'jquery', 'lodash', 'moment', 'angular',
+    'jquery', 'lodash', 'moment', 'angular', 'emotion',
-    'react', 'react-dom', '@grafana/ui', '@grafana/runtime','@grafana/data',
+    'react', 'react-dom', '@grafana/ui', '@grafana/data',
     function (context, request, callback) {
       var prefix = 'grafana/';
       if (request.indexOf(prefix) === 0) {