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

fix empty field error in Item IDs mode

Browse Source
This commit is contained in:
Alexander Zobnin
2017-10-24 13:01:32 +03:00
parent 611bd8b8ad
commit d084e1723a
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,8 +116,7 @@ class ZabbixAPIDatasource {
let useTrends = this.isUseTrends(timeRange);
// Metrics or Text query mode
if (!target.mode || target.mode === c.MODE_METRICS ||
target.mode === c.MODE_TEXT || target.mode === c.MODE_ITEMID) {
if (!target.mode || target.mode === c.MODE_METRICS || target.mode === c.MODE_TEXT) {
// Migrate old targets
target = migrations.migrate(target);
@@ -130,13 +129,18 @@ class ZabbixAPIDatasource {
return this.queryNumericData(target, timeRange, useTrends, options);
} else if (target.mode === c.MODE_TEXT) {
return this.queryTextData(target, timeRange);
} else if (target.mode === c.MODE_ITEMID) {
return this.queryItemIdData(target, timeRange, useTrends, options);
}
} else if (target.mode === c.MODE_ITEMID) {
// Item ID mode
if (!target.itemids) {
return [];
}
return this.queryItemIdData(target, timeRange, useTrends, options);
} else if (target.mode === c.MODE_ITSERVICE) {
// IT services mode
return this.queryITServiceData(target, timeRange, options);
} else if (target.mode === c.MODE_TRIGGERS) {
// Triggers mode
return this.queryTriggersData(target, timeRange);
} else {
return [];