Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1583 FIX Can use contact groups without hosts/ services assigned in RBN rules now

by Lars Michelsen

Module: check_mk Branch: master Commit: 90c441a3ef64f3c1cfea8d39c13fe3990c5b066c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90c441a3ef64f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 12:31:29 2014 +0100 #1583 FIX Can use contact groups without hosts/services assigned in RBN rules now Contact groups without hosts/services assigned could be configured, but not used when using Nagios as monitoring core. This has been fixed now. You can now safely configure all existing contact groups as recipients for notifications. --- .bugs/2156 | 8 ++++++-- .werks/1583 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk.py | 6 +++++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.bugs/2156 b/.bugs/2156 index d71fe4b..2fb782d 100644 --- a/.bugs/2156 +++ b/.bugs/2156 @@ -1,9 +1,9 @@ Title: Do always create contact groups, even if no host/service is contained Component: core -State: open +Class: bug +State: done Date: 2014-05-26 14:18:35 Targetversion: future -Class: bug The rule based notifications allow the selection of a contact group as a rule's contact selection. If you create contact groups with WATO that do @@ -14,3 +14,7 @@ Micro Core is not affected as it seems. Beware: an unpatched Nagios might not consider this as a valid configuration. If that is the case then we need a global config option. We then set this option to True for OMD installations and patch Nagios in OMD. + +2014-12-02 12:27:52: changed state open -> done +Contact groups with contacts assigned, but without host/services are now created +within Nagios (they are already available within CMC). diff --git a/.werks/1583 b/.werks/1583 new file mode 100644 index 0000000..3958ce5 --- /dev/null +++ b/.werks/1583 @@ -0,0 +1,11 @@ +Title: Can use contact groups without hosts/services assigned in RBN rules now +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1417519674 +Class: fix + +Contact groups without hosts/services assigned could be configured, but not +used when using Nagios as monitoring core. This has been fixed now. You can +now safely configure all existing contact groups as recipients for notifications. diff --git a/ChangeLog b/ChangeLog index ade9e24..46bac54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ * 1168 FIX: HTML mails can now be configured to display graphs among each other... * 1514 FIX: Try harder to detect previous hard state in notification when using Nagios as core... * 1582 FIX: Fixed missing graphs in mails when sending notifications to non-contacts... + * 1583 FIX: Can use contact groups without hosts/services assigned in RBN rules now... BI: * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... diff --git a/modules/check_mk.py b/modules/check_mk.py index 02679b1..ec26d4a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1968,12 +1968,12 @@ def create_nagios_config(outfile = sys.stdout, hostnames = None): for hostname in hostnames: create_nagios_config_host(outfile, hostname) + create_nagios_config_contacts(outfile) create_nagios_config_hostgroups(outfile) create_nagios_config_servicegroups(outfile) create_nagios_config_contactgroups(outfile) create_nagios_config_commands(outfile) create_nagios_config_timeperiods(outfile) - create_nagios_config_contacts(outfile) if extra_nagios_conf: outfile.write("\n# extra_nagios_conf\n\n") @@ -2654,6 +2654,10 @@ def create_nagios_config_contacts(outfile): cnames.sort() for cname in cnames: contact = contacts[cname] + # Create contact groups in nagios, even when they are empty. This is needed + # for RBN to work correctly when using contactgroups as recipients which are + # not assigned to any host + contactgroups_to_define.update(contact.get("contactgroups", [])) # If the contact is in no contact group or all of the contact groups # of the contact have neither hosts nor services assigned - in other # words if the contact is not assigned to any host or service, then

9 years, 9 months

