Module: check_mk
Branch: master
Commit: e38c93a847ceca3a6e4497d7f423407fe65b68a3
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e38c93a847ceca…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Sep 20 10:54:24 2013 +0200
apache_status: Nopw also supports multithreaded mp
---
ChangeLog | 19 ++++++++++---------
checks/apache_status | 30 +++++++++++++++++-------------
2 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dbf9419..6eb07ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,7 +32,6 @@
* windows_agent: Now available as 64 bit version
* agent_vsphere: fix problem where sensors were missing when
you queried multiple host systems via vCenter
- * apache_status: fix exception if parameter is None
* cached checks: no longer output cached data if the age of the
cache file is twice the maximum cache age
* windows agent: no longer tries to execute directories
@@ -80,6 +79,16 @@
* New active check, check_form_submit, to submit HTML forms and check the resulting page
* mk-job: /var/lib/check_mk_agent/job directory is now created with mode 1777 so
mk-job can be used by unprivileged users too
+ * ADD: etherbox: new check for etherbox (messpc) sensors.
+ currently supported: temperature, humidity, switch contact and smoke sensors
+ * cisco_wlc_client: now supports low/high warn and crit levels
+ * cisco_wlc: now supports configuration options for missing AP
+ * agent_vsphere: completely rewritten, now considerably faster
+ vCenter is still queried by old version
+ * windows_agent: windows eventlog informational/audit logs now reported with O prefix
+ * mk_logwatch: ignored loglines now reported with an "." prefix (if required)
+ * apache_status: Nopw also supports multithreaded mpm
+ * FIX: apache_status: fix exception if parameter is None
* FIX: hr_mem: handle virtual memory correct on some devices
* FIX: apache_status agent plugin: now also works, if prog name contains slashes
* FIX: check_dns: parameter -A does not get an additional string
@@ -89,16 +98,8 @@
* FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter
* FIX: cleaned up fileinfo.groups pattern handling, manual configuration
is now possible using WATO
- * ADD: etherbox: new check for etherbox (messpc) sensors.
- currently supported: temperature, humidity, switch contact and smoke sensors
- * cisco_wlc_client: now supports low/high warn and crit levels
- * cisco_wlc: now supports configuration options for missing AP
* FIX: check_mk-ipmi.php: PNP template now displays correct units as delivered
by the check plugin
- * agent_vsphere: completely rewritten, now considerably faster
- vCenter is still queried by old version
- * windows_agent: windows eventlog informational/audit logs now reported with O prefix
- * mk_logwatch: ignored loglines now reported with an "." prefix (if required)
Notifications:
diff --git a/checks/apache_status b/checks/apache_status
index 79f53b6..0c5e746 100644
--- a/checks/apache_status
+++ b/checks/apache_status
@@ -36,19 +36,23 @@ def apache_status_open_slots(value, params):
return 0, "", extra_perf
apache_status_fields = {
- # key sort convert-func param_function
- 'Uptime': (0, int),
- 'IdleWorkers': (5, int),
- 'BusyWorkers': (6, int),
- 'OpenSlots': (7, int, apache_status_open_slots),
- 'TotalSlots': (8, int),
- 'Total Accesses': (9, int),
- 'CPULoad': (10, float),
- 'Total kBytes': (11, float),
- 'ReqPerSec': (12, float),
- 'BytesPerReq': (13, float),
- 'BytesPerSec': (14, float),
- 'Scoreboard': (15, str),
+ # key sort convert-func param_function
+ 'Uptime': (0, int),
+ 'IdleWorkers': (5, int),
+ 'BusyWorkers': (6, int),
+ 'OpenSlots': (7, int, apache_status_open_slots),
+ 'TotalSlots': (8, int),
+ 'Total Accesses': (9, int),
+ 'CPULoad': (10, float),
+ 'Total kBytes': (11, float),
+ 'ReqPerSec': (12, float),
+ 'BytesPerReq': (13, float),
+ 'BytesPerSec': (14, float),
+ 'Scoreboard': (15, str),
+ 'ConnsTotal': (16, int),
+ 'ConnsAsyncWriting': (17, int),
+ 'ConnsAsyncKeepAlive': (18, int),
+ 'ConnsAsyncClosing': (19, int),
}
apache_status_stats = {