[checkmk-commits] 2237 Unique name for columns of Host Groups and Service Groups

Module: check_mk Branch: master Commit: 32e063e5896c3052e9c34c98543512d9561717fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32e063e5896c30… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Thu Mar 24 14:08:47 2016 +0100 2237 Unique name for columns of Host Groups and Service Groups The columns of Host Groups and Service Groups had the same name like the standard columns. It was not possible to difference between the columns during the creation or modification of a view. Now the columns have unique names. Thanks to Thorben Soehl --- .werks/2237 | 13 +++++++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 36 ++++++++++++++++++------------------ 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.werks/2237 b/.werks/2237 new file mode 100644 index 0000000..2105799 --- /dev/null +++ b/.werks/2237 @@ -0,0 +1,13 @@ +Title: Unique name for columns of Host Groups and Service Groups +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1458824573 +Class: feature + +The columns of Host Groups and Service Groups had the same name like the standard columns. +It was not possible to difference between the columns during the creation or modification +of a view. Now the columns have unique names. + +Thanks to Thorben Soehl diff --git a/ChangeLog b/ChangeLog index 3403b05..5be31f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ * 3228 The BI Treestate painter now exports the aggregation tree as real json structure * 3288 Implemented grouping of services in table views... * 3297 SEC: Fixes possible XSS in views sidebar snapin... + * 2237 Unique name for columns of Host Groups and Service Groups... * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index af517e9..e077879 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1753,77 +1753,77 @@ def paint_hg_host_list(row): return "", h multisite_painters["hostgroup_hosts"] = { - "title" : _("Hosts colored according to state"), + "title" : _("Hosts colored according to state (Host Group)"), "short" : _("Hosts"), "columns" : [ "hostgroup_members_with_state" ], "paint" : paint_hg_host_list, } multisite_painters["hg_num_services"] = { - "title" : _("Number of services"), + "title" : _("Number of services (Host Group)"), "short" : "", "columns" : [ "hostgroup_num_services" ], "paint" : lambda row: (None, str(row["hostgroup_num_services"])), } multisite_painters["hg_num_services_ok"] = { - "title" : _("Number of services in state OK"), + "title" : _("Number of services in state OK (Host Group)"), "short" : _("O"), "columns" : [ "hostgroup_num_services_ok" ], "paint" : lambda row: paint_svc_count(0, row["hostgroup_num_services_ok"]), } multisite_painters["hg_num_services_warn"] = { - "title" : _("Number of services in state WARN"), + "title" : _("Number of services in state WARN (Host Group)"), "short" : _("W"), "columns" : [ "hostgroup_num_services_warn" ], "paint" : lambda row: paint_svc_count(1, row["hostgroup_num_services_warn"]), } multisite_painters["hg_num_services_crit"] = { - "title" : _("Number of services in state CRIT"), + "title" : _("Number of services in state CRIT (Host Group)"), "short" : _("C"), "columns" : [ "hostgroup_num_services_crit" ], "paint" : lambda row: paint_svc_count(2, row["hostgroup_num_services_crit"]), } multisite_painters["hg_num_services_unknown"] = { - "title" : _("Number of services in state UNKNOWN"), + "title" : _("Number of services in state UNKNOWN (Host Group)"), "short" : _("U"), "columns" : [ "hostgroup_num_services_unknown" ], "paint" : lambda row: paint_svc_count(3, row["hostgroup_num_services_unknown"]), } multisite_painters["hg_num_services_pending"] = { - "title" : _("Number of services in state PENDING"), + "title" : _("Number of services in state PENDING (Host Group)"), "short" : _("P"), "columns" : [ "hostgroup_num_services_pending" ], "paint" : lambda row: paint_svc_count("p", row["hostgroup_num_services_pending"]), } multisite_painters["hg_num_hosts_up"] = { - "title" : _("Number of hosts in state UP"), + "title" : _("Number of hosts in state UP (Host Group)"), "short" : _("Up"), "columns" : [ "hostgroup_num_hosts_up" ], "paint" : lambda row: paint_host_count(0, row["hostgroup_num_hosts_up"]), } multisite_painters["hg_num_hosts_down"] = { - "title" : _("Number of hosts in state DOWN"), + "title" : _("Number of hosts in state DOWN (Host Group)"), "short" : _("Dw"), "columns" : [ "hostgroup_num_hosts_down" ], "paint" : lambda row: paint_host_count(1, row["hostgroup_num_hosts_down"]), } multisite_painters["hg_num_hosts_unreach"] = { - "title" : _("Number of hosts in state UNREACH"), + "title" : _("Number of hosts in state UNREACH (Host Group)"), "short" : _("Un"), "columns" : [ "hostgroup_num_hosts_unreach" ], "paint" : lambda row: paint_host_count(2, row["hostgroup_num_hosts_unreach"]), } multisite_painters["hg_num_hosts_pending"] = { - "title" : _("Number of hosts in state PENDING"), + "title" : _("Number of hosts in state PENDING (Host Group)"), "short" : _("Pd"), "columns" : [ "hostgroup_num_hosts_pending" ], "paint" : lambda row: paint_host_count(None, row["hostgroup_num_hosts_pending"]), @@ -1851,49 +1851,49 @@ multisite_painters["hg_alias"] = { # |___/ |_| multisite_painters["sg_services"] = { - "title" : _("Services colored according to state"), + "title" : _("Services colored according to state (Service Group)"), "short" : _("Services"), "columns" : [ "servicegroup_members_with_state" ], "paint" : lambda row: paint_service_list(row, "servicegroup_members_with_state"), } multisite_painters["sg_num_services"] = { - "title" : _("Number of services"), + "title" : _("Number of services (Service Group)"), "short" : "", "columns" : [ "servicegroup_num_services" ], "paint" : lambda row: (None, str(row["servicegroup_num_services"])), } multisite_painters["sg_num_services_ok"] = { - "title" : _("Number of services in state OK"), + "title" : _("Number of services in state OK (Service Group)"), "short" : _("O"), "columns" : [ "servicegroup_num_services_ok" ], "paint" : lambda row: paint_svc_count(0, row["servicegroup_num_services_ok"]) } multisite_painters["sg_num_services_warn"] = { - "title" : _("Number of services in state WARN"), + "title" : _("Number of services in state WARN (Service Group)"), "short" : _("W"), "columns" : [ "servicegroup_num_services_warn" ], "paint" : lambda row: paint_svc_count(1, row["servicegroup_num_services_warn"]) } multisite_painters["sg_num_services_crit"] = { - "title" : _("Number of services in state CRIT"), + "title" : _("Number of services in state CRIT (Service Group)"), "short" : _("C"), "columns" : [ "servicegroup_num_services_crit" ], "paint" : lambda row: paint_svc_count(2, row["servicegroup_num_services_crit"]) } multisite_painters["sg_num_services_unknown"] = { - "title" : _("Number of services in state UNKNOWN"), + "title" : _("Number of services in state UNKNOWN (Service Group)"), "short" : _("U"), "columns" : [ "servicegroup_num_services_unknown" ], "paint" : lambda row: paint_svc_count(3, row["servicegroup_num_services_unknown"]) } multisite_painters["sg_num_services_pending"] = { - "title" : _("Number of services in state PENDING"), + "title" : _("Number of services in state PENDING (Service Group)"), "short" : _("P"), "columns" : [ "servicegroup_num_services_pending" ], "paint" : lambda row: paint_svc_count("p", row["servicegroup_num_services_pending"])