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

Handle history response in query builder.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-01-23 22:12:03 +03:00
parent 6b71f42c48
commit fa220cc45a
4 changed files with 233 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/datasource-zabbix/datasource.js
View File

@@ -9,12 +9,12 @@ define([
'./zabbixCache',
'./queryCtrl'
],
function (angular, _, dateMath, QueryBuilder) {
function (angular, _, dateMath) {
'use strict';
/** @ngInject */
function ZabbixAPIDatasource(instanceSettings, $q, templateSrv, alertSrv,
ZabbixAPI, zabbixHelperSrv, ZabbixCache) {
ZabbixAPI, zabbixHelperSrv, ZabbixCache, QueryBuilder) {
// General data source settings
this.name = instanceSettings.name;
@@ -39,6 +39,8 @@ function (angular, _, dateMath, QueryBuilder) {
// Initialize query builder
this.queryBuilder = new QueryBuilder(this.zabbixCache);
console.log(this.zabbixCache);
////////////////////////
// Datasource methods //
////////////////////////
@@ -128,19 +130,26 @@ function (angular, _, dateMath, QueryBuilder) {
alias = templateSrv.replace(target.alias, options.scopedVars);
}
var history;
// Add hostname for items from multiple hosts
var addHostName = target.host.isRegex;
var getHistory;
if ((from < useTrendsFrom) && self.trends) {
// Use trends
var points = target.downsampleFunction ? target.downsampleFunction.value : "avg";
history = self.zabbixAPI.getTrends(items, from, to)
.then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, target.scale, points));
var valueType = target.downsampleFunction ? target.downsampleFunction.value : "avg";
getHistory = self.zabbixAPI.getTrends(items, from, to).then(function(history) {
return self.queryBuilder.handleTrends(history, addHostName, valueType);
});
} else {
// Use history
history = self.zabbixAPI.getHistory(items, from, to)
.then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, target.scale));
getHistory = self.zabbixAPI.getHistory(items, from, to).then(function(history) {
return self.queryBuilder.handleHistory(history, addHostName);
});
}
return history.then(function (timeseries) {
return getHistory.then(function (timeseries) {
var timeseries_data = _.flatten(timeseries);
return _.map(timeseries_data, function (timeseries) {