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

replaceTemplateVars() refactor.

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

16
src/datasource-zabbix/datasource.js
View File

@@ -125,10 +125,10 @@ export class ZabbixAPIDatasource {
} }
// Replace templated variables // Replace templated variables
var groupFilter = this.replaceTemplateVars(target.group.filter, options.scopedVars, self.multiValueFormat); var groupFilter = this.replaceTemplateVars(target.group.filter, options.scopedVars);
var hostFilter = this.replaceTemplateVars(target.host.filter, options.scopedVars, self.multiValueFormat); var hostFilter = this.replaceTemplateVars(target.host.filter, options.scopedVars);
var appFilter = this.replaceTemplateVars(target.application.filter, options.scopedVars, self.multiValueFormat); var appFilter = this.replaceTemplateVars(target.application.filter, options.scopedVars);
var itemFilter = this.replaceTemplateVars(target.item.filter, options.scopedVars, self.multiValueFormat); var itemFilter = this.replaceTemplateVars(target.item.filter, options.scopedVars);
// Query numeric data // Query numeric data
if (!target.mode || target.mode === 0) { if (!target.mode || target.mode === 0) {
@@ -288,7 +288,7 @@ export class ZabbixAPIDatasource {
var self = this; var self = this;
var parts = []; var parts = [];
_.each(query.split('.'), function (part) { _.each(query.split('.'), function (part) {
part = self.replaceTemplateVars(part, {}, self.multiValueFormat); part = self.replaceTemplateVars(part, {});
// Replace wildcard to regex // Replace wildcard to regex
if (part === '*') { if (part === '*') {
@@ -349,9 +349,9 @@ export class ZabbixAPIDatasource {
// Show all triggers // Show all triggers
var showTriggers = [0, 1]; var showTriggers = [0, 1];
var buildQuery = self.queryProcessor.buildTriggerQuery(this.replaceTemplateVars(annotation.group, {}, self.multiValueFormat), var buildQuery = self.queryProcessor.buildTriggerQuery(this.replaceTemplateVars(annotation.group, {}),
this.replaceTemplateVars(annotation.host, {}, self.multiValueFormat), this.replaceTemplateVars(annotation.host, {}),
this.replaceTemplateVars(annotation.application, {}, self.multiValueFormat)); this.replaceTemplateVars(annotation.application, {}));
return buildQuery.then(function(query) { return buildQuery.then(function(query) {
return self.zabbixAPI.getTriggers(query.groupids, return self.zabbixAPI.getTriggers(query.groupids,
query.hostids, query.hostids,

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

@@ -116,7 +116,6 @@ export class ZabbixQueryController extends QueryCtrl {
suggestHosts() { suggestHosts() {
var self = this; var self = this;
var groupFilter = this.replaceTemplateVars(this.target.group.filter); var groupFilter = this.replaceTemplateVars(this.target.group.filter);
console.log(groupFilter);
return this.datasource.queryProcessor return this.datasource.queryProcessor
.filterGroups(self.metric.groupList, groupFilter) .filterGroups(self.metric.groupList, groupFilter)
.then(groups => { .then(groups => {