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

Resolved #69 - Able to select min, max or avg value for downsampling.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-08-14 21:22:19 +03:00
parent 53f20fe417
commit bf07637fc1
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zabbix/datasource.js
View File

@@ -171,21 +171,20 @@ function (angular, _, kbn) {
items = _.flatten(items); items = _.flatten(items);
// Use alias only for single metric, otherwise use item names // Use alias only for single metric, otherwise use item names
var alias = target.item.name === 'All' || itemnames.length > 1 ? undefined : templateSrv.replace(target.alias, options.scopedVars); var alias = target.item.name === 'All' || itemnames.length > 1 ?
undefined : templateSrv.replace(target.alias, options.scopedVars);
var history; var history;
var handleFunction;
if ((from < useTrendsFrom) && self.trends) { if ((from < useTrendsFrom) && self.trends) {
history = self.zabbixAPI.getTrends(items, from, to); var points = target.downsampleFunction ? target.downsampleFunction.value : "avg";
handleFunction = zabbixHelperSrv.handleTrendResponse; history = self.zabbixAPI.getTrends(items, from, to)
.then(_.bind(zabbixHelperSrv.handleTrendResponse, zabbixHelperSrv, items, alias, target.scale, points));
} else { } else {
history = self.zabbixAPI.getHistory(items, from, to); history = self.zabbixAPI.getHistory(items, from, to)
handleFunction = zabbixHelperSrv.handleHistoryResponse; .then(_.bind(zabbixHelperSrv.handleHistoryResponse, zabbixHelperSrv, items, alias, target.scale));
} }
return history return history.then(function (timeseries) {
.then(_.bind(handleFunction, zabbixHelperSrv, items, alias, target.scale))
.then(function (timeseries) {
var timeseries_data = _.flatten(timeseries); var timeseries_data = _.flatten(timeseries);
return _.map(timeseries_data, function (timeseries) { return _.map(timeseries_data, function (timeseries) {

15
zabbix/helperFunctions.js
View File

@@ -72,6 +72,7 @@ function (angular, _) {
* @param {Array} items Array of Zabbix Items * @param {Array} items Array of Zabbix Items
* @param alias * @param alias
* @param scale * @param scale
* @param {string} points Point value to return: min, max or avg
* @param {Array} trends Array of Zabbix Trends * @param {Array} trends Array of Zabbix Trends
* *
* @return {Array} Array of timeseries in Grafana format * @return {Array} Array of timeseries in Grafana format
@@ -80,7 +81,7 @@ function (angular, _) {
* datapoints: [[<value>, <unixtime>], ...] * datapoints: [[<value>, <unixtime>], ...]
* } * }
*/ */
this.handleTrendResponse = function (items, alias, scale, trends) { this.handleTrendResponse = function (items, alias, scale, points, trends) {
// Group items and trends by itemid // Group items and trends by itemid
var indexed_items = _.indexBy(items, 'itemid'); var indexed_items = _.indexBy(items, 'itemid');
@@ -95,7 +96,16 @@ function (angular, _) {
datapoints: _.map(trends, function (p) { datapoints: _.map(trends, function (p) {
// Value must be a number for properly work // Value must be a number for properly work
var value = Number(p.value_avg); var value;
if (points === "min") {
value = Number(p.value_min);
}
else if (points === "max") {
value = Number(p.value_max);
}
else {
value = Number(p.value_avg);
}
// Apply scale // Apply scale
if (scale) { if (scale) {
@@ -219,6 +229,7 @@ function (angular, _) {
* @param {Object[]} datapoints [[<value>, <unixtime>], ...] * @param {Object[]} datapoints [[<value>, <unixtime>], ...]
* @param {integer} time_to Panel time to * @param {integer} time_to Panel time to
* @param {integer} ms_interval Interval in milliseconds for grouping datapoints * @param {integer} ms_interval Interval in milliseconds for grouping datapoints
* @param {string} func Value to return: min, max or avg
* @return {Object[]} [[<value>, <unixtime>], ...] * @return {Object[]} [[<value>, <unixtime>], ...]
*/ */
this.downsampleSeries = function(datapoints, time_to, ms_interval, func) { this.downsampleSeries = function(datapoints, time_to, ms_interval, func) {