Module: check_mk
Branch: master
Commit: b5174ac30c04b45ade7431b30c717dd338dd08e7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5174ac30c04b4…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Feb 16 12:37:46 2016 +0100
#3177 FIX mem.linux: added all missing metric definitions
---
.werks/3177 | 10 +++++
ChangeLog | 1 +
web/plugins/metrics/check_mk.py | 93 +++++++++++++++++++++++++++++++--------
3 files changed, 86 insertions(+), 18 deletions(-)
diff --git a/.werks/3177 b/.werks/3177
new file mode 100644
index 0000000..f4ca576
--- /dev/null
+++ b/.werks/3177
@@ -0,0 +1,10 @@
+Title: mem.linux: added all missing metric definitions
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1455622650
+
+
diff --git a/ChangeLog b/ChangeLog
index 674b421..3f132b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@
* 3185 FIX: ucd_cpu_load: this service will be discovered although we prefer
HOST-RESOURCES MIB
NOTE: Please refer to the migration notes!
* 3176 FIX: Fix invalid scaling of some obscure metrics by factor 100...
+ * 3177 FIX: mem.linux: added all missing metric definitions
Multisite:
* 3059 FIX: Fixed highlighting of availability timeline time slices
diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py
index 620aa07..48fc8c8 100644
--- a/web/plugins/metrics/check_mk.py
+++ b/web/plugins/metrics/check_mk.py
@@ -521,6 +521,12 @@ metric_info["mem_pages_rate"] = {
"color": "34/a",
}
+metric_info["mem_lnx_total_used"] = {
+ "title" : _("Total used memory"),
+ "color": "#70f038",
+ "unit" : "bytes",
+}
+
metric_info["mem_lnx_cached"] = {
"title" : _("File contents"),
"color": "#91cceb",
@@ -539,6 +545,43 @@ metric_info["mem_lnx_slab"] = {
"unit" : "bytes",
}
+metric_info["mem_lnx_sreclaimable"] = {
+ "title" : _("Reclaimable memory"),
+ "color": "23/a",
+ "unit" : "bytes",
+}
+
+metric_info["mem_lnx_sunreclaim"] = {
+ "title" : _("Unreclaimable memory"),
+ "color": "24/a",
+ "unit" : "bytes",
+}
+
+metric_info["mem_lnx_pending"] = {
+ "title" : _("Pending memory"),
+ "color": "25/a",
+ "unit" : "bytes",
+}
+
+metric_info["mem_lnx_unevictable"] = {
+ "title" : _("Unevictable memory"),
+ "color": "26/a",
+ "unit" : "bytes",
+}
+
+
+metric_info["mem_lnx_active"] = {
+ "title" : _("Active"),
+ "color": "#dd2020",
+ "unit" : "bytes",
+}
+
+metric_info["mem_lnx_anon_pages"] = {
+ "title" : _("Anonymous pages"),
+ "color": "#cc4040",
+ "unit" : "bytes",
+}
+
metric_info["mem_lnx_active_anon"] = {
"title" : _("Active (anonymous)"),
"color": "#ff4040",
@@ -551,6 +594,12 @@ metric_info["mem_lnx_active_file"] = {
"unit" : "bytes",
}
+metric_info["mem_lnx_inactive"] = {
+ "title" : _("Inactive"),
+ "color": "#275c6b",
+ "unit" : "bytes",
+}
+
metric_info["mem_lnx_inactive_anon"] = {
"title" : _("Inactive (anonymous)"),
"color": "#377cab",
@@ -653,26 +702,32 @@ metric_info["mem_lnx_mapped"] = {
"unit" : "bytes",
}
+metric_info["mem_lnx_anon_huge_pages"] = {
+ "title" : _("Anonymous huge pages"),
+ "color": "#f0f0f0",
+ "unit" : "bytes",
+}
+
metric_info["mem_lnx_huge_pages_total"] = {
- "title" : _("Total"),
+ "title" : _("Huge pages total"),
"color": "#f0f0f0",
"unit" : "bytes",
}
metric_info["mem_lnx_huge_pages_free"] = {
- "title" : _("Free"),
+ "title" : _("Huge pages free"),
"color": "#f0a0f0",
"unit" : "bytes",
}
metric_info["mem_lnx_huge_pages_rsvd"] = {
- "title" : _("Reserved part of Free"),
+ "title" : _("Huge pages reserved part of free"),
"color": "#40f0f0",
"unit" : "bytes",
}
metric_info["mem_lnx_huge_pages_surp"] = {
- "title" : _("Surplus"),
+ "title" : _("Huge pages surplus"),
"color": "#90f0b0",
"unit" : "bytes",
}
@@ -3126,20 +3181,22 @@ check_metrics["check_mk-mem.linux"] = {
"hardware_corrupted" : { "name" :
"mem_lnx_hardware_corrupted", },
# Several computed values should not be graphed because they
- # are already contained in the other graphs.
- "sreclaimable" : { "auto_graph" : False },
- "pending" : { "auto_graph" : False },
- "sunreclaim" : { "auto_graph" : False },
- "anon_huge_pages" : { "auto_graph" : False },
- "anon_pages" : { "auto_graph" : False },
- "caches" : { "auto_graph" : False },
- "mapped" : { "auto_graph" : False },
- "active" : { "auto_graph" : False },
- "inactive" : { "auto_graph" : False },
- "swap_free" : { "auto_graph" : False },
- "total_used" : { "auto_graph" : False },
- "unevictable" : { "auto_graph" : False },
- "mem_free" : { "auto_graph" : False },
+ # are already contained in the other graphs. Or because they
+ # are bizarre
+ "caches" : { "name" : "caches",
"auto_graph" : False },
+ "swap_free" : { "name" : "swap_free",
"auto_graph" : False },
+ "mem_free" : { "name" : "mem_free",
"auto_graph" : False },
+
+ "sreclaimable" : { "name" : "mem_lnx_sreclaimable",
"auto_graph" : False },
+ "pending" : { "name" : "mem_lnx_pending",
"auto_graph" : False },
+ "sunreclaim" : { "name" : "mem_lnx_sunreclaim",
"auto_graph" : False },
+ "anon_huge_pages" : { "name" :
"mem_lnx_anon_huge_pages", "auto_graph" : False },
+ "anon_pages" : { "name" : "mem_lnx_anon_pages",
"auto_graph" : False },
+ "mapped" : { "name" : "mem_lnx_mapped",
"auto_graph" : False },
+ "active" : { "name" : "mem_lnx_active",
"auto_graph" : False },
+ "inactive" : { "name" : "mem_lnx_inactive",
"auto_graph" : False },
+ "total_used" : { "name" : "mem_lnx_total_used",
"auto_graph" : False },
+ "unevictable" : { "name" : "mem_lnx_unevictable",
"auto_graph" : False },
}
check_metrics["check_mk-mem.vmalloc"] = {