Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

Added conveniance link into help of discovery check

by Mathias Kettner

Module: check_mk Branch: master Commit: 57b3eea665c6b2dd430e8076059ddb7dab347faf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57b3eea665c6b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 21:38:29 2016 +0100 Added conveniance link into help of discovery check --- web/plugins/wato/check_mk_configuration.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index ac09533..69336c2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1120,9 +1120,11 @@ register_configvar(group, help = _("If enabled, Check_MK will create one additional service per host " "that does a regular check, if the service discovery would find new services " "currently un-monitored. Note: This option is deprecated and has been " - "replaced by the rule set Periodic Service Discovery, which allows " - "a per-host configuration and additional features such as automatic rediscovery. " - "Rules in that rule set will override the global settings done here.")), + "replaced by the rule set <a href='%s'>Periodic Service Discovery</a>, " + "which allows a per-host configuration and additional features such as " + "automatic rediscovery. Rules in that rule set will override the global " + "settings done here.") % "wato.py?mode=edit_ruleset&varname=periodic_discovery", + ), need_restart = True) register_configvar(group,

8 years, 7 months

Fixed typo in help text

by Mathias Kettner

Module: check_mk Branch: master Commit: ca6af98597ba9d5d81eab2a208f6d1fb34f4421d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca6af98597ba9d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 21:33:58 2016 +0100 Fixed typo in help text --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 93d39b2..ac09533 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1122,7 +1122,7 @@ register_configvar(group, "currently un-monitored. Note: This option is deprecated and has been " "replaced by the rule set Periodic Service Discovery, which allows " "a per-host configuration and additional features such as automatic rediscovery. " - "Rule in that rule set will override the global settings done here.")), + "Rules in that rule set will override the global settings done here.")), need_restart = True) register_configvar(group,

8 years, 7 months

#3166 FIX Fixed problem where scheduled report did not honor host or service group filter

by Mathias Kettner

Module: check_mk Branch: master Commit: f26ba18bf3d7181d0a8d179a50df2f2301e76c68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f26ba18bf3d718… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 21:31:19 2016 +0100 #3166 FIX Fixed problem where scheduled report did not honor host or service group filter --- .bugs/856 | 6 ++++-- .werks/3166 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 8 ++++---- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.bugs/856 b/.bugs/856 index b9eb931..b4181d1 100644 --- a/.bugs/856 +++ b/.bugs/856 @@ -1,11 +1,13 @@ Title: Report scheduler doesn't pass "Group of Host" filter to the report Component: core -State: open +Class: bug +State: done Date: 2015-12-15 16:20:50 Targetversion: 1.2.8 -Class: bug If you create a Report with context "Hostgroup", add a View with Service errors, this will work but not when the report is used in the scheduler. If the scheduler is used, the report shows all systems regradless of the given hostgroup. + +2016-02-06 21:30:50: changed state open -> done diff --git a/.werks/3166 b/.werks/3166 new file mode 100644 index 0000000..f3d11c0 --- /dev/null +++ b/.werks/3166 @@ -0,0 +1,9 @@ +Title: Fixed problem where scheduled report did not honor host or service group filter +Level: 1 +Component: reporting +Compatible: compat +Version: 1.2.7i4 +Date: 1454790655 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9424539..a8191dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -362,6 +362,7 @@ Reporting & Availability: * 2823 FIX: Availability: Fixed division by zero error on rendering the availability table + * 3166 FIX: Fixed problem where scheduled report did not honor host or service group filter Event Console: * 2733 Visibility of Event Console events more flexible now... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d1db483..958a38b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -954,10 +954,10 @@ def show_view(view, show_heading = False, show_buttons = True, # FIXME TODO HACK to make grouping single contextes possible on host/service infos # Is hopefully cleaned up soon. if view['datasource'] in ['hosts', 'services']: - if 'hostgroup' in view['single_infos']: - html.set_var('opthost_group', html.var('hostgroup')) - if 'servicegroup' in view['single_infos']: - html.set_var('optservice_group', html.var('servicegroup')) + if html.has_var('hostgroup') and not html.has_var("opthost_group"): + html.set_var("opthost_group", html.var("hostgroup")) + if html.has_var('servicegroup') and not html.has_var("optservice_group"): + html.set_var("optservice_group", html.var("servicegroup")) # Now populate the HTML vars with context vars from the view definition. Hard # coded default values are treated differently:

8 years, 7 months

Fixed too simple spelling errors in painter titles

by Mathias Kettner

Module: check_mk Branch: master Commit: 1ff44d0243c6b121510f1f375e67c900607d5d4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ff44d0243c6b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 21:19:07 2016 +0100 Fixed too simple spelling errors in painter titles --- web/plugins/views/painters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 72e1c01..6c92022 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -873,7 +873,7 @@ def paint_service_group_memberlist(row): return "", ", ".join(links) multisite_painters["svc_group_memberlist"] = { - "title" : _("Servicegroups the service is member of"), + "title" : _("Service groups the service is member of"), "short" : _("Groups"), "columns" : [ "service_groups" ], "paint" : paint_service_group_memberlist, @@ -1574,7 +1574,7 @@ def paint_host_group_memberlist(row): return "", ", ".join(links) multisite_painters["host_group_memberlist"] = { - "title" : _("Hostgroups the host is member of"), + "title" : _("Host groups the host is member of"), "short" : _("Groups"), "columns" : [ "host_groups" ], "groupby" : lambda row: tuple(row["host_groups"]),

8 years, 7 months

#3165 FIX Make columns in view "Services by group" same as in other service views

by Mathias Kettner

Module: check_mk Branch: master Commit: ab6f18473113588bd86a2ac22d490d5556a25610 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab6f1847311358… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 10:52:14 2016 +0100 #3165 FIX Make columns in view "Services by group" same as in other service views --- .werks/3165 | 9 +++++++++ ChangeLog | 3 +++ web/plugins/views/builtin.py | 8 +------- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.werks/3165 b/.werks/3165 new file mode 100644 index 0000000..25999f0 --- /dev/null +++ b/.werks/3165 @@ -0,0 +1,9 @@ +Title: Make columns in view "Services by group" same as in other service views +Level: 1 +Component: liveproxy +Compatible: compat +Version: 1.2.7i4 +Date: 1454752305 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6f8662b..9424539 100644 --- a/ChangeLog +++ b/ChangeLog @@ -379,6 +379,9 @@ Livestatus: * 2743 FIX: Fixed handling of column types in "GET columns"... + Livestatus-Proxy: + * 3165 FIX: Make columns in view "Services by group" same as in other service views + HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... * 2440 VMware ESX inventory: Now able to display ESX hostsystems and virtualmachines of clusters diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 277b56e..26697cb 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1399,13 +1399,7 @@ multisite_builtin_views.update({ 'name': 'svcbygroups', 'num_columns': 1, 'owner': '', - 'painters': [('host', 'host'), - ('service_state', None), - ('service_description', 'service'), - ('svc_plugin_output', None), - ('svc_state_age', None), - ('svc_check_age', None), - ('service_icons', None)], + 'painters': [('host', 'host')] + service_view_painters, 'public': True, 'show_filters': [], 'sorters': [('servicegroup', False),

8 years, 7 months

#3164 FIX No longer crash on action or email if trap contains a null byte

by Mathias Kettner

Module: check_mk Branch: master Commit: 6606c929adcbcd4535ce8e29bfd628646ae4f2c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6606c929adcbcd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 5 15:39:20 2016 +0100 #3164 FIX No longer crash on action or email if trap contains a null byte --- .bugs/2319 | 6 ++++-- .werks/3164 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 14 ++++++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.bugs/2319 b/.bugs/2319 index 2fae989..c82d3bd 100644 --- a/.bugs/2319 +++ b/.bugs/2319 @@ -1,9 +1,11 @@ Title: Event Console actions fail on non printable chars in event Component: ec -State: open +Class: bug +State: done Date: 2015-10-29 09:45:52 Targetversion: 1.2.8 -Class: bug When e.g. a trap contains a \0, eventually raised script actions fail with an exception in the event console. + +2016-02-05 15:38:58: changed state open -> done diff --git a/.werks/3164 b/.werks/3164 new file mode 100644 index 0000000..9698080 --- /dev/null +++ b/.werks/3164 @@ -0,0 +1,9 @@ +Title: No longer crash on action or email if trap contains a null byte +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i4 +Date: 1454683140 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1a61316..6f8662b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -374,6 +374,7 @@ * 2862 FIX: Fixed handling of umlauts in mails send by the EC * 2893 FIX: Improved error handling of sending mails via Event Console * 2986 FIX: Event Console: Text elements of events are now correctly quoted in shell scripts... + * 3164 FIX: No longer crash on action or email if trap contains a null byte Livestatus: * 2743 FIX: Fixed handling of column types in "GET columns"... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 5b5471d..dbfb787 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3276,6 +3276,10 @@ def get_quoted_event(event): return new_event +def escape_null_bytes(s): + return s.replace("\000", "\\000") + + def do_event_action(action, event, user=""): if action["disabled"]: log("Skipping disabled action %s." % action["id"]) @@ -3284,13 +3288,13 @@ def do_event_action(action, event, user=""): try: action_type, settings = action["action"] if action_type == 'email': - to = substitute_event_tags(settings["to"], event) - subject = substitute_event_tags(settings["subject"], event) - body = substitute_event_tags(settings["body"], event) + to = escape_null_bytes(substitute_event_tags(settings["to"], event)) + subject = escape_null_bytes(substitute_event_tags(settings["subject"], event)) + body = escape_null_bytes(substitute_event_tags(settings["body"], event)) send_email(to, subject, body) log_event_history(event, "EMAIL", user, "%s|%s" % (to, subject)) elif action_type == 'script': - execute_script(substitute_event_tags(settings["script"], get_quoted_event(event))) + execute_script(escape_null_bytes(substitute_event_tags(settings["script"], get_quoted_event(event)))) log_event_history(event, "SCRIPT", user, action['id']) else: log("Cannot execute action %s: invalid action type %s" % (action["id"], action_type)) @@ -3434,6 +3438,8 @@ def send_email(to, subject, body): def execute_script(body): + # Traps can contain 0-Bytes. We need to remove this from the script + # body. Otherwise suprocess.Popen will crash. p = subprocess.Popen( body.encode('utf-8'), shell = True,

8 years, 7 months

Updated bug entries #2318

by Mathias Kettner

Module: check_mk Branch: master Commit: df6fa0d3a78f0c4a042ece03a21706717405eca3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df6fa0d3a78f0c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 5 15:13:03 2016 +0100 Updated bug entries #2318 --- .bugs/2318 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/2318 b/.bugs/2318 index 44484bd..d91d5f8 100644 --- a/.bugs/2318 +++ b/.bugs/2318 @@ -1,11 +1,15 @@ Title: network interface groups are broken Component: checks -State: open +Class: bug +State: done Date: 2015-10-28 15:32:21 Targetversion: 1.2.8 -Class: bug Seems that the interface grouping feature is not working since the interface check has been made cluster aware. An exception "ValueError: need more than 19 values to unpack" is raised for interface group checks. + +2016-02-05 15:12:51: changed state open -> done +Should now work. I've not found *that* exception but another one and fixed +it.

8 years, 7 months

Fix scan functions fetching OID ending in .* for stored SNMP walks

by Mathias Kettner

Module: check_mk Branch: master Commit: 3f96430466d03ed45f03bb807bfca63e570a26fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f96430466d03e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 5 15:11:07 2016 +0100 Fix scan functions fetching OID ending in .* for stored SNMP walks --- modules/check_mk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index b3503d2..5b249b9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1651,6 +1651,8 @@ def get_single_oid(hostname, ipaddress, oid): # we need an exact match if len(walk) == 1 and oid == walk[0][0]: value = walk[0][1] + elif oid.endswith(".*") and len(walk) > 0: + value = walk[0][1] else: value = None

8 years, 7 months

added missing catalog entry

by Simon Betz

Module: check_mk Branch: master Commit: 85366b50fa8205e66692e6129aff1e78776707f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85366b50fa8205… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 5 15:06:35 2016 +0100 added missing catalog entry --- modules/catalog.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/catalog.py b/modules/catalog.py index 1ba8bd2..7b3d141 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -77,6 +77,7 @@ manpage_catalog_titles = { "lancom" : "LANCOM Systems GmbH", "mikrotik" : "MikroTik", "netgear" : "Netgear", + "palo_alto" : "Palo Alto Networks", "qnap" : "QNAP Systems", "riverbed" : "Riverbed Technology", "symantec" : "Symantec",

8 years, 7 months

#3163 FIX Treat interface name '1' and '01' as identical when grouping interfaces

by Mathias Kettner

Module: check_mk Branch: master Commit: d149a3616f612fcf1f509f684302b382f59bf1fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d149a3616f612f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 5 14:54:54 2016 +0100 #3163 FIX Treat interface name '1' and '01' as identical when grouping interfaces Problem was that in the discovery rule for creating interface groups you had to specify <tt>01</tt> as item (just it appeared in the service), while the actual check compared agains the index (<tt>1</tt>). Both are treated identical now and in the rule you may specify either <tt>01</tt> or <tt>1</tt>. --- .werks/3163 | 12 ++++++++++++ ChangeLog | 1 + checks/if.include | 7 ++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/3163 b/.werks/3163 new file mode 100644 index 0000000..58b8d9e --- /dev/null +++ b/.werks/3163 @@ -0,0 +1,12 @@ +Title: Treat interface name '1' and '01' as identical when grouping interfaces +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454680372 +Class: fix + +Problem was that in the discovery rule for creating interface groups you had +to specify <tt>01</tt> as item (just it appeared in the service), while the +actual check compared agains the index (<tt>1</tt>). Both are treated identical +now and in the rule you may specify either <tt>01</tt> or <tt>1</tt>. diff --git a/ChangeLog b/ChangeLog index 757213b..1a61316 100644 --- a/ChangeLog +++ b/ChangeLog @@ -253,6 +253,7 @@ * 3068 FIX: ps: added performance graphs for process handle count (windows only) * 3069 FIX: unitrend_backup: fixed broken plugin output * 2930 FIX: juniper_cpu_util: Better detection, find more devices... + * 3163 FIX: Treat interface name '1' and '01' as identical when grouping interfaces... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/if.include b/checks/if.include index d3bc4e1..9576910 100644 --- a/checks/if.include +++ b/checks/if.include @@ -286,7 +286,7 @@ def inventory_if_common(info, has_nodeinfo = False): is_only_in_group = False for group_name, pattern in group_patterns.items(): # Interfaces can be grouped by item and iftype - match_item = not pattern.get("include_items") or (item in pattern["include_items"]) + match_item = not pattern.get("include_items") or (tryint(item) in map(tryint, pattern["include_items"])) match_type = not pattern.get("iftype") or (pattern["iftype"] == saveint(ifType)) if match_item and match_type: have_groups.setdefault(group_name, {"interfaces": [], @@ -392,7 +392,8 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou if ifGroup and ifGroup == item: matching_interfaces.append((if_member_item, element)) - elif if_member_item in params.get("include_items", []) or\ + # tryint -> force "01" and "1" to be identical. + elif (params.get("include_items") == None or tryint(if_member_item) in map(tryint, params["include_items"])) or\ saveint(element[2 + node_offset]) == params.get("iftype"): matching_interfaces.append((if_member_item, element)) @@ -488,7 +489,7 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou if params.get("iftype"): alias_info.append("iftype %s" % params["iftype"]) if params.get("include_items"): - alias_info.append("grouped items") + alias_info.append("%d grouped interfaces" % len(matching_interfaces)) if has_nodeinfo: group_entry = [None]

8 years, 7 months

← Newer
1
...
25
26
27
28
29
30
31
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016