don't fetch alerts for empty item list
This commit is contained in:
3
dist/datasource-zabbix/datasource.js
vendored
3
dist/datasource-zabbix/datasource.js
vendored
@@ -771,6 +771,9 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
|
|||||||
var items = _.flatten(results);
|
var items = _.flatten(results);
|
||||||
var itemids = _.map(items, 'itemid');
|
var itemids = _.map(items, 'itemid');
|
||||||
|
|
||||||
|
if (itemids.length === 0) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
return _this11.zabbix.getAlerts(itemids);
|
return _this11.zabbix.getAlerts(itemids);
|
||||||
}).then(function (triggers) {
|
}).then(function (triggers) {
|
||||||
triggers = _.filter(triggers, function (trigger) {
|
triggers = _.filter(triggers, function (trigger) {
|
||||||
|
|||||||
2
dist/datasource-zabbix/datasource.js.map
vendored
2
dist/datasource-zabbix/datasource.js.map
vendored
File diff suppressed because one or more lines are too long
3
dist/test/datasource-zabbix/datasource.js
vendored
3
dist/test/datasource-zabbix/datasource.js
vendored
@@ -680,6 +680,9 @@ var ZabbixAPIDatasource = function () {
|
|||||||
var items = _lodash2.default.flatten(results);
|
var items = _lodash2.default.flatten(results);
|
||||||
var itemids = _lodash2.default.map(items, 'itemid');
|
var itemids = _lodash2.default.map(items, 'itemid');
|
||||||
|
|
||||||
|
if (itemids.length === 0) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
return _this11.zabbix.getAlerts(itemids);
|
return _this11.zabbix.getAlerts(itemids);
|
||||||
}).then(function (triggers) {
|
}).then(function (triggers) {
|
||||||
triggers = _lodash2.default.filter(triggers, function (trigger) {
|
triggers = _lodash2.default.filter(triggers, function (trigger) {
|
||||||
|
|||||||
@@ -576,6 +576,9 @@ class ZabbixAPIDatasource {
|
|||||||
let items = _.flatten(results);
|
let items = _.flatten(results);
|
||||||
let itemids = _.map(items, 'itemid');
|
let itemids = _.map(items, 'itemid');
|
||||||
|
|
||||||
|
if (itemids.length === 0) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
return this.zabbix.getAlerts(itemids);
|
return this.zabbix.getAlerts(itemids);
|
||||||
})
|
})
|
||||||
.then(triggers => {
|
.then(triggers => {
|
||||||
|
|||||||
Reference in New Issue
Block a user