Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed metrics suggestion in Triggers panel.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-12-30 14:35:46 +03:00
parent b1b4339e09
commit 4ca72666ca
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/datasource-zabbix/query.controller.js
View File

@@ -180,11 +180,8 @@ export class ZabbixQueryController extends QueryCtrl {
* Check query for template variables * Check query for template variables
*/ */
isContainsVariables() { isContainsVariables() {
var self = this; return _.some(['group', 'host', 'application'], field => {
return _.some(self.templateSrv.variables, variable => { return utils.isTemplateVariable(this.panel.triggers[field].filter, this.templateSrv.variables);
return _.some(['group', 'host', 'application', 'item'], field => {
return self.templateSrv.containsVariable(self.target[field].filter, variable.name);
});
}); });
} }

12
src/panel-triggers/editor.js
View File

@@ -75,6 +75,7 @@ class TriggerPanelEditorCtrl {
this.datasourceSrv.get(this.panel.datasource) this.datasourceSrv.get(this.panel.datasource)
.then(datasource => { .then(datasource => {
this.datasource = datasource; this.datasource = datasource;
this.zabbix = datasource.zabbix;
this.queryBuilder = datasource.queryBuilder; this.queryBuilder = datasource.queryBuilder;
this.initFilters(); this.initFilters();
this.panelCtrl.refresh(); this.panelCtrl.refresh();
@@ -90,7 +91,7 @@ class TriggerPanelEditorCtrl {
} }
suggestGroups() { suggestGroups() {
return this.queryBuilder.getAllGroups() return this.zabbix.getAllGroups()
.then(groups => { .then(groups => {
this.metric.groupList = groups; this.metric.groupList = groups;
return groups; return groups;
@@ -99,7 +100,7 @@ class TriggerPanelEditorCtrl {
suggestHosts() { suggestHosts() {
let groupFilter = this.datasource.replaceTemplateVars(this.panel.triggers.group.filter); let groupFilter = this.datasource.replaceTemplateVars(this.panel.triggers.group.filter);
return this.queryBuilder.getAllHosts(groupFilter) return this.zabbix.getAllHosts(groupFilter)
.then(hosts => { .then(hosts => {
this.metric.hostList = hosts; this.metric.hostList = hosts;
return hosts; return hosts;
@@ -109,7 +110,7 @@ class TriggerPanelEditorCtrl {
suggestApps() { suggestApps() {
let groupFilter = this.datasource.replaceTemplateVars(this.panel.triggers.group.filter); let groupFilter = this.datasource.replaceTemplateVars(this.panel.triggers.group.filter);
let hostFilter = this.datasource.replaceTemplateVars(this.panel.triggers.host.filter); let hostFilter = this.datasource.replaceTemplateVars(this.panel.triggers.host.filter);
return this.queryBuilder.getAllApps(groupFilter, hostFilter) return this.zabbix.getAllApps(groupFilter, hostFilter)
.then(apps => { .then(apps => {
this.metric.appList = apps; this.metric.appList = apps;
return apps; return apps;
@@ -126,11 +127,8 @@ class TriggerPanelEditorCtrl {
* Check query for template variables * Check query for template variables
*/ */
isContainsVariables() { isContainsVariables() {
var self = this;
return _.some(self.templateSrv.variables, variable => {
return _.some(['group', 'host', 'application'], field => { return _.some(['group', 'host', 'application'], field => {
return self.templateSrv.containsVariable(self.panel.triggers[field].filter, variable.name); return utils.isTemplateVariable(this.panel.triggers[field].filter, this.templateSrv.variables);
});
}); });
} }