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

Merge branch 'feature-scale' into develop

Browse Source
This commit is contained in:
Alexander Zobnin
2015-06-20 17:36:49 +03:00
parent 721d978930 c4df472f6c
commit 0b034c1090
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
zabbix/datasource.js
View File

@@ -110,10 +110,10 @@ function (angular, _, kbn) {
if ((from < useTrendsFrom) && self.trends) { if ((from < useTrendsFrom) && self.trends) {
return self.getTrends(items, from, to) return self.getTrends(items, from, to)
.then(_.partial(self.handleTrendResponse, items)); .then(_.partial(self.handleTrendResponse, items, target.scale));
} else { } else {
return self.performTimeSeriesQuery(items, from, to) return self.performTimeSeriesQuery(items, from, to)
.then(_.partial(self.handleHistoryResponse, items)); .then(_.partial(self.handleHistoryResponse, items, target.scale));
} }
} }
}); });
@@ -190,7 +190,7 @@ function (angular, _, kbn) {
}; };
ZabbixAPIDatasource.prototype.handleTrendResponse = function(items, trends) { ZabbixAPIDatasource.prototype.handleTrendResponse = function(items, scale, 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');
@@ -204,6 +204,11 @@ function (angular, _, kbn) {
// Value must be a number for properly work // Value must be a number for properly work
var value = Number(p.value_avg); var value = Number(p.value_avg);
// Apply scale
if (scale) {
value *= scale;
}
return [value, p.clock * 1000]; return [value, p.clock * 1000];
}) })
}; };
@@ -226,7 +231,7 @@ function (angular, _, kbn) {
* datapoints: [[<value>, <unixtime>], ...] * datapoints: [[<value>, <unixtime>], ...]
* } * }
*/ */
ZabbixAPIDatasource.prototype.handleHistoryResponse = function(items, history) { ZabbixAPIDatasource.prototype.handleHistoryResponse = function(items, scale, history) {
/** /**
* Response should be in the format: * Response should be in the format:
* data: [ * data: [
@@ -253,6 +258,11 @@ function (angular, _, kbn) {
// Value must be a number for properly work // Value must be a number for properly work
var value = Number(p.value); var value = Number(p.value);
// Apply scale
if (scale) {
value *= scale;
}
return [value, p.clock * 1000]; return [value, p.clock * 1000];
}) })
}; };

9
zabbix/partials/query.editor.html
View File

@@ -125,6 +125,15 @@
placeholder="Item filter (regex)" placeholder="Item filter (regex)"
ng-blur="targetBlur()"> ng-blur="targetBlur()">
</li> </li>
<!-- Scale -->
<li>
<input type="text"
class="tight-form-input input-small"
ng-model="target.scale"
spellcheck='false'
placeholder="Set scale"
ng-blur="targetBlur()">
</li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>