Make summarize() with alignToFrom=true actually work

felixge · Nov 22, 2011 · 600c6f6 · 600c6f6
1 parent 4f9165d
commit 600c6f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/webapp/graphite/render/evaluator.py b/webapp/graphite/render/evaluator.py
@@ -38,6 +38,8 @@ def evaluateTokens(requestContext, tokens):
   elif tokens.string:
     return str(tokens.string)[1:-1]
 
+  elif tokens.boolean:
+    return tokens.boolean[0] == 'true'
 
 
 #Avoid import circularities

diff --git a/webapp/graphite/render/functions.py b/webapp/graphite/render/functions.py
@@ -1636,7 +1636,7 @@ def summarize(requestContext, seriesList, intervalString, func='sum', alignToFro
     if alignToFrom:
       newEnd += interval
 
-    newName = "summarize(%s, \"%s\")" % (series.name, intervalString)
+    newName = "summarize(%s, \"%s\", \"%s\"%s)" % (series.name, intervalString, func, alignToFrom and ", true" or "")
     newSeries = TimeSeries(newName, newStart, newEnd, interval, newValues)
     newSeries.pathExpression = newName
     results.append(newSeries)

diff --git a/webapp/graphite/render/grammar.py b/webapp/graphite/render/grammar.py
@@ -23,8 +23,14 @@
   (intNumber + afterNumber)
 )('number')
 
+boolean = Group(
+  CaselessKeyword("true") |
+  CaselessKeyword("false")
+)('boolean')
+
 # Function calls
 arg = Group(
+  boolean |
   number |
   aString |
   expression