Fixed variable names

xadrnd · Oct 23, 2013 · abf984e · abf984e
1 parent 2297035
commit abf984e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/conf/carbon.conf.example b/conf/carbon.conf.example
@@ -382,5 +382,6 @@ MAX_AGGREGATION_INTERVALS = 5
 # receiver, set this to False
 # LOG_LISTENER_CONN_SUCCESS = True
 #
-# To use our own rule, set USE_RULE_MANAGER = false
-USE_RULE_MANAGER = false
+# To use our own "sumall" rule, set USE_RULE_MANAGER = sumall
+# To use aggregation-rules.conf, set USE_RULE_MANAGER = rules
+AGGREGATOR_RULE_METHOD = sumall
diff --git a/lib/carbon/aggregator/receiver.py b/lib/carbon/aggregator/receiver.py
@@ -13,7 +13,7 @@ def process(metric, datapoint):
 
   aggregate_metrics = []
 
-  if settings.USE_RULE_MANAGER == True:
+  if settings.AGGREGATOR_RULE_METHOD == "rules":
     for rule in RuleManager.rules:
       aggregate_metric = rule.get_aggregate_metric(metric)
 
@@ -29,7 +29,7 @@ def process(metric, datapoint):
 
       buffer.input(datapoint)
   # Custom rule to sum metrics
-  else:
+  elif settings.AGGREGATOR_RULE_METHOD == "sumall":
     sum_index = metric.find(".sum.")
     if sum_index != -1:
       aggregate_metric = metric[:sum_index] + ".sum_all.hosts"