[checkmk-commits] 3323 FIX kernel.util: fix graph template in case steal is present but guest not

Module: check_mk Branch: master Commit: 9cc83c8ddfc41e2d00dc888348edfbb706d55f81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cc83c8ddfc41e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 11:17:52 2016 +0200 3323 FIX kernel.util: fix graph template in case steal is present but guest not --- .werks/3323 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 16 ++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/.werks/3323 b/.werks/3323 new file mode 100644 index 0000000..5485b1c --- /dev/null +++ b/.werks/3323 @@ -0,0 +1,10 @@ +Title: kernel.util: fix graph template in case steal is present but guest not +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459934244 + + diff --git a/ChangeLog b/ChangeLog index 3f75f3f..fe50c76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ * 3022 FIX: mk_logwatch (linux): now able to handle queries from multiple servers (no longer loosing data)... * 3112 FIX: esx_vsphere_counters: made levels configurable * 3113 FIX: windows agent: fixed process handle weren't freed when using wmi-based ps check + * 3323 FIX: kernel.util: fix graph template in case steal is present but guest not Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 82b2d4b..0195927 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5278,6 +5278,22 @@ graph_info.append({ ( "user", "area" ), ( "system", "stack" ), ( "io_wait", "stack" ), + ( "cpu_util_steal", "stack" ), + ( "user,system,io_wait,cpu_util_steal,+,+,+#004080", "line", _("Total") ), + ], + "conflicting_metrics" : [ + "cpu_util_guest", + ], + "omit_zero_metrics" : True, + "range" : (0, 100), +}) + +graph_info.append({ + "title" : _("CPU utilization"), + "metrics" : [ + ( "user", "area" ), + ( "system", "stack" ), + ( "io_wait", "stack" ), ( "cpu_util_guest", "stack" ), ( "cpu_util_steal", "stack" ), ( "user,system,io_wait,cpu_util_guest,cpu_util_steal,+,+,+,+#004080", "line", _("Total") ),