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

Add alignToFrom param to summarize

Browse Source
This commit is contained in:
Adrien Samson
2014-10-22 10:26:43 +02:00
parent 6c83699e6f
commit 6c70122e55
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,8 +339,12 @@ function (_) {
addFuncDef({ addFuncDef({
name: 'summarize', name: 'summarize',
category: categories.Transform, category: categories.Transform,
params: [{ name: "interval", type: "string" }, { name: "func", type: "select", options: ['sum', 'avg', 'min', 'max', 'last'] }], params: [
defaultParams: ['1h', 'sum'] { name: "interval", type: "string" },
{ name: "func", type: "select", options: ['sum', 'avg', 'min', 'max', 'last'] },
{ name: "alignToFrom", type: "boolean", optional: true, options: ['false', 'true'] },
],
defaultParams: ['1h', 'sum', 'false']
}); });
addFuncDef({ addFuncDef({
@@ -543,7 +547,7 @@ function (_) {
var parameters = _.map(this.params, function(value, index) { var parameters = _.map(this.params, function(value, index) {
var paramType = this.def.params[index].type; var paramType = this.def.params[index].type;
if (paramType === 'int' || paramType === 'value_or_series') { if (paramType === 'int' || paramType === 'value_or_series' || paramType === 'boolean') {
return value; return value;
} }

2
src/test/specs/gfunc-specs.js
View File

@@ -79,7 +79,7 @@ define([
var func = gfunc.createFuncInstance('summarize', { withDefaultParams: true }); var func = gfunc.createFuncInstance('summarize', { withDefaultParams: true });
func.updateParam('1h', 0); func.updateParam('1h', 0);
expect(func.params[0]).to.be('1h'); expect(func.params[0]).to.be('1h');
expect(func.text).to.be('summarize(1h, sum)'); expect(func.text).to.be('summarize(1h, sum, false)');
}); });
it('should parse numbers as float', function() { it('should parse numbers as float', function() {