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

Refactor: queryProcessor renamend to queryBuilder.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-11-13 13:16:07 +03:00
parent 88ddcd0c42
commit 032927cf8f
6 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ class TriggerPanelEditorCtrl {
this.datasourceSrv.get(this.panel.datasource)
.then(datasource => {
this.datasource = datasource;
this.queryProcessor = datasource.queryProcessor;
this.queryBuilder = datasource.queryBuilder;
this.initFilters();
this.panelCtrl.refresh();
});
@@ -91,7 +91,7 @@ class TriggerPanelEditorCtrl {
}
suggestGroups() {
return this.queryProcessor.getAllGroups()
return this.queryBuilder.getAllGroups()
.then(groups => {
this.metric.groupList = groups;
return groups;
@@ -100,7 +100,7 @@ class TriggerPanelEditorCtrl {
suggestHosts() {
let groupFilter = this.datasource.replaceTemplateVars(this.panel.triggers.group.filter);
return this.queryProcessor.getAllHosts(groupFilter)
return this.queryBuilder.getAllHosts(groupFilter)
.then(hosts => {
this.metric.hostList = hosts;
return hosts;
@@ -110,7 +110,7 @@ class TriggerPanelEditorCtrl {
suggestApps() {
let groupFilter = this.datasource.replaceTemplateVars(this.panel.triggers.group.filter);
let hostFilter = this.datasource.replaceTemplateVars(this.panel.triggers.host.filter);
return this.queryProcessor.getAllApps(groupFilter, hostFilter)
return this.queryBuilder.getAllApps(groupFilter, hostFilter)
.then(apps => {
this.metric.appList = apps;
return apps;

4
src/panel-triggers/module.js
View File

@@ -108,7 +108,7 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
// Load datasource
return this.datasourceSrv.get(this.panel.datasource).then(datasource => {
var zabbix = datasource.zabbixAPI;
var queryProcessor = datasource.queryProcessor;
var queryBuilder = datasource.queryBuilder;
var showEvents = self.panel.showEvents.value;
var triggerFilter = self.panel.triggers;
@@ -117,7 +117,7 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
var hostFilter = datasource.replaceTemplateVars(triggerFilter.host.filter);
var appFilter = datasource.replaceTemplateVars(triggerFilter.application.filter);
var buildQuery = queryProcessor.buildTriggerQuery(groupFilter, hostFilter, appFilter);
var buildQuery = queryBuilder.buildTriggerQuery(groupFilter, hostFilter, appFilter);
return buildQuery.then(query => {
return zabbix.getTriggers(query.groupids,
query.hostids,