Module: check_mk
Branch: master
Commit: 0af8fb0275c1bed13e00e6bdacaa83ab7ed37701
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0af8fb0275c1be…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Mar 3 19:18:04 2011 +0100
New dummy man page - used as template
---
checkman/dummy | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/checkman/dummy b/checkman/dummy
new file mode 100644
index 0000000..5f920bb
--- /dev/null
+++ b/checkman/dummy
@@ -0,0 +1,45 @@
+title: Dummy check man page - used as template for new check manuals
+agents: linux, windows, aix, solaris, hpux, vms, freebsd
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ Describe here: (1) what the check actually does, (2) under which
+ circumstances it goes warning/critical, (3) which devices are supported
+ by the check, (4) if the check requires a separated plugin or
+ tool or separate configuration on the target host.
+
+item:
+ Describe the syntax and meaning of the check's item here. Provide all
+ information one needs if coding a manual check with {checks +=} in {main.mk}.
+ Give an example. If the check uses {None} as sole item,
+ then leave out this section.
+
+examples:
+ # Give examples for configuration in {main.mk} here. If the check has
+ # configuration variable, then give example for them here.
+
+ # set default levels to 40 and 60 percent:
+ foo_default_values = (40, 60)
+
+ # another configuration variable here:
+ inventory_foo_filter = [ "superfoo", "superfoo2" ]
+
+perfdata:
+ Describe precisely the number and meaning of performance variables
+ the check sends. If it outputs no performance data, then leave out this
+ section.
+
+inventory:
+ Describe how the inventory for the check works. Which items
+ will it find? Describe the influence of check specific
+ configuration parameters to the inventory.
+
+[parameters]
+foofirst(int): describe the first parameter here (if parameters are grouped
+ as tuple)
+fooother(string): describe another parameter here.
+
+[configuration]
+foo_default_levels(int, int): Describe global configuration variable of
+ foo here. Important: also tell the user how they are preset.
Module: check_mk
Branch: master
Commit: 66b80b934c0eea8a2b4ae50a10b94ed0296da5e9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66b80b934c0eea…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Mar 3 19:18:34 2011 +0100
New man page for systemtime
---
checkman/systemtime | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/checkman/systemtime b/checkman/systemtime
new file mode 100644
index 0000000..66b76a7
--- /dev/null
+++ b/checkman/systemtime
@@ -0,0 +1,33 @@
+title: Check synchronization of operating system time
+agents: windows
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check is a simple check of the correct setting of the current
+ system time of the target host. It simply compares the local time
+ on the monitoring server with that measured by the agent on the
+ target host. It is not very accurate since it does not account for
+ the systematic time delay between the output of the time by the agent
+ and the actual processing of that data by Check_MK.
+
+ Its advantage - however - is that it works on any Windows host (with
+ an agent of version of 1.1.10 or later) - regardless of the method used
+ to synchronize the time.
+
+ Levels can be set for making the check warn/crit if the time difference
+ exceeds the configured limits.
+
+perfdata:
+ the time difference in seconds
+
+inventory:
+ One service will be created for each host supporting this check.
+ Currently this is the windows agent in version 1.1.10 or later.
+
+[parameters]
+warning(int): Time difference in seconds at which the check goes to warning.
+critical(int): Time difference triggering a critical state.
+
+[configuration]
+systemtime_default_values(int, int): Default check levels in seconds of time diference. This is preset to {(30, 60)}.
Module: check_mk
Branch: master
Commit: 85ccba035baf5b0feb063f8f4379ef00479fd431
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85ccba035baf5b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Mar 3 19:30:03 2011 +0100
Added stub man pages for deprecated ORACLE checks
---
checkman/oracle_asm_dg | 10 ++++++++++
checkman/oracle_asm_disk | 10 ++++++++++
checkman/oracle_inst | 10 ++++++++++
checkman/oracle_tbd | 10 ++++++++++
4 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/checkman/oracle_asm_dg b/checkman/oracle_asm_dg
new file mode 100644
index 0000000..57d4651
--- /dev/null
+++ b/checkman/oracle_asm_dg
@@ -0,0 +1,10 @@
+title: *** This check is deprecated ***
+agents:
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check is deprecated and will be removed soon. No agent plugin is
+ publicly available. If you want to monitor ORACLE databases,
+ use {oracle_logswitches}, {oracle_sessions} and {oracle_tablespaces}
+ instead.
diff --git a/checkman/oracle_asm_disk b/checkman/oracle_asm_disk
new file mode 100644
index 0000000..57d4651
--- /dev/null
+++ b/checkman/oracle_asm_disk
@@ -0,0 +1,10 @@
+title: *** This check is deprecated ***
+agents:
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check is deprecated and will be removed soon. No agent plugin is
+ publicly available. If you want to monitor ORACLE databases,
+ use {oracle_logswitches}, {oracle_sessions} and {oracle_tablespaces}
+ instead.
diff --git a/checkman/oracle_inst b/checkman/oracle_inst
new file mode 100644
index 0000000..57d4651
--- /dev/null
+++ b/checkman/oracle_inst
@@ -0,0 +1,10 @@
+title: *** This check is deprecated ***
+agents:
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check is deprecated and will be removed soon. No agent plugin is
+ publicly available. If you want to monitor ORACLE databases,
+ use {oracle_logswitches}, {oracle_sessions} and {oracle_tablespaces}
+ instead.
diff --git a/checkman/oracle_tbd b/checkman/oracle_tbd
new file mode 100644
index 0000000..57d4651
--- /dev/null
+++ b/checkman/oracle_tbd
@@ -0,0 +1,10 @@
+title: *** This check is deprecated ***
+agents:
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check is deprecated and will be removed soon. No agent plugin is
+ publicly available. If you want to monitor ORACLE databases,
+ use {oracle_logswitches}, {oracle_sessions} and {oracle_tablespaces}
+ instead.
Module: check_mk
Branch: master
Commit: 1b9a5f7521a8addb257c0b3ba29e5cbb5a923641
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b9a5f7521a8ad…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Mar 3 19:25:53 2011 +0100
Check man page for multipath
---
ChangeLog | 3 +++
checkman/multipath | 32 ++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6d808d1..c7c9b0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
WATO:
* FIX: Fixed bug that lost autochecks when using WATO and cmk -II together
+ Checks & Agents:
+ * Added check man page for systemtime, multipath
+
1.1.10b1:
Core, Setup, etc.:
diff --git a/checkman/multipath b/checkman/multipath
new file mode 100644
index 0000000..517bc28
--- /dev/null
+++ b/checkman/multipath
@@ -0,0 +1,32 @@
+title: Monitor state of multipathing on Linux
+agents: linux
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the state of multipath devices on Linux
+ hosts. For each multipath device at time of inventory the number
+ of paths is put into the check parameters. If later the number
+ of paths is less then expected, the check goes critical. So it
+ does if any of the paths is broken.
+
+ If the number of paths is higher than expected, the check goes
+ warning. A reinventory of the check might be neccessary in that
+ case.
+
+ This check is based on the output of the command {multipath -l} as
+ sent by the Linux agent. It correctly deals with various subtle
+ differences between the available versions of the multipath tools.
+
+item:
+ The UUID of the multipath device, e.g. {"360a980004334644d654a364469555a76"}.
+ If the multipath device has an alias you can alternatively specify the
+ alias as item.
+
+inventory:
+ One check for each multipath device is created.
+
+[parameters]
+numpaths(int): The only parameter is the number of expected paths. This is not
+ a tuple but a simple integer value.
+
Module: check_mk
Branch: master
Commit: 3b22481a69b85053ea338d2fbcc9e09ec72cc330
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b22481a69b850…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Mar 3 19:35:50 2011 +0100
man page for snmp_info
---
ChangeLog | 2 +-
checkman/dummy | 2 +-
checkman/snmp_info | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c7c9b0c..37e344c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@
* FIX: Fixed bug that lost autochecks when using WATO and cmk -II together
Checks & Agents:
- * Added check man page for systemtime, multipath
+ * Added check man page for systemtime, multipath, snmp_info
1.1.10b1:
diff --git a/checkman/dummy b/checkman/dummy
index 5f920bb..925a0d7 100644
--- a/checkman/dummy
+++ b/checkman/dummy
@@ -1,5 +1,5 @@
title: Dummy check man page - used as template for new check manuals
-agents: linux, windows, aix, solaris, hpux, vms, freebsd
+agents: linux, windows, aix, solaris, hpux, vms, freebsd, snmp
author: Mathias Kettner <mk(a)mathias-kettner.de>
license: GPL
distribution: check_mk
diff --git a/checkman/snmp_info b/checkman/snmp_info
new file mode 100644
index 0000000..620dd56
--- /dev/null
+++ b/checkman/snmp_info
@@ -0,0 +1,23 @@
+title: Retrieve informational SNMP data about host
+agents: snmp
+author: Mathias Kettner <mk(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check retrieves the values {sysDescr}, {sysContact}, {sysName} and
+ {sysLocation} and displays them. It is alwas OK.
+
+examples:
+ # Force snmp_info as manual check on all SNMP hosts
+ checks += [
+ ( [ "snmp" ], ALL_HOSTS, "snmp_info", None, None ),
+ ]
+
+inventory:
+ One check per SNMP host will be created.
+
+ Please note: This check is not found be then SNMP scan (which you do with
+ a simple {cmk -I}). You need to explicitely specify the check, if you
+ want to inventorize it ({cmk --checks snmp_info -I}). Alternatively you
+ can specify it as a manual check.
+
Module: check_mk
Branch: master
Commit: 4aa144ccf5169962bd9670c7810f001f87f5673b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aa144ccf51699…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Mar 3 06:47:11 2011 +0100
Fixed bug that lost autochecks when using WATO and cmk -II together
---
.bugs/169 | 11 ++++++++---
ChangeLog | 4 ++++
modules/check_mk.py | 6 ++++--
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/.bugs/169 b/.bugs/169
index 14a2eed..4ea7850 100644
--- a/.bugs/169
+++ b/.bugs/169
@@ -1,10 +1,11 @@
Title: WATO misses services
Component: wato
+State: done
+Class: bug
+Date: 2011-03-02 09:45:16
Benefit: 4
-State: open
Cost: 2
-Date: 2011-03-02 09:45:16
-Class: bug
+Fun: 0
In some strange cases WATO seems to loose services:
@@ -26,3 +27,7 @@ In some strange cases WATO seems to loose services:
> services were legacy services that I had much earlier added (globally)
> via editing files.
+
+2011-03-03 06:48:36: changed state open -> done
+Was due to different quote types used in autochecks files.
+Should be fixed now.
diff --git a/ChangeLog b/ChangeLog
index c6a7fa7..88b7603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.1.10b2:
+ WATO:
+ * FIX: Fixed bug that lost autochecks when using WATO and cmk -II together
+
1.1.10b1:
Core, Setup, etc.:
* FIX: do not assume 127.0.0.1 as IP address for usewalk_hosts if
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 266ce5b..0ec6f58 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -1873,9 +1873,11 @@ def remove_autochecks_of(hostname, checktypes):
lines = []
count = 0
for line in file(fn):
- if line.lstrip().startswith('("'):
+ # hostname and check type can be quoted with ' or with "
+ double_quoted = line.replace("'", '"').lstrip()
+ if double_quoted.startswith('("'):
count += 1
- splitted = line.split('"')
+ splitted = double_quoted.split('"')
if splitted[1] != hostname or splitted[3] not in checktypes:
if splitted[3] not in check_info:
sys.stderr.write('Removing unimplemented check %s\n' % splitted[3])