Module: check_mk
Branch: master
Commit: 536fd9cff793b20f62f23c1d5a1131f580957a4c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=536fd9cff793b2…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Aug 19 22:51:57 2011 +0200
Multisite: checkman honors OMD"s local hierarchy
---
ChangeLog | 1 +
web/plugins/views/painters.py | 9 ++++++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 68196b7..33d6157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
Multisite:
* FIX: reschedule now works for host names containing spaces
* Bookmarks snapin: save relative URLs whenever possible
+ * Man-Pages of Check_MK checks shown in Multisite honor OMD's local hierarchy
1.1.11i2:
Core, Setup, etc.:
diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py
index 2e74f99..d126817 100644
--- a/web/plugins/views/painters.py
+++ b/web/plugins/views/painters.py
@@ -713,7 +713,14 @@ def paint_check_manpage(row):
if not command.startswith("check_mk-"):
return "", ""
checktype = command[9:]
- p = defaults.check_manpages_dir + "/" + checktype
+ # Honor man-pages in OMD's local structure
+ p = None
+ if defaults.omd_root:
+ p = defaults.omd_root + "/local/share/check_mk/checkman/" + checktype
+ if not os.path.isfile(p):
+ p = None
+ if not p:
+ p = defaults.check_manpages_dir + "/" + checktype
if os.path.isfile(p):
description = None
for line in file(p):