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

Fixed missed lodash indexBy() after upgrade to 4.x.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-09-15 22:14:26 +03:00
parent 2882a48f25
commit 74503655bd
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,7 +378,7 @@ export class ZabbixAPIDatasource {
return self.zabbixAPI return self.zabbixAPI
.getEvents(objectids, timeFrom, timeTo, showOkEvents) .getEvents(objectids, timeFrom, timeTo, showOkEvents)
.then(events => { .then(events => {
var indexedTriggers = _.indexBy(triggers, 'triggerid'); var indexedTriggers = _.groupBy(triggers, 'triggerid');
// Hide acknowledged events if option enabled // Hide acknowledged events if option enabled
if (annotation.hideAcknowledged) { if (annotation.hideAcknowledged) {

2
src/datasource-zabbix/queryProcessor.service.js
View File

@@ -230,7 +230,7 @@ angular.module('grafana.services').factory('QueryProcessor', function($q) {
// Group history by itemid // Group history by itemid
var grouped_history = _.groupBy(history, 'itemid'); var grouped_history = _.groupBy(history, 'itemid');
var hosts = _.indexBy(_.flatten(_.map(items, 'hosts')), 'hostid'); var hosts = _.groupBy(_.flatten(_.map(items, 'hosts')), 'hostid');
return _.map(grouped_history, function(hist, itemid) { return _.map(grouped_history, function(hist, itemid) {
var item = _.find(items, {'itemid': itemid}); var item = _.find(items, {'itemid': itemid});

2
src/datasource-zabbix/zabbixCache.service.js
View File

@@ -117,7 +117,7 @@ angular.module('grafana.services').factory('ZabbixCachingProxy', function($q, $i
var deferred = this.$q.defer(); var deferred = this.$q.defer();
var historyStorage = this.storage.history; var historyStorage = this.storage.history;
var full_history; var full_history;
var expired = _.filter(_.indexBy(items, 'itemid'), function(item, itemid) { var expired = _.filter(_.groupBy(items, 'itemid'), function(item, itemid) {
return !historyStorage[itemid]; return !historyStorage[itemid];
}); });
if (expired.length) { if (expired.length) {