Check_MK Git: check_mk: #1584 FIX winperf_if: Fixed checks of interfaces with equal names but one with index

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f9081911f9b59728ca54a67770c27bed87b2c22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9081911f9b59… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 14:07:05 2014 +0100 #1584 FIX winperf_if: Fixed checks of interfaces with equal names but one with index When having interfaces with nearly equal names, where the only difference is that one has an index number as extension and the other has none, the check could not get the correct information during checking. Example: Intel[R] 82576 Gigabit Dual Port Network Connection 2 Intel[R] 82576 Gigabit Dual Port Network Connection --- .bugs/1065 | 7 +++++-- .bugs/1088 | 7 +++++-- .bugs/842 | 6 +++--- .bugs/845 | 23 +++++++++++++---------- .werks/1584 | 14 ++++++++++++++ ChangeLog | 1 + checks/winperf_if | 2 +- 7 files changed, 42 insertions(+), 18 deletions(-) diff --git a/.bugs/1065 b/.bugs/1065 index c27611d..d216413 100644 --- a/.bugs/1065 +++ b/.bugs/1065 @@ -1,9 +1,9 @@ Title: objects.precache missing on first start Component: core -State: open +Class: bug +State: works4me Date: 2014-03-24 13:28:13 Targetversion: 1.2.5i1 -Class: bug creating a new site with omd create blubb @@ -25,3 +25,6 @@ Error: Cannot open config file '/omd/sites/blubb/var/nagios/objects.precache' fo after a cmk -R nagios starts... :-( + +2014-12-02 12:35:57: changed state open -> works4me +Unable to reproduce this problem. diff --git a/.bugs/1088 b/.bugs/1088 index 401d001..2bb5121 100644 --- a/.bugs/1088 +++ b/.bugs/1088 @@ -1,9 +1,12 @@ Title: Keepalive mode adds multiple --keepalive-fd=__ as time goes by Component: core -State: open +Class: nastiness +State: done Date: 2014-01-24 16:57:53 Targetversion: 1.2.5i1 -Class: nastiness It seems that after each config reload one --keepalive-fd=7 is added to the command line. The Check_MK should remove this option when adding new one. + +2014-12-02 12:38:01: changed state open -> done +Is already fixed. diff --git a/.bugs/842 b/.bugs/842 index 52d4d2e..d47079d 100644 --- a/.bugs/842 +++ b/.bugs/842 @@ -1,9 +1,9 @@ -Title: HW/SW Inventory should not be appear on Clusters or some Special Agents -Component: inv +Title: Make host class (ALL_HOSTS, PHYSICAL_HOSTS, CLUSTER_HOSTS) available in WATO conditions +Component: wato State: open Date: 2014-04-16 09:35:42 Targetversion: 1.2.5i1 -Class: bug +Class: feature In Wato there is no option like PHYSICAL_HOSTS or CLUSTER_HOSTS so there should be a easy way to deactivate the HW/SW Inventory check using Wato for clusters. If you have a big enviroment it is not fine solution to click through a couple of folders to find all clusters an add a Cluster Tag. diff --git a/.bugs/845 b/.bugs/845 index 086c492..b269c44 100644 --- a/.bugs/845 +++ b/.bugs/845 @@ -1,21 +1,18 @@ Title: Interface Check: In some cases the check use information of the wrong interface Component: checks -State: open +Class: bug +State: done Date: 2014-11-21 14:45:22 Targetversion: 1.2.5i1 -Class: bug -In some cases the condition in check_if_common who trys to find the right item matchs to early if there two interfaces have the same -name, but in one case with a number an in the other without but with the same interace index. See the following agent output: +In some cases the condition in check_if_common who trys to find the right item +matchs to early if there two interfaces have the same name, but in one case +with a number and in the other without but with the same interface index. +See the following agent output: <<<winperf_if>>> 1416471728.39 510 -6 instances: Intel[R]_82576_Gigabit_Dual_Port_Network_Connection Intel -[R]_82576_Gigabit_Dual_Port_Network_Connection__2 Intel[R]_PRO_ -1000_PT_Dual_Port_Server_Adapter Intel -[R]_PRO_1000_PT_Dual_Port_Server_Adapter__2 -isatap.{76FCB5A2-8B81-4EC1-A917-7BB6004938B9} 6TO4_ -Adapter +6 instances: Intel[R]_82576_Gigabit_Dual_Port_Network_Connection Intel[R]_82576_Gigabit_Dual_Port_Network_Connection__2 Intel[R]_PRO_1000_PT_Dual_Port_Server_Adapter Intel[R]_PRO_1000_PT_Dual_Port_Server_Adapter__2 isatap.{76FCB5A2-8B81-4EC1-A917-7BB6004938B9} 6TO4_Adapter -122 3152470526 0 0 0 0 3209053651 bulk_count -110 90473997 0 0 0 0 46660432 bulk_count -244 72853543 0 0 0 0 35395085 bulk_count @@ -34,3 +31,9 @@ Adapter 32 0 0 0 0 0 0 large_rawcount 34 0 0 0 0 0 0 large_rawcount 1086 0 0 0 0 0 0 large_rawcount + +Intel[R] 82576 Gigabit Dual Port Network Connection 2 +Intel[R] 82576 Gigabit Dual Port Network Connection + +2014-12-02 14:04:52: changed state open -> done +Fixed by changing internal sorting of interfaces in winperf_if check diff --git a/.werks/1584 b/.werks/1584 new file mode 100644 index 0000000..4bc970a --- /dev/null +++ b/.werks/1584 @@ -0,0 +1,14 @@ +Title: winperf_if: Fixed checks of interfaces with equal names but one with index +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417525531 +Class: fix + +When having interfaces with nearly equal names, where the only difference is that +one has an index number as extension and the other has none, the check could not +get the correct information during checking. Example: + +Intel[R] 82576 Gigabit Dual Port Network Connection 2 +Intel[R] 82576 Gigabit Dual Port Network Connection diff --git a/ChangeLog b/ChangeLog index 46bac54..ba88009 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * 1550 FIX: zfs_arc_cache: do not inventorize of no cache information available... * 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... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/winperf_if b/checks/winperf_if index 03438c8..33d7117 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -152,7 +152,7 @@ def convert_winperf_if(info): # Sort NIC names are create artifical index nic_names = nics.keys() - nic_names.sort() + nic_names.sort(reverse=True) for nr, nic_name in enumerate(nic_names): nic = nics[nic_name]

