Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

added attending paths on a multipath to long output

by Marcel Arentz

Module: check_mk Branch: master Commit: b93b3fb17d99df9e6197d5299c00ee3b8ed248df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b93b3fb17d99df… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Feb 14 10:02:35 2017 +0100 added attending paths on a multipath to long output Change-Id: I9bd9348634a59324f6d2db3108b155dcf9905b9c --- checks/esx_vsphere_hostsystem | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index eba4699..0d694b6 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -417,7 +417,7 @@ def esx_vsphere_multipath_convert(info): paths.setdefault(real_path, []) # Note: There is no path type information available in these esx paths - paths[real_path].append((state, None)) + paths[real_path].append((state, None, path)) continue path_tokens = path.split('-') @@ -429,7 +429,7 @@ def esx_vsphere_multipath_convert(info): hw_type = path.split('.')[0] if hw_type != 'unknown': paths.setdefault(path_id, []) - paths[path_id].append((state, "%s/%s" % (path_type, hw_type))) + paths[path_id].append((state, "%s/%s" % (path_type, hw_type), path)) return paths @@ -449,12 +449,14 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): state = 0 message = "" + path_names = [] for path, states in esx_vsphere_multipath_convert(info).items(): if path == item: # Collect states path_type = None - for path_state, path_type in states: + for path_state, path_type, path_name in states: + path_names.append(path_name) state_item = state_infos.get(path_state) if state_item: state_item[1] += 1 @@ -500,6 +502,7 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): for element in "active", "dead", "disabled", "standby", "unknown": element_text.append("%d %s%s" % ( state_infos[element][1], element, state_infos[element][2])) message += ", ".join(element_text) + message += "\nIncluded Paths:\n" + "\n".join(path_names) break else: return 3, "Path not found in agent output"

7 years, 6 months

4194 FIX esx_vsphere_hostsystem.multipath: Fixed grouping of paths

by Marcel Arentz

Module: check_mk Branch: master Commit: 6deae9e85c6687bbb9d4eb9656384b3d22ea119f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6deae9e85c6687… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Feb 14 09:54:42 2017 +0100 4194 FIX esx_vsphere_hostsystem.multipath: Fixed grouping of paths The changes in vSphere6 made it impossible to display the data in the known way. Now it's necessary to display the information as L#. Additionally there is a suffix to identify the type of the LUN correctly. Otherwise the path to a pseudo-logical device like USB sticks could be accidentally added to the paths of a SAN-LUN. A rediscovery will be necessary since this fix will change the Service Description! Change-Id: If5e2ae3e1c8e54948f10fb1e16c1e5b776fc61b5 --- .werks/4194 | 11 +++++++++++ checks/esx_vsphere_hostsystem | 17 ++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.werks/4194 b/.werks/4194 new file mode 100644 index 0000000..6ac9baf --- /dev/null +++ b/.werks/4194 @@ -0,0 +1,11 @@ +Title: esx_vsphere_hostsystem.multipath: Fixed grouping of paths +Level: 2 +Component: checks +Compatible: incomp +Version: 1.4.0i4 +Date: 1487062070 +Class: fix + +The changes in vSphere6 made it impossible to display the data in the known way. Now it's necessary to display the information as L#. Additionally there is a suffix to identify the type of the LUN correctly. Otherwise the path to a pseudo-logical device like USB sticks could be accidentally added to the paths of a SAN-LUN. + +A rediscovery will be necessary since this fix will change the Service Description! diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 881a4e1..eba4699 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -399,7 +399,22 @@ def esx_vsphere_multipath_convert(info): for path, state in data: # ESX 6.0 uses a different format, e.g "vmhba32:C0:T0:L0 active" if len(path.split(":")) == 4: - real_path = ":".join(path.split(":")[:3]) + hba_num = int(path.split(":")[0].replace("vmhba", "")) + real_path = path.split(":")[-1] + + # vmware specificies three different types of LUNs. Physical LUNs will + # reserves vmhba number 0-31. The other two reserve numbers of base64. + # The lower 32 range is reserved for pseudo logical LUNs. The upper 32 + # for logical LUNs. e.g. 32-63 for pseudo logical LUNs like USB and + # 64-95 for logical LUNs like iSCSI. + # These should be added as different multipath LUNs. + if hba_num >= 32 and hba_num % 64 < 33: + real_path = "%s pseudo-logical" % real_path + elif hba_num >= 32 and hba_num % 64 > 32: + real_path = "%s logical" % real_path + else: + real_path = "%s physical" % real_path + paths.setdefault(real_path, []) # Note: There is no path type information available in these esx paths paths[real_path].append((state, None))

