Module: check_mk
Branch: master
Commit: fdc2f7a305c3ec2d95d845672d21ed6d937450e2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdc2f7a305c3ec…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Oct 18 21:16:36 2013 -0400
FIX: ps: do not output perfdata of CPU averaging
---
.bugs/1054 | 7 +++++--
.bugs/1063 | 6 ++++--
ChangeLog | 1 +
checks/ps | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.bugs/1054 b/.bugs/1054
index f4bd6ce..dbb92a6 100644
--- a/.bugs/1054
+++ b/.bugs/1054
@@ -1,10 +1,13 @@
Title: ps check returns perfdata
Component: checks
-State: open
+Class: nastiness
+State: done
Date: 2013-09-23 12:32:48
Targetversion: 1.2.3i2
-Class: nastiness
ps check returns (some) perfdata:
pcpuavg=0;90;98;0;15
but it should not. only ps.perf should!
+
+2013-10-18 21:16:27: changed state open -> done
+Done.
diff --git a/.bugs/1063 b/.bugs/1063
index 6293746..67e6d19 100644
--- a/.bugs/1063
+++ b/.bugs/1063
@@ -1,8 +1,10 @@
Title: manpage for check_form_submit is missing
Component: checks
-State: open
+Class: nastiness
+State: done
Date: 2013-10-08 17:26:07
Targetversion: 1.2.3i3
-Class: nastiness
manpage for check_form_submit needs to be written
+
+2013-10-18 21:12:07: changed state open -> done
diff --git a/ChangeLog b/ChangeLog
index 7be4f6c..e3c5d7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,7 @@
* FIX: hp_proliant: Correct handling of missing snmp data
* FIX: logwatch.ec: No longer forwards "I" lines to event console
* FIX: check_dns: default to querying the host itself
+ * FIX: ps: do not output perfdata of CPU averaging (use ps.perf for that)
WATO:
* You can now have site-specific global settings when using
diff --git a/checks/ps b/checks/ps
index a18d1d2..c3c3cd0 100644
--- a/checks/ps
+++ b/checks/ps
@@ -384,7 +384,7 @@ def check_procs(item, params, info, with_perfdata):
timedif, avg_cpu = get_average("ps.%s.cpu" % item, now,
percent_cpu, params["cpu_average"], False)
infotext += " (%d min average: %.1f%%)" %
(params["cpu_average"], avg_cpu)
percent_cpu = avg_cpu # use this for level comparison
- if extended_perfdata:
+ if with_perfdata and extended_perfdata:
perfdata.append(("pcpuavg", avg_cpu, warn_cpu, crit_cpu, 0,
params["cpu_average"]))
if "cpulevels" in params: