Add configurable metric group

vuksanv · vuksanv · commit c620308f292e · 2011-09-13T21:39:53.000-04:00
diff --git a/apache_status/conf.d/apache_status.conf b/apache_status/conf.d/apache_status.conf
@@ -5,9 +5,16 @@ modules {
     param url {
         value = "http://localhost/server-status?auto"
     }
+
     param virtual_host {
         value = "health"
     }
+
+    # Which metric group should these metrics be put into
+    param metric_group {
+        value = "apache"
+    }
+
   }
 }
 
diff --git a/apache_status/python_modules/apache_status.py b/apache_status/python_modules/apache_status.py
@@ -134,6 +134,9 @@ def metric_init(params):
     print '[apache_status] Received the following parameters'
     print params
 
+    if "metric_group" not in params:
+        params["metric_group"] = "apache"
+
     Desc_Skel = {
         'name'        : 'XXX',
         'call_back'   : process_status_of,
@@ -143,7 +146,7 @@ def metric_init(params):
         'slope'       : 'both',
         'format'      : '%d',
         'description' : 'XXX',
-        'groups'      : 'apache',
+        'groups'      : params["metric_group"],
         }
 
     if "refresh_rate" not in params:

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,16 @@ modules {`
`5`	`5`	`param url {`
`6`	`6`	`value = "http://localhost/server-status?auto"`
`7`	`7`	`}`
	`8`	`+`
`8`	`9`	`param virtual_host {`
`9`	`10`	`value = "health"`
`10`	`11`	`}`
	`12`	`+`
	`13`	`+ # Which metric group should these metrics be put into`
	`14`	`+ param metric_group {`
	`15`	`+ value = "apache"`
	`16`	`+ }`
	`17`	`+`
`11`	`18`	`}`
`12`	`19`	`}`
`13`	`20`