Module: check_mk
Branch: master
Commit: a3221e547ffb8f9f59208884968dc19a3fa167cc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3221e547ffb8f…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 3 15:12:57 2013 +0200
FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf
Conflicts:
ChangeLog
---
ChangeLog | 6 ++++++
agents/plugins/apache_status | 11 ++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1b801f4..8595e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,6 +116,12 @@
* Inventory: Display link symbol for ps ruleset
* FIX: Rulesets: correct display of rules within subfolders
+
+1.2.2p2:
+ Checks & Agents:
+ * FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf
+
+
1.2.2p1:
Core:
* FIX: correctly quote ! and \ in active checks for Nagios
diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status
index ca70602..71d1f61 100755
--- a/agents/plugins/apache_status
+++ b/agents/plugins/apache_status
@@ -12,7 +12,7 @@
#
# By default this plugin tries to detect all locally running apache processes
# and to monitor them. If this is not good for your environment you might
-# create an apache_status.conf file in MK_CONFDIR and populate the servers
+# create an apache_status.cfg file in MK_CONFDIR and populate the servers
# list to prevent executing the detection mechanism.
#
# It is also possible to override or extend the ssl_ports variable to make the
@@ -20,9 +20,14 @@
import os, sys, urllib2
-config_file = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/apache_status.conf"
+config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk")
+config_file = config_dir + "/apache_status.conf"
+if not os.path.exists(config_file):
+ config_file = config_dir + "/apache_status.cfg"
-# None or list of (ipaddress, port) tuples
+
+# None or list of (proto, ipaddress, port) tuples.
+# proto is 'http' or 'https'
servers = None
ssl_ports = [ 443, ]
Module: check_mk
Branch: master
Commit: efc1b31ec08b1ed87311846803e0ee5a9e231c04
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efc1b31ec08b1e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 3 15:00:37 2013 +0200
Added manpage for esx_vsphere_hostsystem.mem_usage
---
checkman/check_mk-esx_vsphere_hostsystem.mem_usage | 36 --------------------
checkman/esx_vsphere_hostsystem.mem_usage | 26 ++++++++++++++
2 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/checkman/check_mk-esx_vsphere_hostsystem.mem_usage b/checkman/check_mk-esx_vsphere_hostsystem.mem_usage
deleted file mode 100644
index 9285297..0000000
--- a/checkman/check_mk-esx_vsphere_hostsystem.mem_usage
+++ /dev/null
@@ -1,36 +0,0 @@
-title: Check usage of physical RAM on ESX host system
-agents: vsphere
-author: Mathias Kettner <mk(a)mathias-kettner.de>
-license: GPL
-distribution: check_mk
-description:
- This check measures the current usage of physical RAM by
- an ESX host system.
-
-inventory:
- One check per ESX host system is being created.
-
-
-perfdata:
- One value: the current usage in bytes.
-
-[parameters]
-warning (int or float): the percentage of virtual memory used
- by processes at which WARNING state is triggered. If the
- level is defined as an integer value then it is interpreted
- as an absolute value in megabytes.
-critical (int or float): the percentage or absolute value
- at which CRITICAL state is triggered
-
-
-[configuration]
-memused_default_levels (float, float): Levels used by
- all checks that are created by inventory.
-
-mem_extended_perfdata (boolean): If this variable is set
- to {True}, then the checks outputs additional performance
- data, if the agent provides that information. On Linux
- the amount of mapped and committed memory is output
- (see {Mapped} and {Committed_AS} in {/proc/meminfo}) and
- also the size used for page tables {Pagetables}.
-
diff --git a/checkman/esx_vsphere_hostsystem.mem_usage b/checkman/esx_vsphere_hostsystem.mem_usage
new file mode 100644
index 0000000..fb6a5cb
--- /dev/null
+++ b/checkman/esx_vsphere_hostsystem.mem_usage
@@ -0,0 +1,26 @@
+title: Usage of physical RAM on an ESX host system
+agents: vsphere
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check measures the current usage of physical RAM by
+ an ESX host system.
+
+inventory:
+ One check per ESX host system is being created.
+
+perfdata:
+ One value: the current usage in bytes.
+
+[parameters]
+warning (float): the percentage of virtual memory used
+ by processes at which WARNING state is triggered.
+critical (float): the percentage or absolute value
+ at which CRITICAL state is triggered
+
+[configuration]
+esx_host_mem_default_levels(float, float): Levels used by
+ all checks that are created by inventory. This defaults to {(80.0, 90.0)}.
+
+
Module: check_mk
Branch: master
Commit: ac40c72b220d8b1c9b01c086f2e99af397ec1125
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac40c72b220d8b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 3 09:15:51 2013 +0200
handle exception in check_timeperiod
---
modules/check_mk_base.py | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index a24a650..09a3043 100755
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -1493,13 +1493,21 @@ def check_timeperiod(timeperiod):
global g_inactive_timerperiods
# Let exceptions happen, they will be handled upstream.
if g_inactive_timerperiods == None:
- import socket
- s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
- s.connect(livestatus_unix_socket)
- # We just get the currently inactive timeperiods. All others
- # (also non-existing) are considered to be active
- s.send("GET timeperiods\nColumns:name\nFilter: in = 0\n")
- s.shutdown(socket.SHUT_WR)
- g_inactive_timerperiods = s.recv(10000000).splitlines()
+ try:
+ import socket
+ s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+ s.connect(livestatus_unix_socket)
+ # We just get the currently inactive timeperiods. All others
+ # (also non-existing) are considered to be active
+ s.send("GET timeperiods\nColumns:name\nFilter: in = 0\n")
+ s.shutdown(socket.SHUT_WR)
+ g_inactive_timerperiods = s.recv(10000000).splitlines()
+ except Exception, e:
+ if opt_debug:
+ raise
+ else:
+ # If the query is not successful better skip this check then fail
+ return False
+
return timeperiod not in g_inactive_timerperiods