Module: check_mk
Branch: master
Commit: d560c4169c621c14a24dd7b87c39b64fe2006bce
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d560c4169c621c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Feb 15 16:44:04 2011 +0100
FIX: read .include before checks
---
ChangeLog | 2 ++
modules/check_mk.py | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b390c1c..e9433df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
Core, Setup, etc.:
* FIX: check_mk_templates.cfg: add missing check_period for hosts
(needed for Shinken)
+ * FIX: read *.include files before checks. Fixes df_netapp not finding
+ its check function
Checks & Agents:
* ucd_cpu_load: new check for CPU load via UCD SNMP agent
diff --git a/modules/check_mk.py b/modules/check_mk.py
index e6bd72e..ff165dd 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -350,6 +350,9 @@ if __name__ == "__main__":
filelist = glob.glob(checks_dir + "/*")
if local_checks_dir:
filelist += glob.glob(local_checks_dir + "/*")
+ # read include files first!
+ filelist = [ f for f in filelist if f.endswith(".include") ] + \
+ [ f for f in filelist if not f.endswith(".include") ]
for f in filelist:
if not f.endswith("~"): # ignore emacs-like backup files
try: