Changeset 1774 for trunk

Timestamp:

Nov 25, 2008, 7:09:50 PM (16 years ago)

Author:

broder

Message:

Fix xen_cpu monitoring script to not use hyphens in UUID

Location:

trunk/packages/xvm-munin-config

Files:

• debian/changelog (modified) (1 diff)
• host/usr/share/xvm-munin-host-config/plugins/xen_cpu (modified) (1 diff)

trunk/packages/xvm-munin-config/debian/changelog

@@ +1 @@
+xvm-munin-config (0.0.3) unstable; urgency=low
+
+  * Fix xen_cpu script to leave out hyphens from UUID
+
+ -- Evan Broder <broder@mit.edu>  Tue, 25 Nov 2008 19:07:44 -0500
+
 xvm-munin-config (0.0.2) unstable; urgency=low
 

trunk/packages/xvm-munin-config/host/usr/share/xvm-munin-host-config/plugins/xen_cpu

@@ -34 +34 @@
         metrics = server.xenapi.VM_metrics.get_all_records()
         for d in domains.values():
-            ret[d['uuid']] = {'name': d['name_label'],
-                              'cpu_time': sum(metrics[d['metrics']]['VCPUs_utilisation'].values()),
-                              'domid': d['domid'],
-                              }
+            ret[d['uuid'].replace('-', '_')] = {'name': d['name_label'],
+                                                'cpu_time': sum(metrics[d['metrics']]['VCPUs_utilisation'].values()),
+                                                'domid': d['domid'],
+                                                }
         return ret
     else:
         domains = server.xend.domains_with_state(True, 'all', True)
         for d in domains:
-            ret[sxp.child_value(d, 'uuid', 'NONE')] = {'name': sxp.child_value(d, 'name', 'UNKNOWN'),
-                                                       'cpu_time': sxp.child_value(d, 'cpu_time', 0.0),
-                                                       'domid': sxp.child_value(d, 'domid', -1),
-                                                       }
+            ret[sxp.child_value(d, 'uuid', 'NONE').replace('-', '_')] = {'name': sxp.child_value(d, 'name', 'UNKNOWN'),
+                                                                         'cpu_time': sxp.child_value(d, 'cpu_time', 0.0),
+                                                                         'domid': sxp.child_value(d, 'domid', -1),
+                                                                         }
         return ret