X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-munin-config.git/blobdiff_plain/930b253816980ad014aaecef70ed6e9f5b4b6829..HEAD:/host/usr/share/xvm-munin-host-config/plugins/xen_cpu?ds=sidebyside diff --git a/host/usr/share/xvm-munin-host-config/plugins/xen_cpu b/host/usr/share/xvm-munin-host-config/plugins/xen_cpu index 2efffe4..06850cf 100755 --- a/host/usr/share/xvm-munin-host-config/plugins/xen_cpu +++ b/host/usr/share/xvm-munin-host-config/plugins/xen_cpu @@ -37,12 +37,12 @@ def getDomains(): domains = server.xenapi.VM.get_all_records() metrics = server.xenapi.VM_metrics.get_all_records() for d in domains.values(): - ret[d['uuid'].replace('-', '_')] = {'name': d['name_label'], - 'cpu_time': sum(metrics[d['metrics']]['VCPUs_utilisation'].values()), - 'domid': d['domid'], - 'uuid': d['uuid'], - # No equivalent - } + ret['uuid_'+d['uuid'].replace('-', '_')] = {'name': d['name_label'], + 'cpu_time': sum(metrics[d['metrics']]['VCPUs_utilisation'].values()), + 'domid': d['domid'], + 'uuid': d['uuid'], + # No equivalent + } return ret else: domains = server.xend.domains_with_state(True, 'all', True) @@ -57,7 +57,7 @@ def getDomains(): data['sched-credit'] = sched except: data['sched-credit'] = None - ret[sxp.child_value(d, 'uuid', 'NONE').replace('-', '_')] = data + ret['uuid_'+sxp.child_value(d, 'uuid', 'NONE').replace('-', '_')] = data return ret if cmd == 'config':