9 years, 9 months

Check_MK Git: check_mk: agent_vsphere: now reports additional hostsystem information.

by Andreas Boesl

Module: check_mk Branch: master Commit: 61c0c54f30ef0527d86849b76bc81d4de250a893 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61c0c54f30ef05… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 2 14:52:51 2014 +0100 agent_vsphere: now reports additional hostsystem information. This info will be evaluated later on by inventory checks. --- agents/special/agent_vsphere | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index fd0e780..509bd35 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -171,6 +171,8 @@ telegram_list = { '<ns1:pathSet>hardware.cpuInfo.numCpuCores</ns1:pathSet>'\ '<ns1:pathSet>config.multipathState.path</ns1:pathSet>'\ '<ns1:pathSet>hardware.systemInfo.model</ns1:pathSet>'\ + '<ns1:pathSet>hardware.systemInfo.uuid</ns1:pathSet>'\ + '<ns1:pathSet>hardware.systemInfo.otherIdentifyingInfo</ns1:pathSet>'\ '<ns1:pathSet>hardware.systemInfo.vendor</ns1:pathSet>'\ '<ns1:pathSet>name</ns1:pathSet>'\ '<ns1:pathSet>overallStatus</ns1:pathSet>'\ @@ -858,11 +860,24 @@ if not error: def eval_pci_device(pci_propset): eval_propset_block( [ "id", "vendorName", "deviceName" ], "id", pci_propset) + def eval_systeminfo_other(otherinfo_propset): + data = get_pattern("<identifierValue>(.*?)</identifierValue>.*?<key>(.*?)</key>", otherinfo_propset) + keys_index = {} + + for value, key in data: + idx = 0 + if key in keys_index: + keys_index[key] = keys_index[key] + 1 + idx = keys_index[key] + hostsystems_properties[hostname]["hardware.systemInfo.otherIdentifyingInfo.%s.%d" % (key, idx)] = [ value ] + keys_index[key] = idx + eval_functions = { "config.multipathState.path" : eval_multipath_state, "runtime.healthSystemRuntime.systemHealthInfo.numericSensorInfo": eval_sensor_info, "hardware.cpuPkg" : eval_cpu_pkg, "hardware.pciDevice" : eval_pci_device, + "hardware.systemInfo.otherIdentifyingInfo" : eval_systeminfo_other, } elements = get_pattern('<propSet><name>(.*?)</name><val.*?>(.*?)</val></propSet>', entry)

9 years, 9 months

Check_MK Git: check_mk: Special handling of modified attributes in Livestatus for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: c7a6b2d20c4647eeddc987416b38c9983032be27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7a6b2d20c4647… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 2 13:54:24 2014 +0100 Special handling of modified attributes in Livestatus for CMC --- livestatus/src/AttributelistColumn.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/livestatus/src/AttributelistColumn.cc b/livestatus/src/AttributelistColumn.cc index e3eb636..6d9cf9e 100644 --- a/livestatus/src/AttributelistColumn.cc +++ b/livestatus/src/AttributelistColumn.cc @@ -61,7 +61,11 @@ unsigned long AttributelistColumn::getValue(void *data) data = shiftPointer(data); if (!data) return 0; +#ifdef CMC + return *(uint16_t *)((char *)data + _offset); +#else return *(unsigned long *)((char *)data + _offset); +#endif } void AttributelistColumn::output(void *data, Query *query)

9 years, 9 months

Check_MK Git: check_mk: msi-build: use ~/tmp as tmp directory,

by Mathias Kettner

not ~ directly Message-ID: <547d9f31.ElWkXAoALfVhgYd8%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: f05cb629749b3a42ab2fa43b1ef3fd498bf3865d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f05cb629749b3a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 2 12:14:52 2014 +0100 msi-build: use ~/tmp as tmp directory, not ~ directly --- agents/windows/msibuild/msi-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index fd12341..2819304 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -59,7 +59,7 @@ except: try: if "OMD_ROOT" in os.environ: path_prefix = "" - tmp_dir = os.environ["OMD_ROOT"] + tmp_dir = os.environ["OMD_ROOT"] + "/tmp" else: path_prefix = "./" tmp_dir = "."

9 years, 9 months

Check_MK Git: check_mk: #1558 Better visualize manually changed notification enable/disable

by Mathias Kettner

Module: check_mk Branch: master Commit: d9894b8ee672ac77f1f5a7cc9a8d440669bbf4fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9894b8ee672ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 2 11:00:44 2014 +0100 #1558 Better visualize manually changed notification enable/disable --- .werks/1558 | 9 +++++++++ ChangeLog | 1 + web/htdocs/images/icon_ndisabled.gif | Bin 1106 -> 0 bytes web/htdocs/images/icon_notif_disabled.png | Bin 0 -> 4575 bytes web/htdocs/images/icon_notif_enabled.png | Bin 0 -> 4868 bytes web/htdocs/images/icon_notif_man_disabled.png | Bin 0 -> 5161 bytes web/plugins/icons/builtin.py | 15 ++++++++++++--- web/plugins/views/commands.py | 8 ++++---- 8 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.werks/1558 b/.werks/1558 new file mode 100644 index 0000000..1e06907 --- /dev/null +++ b/.werks/1558 @@ -0,0 +1,9 @@ +Title: Better visualize manually changed notification enable/disable +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417514424 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 447cec7..44c22c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ NOTE: Please refer to the migration notes! * 1500 SEC: Preventing livestatus injections in different places... * 1530 Dashboard: Host/service statistics dashlets now deal with the context... + * 1558 Better visualize manually changed notification enable/disable * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters diff --git a/web/htdocs/images/icon_ndisabled.gif b/web/htdocs/images/icon_ndisabled.gif deleted file mode 100644 index f515c68..0000000 Binary files a/web/htdocs/images/icon_ndisabled.gif and /dev/null differ diff --git a/web/htdocs/images/icon_notif_disabled.png b/web/htdocs/images/icon_notif_disabled.png new file mode 100644 index 0000000..f4955f9 Binary files /dev/null and b/web/htdocs/images/icon_notif_disabled.png differ diff --git a/web/htdocs/images/icon_notif_enabled.png b/web/htdocs/images/icon_notif_enabled.png new file mode 100644 index 0000000..4dd2492 Binary files /dev/null and b/web/htdocs/images/icon_notif_enabled.png differ diff --git a/web/htdocs/images/icon_notif_man_disabled.png b/web/htdocs/images/icon_notif_man_disabled.png new file mode 100644 index 0000000..853f077 Binary files /dev/null and b/web/htdocs/images/icon_notif_man_disabled.png differ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index affc9ab..304598d 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -402,12 +402,21 @@ multisite_icons.append({ def paint_notifications(what, row, tags, custom_vars): # Notifications disabled - if not row[what + "_notifications_enabled"]: - return '<img class=icon title="%s" src="images/icon_ndisabled.gif">' % \ + enabled = row[what + "_notifications_enabled"] + modified = "notifications_enabled" in row[what + "_modified_attributes_list"] + if modified and enabled: + return '<img class=icon title="%s" src="images/icon_notif_enabled.png">' % \ + _('Notifications are manually enabled for this %s') % what + elif modified and not enabled: + return '<img class=icon title="%s" src="images/icon_notif_man_disabled.png">' % \ + _('Notifications are manually disabled for this %s') % what + elif not enabled: + return '<img class=icon title="%s" src="images/icon_notif_disabled.png">' % \ _('Notifications are disabled for this %s') % what + multisite_icons.append({ - 'columns': [ 'notifications_enabled' ], + 'columns': [ 'modified_attributes_list', 'notifications_enabled' ], 'paint': paint_notifications, }) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 493500f..65dc3fc 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -146,8 +146,8 @@ multisite_commands.append({ # CLEAR MODIFIED ATTRIBUTES config.declare_permission("action.clearmodattr", - _("Clear modified attributes"), - _("Remove the information that an attribute (like check enabling) has been changed"), + _("Reset modified attributes"), + _("Reset all manually modified attributes of a host or service (like disabled notifications)"), [ "admin" ]) multisite_commands.append({ @@ -155,11 +155,11 @@ multisite_commands.append({ "permission" : "action.clearmodattr", "title" : _("Modified attributes"), "render" : lambda: \ - html.button("_clear_modattr", _('Clear information about modified attributes')), + html.button("_clear_modattr", _('Clear modified attributes')), "action" : lambda cmdtag, spec, row: ( html.var("_clear_modattr") and ( "CHANGE_" + cmdtag + "_MODATTR;%s;0" % spec, - _("<b>clear the information about modified attributes</b> of"))), + _("<b>clear the modified attributes</b> of"))), }) # FAKE CHECKS

9 years, 9 months

Check_MK Git: check_mk: Ignore rushahead config for CMC on manual cmk -O/ -R

by Mathias Kettner

Module: check_mk Branch: master Commit: c34b5e6d2ed7589422a5966cf2152d54f955b6a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c34b5e6d2ed758… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 2 11:00:16 2014 +0100 Ignore rushahead config for CMC on manual cmk -O/-R --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 02679b1..507d572 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4891,7 +4891,7 @@ def do_create_config(): sys.stdout.write("Generating configuration for core (type %s)..." % monitoring_core) sys.stdout.flush() if monitoring_core == "cmc": - do_create_cmc_config(opt_cmc_relfilename) + do_create_cmc_config(opt_cmc_relfilename, False) # do not use rushed ahead config else: out = file(nagios_objects_file, "w") create_nagios_config(out)

9 years, 9 months

Check_MK Git: check_mk: Revert "#1579 FIX Views: Setting for hard coded single context filters can now be changed by URL and filter "

by Lars Michelsen

Module: check_mk Branch: master Commit: 7caec0c6122b4be1a96f6c0f26d3126ff70a44fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7caec0c6122b4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 10:11:07 2014 +0100 Revert "#1579 FIX Views: Setting for hard coded single context filters can now be changed by URL and filter" This reverts commit fc066d9e86eec81c882c709b4f7a7cbea8efc156. --- .werks/1579 | 11 ----------- ChangeLog | 1 - web/htdocs/visuals.py | 6 +++--- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.werks/1579 b/.werks/1579 deleted file mode 100644 index 3ac34ce..0000000 --- a/.werks/1579 +++ /dev/null @@ -1,11 +0,0 @@ -Title: Views: Setting for hard coded single context filters can now be changed by URL and filter -Level: 1 -Component: multisite -Compatible: compat -Version: 1.2.5i7 -Date: 1417510947 -Class: fix - -When a view has a hard coded value for a single context filter, the value could -not be changed by the user when watching a view, neither by URL nor filter form. -This has been changed now to make it possible to override the default value. diff --git a/ChangeLog b/ChangeLog index b6f4c24..5d7e4e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,7 +91,6 @@ * 1557 FIX: Fix sorting of hostnames that only differ in lower/uppercaseness * 1577 FIX: Fixed editing of views using the "Downtime for host/service" sorter or column... * 1578 FIX: Folding states of containers with umlauts in titles are now persisted... - * 1579 FIX: Views: Setting for hard coded single context filters can now be changed by URL and filter... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 5185dfc..f7115a7 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -903,10 +903,10 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): only_infos = infos.keys() # all datasources! # Populate the HTML vars with missing context vars. The context vars set - # in single context are not enforced (they can be overwritten by URL or by - # changing the filter form). + # in single context are enforced (can not be overwritten by URL). The normal + # filter vars in "multiple" context are not enforced. for key in get_single_info_keys(visual): - if key in visual['context'] and not html.has_var(key): + if key in visual['context']: html.set_var(key, visual['context'][key]) # Now apply the multiple context filters

