Backend: Merge master into the backend branch (#845)

* CI: fix shellcheck issues (#789)

Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>

* annotations: fix options in grafana 6.x, fix #813

* fix function editor in Grafana 6.4, closes #810

* add typings for grafana packages

* Add $__range_series variable for calculating function over the whole series, #531

* fix tests

* Don't set alert styles for react panels, fix #823

* docs: add range variables

* docs: percentile reference

* fix codespell

Co-authored-by: Mario Trangoni <mario@mariotrangoni.de>
Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>

.circleci/deploy-docs.sh

@@ -10,15 +10,15 @@ set -o pipefail
 echo "current dir: $(pwd)"
 
 # Setup git env
-git config --global user.email $CI_GIT_EMAIL
-git config --global user.name $CI_GIT_USER
+git config --global user.email "$CI_GIT_EMAIL"
+git config --global user.name "$CI_GIT_USER"
 echo "git user is $CI_GIT_USER ($CI_GIT_EMAIL)"
 
-git checkout -b $GH_PAGES_BRANCH
-rm -rf * || true
+git checkout -b "$GH_PAGES_BRANCH"
+rm -rf ./* || true
 mv ../gh-pages/docs/site/* ./
 git add --force .
 git commit -m "build docs from commit ${CIRCLE_SHA1:0:7} (branch $CIRCLE_BRANCH)"
 git log -n 3
 
-git push origin $GH_PAGES_BRANCH --force
+git push origin "$GH_PAGES_BRANCH" --force

.circleci/make-release.sh

@@ -8,13 +8,13 @@ set -o errexit
 set -o pipefail
 
 # Setup git env
-git config --global user.email $CI_GIT_EMAIL
-git config --global user.name $CI_GIT_USER
+git config --global user.email "$CI_GIT_EMAIL"
+git config --global user.name "$CI_GIT_USER"
 echo "git user is $CI_GIT_USER ($CI_GIT_EMAIL)"
 
-RELEASE_VER=$(echo $CIRCLE_TAG | grep -Po "(?<=v)[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)")
+RELEASE_VER=$(echo "$CIRCLE_TAG" | grep -Po "(?<=v)[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)")
 
-if [ -z $RELEASE_VER ]; then
+if [ -z "$RELEASE_VER" ]; then
     echo "No release version provided"
     exit 1
 fi
@@ -36,7 +36,7 @@ git add --force dist/
 git commit -m "release $RELEASE_VER"
 
 RELEASE_COMMIT_HASH=$(git log -n 1 | grep -Po "(?<=commit )[0-9a-z]{40}")
-echo $RELEASE_COMMIT_HASH
+echo "$RELEASE_COMMIT_HASH"
 
 # Push release branch
-git push origin $RELEASE_BRANCH
+git push origin "$RELEASE_BRANCH"

.codespell_ignore

@@ -0,0 +1 @@
+hist

docs/sources/reference/functions.md

@@ -1,6 +1,23 @@
 Functions reference
 ===================
 
+## Functions Variables
+
+There are some built-in template variables available for using in functions:
+
+- `$__range_ms` - panel time range in ms
+- `$__range_s` - panel time range in seconds
+- `$__range` - panel time range, string representation (`30s`, `1m`, `1h`)
+- `$__range_series` - invoke function over all series values
+
+Examples:
+```
+groupBy($__range, avg)
+percentile($__range_series, 95) - 95th percentile over all values
+```
+
+---
+
 ## Transform
 
 
@@ -10,7 +27,7 @@ Functions reference
 groupBy(interval, function)
 ```
 
-Takes each timeseries and consolidate its points falled in given _interval_ into one point using _function_, which can be one of: _avg_, _min_, _max_, _median_.
+Takes each timeseries and consolidate its points fallen in the given _interval_ into one point using _function_, which can be one of: _avg_, _min_, _max_, _median_.
 
 Examples:
 ```
@@ -124,7 +141,7 @@ Replaces `null` values with N
 aggregateBy(interval, function)
 ```
 
-Takes all timeseries and consolidate all its points falled in given _interval_ into one point using _function_, which can be one of: _avg_, _min_, _max_, _median_.
+Takes all timeseries and consolidate all its points fallen in the given _interval_ into one point using _function_, which can be one of: _avg_, _min_, _max_, _median_.
 
 Examples:
 ```
@@ -142,6 +159,20 @@ This will add metrics together and return the sum at each datapoint. This method
 
 ---
 
+### _percentile_
+```
+percentile(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)
+percentile($__range_series, 95) - 95th percentile over all values
+```
+
+---
+
 ### _average_
 ```
 average(interval)

src/datasource-zabbix/components/FunctionEditor.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { FunctionDescriptor, FunctionEditorControlsProps, FunctionEditorControls } from './FunctionEditorControls';
 
 // @ts-ignore
-import { PopperController, Popper } from '@grafana/ui';
+import { PopoverController, Popover } from '@grafana/ui';
 
 interface FunctionEditorProps extends FunctionEditorControlsProps {
   func: FunctionDescriptor;
@@ -66,12 +66,12 @@ class FunctionEditor extends React.PureComponent<FunctionEditorProps, FunctionEd
 
   render() {
     return (
-      <PopperController content={this.renderContent} placement="top" hideAfter={300}>
+      <PopoverController content={this.renderContent} placement="top" hideAfter={300}>
         {(showPopper, hidePopper, popperProps) => {
           return (
             <>
               {this.triggerRef && (
-                <Popper
+                <Popover
                   {...popperProps}
                   referenceElement={this.triggerRef.current}
                   wrapperClassName="popper"
@@ -101,7 +101,7 @@ class FunctionEditor extends React.PureComponent<FunctionEditorProps, FunctionEd
             </>
           );
         }}
-      </PopperController>
+      </PopoverController>
     );
   }
 }

src/datasource-zabbix/constants.js

@@ -37,3 +37,5 @@ export const TRIGGER_SEVERITY = [
 
 /** Minimum interval for SLA over time (1 hour) */
 export const MIN_SLA_INTERVAL = 3600;
+
+export const RANGE_VARIABLE_VALUE = 'range_series';

src/datasource-zabbix/dataProcessor.js

@@ -1,9 +1,8 @@
 import _ from 'lodash';
 import * as utils from './utils';
-import ts from './timeseries';
+import ts, { groupBy_perf as groupBy } from './timeseries';
 
 let downsampleSeries = ts.downsample;
-let groupBy = ts.groupBy_perf;
 let groupBy_exported = (interval, groupFunc, datapoints) => groupBy(datapoints, interval, groupFunc);
 let sumSeries = ts.sumSeries;
 let delta = ts.delta;

src/datasource-zabbix/datasource.js

@@ -132,6 +132,9 @@ export class ZabbixDatasource extends DataSourceApi {
       let timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);
       let timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);
 
+      // Add range variables
+      options.scopedVars = Object.assign({}, options.scopedVars, utils.getRangeScopedVars(options.range));
+
       // Prevent changes of original object
       let target = _.cloneDeep(t);
 

src/datasource-zabbix/partials/annotations.editor.html

@@ -1,5 +1,4 @@
 <div class="gf-form-group">
-  <h6>Filter Triggers</h6>
   <div class="gf-form-inline">
     <div class="gf-form">
       <span class="gf-form-label width-10">Group</span>
@@ -36,8 +35,9 @@ <h6>Filter Triggers</h6>
   </div>
 </div>
 <div class="gf-form-group">
+  <h6>Options</h6>
   <div class="gf-form">
-    <span class="gf-form-label width-10">Minimum severity</span>
+    <span class="gf-form-label width-12">Minimum severity</span>
     <div class="gf-form-select-wrapper">
       <select class="gf-form-input gf-size-auto"
               ng-init='ctrl.annotation.minseverity = ctrl.annotation.minseverity || 0'
@@ -54,12 +54,16 @@ <h6>Filter Triggers</h6>
       </select>
     </div>
   </div>
-</div>
-<div class="gf-form-group">
-  <h6>Options</h6>
-  <div class="gf-form">
-    <editor-checkbox text="Show OK events" model="ctrl.annotation.showOkEvents"></editor-checkbox>
-    <editor-checkbox text="Hide acknowledged events" model="ctrl.annotation.hideAcknowledged"></editor-checkbox>
-    <editor-checkbox text="Show hostname" model="ctrl.annotation.showHostname"></editor-checkbox>
-  </div>
+  <gf-form-switch class="gf-form" label-class="width-12"
+    label="Show OK events"
+    checked="ctrl.annotation.showOkEvents">
+  </gf-form-switch>
+  <gf-form-switch class="gf-form" label-class="width-12"
+    label="Hide acknowledged events"
+    checked="ctrl.annotation.hideAcknowledged">
+  </gf-form-switch>
+  <gf-form-switch class="gf-form" label-class="width-12"
+    label="Show hostname"
+    checked="ctrl.annotation.showHostname">
+  </gf-form-switch>
 </div>

src/datasource-zabbix/specs/datasource.spec.js

@@ -2,6 +2,7 @@ import _ from 'lodash';
 import mocks from '../../test-setup/mocks';
 import { Datasource } from "../module";
 import { zabbixTemplateFormat } from "../datasource";
+import { dateMath } from '@grafana/data';
 
 describe('ZabbixDatasource', () => {
   let ctx = {};
@@ -41,7 +42,10 @@ describe('ZabbixDatasource', () => {
           item: {filter: ""}
         }
       ],
-      range: {from: 'now-7d', to: 'now'}
+      range: {
+        from: dateMath.parse('now-1h'),
+        to: dateMath.parse('now')
+      }
     };
 
     it('should return an empty array when no targets are set', (done) => {
@@ -59,7 +63,7 @@ describe('ZabbixDatasource', () => {
       let ranges = ['now-8d', 'now-169h', 'now-1M', 'now-1y'];
 
       _.forEach(ranges, range => {
-        ctx.options.range.from = range;
+        ctx.options.range.from = dateMath.parse(range);
         ctx.ds.queryNumericData = jest.fn();
         ctx.ds.query(ctx.options);
 
@@ -76,7 +80,7 @@ describe('ZabbixDatasource', () => {
       let ranges = ['now-7d', 'now-168h', 'now-1h', 'now-30m', 'now-30s'];
 
       _.forEach(ranges, range => {
-        ctx.options.range.from = range;
+        ctx.options.range.from = dateMath.parse(range);
         ctx.ds.queryNumericData = jest.fn();
         ctx.ds.query(ctx.options);
 
@@ -108,24 +112,19 @@ describe('ZabbixDatasource', () => {
         }
       ]));
 
-      ctx.options = {
-        range: {from: 'now-1h', to: 'now'},
-        targets: [
-          {
-            group: {filter: ""},
-            host: {filter: "Zabbix server"},
-            application: {filter: ""},
-            item: {filter: "System information"},
-            textFilter: "",
-            useCaptureGroups: true,
-            mode: 2,
-            resultFormat: "table",
-            options: {
-              skipEmptyValues: false
-            }
-          }
-        ],
-      };
+      ctx.options.targets = [{
+        group: {filter: ""},
+        host: {filter: "Zabbix server"},
+        application: {filter: ""},
+        item: {filter: "System information"},
+        textFilter: "",
+        useCaptureGroups: true,
+        mode: 2,
+        resultFormat: "table",
+        options: {
+          skipEmptyValues: false
+        }
+      }];
     });
 
     it('should return data in table format', (done) => {

src/datasource-zabbix/timeseries.js

@@ -11,6 +11,7 @@
 
 import _ from 'lodash';
 import * as utils from './utils';
+import * as c from './constants';
 
 const POINT_VALUE = 0;
 const POINT_TIMESTAMP = 1;
@@ -94,11 +95,15 @@ function groupBy(datapoints, interval, groupByCallback) {
   }));
 }
 
-function groupBy_perf(datapoints, interval, groupByCallback) {
+export function groupBy_perf(datapoints, interval, groupByCallback) {
   if (datapoints.length === 0) {
     return [];
   }
 
+  if (interval === c.RANGE_VARIABLE_VALUE) {
+    return groupByRange(datapoints, groupByCallback);
+  }
+
   let ms_interval = utils.parseInterval(interval);
   let grouped_series = [];
   let frame_values = [];
@@ -132,6 +137,19 @@ function groupBy_perf(datapoints, interval, groupByCallback) {
   return grouped_series;
 }
 
+export function groupByRange(datapoints, groupByCallback) {
+  const frame_values = [];
+  const frame_start = datapoints[0][POINT_TIMESTAMP];
+  const frame_end = datapoints[datapoints.length - 1][POINT_TIMESTAMP];
+  let point;
+  for (let i=0; i < datapoints.length; i++) {
+    point = datapoints[i];
+    frame_values.push(point[POINT_VALUE]);
+  }
+  const frame_value = groupByCallback(frame_values);
+  return [[frame_value, frame_start], [frame_value, frame_end]];
+}
+
 /**
  * Summarize set of time series into one.
  * @param {datapoints[]} timeseries array of time series
@@ -495,6 +513,7 @@ const exportedFunctions = {
   downsample,
   groupBy,
   groupBy_perf,
+  groupByRange,
   sumSeries,
   scale,
   offset,

src/datasource-zabbix/utils.js

@@ -1,5 +1,7 @@
 import _ from 'lodash';
 import moment from 'moment';
+import kbn from 'grafana/app/core/utils/kbn';
+import * as c from './constants';
 
 /**
  * Expand Zabbix item name
@@ -141,6 +143,18 @@ export function isTemplateVariable(str, templateVariables) {
   }
 }
 
+export function getRangeScopedVars(range) {
+  const msRange = range.to.diff(range.from);
+  const sRange = Math.round(msRange / 1000);
+  const regularRange = kbn.secondsToHms(msRange / 1000);
+  return {
+    __range_ms: { text: msRange, value: msRange },
+    __range_s: { text: sRange, value: sRange },
+    __range: { text: regularRange, value: regularRange },
+    __range_series: {text: c.RANGE_VARIABLE_VALUE, value: c.RANGE_VARIABLE_VALUE},
+  };
+}
+
 export function buildRegex(str) {
   var matches = str.match(regexPattern);
   var pattern = matches[1];

src/datasource-zabbix/zabbixAlerting.service.js

@@ -32,7 +32,8 @@ export class ZabbixAlertingService {
       });
     }
 
-    if (panelIndex >= 0) {
+    // Don't apply alert styles to .panel-container--absolute (it rewrites position from absolute to relative)
+    if (panelIndex >= 0 && !panelContainers[panelIndex].className.includes('panel-container--absolute')) {
       let alertClass = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";
       $(panelContainers[panelIndex]).removeClass(alertClass);
 

src/test-setup/jest-setup.js

@@ -52,6 +52,7 @@ jest.mock('grafana/app/core/utils/datemath', () => {
 jest.mock('grafana/app/core/utils/kbn', () => {
   return {
     round_interval: n => n,
+    secondsToHms: n => n + 'ms'
   };
 }, {virtual: true});