Merge pull request #2901 from MRZA-MRZA/default_consolidation_setting

Add DEFAULT_CONSOLIDATION optional parameter to local_settings.py

Author: deniszh

webapp/graphite/local_settings.py.example

@@ -98,6 +98,10 @@ DEFAULT_XFILES_FACTOR = 0
 # Allow UTF-8 metrics' names (can cause performance issues)
 #UTF8_METRICS = False
 
+# Default consolidation function ('sum', 'average', 'avg_zero', 'max', 'min', 'first', 'last')
+# If not set average is used
+#DEFAULT_CONSOLIDATION = 'sum'
+
 #####################################
 # Filesystem Paths #
 #####################################

webapp/graphite/render/datalib.py

@@ -25,6 +25,8 @@
 from graphite.storage import STORE
 from graphite.util import timebounds, logtime
 
+if not hasattr(settings, 'DEFAULT_CONSOLIDATION'):
+  settings.DEFAULT_CONSOLIDATION = 'average'
 
 try:
   from collections import UserDict
@@ -38,7 +40,7 @@ def __setitem__(self, key, value):
 
 
 class TimeSeries(list):
-  def __init__(self, name, start, end, step, values, consolidate='average', tags=None, xFilesFactor=None, pathExpression=None):
+  def __init__(self, name, start, end, step, values, consolidate=settings.DEFAULT_CONSOLIDATION, tags=None, xFilesFactor=None, pathExpression=None):
     list.__init__(self, values)
     self.name = name
     self.start = start