Module: check_mk
Branch: master
Commit: e1a1dea348ee85a687b49b0166ffd487677ea332
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1a1dea348ee85…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat Nov 6 10:53:39 2010 +0100
Allow ALL_SERVICES
---
ChangeLog | 1 +
LIESMICH.zutun | 12 ++++++++----
modules/check_mk.py | 9 +++++++++
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 94a5064..8f924a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
* Inventory: Better error handling on invalid inventory result of checks
* setup.sh: fix problem with missing package_info (only appears if setup
is called from another directory)
+ * ALL_SERVICES: Instead of [ "" ] you can now write ALL_SERVICES
Checks & Agents:
diff --git a/LIESMICH.zutun b/LIESMICH.zutun
index 3cd0b66..63e9399 100644
--- a/LIESMICH.zutun
+++ b/LIESMICH.zutun
@@ -92,10 +92,6 @@ auftritt.
--snmpwalk: Braucht man das translaten noch? Ich arbeite doch jetzt eh
nur noch ohne MIB-Dateien. Das würde das ganze deutlich vereinfachen!
-
-filesystem_levels rausnehmen. Hinweis, dass check_parameters verwendet
-werden soll.
-
Direct rrd updates ganz entfernen.
snmp_communities: dictionary nicht mehr verwenden, aus Doku raus, Defaultwert
@@ -113,6 +109,14 @@ Icons.
Host- und Serviceicons (icon_image) anzeigen.
--------------------------------------------------------------------------------
+ab 1.1.11i1
+
+filesystem_levels wirklich rausnehmen. Hinweis, dass check_parameters verwendet
+werden soll.
+
+
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
UNSCHOENHEITEN
--------------------------------------------------------------------------------
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 4d07886..111336e 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -195,6 +195,7 @@ else:
PHYSICAL_HOSTS = [ '@physical' ] # all hosts but not clusters
CLUSTER_HOSTS = [ '@cluster' ] # all cluster hosts
ALL_HOSTS = [ '@all' ] # physical and cluster hosts
+ALL_SERVICES = [ "" ] # optical replacement"
NEGATE = '@negate' # negation in boolean lists
# Basic Settings
@@ -3456,6 +3457,14 @@ if opt_config_check:
if name not in ignored_variables and name not in vars_before_config:
sys.stderr.write("Invalid configuration variable '%s'\n" % name)
errors += 1
+
+ # Special handling for certain deprecated variables
+ if filesystem_levels != []:
+ sys.stderr.write("WARNING: filesystem_levels is deprecated and will be removed\n"
+ "any decade now. Please use check_parameters instead! Details can be\n"
+ "found at http://mathias-kettner.de/checkmk_check_parameters.html.\n");
+
+
if errors > 0:
sys.stderr.write("--> Found %d invalid variables\n" % errors)
sys.stderr.write("If you use own helper variables, please prefix them with _.\n")
Module: check_mk
Branch: master
Commit: bf18408779489d535579763351e8deae79e68a52
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf18408779489d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat Nov 6 10:59:13 2010 +0100
deprecate filesystem_levels
---
LIESMICH.zutun | 4 ++--
checkman/df | 16 ++++++----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/LIESMICH.zutun b/LIESMICH.zutun
index 63e9399..a4235f5 100644
--- a/LIESMICH.zutun
+++ b/LIESMICH.zutun
@@ -98,8 +98,6 @@ snmp_communities: dictionary nicht mehr verwenden, aus Doku raus, Defaultwert
leere Liste, aus Code raus, Hinweis im ChangeLog. Evtl einen Test mit
Abbruch, wenn immer noch type ist dict. Gleiches für bulkwalk_hosts
-[""] deprecaten, aus der Doku raus und durch ALL_SERVICES ersetzen
-
IDEE: Scan-Modus: Wenn man einen Host per SNMP scannt und *keine*
Antwort kommt, dann probiert man einfach alle SNMP-Checks aus.
@@ -114,6 +112,8 @@ ab 1.1.11i1
filesystem_levels wirklich rausnehmen. Hinweis, dass check_parameters verwendet
werden soll.
+[""] deprecaten, aus der Doku raus und durch ALL_SERVICES ersetzen. Das geht
+aber erst, wenn eine stabile Version das ALL_SERVICES erlaubt!
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
diff --git a/checkman/df b/checkman/df
index 135e314..65aa318 100644
--- a/checkman/df
+++ b/checkman/df
@@ -33,17 +33,17 @@ examples:
# Override warning/critical levels for all checks where
# levels are "filesystem_default_levels"
- filesystem_levels = [
+ check_parameters = [
# Hosts with tag "vms" get 85/95
- ( (85, 95), ["vms"], ALL_HOSTS, [ "" ] ),
+ ( (85, 95), ["vms"], ALL_HOSTS, [ "fs_" ] ),
# all /sapdata partitions will never be critical
- ( (101, 101), ALL_HOSTS, [ "/sapdata$" ] ),
+ ( (101, 101), ALL_HOSTS, [ "fs_/sapdata$" ] ),
# Partitions below "/var" get 80/90 with magic factor 0.5
- ( (80, 90, 0.5), ALL_HOSTS, [ "/var" ] ),
+ ( (80, 90, 0.5), ALL_HOSTS, [ "fs_/var" ] ),
# /usr and /opt on hosts zlnx01 and zlnx02
- ( (98, 99), [ "zlnx01", "zlnx02" ], [ "/usr$", "/opt$" ] ),
+ ( (98, 99), [ "zlnx01", "zlnx02" ], [ "fs_/usr$", "fs_/opt$" ] ),
# All filesystems on clusters get 80/95
- ( (80, 95), ALL_CLUSTERS, [ "" ] )
+ ( (80, 95), ALL_CLUSTERS, [ "fs_" ] )
]
# Exclude certain filesystems from being inventorized at all
@@ -81,10 +81,6 @@ filesystem_default_levels (int, int): Default levels for filesystem detected by
df_magicnumber_normsize (float): Reference filesystem size in GB. Default is 20.0.
Levels for File systems larger then that will be raised by a magic
factor < 1.0. Level for smaller filesystems will be lowered.
-filesystem_levels: Configuration list that allows you to specify
- filesystem levels for groups of hosts and mount points. The configuration
- is analogous to that of {service_contactgroups}. The list is processed from
- top to bottom. The first match wins.
df_lowest_warning_level (int): When using a magic number, the warning level will never drop
below this value. The default is {50} (percent).
df_lowest_critical_level (int): When using a magic number, the critical level will never drop
Module: check_mk
Branch: master
Commit: b53951620445a8fbb853e095e2f2eafe51745d99
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b53951620445a8…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat Nov 6 10:14:51 2010 +0100
Inventory checks: severity defaults to 1 now
---
ChangeLog | 1 +
LIESMICH.zutun | 2 --
modules/check_mk.py | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 73bc1e1..b0d938b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
* perfdata_format now defaults to "pnp". Previous default was "standard".
You might have to change that in main.mk if you are not using PNP (only
relevant for MRPE checks)
+ * inventory_check_severity default to 1 now (WARNING)
Checks & Agents:
* megaraid_pdisks: Using the real enclosure number as check item now
diff --git a/LIESMICH.zutun b/LIESMICH.zutun
index 5985abe..61a2842 100644
--- a/LIESMICH.zutun
+++ b/LIESMICH.zutun
@@ -100,8 +100,6 @@ aggregation_output_format: Aggregation per Default auf mehrzeilige Ausgabe
Direct rrd updates ganz entfernen.
-Inventurchecks: severity per Default auf 1 stellen.
-
snmp_communities: dictionary nicht mehr verwenden, aus Doku raus, Defaultwert
leere Liste, aus Code raus, Hinweis im ChangeLog. Evtl einen Test mit
Abbruch, wenn immer noch type ist dict. Gleiches für bulkwalk_hosts
diff --git a/modules/check_mk.py b/modules/check_mk.py
index e9d5236..7289b7f 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -217,7 +217,7 @@ snmp_communities = {}
# Inventory and inventory checks
inventory_check_interval = None # Nagios intervals (4h = 240)
-inventory_check_severity = 2 # critical
+inventory_check_severity = 1 # warning
inventory_max_cachefile_age = 120 # secs.
always_cleanup_autochecks = False
Module: check_mk
Branch: master
Commit: 4324bbde47cc7e96824016dd704ad8b132761506
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4324bbde47cc7e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat Nov 6 10:11:10 2010 +0100
Update MRPE man page
---
checkman/mrpe | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/checkman/mrpe b/checkman/mrpe
index cfdaab7..bfbcf6b 100644
--- a/checkman/mrpe
+++ b/checkman/mrpe
@@ -26,9 +26,13 @@ perfdata:
can set {perfdata_format = "pnp"} in your {main.mk}. This will let
PNP4Nagios choose a template matching the original check command.
+ Note: from version 1.1.9i2 on {"pnp"} is the default setting. You
+ can change it back by setting {perfdata_format} to {"standard"}.
+
inventory:
All plugins configured in {mrpe.cfg} are automatically inventorized.
[configuration]
perfdata_format (string): Set to {"pnp"} for adding the check command
- for PNP4Nagios
+ for PNP4Nagios. Set to {"standard"} for omitting template information
+ and better comply with the Nagios standard.
Module: check_mk
Branch: master
Commit: 73c3b1766c50da8c13d8f15981e467b3f596e0f5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73c3b1766c50da…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat Nov 6 10:08:04 2010 +0100
perfdata_format now defaults to "pnp"
---
ChangeLog | 3 +++
LIESMICH.zutun | 2 --
main.mk | 5 -----
modules/check_mk.py | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fc78dae..73bc1e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
* Inventory: Better error handling on invalid inventory result of checks
* setup.sh: fix problem with missing package_info (only appears if setup
is called from another directory)
+ * perfdata_format now defaults to "pnp". Previous default was "standard".
+ You might have to change that in main.mk if you are not using PNP (only
+ relevant for MRPE checks)
Checks & Agents:
* megaraid_pdisks: Using the real enclosure number as check item now
diff --git a/LIESMICH.zutun b/LIESMICH.zutun
index 57f7413..5985abe 100644
--- a/LIESMICH.zutun
+++ b/LIESMICH.zutun
@@ -96,8 +96,6 @@ nur noch ohne MIB-Dateien. Das würde das ganze deutlich vereinfachen!
filesystem_levels rausnehmen. Hinweis, dass check_parameters verwendet
werden soll.
-Perfdatenformat per Default auf 'pnp'
-
aggregation_output_format: Aggregation per Default auf mehrzeilige Ausgabe
Direct rrd updates ganz entfernen.
diff --git a/main.mk b/main.mk
index 1f33794..ecd627c 100644
--- a/main.mk
+++ b/main.mk
@@ -1,8 +1,3 @@
# Put your host names here
# all_hosts = [ 'localhost' ]
all_hosts = [ ]
-
-# Are you using PNP4Nagios and MRPE checks? This will make PNP
-# choose the correct template for standard Nagios checks:
-# perfdata_format = "pnp"
-
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 7d45f4b..e9d5236 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -206,7 +206,7 @@ agent_min_version = 0 # warn, if plugin has not at least versio
check_max_cachefile_age = 0 # per default do not use cache files when checking
cluster_max_cachefile_age = 90 # secs.
simulation_mode = False
-perfdata_format = "standard" # also possible: "pnp"
+perfdata_format = "pnp" # also possible: "standard"
debug_log = None
monitoring_host = "localhost" # your Nagios host
max_num_processes = 50
Module: check_mk
Branch: master
Commit: 7edf714ac3e1b6ef944a7a65803e94cc1d611f84
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7edf714ac3e1b6…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Nov 5 18:51:27 2010 +0100
Added missing manpage
---
checkman/blade_blades | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/checkman/blade_blades b/checkman/blade_blades
new file mode 100644
index 0000000..cf05d93
--- /dev/null
+++ b/checkman/blade_blades
@@ -0,0 +1,25 @@
+title: Check for blades in an IBM blade center
+agents: snmp
+author: Lars Michelsen <lm(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check verifies the present-, health- and power-state of a blade in an
+ IBM blade center.
+
+ The check raises {CRITICAL} and {WARNING} states depending on the different states:
+ When a blade does not exist anymore the check becomes {CRITICAL}, when a blade has
+ been turned off the check becomes {WARNING} and when the health state of the blade
+ is reported as not ok it raises {WARNING} or {CRITICAL} depending on the severity.
+
+item:
+ Number of the blade (as string, not int).
+
+examples:
+ checks += [
+ ( "hostabc", "blade_bays", "8", None)
+ ]
+
+inventory:
+ All blades in the system with the state 1 (present) are automatically
+ inventorized.