7 years, 6 months

Deobfuscated the contact column class hierarchy, simplifying things quite a bit.

by Sven Panne

Module: check_mk Branch: master Commit: 47ee106e382c6ec791cbb446c3e53660a8265956 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47ee106e382c6e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 22 15:01:29 2017 +0100 Deobfuscated the contact column class hierarchy, simplifying things quite a bit. Change-Id: I4443160fa2f013078d093dc89bb8118d72bc8c04 --- livestatus/src/ContactGroupsMemberColumn.cc | 42 +++++------------------------ livestatus/src/ContactGroupsMemberColumn.h | 21 +++++---------- livestatus/src/ContactsColumn.cc | 37 ++++++++++++++++--------- livestatus/src/ContactsColumn.h | 17 ++++++------ livestatus/src/HostContactsColumn.cc | 42 +++++++++-------------------- livestatus/src/HostContactsColumn.h | 8 +++--- livestatus/src/ServiceContactsColumn.cc | 42 +++++++++-------------------- livestatus/src/ServiceContactsColumn.h | 8 +++--- 8 files changed, 81 insertions(+), 136 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=47ee106e38…

7 years, 6 months

8626 FIX jolokia_metrics.threads: Prevent service staleness in case of decreasing threads

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3ab69ddf206a61f0caf13cbb0ba18cfb05f51a0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ab69ddf206a61… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Mar 22 14:39:53 2017 +0100 8626 FIX jolokia_metrics.threads: Prevent service staleness in case of decreasing threads Previously, the check would go stale occasionally due to a decreasing number of threads being interpreted as a counter wrap. This has been fixed. Change-Id: I42e516116f8471b5d9ef4c20bb4b53017ed9d5b6 --- .werks/8626 | 12 ++++++++++++ checks/jolokia_metrics | 16 ++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.werks/8626 b/.werks/8626 new file mode 100644 index 0000000..c5af1a2 --- /dev/null +++ b/.werks/8626 @@ -0,0 +1,12 @@ +Title: jolokia_metrics.threads: Prevent service staleness in case of decreasing threads +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490189869 + +Previously, the check would go stale occasionally due to a decreasing number of threads +being interpreted as a counter wrap. This has been fixed. diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 0bc9144..5b0f414 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -653,7 +653,6 @@ def check_jolokia_metrics_threads(item, params, info): d = parsed[item] this_time = time.time() - wrapped = False perfdata = [] output = [] status = 0 @@ -673,20 +672,13 @@ def check_jolokia_metrics_threads(item, params, info): status_info = "(!) (Levels at %d/%d)" % (warn, crit) # Calculate the thread increase rate - try: - rate = get_rate("jolokia_metrics.threads.%s" % item, this_time, val) - output.append('ThreadRate: %0.2f' % rate) - perfdata.append(('ThreadRate', rate)) - except MKCounterWrapped: - wrapped = True + rate = get_rate("jolokia_metrics.threads.%s" % item, this_time, val, allow_negative=True) + output.append('ThreadRate: %0.2f' % rate) + perfdata.append(('ThreadRate', rate)) perfdata.append((key, val)) output.append('%s: %d%s' % (key, val, status_info)) - # Only process the perfdata when no wrap occured - if wrapped: - return (status, ', '.join(output)) - else: - return (status, ', '.join(output), perfdata) + return (status, ', '.join(output), perfdata) check_info["jolokia_metrics.threads"] = {

7 years, 6 months

8625 fortigate_ipsecvpn: Now configurable via WATO

by Konstantin Büttner

