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

Merge branch 'cache-service' into grafana-3.0

Browse Source
This commit is contained in:
Alexander Zobnin
2016-02-01 13:50:44 +03:00
parent c10f10e811 607e867ccb
commit fbebb1f04e
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/datasource-zabbix/datasource.js
View File

@@ -295,14 +295,14 @@ function (angular, _, dateMath, utils, metricFunctions) {
// Get items
if (parts.length === 4) {
//var items = this.queryProcessor.filterItems(template.host, template.app, true);
return this.queryProcessor.filterItems(template.host, template.app, true)
return this.queryProcessor.filterItems(template.group, template.host, template.app, true)
.then(function(items) {
return _.map(items, formatMetric);
});
}
// Get applications
else if (parts.length === 3) {
return this.queryProcessor.filterApplications(template.host)
return this.queryProcessor.filterApplications(template.group, template.host)
.then(function(apps) {
return _.map(apps, formatMetric);
});