[checkmk-commits] 3399 FIX statgrab_mem, hr_mem: Fix display of total installed memory in graph

Module: check_mk Branch: master Commit: c537ac33bf4777db9bcee9f749cce384346a6290 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c537ac33bf4777… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 15 15:17:01 2016 +0200 3399 FIX statgrab_mem, hr_mem: Fix display of total installed memory in graph --- .werks/3399 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/3399 b/.werks/3399 new file mode 100644 index 0000000..808bd72 --- /dev/null +++ b/.werks/3399 @@ -0,0 +1,10 @@ +Title: statgrab_mem, hr_mem: Fix display of total installed memory in graph +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460726194 + + diff --git a/ChangeLog b/ChangeLog index 2a9c447..51f6a99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,6 +153,7 @@ * 3408 FIX: temperature.include: now does not ignore levels with value 0 any more * 3122 FIX: netapp_fcpio: the rules for this check are now actually used... * 3409 FIX: apt: fixed 'UNKNOWN - Item not found in agent output' error if there are no pending updates + * 3399 FIX: statgrab_mem, hr_mem: Fix display of total installed memory in graph 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 b72d0d4..ad80128 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3201,7 +3201,7 @@ check_metrics["check_mk-netscaler_mem"] = { ram_used_swap_translation = { "ramused" : { "name" : "mem_used", "scale" : MB }, "swapused" : { "name" : "swap_used", "scale" : MB }, - "memused" : { "name" : "mem_total", "scale" : MB }, + "memused" : { "name" : "total_used", "auto_graph" : False, "scale" : MB }, } check_metrics["check_mk-statgrab_mem"] = ram_used_swap_translation @@ -5695,9 +5695,13 @@ graph_info.append({ "metrics" : [ ("mem_used", "area"), ("swap_used", "stack"), - ("mem_total", "line"), ], "conflicting_metrics" : [ "swap_total" ], + "scalars" : [ + ( "swap_used:max,mem_used:max,+#008080", _("Total RAM + SWAP installed") ), + ( "mem_used:max#80ffff", _("Total RAM installed") ), + ], + "range" : (0, "swap_used:max,mem_used:max,+"), }) graph_info.append({