Module: check_mk Branch: master Commit: a39873faab193095a27297cb0f370bbd8d699654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a39873faab1930… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Mar 22 13:42:54 2017 +0100 8625 fortigate_ipsecvpn: Now configurable via WATO Change-Id: I67a04067fe40cae217b859ccf5b408257250bc2f --- .werks/8625 | 11 +++++++++++ checks/fortigate_ipsecvpn | 22 ++++++++++++++-------- web/plugins/wato/check_parameters.py | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/.werks/8625 b/.werks/8625 new file mode 100644 index 0000000..8a075e2 --- /dev/null +++ b/.werks/8625 @@ -0,0 +1,11 @@ +Title: fortigate_ipsecvpn: Now configurable via WATO +Level: 1 +Component: checks +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490186539 + + diff --git a/checks/fortigate_ipsecvpn b/checks/fortigate_ipsecvpn index 81baaf8..7019ffa 100644 --- a/checks/fortigate_ipsecvpn +++ b/checks/fortigate_ipsecvpn @@ -30,16 +30,20 @@ fortigate_ipsecvpn_default_levels = (1, 2) def inventory_fortigate_ipsecvpn(info): if len(info) > 0: - return [(None, "fortigate_ipsecvpn_default_levels")] + return [(None, {})] def check_fortigate_ipsecvpn(item, params, info): + + if type(params) == tuple: + params = { "levels" : params } + ent_status_map = { "1": "down", "2": "up" } - warn, crit = params + warn, crit = params["levels"] tunnels_down = [p2name for p2name, ent_status in info if ent_status_map[ent_status] == "down"] @@ -63,12 +67,14 @@ def check_fortigate_ipsecvpn(item, params, info): check_info["fortigate_ipsecvpn"] = { - "inventory_function" : inventory_fortigate_ipsecvpn, - "check_function" : check_fortigate_ipsecvpn, - "service_description" : "VPN IPSec Tunnels", - "has_perfdata" : True, - "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0"), - "snmp_info" : (".1.3.6.1.4.1.12356.101.12.2.2.1", [3, # fgVpnTunEntPhase2Name + "default_levels_variable" : "fortigate_ipsecvpn", + "inventory_function" : inventory_fortigate_ipsecvpn, + "check_function" : check_fortigate_ipsecvpn, + "service_description" : "VPN IPSec Tunnels", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0"), + "snmp_info" : (".1.3.6.1.4.1.12356.101.12.2.2.1", [3, # fgVpnTunEntPhase2Name 20]), # fgVpnTunEntStatus + "group" : "ipsecvpn", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a3192fa..40c4f59 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -623,6 +623,28 @@ register_check_parameters( "dict", ) +register_check_parameters( + subgroup_networking, + "ipsecvpn", + _(u"Fortigate IPSec VPN Tunnels"), + Transform( + Dictionary( + elements=[ + ("levels", Tuple( + title=_("Levels for number of down channels"), + elements=[ + Integer(title=_("Warning at"), default_value=1), + Integer(title=_("Critical at"), default_value=2), + ])), + ], + optional_keys = [] + ), + forth=lambda params: type(params) == dict and params or { "levels" : params }, + ), + None, + "dict", +) + #. # .--Inventory-----------------------------------------------------------.

7 years, 6 months

Better error message in case of failed DNS lookup

by Mathias Kettner

Module: check_mk Branch: master Commit: 9cc52ab29ee3e24636aacf7e708eb1559c26f022 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cc52ab29ee3e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 22 13:32:31 2017 +0100 Better error message in case of failed DNS lookup Change-Id: I5c5159b0a0956f4624ea8c6b225a3855895107ee --- modules/check_mk.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 3823a0b..ec24602 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2202,7 +2202,7 @@ def cached_dns_lookup(hostname, family): cache[cache_id] = ipa # Update in-memory-cache return ipa - except: + except Exception, e: # DNS failed. Use cached IP address if present, even if caching # is disabled. if cached_ip: @@ -2210,7 +2210,9 @@ def cached_dns_lookup(hostname, family): return cached_ip else: cache[cache_id] = None - raise + raise MKGeneralException( + "Failed to lookup IPv%d address of %s via DNS: %s\n" % + (family, hostname, e)) def lookup_ipv4_address(hostname):

7 years, 6 months

New bug for agent updater

by Sven Rueß

Module: check_mk Branch: master Commit: 0ebcf7bf769694a2a7e84c3687bf43d630b9d72d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ebcf7bf769694… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Mar 22 12:12:30 2017 +0100 New bug for agent updater Change-Id: I139cafbf199edc99a9b188323094ef88dc0dca29 --- .bugs/2900 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.bugs/2900 b/.bugs/2900 new file mode 100644 index 0000000..b436de4 --- /dev/null +++ b/.bugs/2900 @@ -0,0 +1,28 @@ +Title: cmk-update-agent: Better configuration of updater plugin to prevent problems during updates +Component: checks +State: open +Date: 2017-03-22 11:58:23 +Targetversion: 1.2.8 +Class: bug + +The current standard setings of our cmk-update-agent: +- Timeout for plugin: 60s +- Execution is synchron to agent + +This settings do not take care about several situations on customer side. +Updates in the local network will not be a problem, because most systems do not need +more time than 60 seconds for it. + +If the updater is used on foreign hosts, like other locations or countries, then +the 60 seconds are a problem. The download will take much more time to end successfully. +That will result in the situation, that download perhaps will be finished, but the updater +does not have enough time to finish. The agent will not work and no further information +can be queried. + +A workaround for it is following (manual setting of specific rules): +- Set execution mode for plugins and local checks: as value use cmk-update-agent.exe +- Set timeouts for plugins and local checks: as value use cmk-upadte-agent.exe and 300 seconds (5 Minutes) + +It will not solve the problem of long running agent udpates. It will only take care about, +that the update will successful ended in more situations. For a good solution, the updater +should handle those thing itself.

7 years, 6 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: b62f4e85693b75017743af36e20670b1c9d00277 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b62f4e85693b75… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Mar 22 11:58:08 2017 +0100 Reserved 1 bug IDS Change-Id: I69f94ecb32326e1c04dbd7cd06390133ee57f5f1 --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index d77de05..c914c6a 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2900 +2901

7 years, 6 months

Fixed typo

by Lars Michelsen

Module: check_mk Branch: master Commit: ad3acb4b39cf95b233b1d36e82a224557fe79729 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad3acb4b39cf95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 22 11:50:51 2017 +0100 Fixed typo Change-Id: I01d6c4fbaa0d116183c845b546e9bc6fa051598b --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9cedef1..a3192fa 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -12676,7 +12676,7 @@ register_check_parameters(subgroup_applications, )), ("spool", Dictionary( title = _("Spool messages that could not be sent"), - help = _("Messages that can now be forwarded, e.g. when the target Event Console is " + help = _("Messages that can not be forwarded, e.g. when the target Event Console is " "not running, can temporarily be stored locally. Forwarding is tried again " "on next execution. When messages are spooled, the check will go into WARNING " "state. In case messages are dropped by the rules below, the check will shortly "

7 years, 6 months

4511 FIX Graph dashlets: Fixed graph rendering on host specific dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: 83959bd3ad69b3e0fed84641200e2029f64027f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83959bd3ad69b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 22 11:23:32 2017 +0100 4511 FIX Graph dashlets: Fixed graph rendering on host specific dashboards When creating a host specific dashlet, where the host context is set via URL variable, the graph dashlet was unable to select the correct graph. Instead it displayed the message "Missing needed host parameter.". Change-Id: I3174034ea4d083edc0c5dea0d30472069d970c23 --- .werks/4511 | 13 +++++++++++++ web/plugins/dashboard/dashlets.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4511 b/.werks/4511 new file mode 100644 index 0000000..af1c74b --- /dev/null +++ b/.werks/4511 @@ -0,0 +1,13 @@ +Title: Graph dashlets: Fixed graph rendering on host specific dashboards +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490178137 + +When creating a host specific dashlet, where the host context is set via URL +variable, the graph dashlet was unable to select the correct graph. Instead it +displayed the message "Missing needed host parameter.". diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 7596004..9d4fb2f 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -364,7 +364,7 @@ def dashlet_graph(nr, dashlet): def dashlet_graph_reload_js(nr, dashlet): - host = dashlet['context'].get('host') + host = dashlet['context'].get('host', html.var("host")) if not host: raise MKUserError('host', _('Missing needed host parameter.'))

7 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017