Change in vdsm[master]: Rename reports to metrics
Dan Kenigsberg has submitted this change and it was merged. Change subject: Rename reports to metrics .. Rename reports to metrics Leftovers from using reports instead of metrics (following https://gerrit.ovirt.org/#/c/60846/) Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Signed-off-by: Yaniv BronhaimReviewed-on: https://gerrit.ovirt.org/61870 Continuous-Integration: Jenkins CI Reviewed-by: Piotr Kliczewski Reviewed-by: Francesco Romani --- M lib/vdsm/host/api.py M lib/vdsm/virt/sampling.py M lib/vdsm/virt/vmstats.py 3 files changed, 65 insertions(+), 64 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, approved Yaniv Bronhaim: Verified Jenkins CI: Passed CI tests Francesco Romani: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Francesco Romani has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Piotr Kliczewski has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 4: Code-Review+2 Rising the score. @Francesco please take a look as well. -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Yaniv Bronhaim has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Piotr Kliczewski has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
gerrit-hooks has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 4: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Francesco Romani has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Yaniv Bronhaim has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 3: only rebased -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Piotr Kliczewski has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
gerrit-hooks has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 3: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Yaniv Bronhaim has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Francesco Romani has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 2: Code-Review+2 mostly virt domain, so taking ownership -> +2 -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Yaniv Bronhaim has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Piotr Kliczewski has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
gerrit-hooks has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 2: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Yaniv Bronhaim has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/61870/1/lib/vdsm/host/api.py File lib/vdsm/host/api.py: PS1, Line 86: m > please use more descriptive name why? metrics is already taken and the lines already quite long, this makes the code cleaner imo, but as you wish -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Piotr Kliczewski has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 1: Code-Review-1 (2 comments) https://gerrit.ovirt.org/#/c/61870/1/lib/vdsm/host/api.py File lib/vdsm/host/api.py: PS1, Line 86: m please use more descriptive name https://gerrit.ovirt.org/#/c/61870/1/lib/vdsm/virt/vmstats.py File lib/vdsm/virt/vmstats.py: PS1, Line 194: m please use more descriptive name -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
gerrit-hooks has posted comments on this change. Change subject: Rename reports to metrics .. Patch Set 1: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/61870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Rename reports to metrics
Yaniv Bronhaim has uploaded a new change for review. Change subject: Rename reports to metrics .. Rename reports to metrics Leftovers from using reports instead of metrics (following https://gerrit.ovirt.org/#/c/60846/) Change-Id: I340c1854d67ce5b6be01cad6a540c6d81eaa0eff Signed-off-by: Yaniv Bronhaim--- M lib/vdsm/host/api.py M lib/vdsm/virt/sampling.py M lib/vdsm/virt/vmstats.py 3 files changed, 65 insertions(+), 65 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/61870/1 diff --git a/lib/vdsm/host/api.py b/lib/vdsm/host/api.py index f55fa10..2b41ea9 100644 --- a/lib/vdsm/host/api.py +++ b/lib/vdsm/host/api.py @@ -81,60 +81,60 @@ return ret -def report_stats(hoststats): +def send_metrics(hoststats): prefix = "hosts." + uuid() -report = {} +m = {} try: for dom in hoststats['storageDomains']: storage_prefix = prefix + '.storage.' + dom dom_info = hoststats['storageDomains'][dom] -report[storage_prefix + '.delay'] = dom_info['delay'] -report[storage_prefix + '.last_check'] = dom_info['lastCheck'] +m[storage_prefix + '.delay'] = dom_info['delay'] +m[storage_prefix + '.last_check'] = dom_info['lastCheck'] -report[prefix + '.memory.available'] = hoststats['memAvailable'] -report[prefix + '.memory.committed'] = hoststats['memCommitted'] -report[prefix + '.memory.free_mb'] = hoststats['memFree'] -report[prefix + '.memory.usage_percent'] = hoststats['memUsed'] -report[prefix + '.memory.anon_huge_pages'] = hoststats['anonHugePages'] +m[prefix + '.memory.available'] = hoststats['memAvailable'] +m[prefix + '.memory.committed'] = hoststats['memCommitted'] +m[prefix + '.memory.free_mb'] = hoststats['memFree'] +m[prefix + '.memory.usage_percent'] = hoststats['memUsed'] +m[prefix + '.memory.anon_huge_pages'] = hoststats['anonHugePages'] -report[prefix + '.swap.total_mb'] = hoststats['swapTotal'] -report[prefix + '.swap.free_mb'] = hoststats['swapFree'] +m[prefix + '.swap.total_mb'] = hoststats['swapTotal'] +m[prefix + '.swap.free_mb'] = hoststats['swapFree'] -report[prefix + '.vms.active'] = hoststats['vmActive'] -report[prefix + '.vms.total'] = hoststats['vmCount'] +m[prefix + '.vms.active'] = hoststats['vmActive'] +m[prefix + '.vms.total'] = hoststats['vmCount'] -report[prefix + '.cpu.load'] = hoststats['cpuLoad'] -report[prefix + '.cpu.user'] = hoststats['cpuUser'] -report[prefix + '.cpu.sys'] = hoststats['cpuSys'] -report[prefix + '.cpu.idle'] = hoststats['cpuIdle'] -report[prefix + '.cpu.sys_vdsmd'] = hoststats['cpuSysVdsmd'] -report[prefix + '.cpu.user_vdsmd'] = hoststats['cpuUserVdsmd'] -report[prefix + '.cpu.ksm_pages'] = hoststats['ksmPages'] -report[prefix + '.cpu.ksm_cpu_precent'] = hoststats['ksmCpu'] +m[prefix + '.cpu.load'] = hoststats['cpuLoad'] +m[prefix + '.cpu.user'] = hoststats['cpuUser'] +m[prefix + '.cpu.sys'] = hoststats['cpuSys'] +m[prefix + '.cpu.idle'] = hoststats['cpuIdle'] +m[prefix + '.cpu.sys_vdsmd'] = hoststats['cpuSysVdsmd'] +m[prefix + '.cpu.user_vdsmd'] = hoststats['cpuUserVdsmd'] +m[prefix + '.cpu.ksm_pages'] = hoststats['ksmPages'] +m[prefix + '.cpu.ksm_cpu_precent'] = hoststats['ksmCpu'] if hoststats['haStats']['configured']: -report[prefix + '.ha_score'] = hoststats['haScore'] +m[prefix + '.ha_score'] = hoststats['haScore'] -report[prefix + '.elapsed_time'] = hoststats['elapsedTime'] +m[prefix + '.elapsed_time'] = hoststats['elapsedTime'] if 'network' in hoststats: for interface in hoststats['network']: if_info = hoststats['network'][interface] net_prefix = prefix + '.network_interfaces.' + interface -report[net_prefix + '.speed'] = if_info['speed'] -report[net_prefix + '.rx_rate'] = if_info['rxRate'] -report[net_prefix + '.tx_rate'] = if_info['txRate'] -report[net_prefix + '.rx_errors'] = if_info['rxErrors'] -report[net_prefix + '.tx_errors'] = if_info['txErrors'] -report[net_prefix + '.rx_dropped'] = if_info['rxDropped'] -report[net_prefix + '.tx_dropped'] = if_info['txDropped'] -report[net_prefix + '.rx'] = if_info['rx'] -report[net_prefix + '.tx'] = if_info['tx'] +m[net_prefix + '.speed'] = if_info['speed'] +m[net_prefix + '.rx_rate'] = if_info['rxRate'] +m[net_prefix + '.tx_rate'] = if_info['txRate'] +m[net_prefix + '.rx_errors'] = if_info['rxErrors'] +