Module: check_mk Branch: master Commit: 6b23772ffea99a5ed6b39dfd293ce1410c6e3bf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b23772ffea99a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 29 11:14:01 2012 +0200 FIX: fix filtering/sorting in Single-Host Aggregations --- ChangeLog | 5 +++++ web/plugins/views/builtin.py | 4 ++-- web/plugins/views/sorters.py | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9112083..e8dcab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,11 @@ is present in the current search result list * FIX: Fixed encoding problem in "custom notification" message + BI + * FIX: Fixed filtering of Single-Host Aggregations + * New sorter for aggregation group + * FIX: fix sorting of Single-Host Aggregations after group + Checks & Agents: * FIX: snmp_uptime handles empty snmp information without exception * FIX: Oracle checks try to handle ORA-* errors reported by the agent diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index e0ef94d..db8f6e9 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2108,7 +2108,7 @@ multisite_builtin_views.update({ 'hard_filters': ['summary_host'], 'hard_filtervars': [('is_host_scheduled_downtime_depth', '-1'), ('aggr_name', ''), - ('aggr_group', 'Hosts'), + ('aggr_group', ''), ('birs0', 'on'), ('birs1', 'on'), ('birs2', 'on'), @@ -2161,7 +2161,7 @@ multisite_builtin_views.update({ 'hostregex', 'opthostgroup', 'aggr_effective_state'], - 'sorters': [('site_host', False)], + 'sorters': [('aggr_group', False), ('site_host', False)], 'title': _('Single-Host Aggregations'), 'topic': _('Business Intelligence')}, diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 67ae2ca..02a579e 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -338,3 +338,4 @@ declare_simple_sorter("alerts_problem", _("Number of problem alerts"), "alerts # Aggregations declare_simple_sorter("aggr_name", _("Aggregation name"), "aggr_name", cmp_simple_string) +declare_simple_sorter("aggr_group", _("Aggregation group"), "aggr_group", cmp_simple_string)