[checkmk-commits] 6126 FIX cpu_util.include: use correct metric with a better visible colour for averaged CPU utilization

Module: check_mk Branch: master Commit: 21a7caf87bfeeb2ac830aa8609aa534288d7c36c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21a7caf87bfeeb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jul 23 17:48:21 2018 +0200 6126 FIX cpu_util.include: use correct metric with a better visible colour for averaged CPU utilization Change-Id: I2b836dadfe569a64492e26c52312e3880961c087 --- .werks/6126 | 9 +++++++++ checks/cpu_util.include | 2 +- cmk/gui/plugins/metrics/check_mk.py | 9 +++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/6126 b/.werks/6126 new file mode 100644 index 0000000..cbe3504 --- /dev/null +++ b/.werks/6126 @@ -0,0 +1,9 @@ +Title: use correct metric with a better visible colour for averaged CPU utilization +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1532360464 +Class: fix + diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 1ecba2a..c5557cc 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -87,7 +87,7 @@ def check_cpu_util(util, params, this_time=None, cores=None): perfdata = [ ("util", util, warn, crit, 0, 100) ] if "average" in params: - perfdata.append( ("avg", util_avg, warn, crit, 0, 100) ) + perfdata.append( ("util_average", util_avg, warn, crit, 0, 100) ) perfdata += extraperf # reference curve for predictive levels yield state, infotext, perfdata diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 134efda..bcdaff3 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -1439,7 +1439,7 @@ metric_info["util"] = { metric_info["util_average"] = { "title" : _("CPU utilization (average)"), "unit" : "%", - "color" : "26/b", + "color" : "44/a", } metric_info["util1s"] = { @@ -4463,9 +4463,10 @@ check_metrics["check-mk-host-tcp"] = { "time" : { "name": "response_time" } } - - - +for check in ['winperf_processor', 'docker_container_cpu', 'hr_cpu', 'bintec_cpu', 'esx_vsphere_hostsystem']: + check_metrics["check_mk-%s" % check] = { + "avg": { "name": "util_average" } + } check_metrics["check_mk-citrix_serverload"] = { "perf" : { "name" : "citrix_load", "scale" : 0.01 }