Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	src/datasource-zabbix/partials/query.editor.html
	src/datasource-zabbix/query.controller.js

src/datasource-zabbix/query.controller.js

@@ -26,9 +26,9 @@ export class ZabbixQueryController extends QueryCtrl {
     this.templateSrv = templateSrv;
 
     this.editorModes = {
-      0: 'num',
-      1: 'itservice',
-      2: 'text'
+      0: {value: 'num', text: 'Numeric metrics', mode: 0},
+      1: {value: 'itservice', text: 'IT Services', mode: 1},
+      2: {value: 'text', text: 'Text metrics', mode: 2}
     };
 
     // Map functions for bs-typeahead
@@ -63,8 +63,7 @@ export class ZabbixQueryController extends QueryCtrl {
         functions: [],
         options: {
           showDisabledItems: false
-        },
-        refId: "A"
+        }
       };
       _.defaults(target, targetDefaults);
 
@@ -102,7 +101,7 @@ export class ZabbixQueryController extends QueryCtrl {
 
   initFilters() {
     var self = this;
-    var itemtype = self.editorModes[self.target.mode];
+    var itemtype = self.editorModes[self.target.mode].value;
     return this.$q.when(this.suggestGroups())
       .then(() => {return self.suggestHosts();})
       .then(() => {return self.suggestApps();})