9 years, 9 months

Check_MK Git: check_mk: #1580 FIX Views: Hardcoded single context filters are not shown in filter form anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 2aa2d805e4d5dc638eb1176ea49499a89a8878c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2aa2d805e4d5dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 10:36:24 2014 +0100 #1580 FIX Views: Hardcoded single context filters are not shown in filter form anymore When a view has a single context and the value of the filters hard coded in the view, the filter elements are not shown to the user in the filter form anymore. --- .werks/1580 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 10 +++++++--- web/htdocs/visuals.py | 31 +++++++++++++++++++++++-------- web/plugins/dashboard/dashlets.py | 4 ++-- 5 files changed, 43 insertions(+), 13 deletions(-) diff --git a/.werks/1580 b/.werks/1580 new file mode 100644 index 0000000..0a6c0f4 --- /dev/null +++ b/.werks/1580 @@ -0,0 +1,10 @@ +Title: Views: Hardcoded single context filters are not shown in filter form anymore +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417512923 +Class: fix + +When a view has a single context and the value of the filters hard coded in the view, +the filter elements are not shown to the user in the filter form anymore. diff --git a/ChangeLog b/ChangeLog index 5d7e4e5..e0e9bf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * 1557 FIX: Fix sorting of hostnames that only differ in lower/uppercaseness * 1577 FIX: Fixed editing of views using the "Downtime for host/service" sorter or column... * 1578 FIX: Folding states of containers with umlauts in titles are now persisted... + * 1580 FIX: Views: Hardcoded single context filters are not shown in filter form anymore... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e330b32..3e6745e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -930,10 +930,14 @@ def show_view(view, show_heading = False, show_buttons = True, datasource = multisite_datasources[view["datasource"]] tablename = datasource["table"] - # Filters to show in the view + # Filters to use in the view # In case of single object views, the needed filters are fixed, but not always present # in context. In this case, take them from the context type definition. - show_filters = visuals.show_filters(view, datasource['infos'], all_filters_active) + use_filters = visuals.filters_of_visual(view, datasource['infos'], all_filters_active) + + # Not all filters are really shown later in show_filter_form(), because filters which + # have a hardcoded value are not changeable by the user + show_filters = visuals.visible_filters_of_visual(view, use_filters) visuals.add_context_to_uri_vars(view, datasource["infos"], only_count) @@ -944,7 +948,7 @@ def show_view(view, show_heading = False, show_buttons = True, # Prepare Filter headers for Livestatus filterheaders = "" only_sites = None - all_active_filters = [ f for f in show_filters if f.available() ] + all_active_filters = [ f for f in use_filters if f.available() ] for filt in all_active_filters: header = filt.filter(tablename) if header.startswith("Sites:"): diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index f7115a7..0fd8a81 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -869,22 +869,22 @@ def filters_allowed_for_info(info): allowed[fname] = filt return allowed -# Collects all filters to be shown for the given visual -def show_filters(visual, info_keys, show_all=False): - show_filters = [] +# Collects all filters to be used for the given visual +def filters_of_visual(visual, info_keys, show_all=False): + filters = [] for info_key in info_keys: if info_key in visual['single_infos']: for key in info_params(info_key): - show_filters.append(get_filter(key)) + filters.append(get_filter(key)) elif not show_all: for key, val in visual['context'].items(): if type(val) == dict: # this is a real filter - show_filters.append(get_filter(key)) + filters.append(get_filter(key)) if show_all: # add *all* available filters of these infos for filter_name, filter in multisite_filters.items(): if filter.info in info_keys: - show_filters.append(filter) + filters.append(filter) # add ubiquitary_filters that are possible for these infos for fn in ubiquitary_filters: @@ -893,10 +893,25 @@ def show_filters(visual, info_keys, show_all=False): continue filter = get_filter(fn) if not filter.info or filter.info in info_keys: - show_filters.append(filter) + filters.append(filter) + + return list(set(filters)) # remove duplicates + +# Reduces the list of the visuals used filters. The result are the ones +# which are really presented to the user later. +# For the moment we only remove the single context filters which have a +# hard coded default value which is treated as enforced value. +def visible_filters_of_visual(visual, use_filters): + show_filters = [] + + single_keys = get_single_info_keys(visual) - return list(set(show_filters)) # remove duplicates + for f in use_filters: + if f.name not in single_keys or \ + not visual['context'].get(f.name): + show_filters.append(f) + return show_filters def add_context_to_uri_vars(visual, only_infos=None, only_count=False): if only_infos == None: diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 34685fb..5ed326b 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -209,8 +209,8 @@ def render_statistics(pie_id, what, table, filter, dashlet): pie_right_aspect = 0.8 info = what == 'hosts' and 'host' or 'service' - show_filters = visuals.show_filters(dashlet, [info]) - for filt in show_filters: + use_filters = visuals.filters_of_visual(dashlet, [info]) + for filt in use_filters: if filt.available(): filter += filt.filter(info)

