Merge branch 'master' into backend

src/datasource-zabbix/migrations.ts

@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import { ZabbixMetricsQuery } from './types';
+import * as c from './constants';
 
 /**
  * Query format migration.
@@ -28,6 +29,34 @@ export function migrateFrom2To3version(target: ZabbixMetricsQuery) {
   return target;
 }
 
+function migratePercentileAgg(target) {
+  if (target.functions) {
+    for (const f of target.functions) {
+      if (f.def && f.def.name === 'percentil') {
+        f.def.name = 'percentile';
+      }
+    }
+  }
+}
+
+function migrateQueryType(target) {
+  if (target.queryType === undefined) {
+    if (target.mode === 'Metrics') {
+      // Explore mode
+      target.queryType = c.MODE_METRICS;
+    } else if (target.mode !== undefined) {
+      target.queryType = target.mode;
+      delete target.mode;
+    }
+  }
+}
+
+function migrateSLA(target) {
+  if (target.queryType === c.MODE_ITSERVICE && !target.slaInterval) {
+    target.slaInterval = 'none';
+  }
+}
+
 export function migrate(target) {
   target.resultFormat = target.resultFormat || 'time_series';
   target = fixTargetGroup(target);
@@ -35,6 +64,8 @@ export function migrate(target) {
     return migrateFrom2To3version(target);
   }
   migratePercentileAgg(target);
+  migrateQueryType(target);
+  migrateSLA(target);
   return target;
 }
 
@@ -53,16 +84,6 @@ function convertToRegex(str) {
   }
 }
 
-function migratePercentileAgg(target) {
-  if (target.functions) {
-    for (const f of target.functions) {
-      if (f.def && f.def.name === 'percentil') {
-        f.def.name = 'percentile';
-      }
-    }
-  }
-}
-
 export const DS_CONFIG_SCHEMA = 2;
 export function migrateDSConfig(jsonData) {
   if (!jsonData) {