Slight correction and comment-update in perfmon

rrd_regex must match the whole data-source name, not just a substring

Signed-off-by: Thomas Sanders <[email protected]>

Author: thomassa

scripts/perfmon

@@ -392,7 +392,7 @@ class VariableConfig:
 
         self.name = name
         try:
-            self.rrd_regex = re.compile(rrd_regex)
+            self.rrd_regex = re.compile("^%s$" % rrd_regex)
         except:
             raise XmlConfigException, "variable %s: regex %s does not compile" % (name, rrd_regex)
 
@@ -573,7 +573,7 @@ class ObjectMonitor:
         params_in_obj_report = obj_report.get_var_names()
         for var in self.variables:
             # find the subset of the params returned for this object that we need to consolidate into var
-            params_to_consolidate = filter(var.rrd_regex.search, params_in_obj_report)
+            params_to_consolidate = filter(var.rrd_regex.match, params_in_obj_report)
             for row in range(num_rows):
                 # Get the values to consolidate
                 values_to_consolidate = map(lambda param: obj_report.get_value(param, row), params_to_consolidate)
@@ -604,7 +604,7 @@ class VMMonitor(ObjectMonitor):
        * alarm_trigger_period: num seconds of 'bad' values before an alarm is sent (default '60')
        * alarm_auto_inhibit_period: num seconds this alarm disabled after an alarm is sent (default '3600')
        * consolidation_fn: how to combine variables from rrd_updates into one value
-         (default is 'average' for 'cpu_usage' & 'sum' for everything else)
+         (default is 'average' for 'cpu_usage', 'get_percent_fs_usage' for 'fs_usage', & 'sum' for everything else)
        * rrd_regex matches the names of variables from (xe vm-data-sources-list uuid=$vmuuid) used to compute value
          (only has defaults for "cpu_usage", "network_usage", and "disk_usage")
     """