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

Updated sumSeries, averageSeries to support other series reference arguments, #117

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-09-03 07:35:14 +02:00
parent 4a9380cc95
commit afdc19ce9d
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/services/graphite/gfunc.js
View File

@ -24,6 +24,15 @@ function (_) {
index[funcDef.shortName || funcDef.name] = funcDef;
}
var optionalSeriesRefArgs = [
{ name: 'other', type: 'value_or_series', optional: true },
{ name: 'other', type: 'value_or_series', optional: true },
{ name: 'other', type: 'value_or_series', optional: true },
{ name: 'other', type: 'value_or_series', optional: true },
{ name: 'other', type: 'value_or_series', optional: true }
];
addFuncDef({
name: 'scaleToSeconds',
category: categories.Transform,
@ -59,22 +68,14 @@ function (_) {
addFuncDef({
name: 'diffSeries',
params: [
{ name: 'other', type: 'value_or_series', optional: true },
{ name: 'other', type: 'value_or_series', optional: true },
{ name: 'other', type: 'value_or_series', optional: true }
],
defaultParams: ['$B'],
params: optionalSeriesRefArgs,
defaultParams: ['#B'],
category: categories.Calculate,
});
addFuncDef({
name: 'asPercent',
params: [
{ name: 'other', type: 'value_or_series', optional: true },
{ name: 'other', type: 'value_or_series', optional: true },
{ name: 'other', type: 'value_or_series', optional: true }
],
params: optionalSeriesRefArgs,
defaultParams: ['#A'],
category: categories.Calculate,
});
@ -83,12 +84,16 @@ function (_) {
name: 'sumSeries',
shortName: 'sum',
category: categories.Combine,
params: optionalSeriesRefArgs,
defaultParams: [''],
});
addFuncDef({
name: 'averageSeries',
shortName: 'avg',
category: categories.Combine,
params: optionalSeriesRefArgs,
defaultParams: [''],
});
addFuncDef({