Changeset 1777 for trunk/packages

Timestamp:

Nov 25, 2008, 9:33:57 PM (16 years ago)

Author:

quentin

Message:

Munin Xen CPU utilization fixes

rrdtool and thus Munin can't handle floating point DERIVE or COUNTER sources, so convert to microseconds before passing to Munin.

Location:

trunk/packages/xvm-munin-config

Files:

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

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

@@ +1 @@
+xvm-munin-config (0.0.4) unstable; urgency=low
+
+  * Pass microseconds to Munin and display as percentages on graph
+
+ -- Quentin Smith <quentin@mit.edu>  Tue, 25 Nov 2008 21:31:07 -0500
+
 xvm-munin-config (0.0.3) unstable; urgency=low
 

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

@@ -37 +37 @@
                                                 'cpu_time': sum(metrics[d['metrics']]['VCPUs_utilisation'].values()),
                                                 'domid': d['domid'],
+                                                'uuid': d['uuid'],
                                                 }
         return ret
@@ -45 +46 @@
                                                                          'cpu_time': sxp.child_value(d, 'cpu_time', 0.0),
                                                                          'domid': sxp.child_value(d, 'domid', -1),
+                                                                         'uuid': sxp.child_value(d, 'uuid', 'NONE'),
                                                                          }
         return ret
@@ -70 +72 @@
         print "%s.min 0" % d
         print "%s.type DERIVE" % d
-        print "%s.info %s" % (d, name)
+        print "%s.info %s" % (d, domains[d]['uuid'])
+        print "%s.cdef %s,10000,/" % (d, d)
     sys.exit(0)
 
 domains = getDomains()
 for d in sorted(domains):
-    print "%s.value %s" % (d, domains[d]['cpu_time'])
+    print "%s.value %s" % (d, long(domains[d]['cpu_time']*1000000))