Module: check_mk
Branch: master
Commit: 1513b89948de0d9ac4406b46c7d5346654451ac4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1513b89948de0d…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Thu Mar 9 14:30:37 2017 +0100
Changed description of MemAvailable to RAM available
Change-Id: I5252fe1c0ff7d0b8f70e15f6e125ec9a16334f6e
---
checks/mem | 3 +--
web/plugins/wato/check_parameters.py | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/checks/mem b/checks/mem
index 6d93823..3d07ce6 100644
--- a/checks/mem
+++ b/checks/mem
@@ -154,7 +154,6 @@ factory_settings["mem_linux_default_levels"] = {
"levels_pagetables" : ("perc_used", ( 8.0, 16.0)),
"levels_committed" : ("perc_used", (100.0, 150.0)),
"levels_commitlimit" : ("perc_free", ( 20.0, 10.0)),
- "levels_available" : ("perc_free", ( 20.0, 10.0)),
"levels_vmalloc" : ("abs_free", (50*1024*1024,
30*1024*1024)),
}
@@ -322,7 +321,7 @@ def check_mem_linux(_no_item, params, info):
# Available Memory
if "MemAvailable" in meminfo:
- r = check_mem_levels("Available Memory", meminfo["MemTotal"]
- meminfo["MemAvailable"],
+ r = check_mem_levels("RAM available", meminfo["MemTotal"] -
meminfo["MemAvailable"],
meminfo["MemTotal"], params.get("levels_available"),
of_what = "RAM", show_free=True)
if r[0]:
yield r # only display if non-OK
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index a5e7dda..5e4cecb 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -7463,7 +7463,7 @@ register_check_parameters(
( "levels_writeback", UpperMemoryLevels(_("Disk
Writeback"))),
( "levels_committed", UpperMemoryLevels(_("Committed
memory"), (100.0, 150.0), _("RAM + Swap"))),
( "levels_commitlimit", LowerMemoryLevels(_("Commit
Limit"), ( 20.0, 10.0), _("RAM + Swap"))),
- ( "levels_available", LowerMemoryLevels(_("Available
memory"), ( 20.0, 10.0), _("RAM"))),
+ ( "levels_available", LowerMemoryLevels(_("RAM
available"), ( 20.0, 10.0), _("RAM"))),
( "levels_vmalloc", LowerMemoryLevels(_("Largest Free
VMalloc Chunk"))),
( "handle_hw_corrupted_error", MonitoringState(
title = _("Handle Hardware Corrupted Error"),