Module: check_mk
Branch: master
Commit: aa245b6c80951905c19c3f7783e7db9c48eb0bc8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa245b6c809519…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Mon Aug 1 15:46:19 2016 +0200
3742 FIX ps: Fixed broken averaging
Averaging for CPU util always returned the current value. This has been fixed.
---
.werks/3742 | 10 ++++++++++
ChangeLog | 1 +
checks/ps | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/3742 b/.werks/3742
new file mode 100644
index 0000000..3e8c2f1
--- /dev/null
+++ b/.werks/3742
@@ -0,0 +1,10 @@
+Title: ps: Fixed broken averaging
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.4.0i1
+Date: 1470059119
+
+Averaging for CPU util always returned the current value. This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index 01d517a..164cf38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -321,6 +321,7 @@
* 3672 FIX: Agent sections cached by the agent could cause stale services...
* 3727 FIX: fc_port: Fixed broken interpretation of counter values leading to wrong
measurements
* 3731 FIX: sap.value-groups: Replaced this check with sap.value_groups...
+ * 3742 FIX: ps: Fixed broken averaging...
Multisite:
* 3187 notification view: new filter for log command via regex
diff --git a/checks/ps b/checks/ps
index cf02118..394b106 100644
--- a/checks/ps
+++ b/checks/ps
@@ -111,7 +111,7 @@ def ps_get_counters_to_delete(pids):
continue
pid = check_ident.split(".")[-1]
- if pid not in pids:
+ if pid.isdigit() and pid not in pids:
counters_to_delete.append(ident)
return counters_to_delete