[checkmk-commits] Check_MK Git: check_mk: #1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page

Module: check_mk Branch: master Commit: dbd2f29c6b28d4dadbb4c82bec5c1001214e6af4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbd2f29c6b28d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 10:19:58 2014 +0100 #1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page --- .werks/1561 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 3 +++ web/plugins/wato/builtin_modules.py | 3 --- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/1561 b/.werks/1561 new file mode 100644 index 0000000..328bd54 --- /dev/null +++ b/.werks/1561 @@ -0,0 +1,9 @@ +Title: Remove Auditlog from the main WATO menu and put it into the activate Changes page +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417598377 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 07e2a0f..ee7258c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 1535 Disabled services on service discovery page now link to the ruleset * 1587 SEC: Prevent logging of passwords during initial distributed site login... * 1560 Put host and service groups into one WATO menu item... + * 1561 Remove Auditlog from the main WATO menu and put it into the activate Changes page * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 750b92d..2132e18 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4648,6 +4648,9 @@ def mode_changelog(phase): if is_distributed(): html.context_button(_("Site Configuration"), make_link([("mode", "sites")]), "sites") + if config.may("wato.auditlog"): + html.context_button(_("Audit log"), make_link([("mode", "auditlog")]), "auditlog") + elif phase == "action": # Let host validators do their work diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index 7992dde..d337e8b 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -71,9 +71,6 @@ modules += [ ( "sites", _("Distributed Monitoring"), "sites", "sites", _("Distributed monitoring via Multsite, distributed configuration via WATO")), - ( "auditlog", _("Audit Logfile"), "auditlog", "auditlog", - _("Keep track of all modifications and actions of the users in WATO.")), - ( "snapshot", _("Backup & Restore"), "backup", "snapshots", _("Make snapshots of your configuration, download, upload and restore snapshots.")),