[checkmk-commits] Check_MK Git: check_mk: #1560 Put host and service groups into one WATO menu item

Module: check_mk Branch: master Commit: 3ee6ad88206d229939412d753c891874f99659bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ee6ad88206d22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 10:17:42 2014 +0100 #1560 Put host and service groups into one WATO menu item There is now a common menu item in WATO for host and service groups. It points to the host group management where you can switch to the service groups. This makes the WATO menu a bit more cleaned up. --- .werks/1560 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 9 ++++++++- web/plugins/wato/builtin_modules.py | 7 ++----- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.werks/1560 b/.werks/1560 new file mode 100644 index 0000000..cfa460e --- /dev/null +++ b/.werks/1560 @@ -0,0 +1,12 @@ +Title: Put host and service groups into one WATO menu item +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417598188 +Class: feature + +There is now a common menu item in WATO for host and service groups. It +points to the host group management where you can switch to the service +groups. This makes the WATO menu a bit more cleaned up. + diff --git a/ChangeLog b/ChangeLog index 369b516..07e2a0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ * 1504 WATO makes host tag and group information available for NagVis... * 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... * 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 089e6bb..750b92d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7769,7 +7769,14 @@ def mode_groups(phase, what): elif phase == "buttons": global_buttons() - html.context_button(_("New group"), make_link([("mode", "edit_%s_group" % what)]), "new") + if what == "host": + html.context_button(_("Service groups"), make_link([("mode", "service_groups")]), "hostgroups") + html.context_button(_("New host group"), make_link([("mode", "edit_host_group")]), "new") + elif what == "service": + html.context_button(_("Host groups"), make_link([("mode", "host_groups")]), "servicegroups") + html.context_button(_("New service group"), make_link([("mode", "edit_service_group")]), "new") + else: + html.context_button(_("New contact group"), make_link([("mode", "edit_contact_group")]), "new") if what == "contact": html.context_button(_("Rules"), make_link([("mode", "rulesets"), ("filled_in", "search"), ("search", _("contact group"))]), "rulesets") diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index 9e9ff0f..7992dde 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -43,11 +43,8 @@ modules += [ _("Check parameters and other configuration variables on " "hosts and services") ), - ( "host_groups", _("Host Groups"), "hostgroups", "groups", - _("Organize your hosts in groups independent of the tree structure.") ), - - ( "service_groups", _("Service Groups"), "servicegroups", "groups", - _("Organize services in groups for a better overview in the status display.") ), + ( "host_groups", _("Host & Service Groups"), "hostgroups", "groups", + _("Organize your hosts and services in groups independent of the tree structure.") ), ( "users", _("Users"), "users", "users", _("Manage users of the monitoring system.") ),