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

11
dist/datasource-zabbix/datasource.js vendored
View File

@@ -318,7 +318,7 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
var useTrends = _this.isUseTrends(timeRange); var useTrends = _this.isUseTrends(timeRange);
// Metrics or Text query mode // 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 // Migrate old targets
target = migrations.migrate(target); target = migrations.migrate(target);
@@ -331,13 +331,18 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
return _this.queryNumericData(target, timeRange, useTrends, options); return _this.queryNumericData(target, timeRange, useTrends, options);
} else if (target.mode === c.MODE_TEXT) { } else if (target.mode === c.MODE_TEXT) {
return _this.queryTextData(target, timeRange); 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) { } else if (target.mode === c.MODE_ITSERVICE) {
// IT services mode // IT services mode
return _this.queryITServiceData(target, timeRange, options); return _this.queryITServiceData(target, timeRange, options);
} else if (target.mode === c.MODE_TRIGGERS) { } else if (target.mode === c.MODE_TRIGGERS) {
// Triggers mode
return _this.queryTriggersData(target, timeRange); return _this.queryTriggersData(target, timeRange);
} else { } else {
return []; return [];

2
dist/datasource-zabbix/datasource.js.map vendored
View File

File diff suppressed because one or more lines are too long

11
dist/test/datasource-zabbix/datasource.js vendored
View File

@@ -171,7 +171,7 @@ var ZabbixAPIDatasource = function () {
var useTrends = _this.isUseTrends(timeRange); var useTrends = _this.isUseTrends(timeRange);
// Metrics or Text query mode // 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 // Migrate old targets
target = migrations.migrate(target); target = migrations.migrate(target);
@@ -184,13 +184,18 @@ var ZabbixAPIDatasource = function () {
return _this.queryNumericData(target, timeRange, useTrends, options); return _this.queryNumericData(target, timeRange, useTrends, options);
} else if (target.mode === c.MODE_TEXT) { } else if (target.mode === c.MODE_TEXT) {
return _this.queryTextData(target, timeRange); 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) { } else if (target.mode === c.MODE_ITSERVICE) {
// IT services mode // IT services mode
return _this.queryITServiceData(target, timeRange, options); return _this.queryITServiceData(target, timeRange, options);
} else if (target.mode === c.MODE_TRIGGERS) { } else if (target.mode === c.MODE_TRIGGERS) {
// Triggers mode
return _this.queryTriggersData(target, timeRange); return _this.queryTriggersData(target, timeRange);
} else { } else {
return []; return [];

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

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