diff --git a/src/app/panels/histogram/editor.html b/src/app/panels/histogram/editor.html index ea74682b6a2..15490701bb4 100644 --- a/src/app/panels/histogram/editor.html +++ b/src/app/panels/histogram/editor.html @@ -16,6 +16,9 @@ +
+ +
diff --git a/src/app/panels/histogram/module.html b/src/app/panels/histogram/module.html index 81a49717408..20ca4732d93 100644 --- a/src/app/panels/histogram/module.html +++ b/src/app/panels/histogram/module.html @@ -51,7 +51,7 @@ ({{series.hits}}) - change in {{panel.value_field}} {{panel.mode}} per {{panel.interval}} | ({{hits}} hits) + change in {{panel.value_field}} {{panel.mode}} per {{panel.interval}}1s | ({{hits}} hits)
diff --git a/src/app/panels/histogram/module.js b/src/app/panels/histogram/module.js index 75391642460..6d33242c17b 100644 --- a/src/app/panels/histogram/module.js +++ b/src/app/panels/histogram/module.js @@ -438,6 +438,12 @@ function (angular, app, $, _, kbn, moment, timeSeries) { }); }; + var scaleSeconds = function(series,interval) { + return _.map(series,function(p) { + return [p[0],p[1]/kbn.interval_to_seconds(interval)]; + }); + }; + var derivative = function(series) { return _.map(series, function(p,i) { var _v; @@ -565,6 +571,9 @@ function (angular, app, $, _, kbn, moment, timeSeries) { if(scope.panel.scale !== 1) { _d = scale(_d,scope.panel.scale); } + if(scope.panel.scaleSeconds) { + _d = scaleSeconds(_d,scope.panel.interval); + } scope.data[i].data = _d; }