Fixed #196 - Exponential lag on auto-updating dashboards.

Disabled hosts and items cahching.
This commit is contained in:
Alexander Zobnin
2016-04-13 23:40:39 +03:00
parent 293eb5792b
commit feb5033a0e
2 changed files with 7 additions and 6 deletions

View File

@@ -227,14 +227,13 @@ angular.module('grafana.services').factory('QueryProcessor', function($q) {
* }, ...
* ]
*/
var self = this;
// Group history by itemid
var grouped_history = _.groupBy(history, 'itemid');
var hosts = _.indexBy(_.flatten(_.map(items, 'hosts')), 'hostid');
return _.map(grouped_history, function(hist, itemid) {
var item = self.cache.getItem(itemid);
var item = _.find(items, {'itemid': itemid});
var alias = item.name;
if (_.keys(hosts).length > 1 || addHostName) {
var host = hosts[item.hostid];

View File

@@ -87,10 +87,11 @@ angular.module('grafana.services').factory('ZabbixCachingProxy', function($q, $i
}
getHosts(groupids) {
var self = this;
//var self = this;
return this.getHostsOnce(groupids)
.then(hosts => {
self._hosts = _.union(self._hosts, hosts);
// iss #196 - disable caching due performance issues
//self._hosts = _.union(self._hosts, hosts);
return hosts;
});
}
@@ -103,10 +104,11 @@ angular.module('grafana.services').factory('ZabbixCachingProxy', function($q, $i
}
getItems(hostids, appids, itemtype) {
var self = this;
//var self = this;
return this.getItemsOnce(hostids, appids, itemtype)
.then(items => {
self._items = _.union(self._items, items);
// iss #196 - disable caching due performance issues
//self._items = _.union(self._items, items);
return items;
});
}