6 Nov
2010
6 Nov
'10
6:04 a.m.
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")uot;);
+
+
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")