Module: check_mk
Branch: master
Commit: 6a3bb0bfe2bf9a43804633a8440fa6924c81cb66
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a3bb0bfe2bf9a…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Sep 17 08:55:38 2015 +0200
Conflicts:
ChangeLog
web/plugins/views/bi.py
web/plugins/visuals/infos.py
---
.werks/2607 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/views.py | 2 ++
web/plugins/views/bi.py | 8 ++++----
web/plugins/views/builtin.py | 6 +++---
web/plugins/visuals/infos.py | 9 +++++++++
6 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/.werks/2607 b/.werks/2607
new file mode 100644
index 0000000..a2fa5fb
--- /dev/null
+++ b/.werks/2607
@@ -0,0 +1,10 @@
+Title: Fixed broken links from BI views to aggregation group views
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i3
+Date: 1442472836
+
+
diff --git a/ChangeLog b/ChangeLog
index b050fb5..88182ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -233,6 +233,7 @@
* 2604 FIX: Dashboards: Improved error handling in case of broken dashlet
* 2597 FIX: Fix settings downtimes on BI aggregates in distributed environment...
* 2598 FIX: Remove button for removing downtimes an BI aggregates because it cannot
work...
+ * 2607 FIX: Fixed broken links from BI views to aggregation group views
WATO:
* 2365 Removed old deprecated notification global options for plain emails...
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index bfdcac0..360ab29 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -139,6 +139,8 @@ def transform_old_views():
view['single_infos'] = ['service']
elif 'aggr_name' in hide_filters:
view['single_infos'] = ['aggr']
+ elif 'aggr_group' in hide_filters:
+ view['single_infos'] = ['aggr_group']
elif 'log_contact_name' in hide_filters:
view['single_infos'] = ['contact']
elif 'event_host' in hide_filters:
diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py
index 0288419..bea1ed9 100644
--- a/web/plugins/views/bi.py
+++ b/web/plugins/views/bi.py
@@ -37,7 +37,7 @@ import bi
multisite_datasources["bi_aggregations"] = {
"title" : _("BI Aggregations"),
"table" : bi.table,
- "infos" : [ "aggr" ],
+ "infos" : [ "aggr", "aggr_group", ],
"keys" : [],
"idkeys" : [ 'aggr_name' ],
}
@@ -45,7 +45,7 @@ multisite_datasources["bi_aggregations"] = {
multisite_datasources["bi_host_aggregations"] = {
"title" : _("BI Aggregations affected by one host"),
"table" : bi.host_table,
- "infos" : [ "aggr", "host" ],
+ "infos" : [ "aggr", "host",
"aggr_group" ],
"keys" : [],
"idkeys" : [ 'aggr_name' ],
}
@@ -55,7 +55,7 @@ multisite_datasources["bi_host_aggregations"] = {
multisite_datasources["bi_hostname_aggregations"] = {
"title" : _("BI Hostname Aggregations"),
"table" : bi.hostname_table,
- "infos" : [ "aggr", "host" ],
+ "infos" : [ "aggr", "host",
"aggr_group" ],
"keys" : [],
"idkeys" : [ 'aggr_name' ],
}
@@ -64,7 +64,7 @@ multisite_datasources["bi_hostname_aggregations"] = {
multisite_datasources["bi_hostnamebygroup_aggregations"] = {
"title" : _("BI Aggregations for Hosts by Hostgroups"),
"table" : bi.hostname_by_group_table,
- "infos" : [ "aggr", "host" "hostgroup"
],
+ "infos" : [ "aggr", "host" "hostgroup",
"aggr_group" ],
"keys" : [],
"idkeys" : [ 'aggr_name' ],
}
diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py
index 9bce7d4..c031bfa 100644
--- a/web/plugins/views/builtin.py
+++ b/web/plugins/views/builtin.py
@@ -2411,7 +2411,7 @@ multisite_builtin_views.update({
'column_headers': 'off',
'datasource': 'bi_host_aggregations',
'description': _('Lists all aggregations which only rely on
information of one host.'),
- 'group_painters': [('aggr_group',
'biaggr_group')],
+ 'group_painters': [('aggr_group', 'aggr_group')],
'hard_filters': ['summary_host'],
'hard_filtervars': [('is_host_scheduled_downtime_depth',
'-1'),
('aggr_name_regex', ''),
@@ -2479,7 +2479,7 @@ multisite_builtin_views.update({
'column_headers': 'off',
'datasource': 'bi_hostname_aggregations',
'description': _('Host related aggregations'),
- 'group_painters': [('aggr_group',
'biaggr_group')],
+ 'group_painters': [('aggr_group', 'aggr_group')],
'hard_filters': ['summary_host'],
'hard_filtervars': [('is_host_scheduled_downtime_depth',
'-1'),
('aggr_name_regex', ''),
@@ -2735,7 +2735,7 @@ multisite_builtin_views.update({
'column_headers': 'off',
'datasource': 'bi_host_aggregations',
'description': _('All single-host aggregations that are in
non-OK state (honoring state assumptions)'),
- 'group_painters': [('aggr_group',
'biaggr_group')],
+ 'group_painters': [('aggr_group', 'aggr_group')],
'hard_filters': ['summary_host'],
'hard_filtervars': [('is_host_scheduled_downtime_depth',
'-1'),
('aggr_name_regex', ''),
diff --git a/web/plugins/visuals/infos.py b/web/plugins/visuals/infos.py
index 3c5f681..0b8ed2f 100644
--- a/web/plugins/visuals/infos.py
+++ b/web/plugins/visuals/infos.py
@@ -122,3 +122,12 @@ infos['aggr'] = {
],
}
+infos['aggr_group'] = {
+ 'title' : _('BI Aggregation Group'),
+ 'title_plural': _('BI Aggregation Groups'),
+ 'single_spec' : [
+ ('aggr_group', TextAscii(
+ title = _('Aggregation group'),
+ )),
+ ],
+}