Module: check_mk
Branch: master
Commit: f655e12a22887c4ca3febbbe3117490d12d139ed
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f655e12a22887c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Sep 10 17:17:57 2015 +0200
#2594 FIX mem.linux: Remove several bogus exceeding time graphs
---
.werks/2594 | 9 +++++++++
ChangeLog | 1 +
web/plugins/metrics/check_mk.py | 25 +++++++++++++++++++++++++
3 files changed, 35 insertions(+)
diff --git a/.werks/2594 b/.werks/2594
new file mode 100644
index 0000000..8728790
--- /dev/null
+++ b/.werks/2594
@@ -0,0 +1,9 @@
+Title: mem.linux: Remove several bogus exceeding time graphs
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i3
+Date: 1441898260
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index c30f93e..08458bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -176,6 +176,7 @@
* 1292 FIX: hitachi_hus_status: Internal Name of Check changed...
NOTE: Please refer to the migration notes!
* 2561 FIX: check-mk-agent rpm is now also replacing check_mk_agent named rpms...
+ * 2594 FIX: mem.linux: Remove several bogus exceeding time graphs
Multisite:
* 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce
unhandled exceptions...
diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py
index 017bcc2..47c0ad0 100644
--- a/web/plugins/metrics/check_mk.py
+++ b/web/plugins/metrics/check_mk.py
@@ -638,6 +638,13 @@ metric_info["mem_lnx_vmalloc_chunk"] = {
"unit" : "bytes",
}
+metric_info["mem_lnx_hardware_corrupted"] = {
+ "title" : _("Hardware corrupted memory"),
+ "color": "13/a",
+ "unit" : "bytes",
+}
+
+
metric_info["load1"] = {
"title" : _("CPU load average of last minute"),
"unit" : "",
@@ -2748,6 +2755,23 @@ check_metrics["check_mk-mem.linux"] = {
"vmalloc_total" : { "name" :
"mem_lnx_vmalloc_total", },
"vmalloc_used" : { "name" : "mem_lnx_vmalloc_used",
},
"vmalloc_chunk" : { "name" :
"mem_lnx_vmalloc_chunk", },
+ "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 },
}
check_metrics["check_mk-mem.vmalloc"] = {
@@ -4946,6 +4970,7 @@ graph_info.append({
("swap_used", "stack"),
("mem_total", "line"),
],
+ "conflicting_metrics" : [ "swap_total" ],
})
# Linux memory graphs. They are a lot...