[checkmk-commits] Check_MK Git: check_mk: #1164 FIX Fixed links from servicegroup overviews to single servicegroups

Module: check_mk Branch: master Commit: 096b88ccb41c6c24cdf7d4c2c095f52389a4c9ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=096b88ccb41c6c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 30 16:23:30 2014 +0100 #1164 FIX Fixed links from servicegroup overviews to single servicegroups --- .werks/1164 | 10 ++++++++++ ChangeLog | 3 +++ web/plugins/views/builtin.py | 2 +- web/plugins/views/datasources.py | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/1164 b/.werks/1164 new file mode 100644 index 0000000..85896c2 --- /dev/null +++ b/.werks/1164 @@ -0,0 +1,10 @@ +Title: Fixed links from servicegroup overviews to single servicegroups +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1414682574 + + diff --git a/ChangeLog b/ChangeLog index b46078e..1fdff2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i7: + Multisite: + * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups + 1.2.5i6: Core & Setup: diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 726ff0c..09f33b6 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1400,7 +1400,7 @@ multisite_builtin_views.update({ 'topic': _('Other')}, 'servicegroup': {'browser_reload': 30, 'column_headers': 'pergroup', - 'datasource': 'services', + 'datasource': 'servicesbygroup', 'description': _('Services of a servicegroup'), 'group_painters': [('sitealias', 'sitehosts'), ('host', 'host')], diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 65dfb23..4a5dd13 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -126,6 +126,7 @@ multisite_datasources["hostgroups"] = { "idkeys" : [ "site", "hostgroup_name" ], } +# Merged groups across sites multisite_datasources["merged_hostgroups"] = { "title" : _("Hostgroups, merged"), "table" : "hostgroups", @@ -143,6 +144,7 @@ multisite_datasources["servicegroups"] = { "idkeys" : [ "site", "servicegroup_name" ], } +# Merged groups across sites multisite_datasources["merged_servicegroups"] = { "title" : _("Servicegroups, merged"), "table" : "servicegroups",