9 years, 9 months

Check_MK Git: check_mk: #1581 FIX Single context views with missing context show an error message now

by Lars Michelsen

Module: check_mk Branch: master Commit: be846756858a7c34d62d1b9962c006e1691eb124 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be846756858a7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 2 10:51:42 2014 +0100 #1581 FIX Single context views with missing context show an error message now When views which have a single context defined but are missing needed context information (not hard coded, not provided per URL) are opened, they show an error message about the missing context now. --- .bugs/2160 | 7 +++++-- .werks/1581 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/views.py | 8 ++++++++ web/htdocs/visuals.py | 7 +++++++ 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/.bugs/2160 b/.bugs/2160 index 9ab473d..b9f0b8e 100644 --- a/.bugs/2160 +++ b/.bugs/2160 @@ -1,10 +1,13 @@ Title: Visuals: when single-context views are shown without context, show proper error Component: multisite -State: open +Class: bug +State: done Date: 2014-09-02 12:18:00 Targetversion: future -Class: bug In the table of all views, a single-context view should either not be clickable (except it has its context hard coded). Also we should display a useful error if the view is being called directly via URL. + +2014-12-02 10:50:14: changed state open -> done +Fixed. diff --git a/.werks/1581 b/.werks/1581 new file mode 100644 index 0000000..a1d853a --- /dev/null +++ b/.werks/1581 @@ -0,0 +1,12 @@ +Title: Single context views with missing context show an error message now +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417513817 +Class: fix + +When views which have a single context defined but are missing needed +context information (not hard coded, not provided per URL) are opened, +they show an error message about the missing context now. + diff --git a/ChangeLog b/ChangeLog index e0e9bf7..3481d36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * 1577 FIX: Fixed editing of views using the "Downtime for host/service" sorter or column... * 1578 FIX: Folding states of containers with umlauts in titles are now persisted... * 1580 FIX: Views: Hardcoded single context filters are not shown in filter form anymore... + * 1581 FIX: Single context views with missing context show an error message now... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 3e6745e..9c057d3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -939,8 +939,16 @@ def show_view(view, show_heading = False, show_buttons = True, # have a hardcoded value are not changeable by the user show_filters = visuals.visible_filters_of_visual(view, use_filters) + # Now populate the HTML vars with context vars from the view definition. Hard + # coded default values are treated differently: + # + # a) single context vars of the view are enforced + # b) multi context vars can be overwritten by existing HTML vars visuals.add_context_to_uri_vars(view, datasource["infos"], only_count) + # Check that all needed information for configured single contexts are available + visuals.verify_single_contexts('views', view) + # Af any painter, sorter or filter needs the information about the host's # inventory, then we load it and attach it as column "host_inventory" need_inventory_data = False diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 0fd8a81..4dc2342 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1117,6 +1117,13 @@ def unpack_context_after_editing(packed_context): # | | # '----------------------------------------------------------------------' +def verify_single_contexts(what, visual): + for k, v in get_singlecontext_html_vars(visual): + if v == None: + raise MKUserError(k, _('This %s can not be displayed, because the ' + 'necessary context information "%s" is missing.') % + (visual_types[what]['title'], k)) + def visual_title(what, visual): extra_titles = []

9 years, 9 months

← Newer
1
...
45
46
47
48
49
50
51
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014