[checkmk-commits] Check_MK Git: check_mk: #1619 FIX Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups"

Module: check_mk Branch: master Commit: 185cdb4c809e8f3b32ac8e6e1d007caa902f08a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=185cdb4c809e8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 09:18:33 2014 +0100 #1619 FIX Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" --- .werks/1619 | 9 +++++++++ ChangeLog | 11 ++++++----- web/plugins/views/builtin.py | 28 +++++++++++++--------------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.werks/1619 b/.werks/1619 new file mode 100644 index 0000000..7b75410 --- /dev/null +++ b/.werks/1619 @@ -0,0 +1,9 @@ +Title: Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417681030 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8c35b8a..246f486 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,10 +32,10 @@ * 1518 raritan_pdu_inlet, raritan_pdu_inlet_summary: Modified existing check to give one item per phase and support setting levels.... NOTE: Please refer to the migration notes! * 1592 AIX: New Plugin to monitor errpt in logwatch style... - * 1594 ibm_svc_host: Can now be set to be always OK... - * 1595 esx_vsphere_objects_count: New Check to Ouput the number of VMs * 1565 mem.win: set default levels for page file to 80%/90% * 1608 zpool_status: Add an overall state check (thx to Craig Cook)... + * 1594 ibm_svc_host: Can now be set to be always OK... + * 1595 esx_vsphere_objects_count: New Check to Ouput the number of VMs * 1567 postfix_mailq: speedup in Linux agent for large mail queues... * 1611 mssql.vbs: Supporting SQL-Server 2014 now * 1568 f5_bigip_cluster_v11: new check for F5 cluster status for firmware version 11 @@ -67,9 +67,6 @@ * 1572 FIX: Sample configs, plugins etc. for windows agent use windows linebreaks now... * 1575 FIX: vSphere Monitoring works with RedHat 5.x now... * 1584 FIX: winperf_if: Fixed checks of interfaces with equal names but one with index... - * 1593 FIX: IBM SVC Checks: The Service Descriptions not longer contain IBM SVC as prefix... - NOTE: Please refer to the migration notes! - * 1596 FIX: etherbox: Fix for the inventory in case of not connected temperature sensors... * 1590 FIX: printer_supply_ricoh: Fixed broken check * 1591 FIX: netapp_volumes: The state mixed_raid_type is now treated as non-critical state * 1602 FIX: dell_om_esmlog: Fixed typo in plugin output @@ -77,10 +74,13 @@ * 1604 FIX: mysql_slave: Dealing with situation where connection with master is lost * 1563 FIX: Reworked configuration of process monitoring... NOTE: Please refer to the migration notes! + * 1593 FIX: IBM SVC Checks: The Service Descriptions not longer contain IBM SVC as prefix... + NOTE: Please refer to the migration notes! * 1564 FIX: check_mk_agent.linux: fix situation where async plugin is not executed after crash... * 1609 FIX: zpool_status: fix problem when the zpool has a separate log or cache device... * 1566 FIX: 3ware_disks: consider VERIFYING state as OK now... * 1612 FIX: job: Fixed wrong reported start time for running jobs + * 1596 FIX: etherbox: Fix for the inventory in case of not connected temperature sensors... * 1571 FIX: check_mk_agent.linux: fix output of lnx_if on Ubuntu 8.04 (on older kernels), repairs tcp_conn_stats... * 1622 FIX: megaraid_bbu: handle case isSOHGood and consider it as critical... * 1617 FIX: lnx_if: Deal with data provided by cluster host @@ -132,6 +132,7 @@ * 1605 FIX: Fixed perfometer of check check_mk-printer_supply_ricoh * 1607 FIX: check_http: Fixed broken links in escaped plugin output * 1614 FIX: Fixed wrong URL in webapi.py documentation + * 1619 FIX: Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index e1ac028..41e3a9f 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -935,8 +935,8 @@ multisite_builtin_views.update({ 'sorters': [('site', False), ('hostgroup', False), ('site_host', False)], - 'title': _('Hostgroups (Grid)'), - 'topic': _('Hostgroups')}, + 'title': _('Host Groups (Grid)'), + 'topic': _('Host Groups')}, 'hostgroups': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'hostgroups', @@ -965,8 +965,8 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': ['hostgroupnameregex', 'hostgroupvisibility'], 'sorters': [], - 'title': _('Hostgroups (Summary)'), - 'topic': _('Hostgroups') }, + 'title': _('Host Groups (Summary)'), + 'topic': _('Host Groups') }, 'hostproblems': {'browser_reload': 30, 'column_headers': 'pergroup', @@ -1052,8 +1052,8 @@ multisite_builtin_views.update({ 'sorters': [('site', False), ('hostgroup', False), ('site_host', False)], - 'title': _('Hostgroups'), - 'topic': _('Hostgroups')}, + 'title': _('Host Groups'), + 'topic': _('Host Groups')}, 'hoststatus': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'hosts', @@ -1486,7 +1486,7 @@ multisite_builtin_views.update({ ('site_host', False), ('svcdescr', False)], 'title': _('Services by group'), - 'topic': _('Servicegroups')}, + 'topic': _('Service Groups')}, 'svcbyhgroups': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'servicesbyhostgroup', @@ -1517,7 +1517,7 @@ multisite_builtin_views.update({ 'svcgroups': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'servicegroups', - 'description': _('A short overview over all servicegroups, without explicity listing of the actual hosts and services'), + 'description': _('A short overview over all service groups, without explicity listing of the actual hosts and services'), 'group_painters': [('sitealias', 'sitehosts')], 'hard_filters': [], 'hard_filtervars': [], @@ -1538,12 +1538,12 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': ['servicegroupnameregex'], 'sorters': [], - 'title': _('Servicegroups (Summary)'), - 'topic': _('Servicegroups')}, + 'title': _('Service Groups (Summary)'), + 'topic': _('Service Groups')}, 'svcgroups_grid': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'servicegroups', - 'description': _('A short overview over all servicegroups, without explicity listing of the actual hosts and services'), + 'description': _('A short overview over all service groups, without explicity listing of the actual hosts and services'), 'group_painters': [('sitealias', 'sitehosts')], 'hard_filters': [], 'hard_filtervars': [], @@ -1560,8 +1560,8 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': [], 'sorters': [], - 'title': _('Servicegroups (Grid)'), - 'topic': _('Servicegroups'), + 'title': _('Service Groups (Grid)'), + 'topic': _('Service Groups'), }, 'svcproblems': { 'browser_reload': 30, @@ -3148,8 +3148,6 @@ multisite_builtin_views.update({ ('host', None, ''), ('log_state', None, ''), ('log_plugin_output', None, '')], - 'play_sounds': False, - 'public': True, 'show_filters': ['log_plugin_output', 'logtime', 'log_state'], 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Service Notifications'),