Merge branch 'master' of github.com:torkelo/grafana

This commit is contained in:
Torkel Ödegaard 2014-03-17 17:25:21 +01:00
commit dadae53e51

View File

@ -50,6 +50,13 @@ function (_) {
defaultParams: [3]
});
addFuncDef({
name: "nPercentile",
category: categories.Calculate,
params: [ { name: "Nth percentile", type: 'int' } ],
defaultParams: [95]
});
addFuncDef({
name: 'sumSeries',
shortName: 'sum',
@ -163,6 +170,11 @@ function (_) {
category: categories.Special,
});
addFuncDef({
name: 'keepLastValue',
category: categories.Special,
});
addFuncDef({
name: 'scale',
category: categories.Transform,