IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge branch 'oliverpool-diff-aggregate'

Browse Source
This commit is contained in:
bergquist 2017-01-16 11:52:34 +01:00
commit 99f18f9d69
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/sources/features/panels/singlestat.md
View File

@ -31,6 +31,7 @@ The singlestat panel has a normal query editor to allow you define your exact me
* `total` - The sum of all the non-null values in the series * `total` - The sum of all the non-null values in the series
* `first` - The first value in the series * `first` - The first value in the series
* `delta` - The total incremental increase (of a counter) in the series. An attempt is made to account for counter resets, but this will only be accurate for single instance metrics. Used to show total counter increase in time series. * `delta` - The total incremental increase (of a counter) in the series. An attempt is made to account for counter resets, but this will only be accurate for single instance metrics. Used to show total counter increase in time series.
* `diff` - The difference betwen 'current' (last value) and 'first'.
* `range` - The difference between 'min' and 'max'. Useful the show the range of change for a gauge. * `range` - The difference between 'min' and 'max'. Useful the show the range of change for a gauge.
4. `Postfixes`: The Postfix fields let you define a custom label and font-size (as a %) to appear *after* the value 4. `Postfixes`: The Postfix fields let you define a custom label and font-size (as a %) to appear *after* the value
5. `Units`: Units are appended to the the Singlestat within the panel, and will respect the color and threshold settings for the value. 5. `Units`: Units are appended to the the Singlestat within the panel, and will respect the color and threshold settings for the value.

4
public/app/core/time_series2.ts
View File

@ -104,6 +104,7 @@ export default class TimeSeries {
this.stats.current = null; this.stats.current = null;
this.stats.first = null; this.stats.first = null;
this.stats.delta = 0; this.stats.delta = 0;
this.stats.diff = null;
this.stats.range = null; this.stats.range = null;
this.stats.timeStep = Number.MAX_VALUE; this.stats.timeStep = Number.MAX_VALUE;
this.allIsNull = true; this.allIsNull = true;
@ -193,6 +194,9 @@ export default class TimeSeries {
if (this.stats.max !== null && this.stats.min !== null) { if (this.stats.max !== null && this.stats.min !== null) {
this.stats.range = this.stats.max - this.stats.min; this.stats.range = this.stats.max - this.stats.min;
} }
if (this.stats.current !== null && this.stats.first !== null) {
this.stats.diff = this.stats.current - this.stats.first;
}
this.stats.count = result.length; this.stats.count = result.length;
return result; return result;

2
public/app/plugins/panel/singlestat/module.ts
View File

@ -21,7 +21,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {
invalidGaugeRange: boolean; invalidGaugeRange: boolean;
panel: any; panel: any;
events: any; events: any;
valueNameOptions: any[] = ['min','max','avg', 'current', 'total', 'name', 'first', 'delta', 'range']; valueNameOptions: any[] = ['min','max','avg', 'current', 'total', 'name', 'first', 'delta', 'diff', 'range'];
// Set and populate defaults // Set and populate defaults
panelDefaults = { panelDefaults = {