[checkmk-commits] Check_MK Git: check_mk: #1542 FIX Changed text of "debug_log"

option to be clearer in distributed setups Message-ID: &lt;547c5f55.g4DqFake8FJwrozK%lm(a)mathias-kettner.de&gt; User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: e17eed5879a520bea49737d2d222eb979f596f7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e17eed5879a520… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Dec 1 08:59:12 2014 +0100 #1542 FIX Changed text of "debug_log" option to be clearer in distributed setups The text of the rule was always refering to the central site, which is missleading in distributed setups. Replaced the siteid in the path with a spacer. --- .bugs/2205 | 7 +++++-- .werks/1542 | 11 +++++++++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 14 +++++++++++--- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.bugs/2205 b/.bugs/2205 index d9ac414..27c0824 100644 --- a/.bugs/2205 +++ b/.bugs/2205 @@ -1,10 +1,13 @@ Title: Path in debug_log is wrong in distributed WATO setups Component: wato -State: open +Class: bug +State: done Date: 2014-11-24 15:07:07 Targetversion: 1.2.5i1 -Class: bug The shown path always shows the path on the centeral site. It should either show the path to the correct site, or better, just a spacer which indicates that the site id needs to be put into the path. + +2014-12-01 08:57:49: changed state open -> done +Fixed. diff --git a/.werks/1542 b/.werks/1542 new file mode 100644 index 0000000..6119da6 --- /dev/null +++ b/.werks/1542 @@ -0,0 +1,11 @@ +Title: Changed text of "debug_log" option to be clearer in distributed setups +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417420673 +Class: fix + +The text of the rule was always refering to the central site, which is +missleading in distributed setups. Replaced the siteid in the path +with a spacer. diff --git a/ChangeLog b/ChangeLog index 3ff5882..becbc9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 1505 FIX: Snapshots are now bound to the used monitoring core... * 1540 FIX: Host diagnose page: Some tests were failing randomly * 1541 FIX: Fixed missing form fields for notification method when editing rbn default rule + * 1542 FIX: Changed text of "debug_log" option to be clearer in distributed setups... Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 782cb0d..caa2468 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1138,19 +1138,27 @@ register_configvar(group, "for the operation, but on the other hand will lead to a slightly higher load " "of Nagios for the first couple of minutes after the restart. "))) +def log_dir_path(): + path = defaults.log_dir + if path.startswith('/omd'): + parts = path.split('/') + parts[2] = '&lt;siteid&gt;' + return '/'.join(parts) + else: + return path register_configvar(group, "debug_log", Transform( Checkbox( - label = _("Write exceptions to <tt>%s/crashed-checks.log</tt>" % defaults.log_dir), + label = _("Write exceptions to <tt>%s/crashed-checks.log</tt>" % log_dir_path()), ), title = _("Log exceptions in check plugins"), help = _("If this option is enabled Check_MK will create a debug logfile at " - "<tt>%s/chrashed-checks.log</tt> " + "<tt>%s/crashed-checks.log</tt> " "containing details about failed checks (those which have the state <i>UNKNOWN " "and the output UNKNOWN - invalid output from plugin</i>...) Per default no " - "logfile is written.") % defaults.log_dir, + "logfile is written.") % log_dir_path(), forth = lambda x: not not x, ), need_restart = True)