[checkmk-commits] Check_MK Git: check_mk: Fix: new rule to change the output of logwatch

Module: check_mk Branch: master Commit: 7cb2859a60b1e52a7a411160fe28303f52765505 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cb2859a60b1e5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 1 12:23:32 2012 +0200 Fix: new rule to change the output of logwatch --- checkman/logwatch | 5 +++-- web/plugins/wato/check_mk_configuration.py | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/checkman/logwatch b/checkman/logwatch index da4d90c..153c6bc 100644 --- a/checkman/logwatch +++ b/checkman/logwatch @@ -88,5 +88,6 @@ logwatch_dir (string): Directory where log messages are replaced by backslashes. logwatch_service_output (string): Change the output of the service to ony - print stats and not the last error message. Default is {default}, use {small} if - you only want to have the stats. + show the count of events whitout the last error message. Default is {default} which + shows the last error message and the count, use {count} if + you only want to see the count. diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f71b035..d3749d2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -549,15 +549,17 @@ register_configvar(group, register_configvar(group, "logwatch_service_output", DropdownChoice( - title = _("Service output of Logwatch"), - help = _("You can change the output of the logwatch service " - "between an view with oh"), + title = _("Service output for logwatch"), + help = _("You can change the plugin output of logwatch " + "to show only the count of messages or also " + "to show the last worst message"), choices = [ - ( 'default' , _("Output last log message in service output") ), - ( 'small', _("Only print stats in service output")), + ( 'default' , _("Show count and last message") ), + ( 'count', _("Show only count")), ], default_value = 'default', ), + need_restart = True ) register_configvar(group,