Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

7234 FIX Fixed broken event cancelling by priority (1.5.0p12 regression)

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ed42d19657b897d54eefbc2224e76aeaaec0b28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ed42d19657b89… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 8 13:49:37 2019 +0100 7234 FIX Fixed broken event cancelling by priority (1.5.0p12 regression) When a EC rule is configured to cancel an open event by priority and the lower priority level is the left of the priority range, the cancelling was not working. For example EMERG to CRIT worked while CRIT to EMERG did not work. This has been fixed. The order of both levels should not be relevant for the processing of the rules. Change-Id: I7a285338fb1c716b50503c37fe0b3b55a27fd364 --- .werks/7234 | 16 ++++++++++++++++ cmk/ec/main.py | 6 ++---- tests/unit/cmk/ec/test_rule_matching.py | 10 ++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.werks/7234 b/.werks/7234 new file mode 100644 index 0000000..4a94b8e --- /dev/null +++ b/.werks/7234 @@ -0,0 +1,16 @@ +Title: Fixed broken event cancelling by priority (1.5.0p12 regression) +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1552049108 +Class: fix + +When a EC rule is configured to cancel an open event by priority and the lower +priority level is the left of the priority range, the cancelling was not +working. + +For example EMERG to CRIT worked while CRIT to EMERG did not work. This has +been fixed. The order of both levels should not be relevant for the processing +of the rules. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 2fe1eee..d2a5761 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -2367,15 +2367,13 @@ class RuleMatcher(object): p = event["priority"] if "match_priority" in rule: - prio_from, prio_to = rule["match_priority"] - if prio_from > prio_to: - prio_to, prio_from = prio_from, prio_to + prio_from, prio_to = sorted(rule["match_priority"]) match_priority["has_match"] = prio_from <= p <= prio_to else: match_priority["has_match"] = True if "cancel_priority" in rule: - cancel_from, cancel_to = rule["cancel_priority"] + cancel_from, cancel_to = sorted(rule["cancel_priority"]) match_priority["has_canceling_match"] = cancel_from <= p <= cancel_to else: match_priority["has_canceling_match"] = False diff --git a/tests/unit/cmk/ec/test_rule_matching.py b/tests/unit/cmk/ec/test_rule_matching.py index 3b70e0b..96aec86 100644 --- a/tests/unit/cmk/ec/test_rule_matching.py +++ b/tests/unit/cmk/ec/test_rule_matching.py @@ -67,6 +67,10 @@ def test_match_message(m, message, result, match_message, cancel_message, match_ (2, (2, 2), None, True, False, True), (2, (1, 1), None, False, False, False), (2, (3, 5), None, False, False, False), + (2, (10, 0), None, True, False, True), + (2, (2, 2), None, True, False, True), + (2, (1, 1), None, False, False, False), + (2, (5, 3), None, False, False, False), # cancel (2, None, (2, 2), True, True, True), (2, (3, 5), (2, 2), False, True, True), @@ -74,6 +78,12 @@ def test_match_message(m, message, result, match_message, cancel_message, match_ (2, None, (1, 1), True, False, True), (2, None, (3, 5), True, False, True), (2, (3, 5), (3, 5), False, False, False), + (2, None, (2, 2), True, True, True), + (2, (5, 3), (2, 2), False, True, True), + (2, None, (10, 0), True, True, True), + (2, None, (1, 1), True, False, True), + (2, None, (5, 3), True, False, True), + (2, (5, 3), (5, 3), False, False, False), # positive + cancel (2, (2, 2), (2, 2), True, True, True), ])

5 years, 7 months

Extend expected mime type to allow the type reported by CentOS 6 apache

by Lars Michelsen

Module: check_mk Branch: master Commit: f0965b424b3cee99417fdd45ae18b7804cb8123c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0965b424b3cee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 8 13:54:53 2019 +0100 Extend expected mime type to allow the type reported by CentOS 6 apache Change-Id: I0ffd53e4f3b953b1bc9b37fa4d6738d4d998499c --- tests/testlib/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 0246e09..5bf9c29 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1125,7 +1125,8 @@ class WebSession(requests.Session): # There might be other resources like iframe, audio, ... but we don't care about them self._check_resources(soup, response, "img", "src", ["image/png"]) - self._check_resources(soup, response, "script", "src", ["application/javascript"]) + self._check_resources(soup, response, "script", "src", + ["application/javascript", "text/javascript"]) self._check_resources( soup, response, "link", "href", ["text/css"], filters=[("rel", "stylesheet")]) self._check_resources(

5 years, 7 months

if.include: rigorously make if-scans mutually exclusive

by Moritz Kiemer

Module: check_mk Branch: master Commit: 88c69fddadc2a5eb87e03c8be4c30ee3e1dcbade URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88c69fddadc2a5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Mar 7 15:40:54 2019 +0100 if.include: rigorously make if-scans mutually exclusive 7214 Interface checks: Introduce scan function API In the past conflicting check plugins with services called "Interface <ITEM>" could lead to a "duplicate services" warning on the discovery page. To avoid this issue in the future, all scan functions for those plugins are now located in the file "if.include". If you add a new "Interface <ITEM>"- service, please add the corresponding scan function to the file "if.include", and list in the dictionary <tt>_SPECIFIC_IF_SCANS</tt>. You can then access the scan function by specifying <tt> 'snmp_scan_function': get_snmp_if_scan_function('my_if_check')</tt> in your check plugin. The matching devices will then be automatically excluded from the generic if and if64 check plugin. 7215 FIX Avoid duplicate services for if_fortigate check This fixes the duplicate services warning displayed on the discovery page for if/if_fortigate checks. Services of the if checkplugin are no longer discovered if the if_fortigate plugin already found interfaces. Change-Id: Id6736a24fcce8f235354213bd3708527ea5b8779 --- .werks/7214 | 21 +++++++++++++++++++++ .werks/7215 | 14 ++++++++++++++ checks/if.include | 40 ++++++++++++++++++++-------------------- 3 files changed, 55 insertions(+), 20 deletions(-) diff --git a/.werks/7214 b/.werks/7214 new file mode 100644 index 0000000..640242e --- /dev/null +++ b/.werks/7214 @@ -0,0 +1,21 @@ +Title: Interface checks: Introduce scan function API +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1552033415 +Class: feature + +In the past conflicting check plugins with services called "Interface <ITEM>" +could lead to a "duplicate services" warning on the discovery page. + +To avoid this issue in the future, all scan functions for those plugins +are now located in the file "if.include". +If you add a new "Interface <ITEM>"- service, please add the corresponding +scan function to the file "if.include", and list in the dictionary +<tt>_SPECIFIC_IF_SCANS</tt>. You can then access the scan function by specifying +<tt> 'snmp_scan_function': get_snmp_if_scan_function('my_if_check')</tt> +in your check plugin. +The matching devices will then be automatically excluded from the generic if +and if64 check plugin. diff --git a/.werks/7215 b/.werks/7215 new file mode 100644 index 0000000..38dc992 --- /dev/null +++ b/.werks/7215 @@ -0,0 +1,14 @@ +Title: Avoid duplicate services for if_fortigate check +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1552034080 +Class: fix + +This fixes the duplicate services warning displayed on the +discovery page for if/if_fortigate checks. + +Services of the if checkplugin are no longer discovered if +the if_fortigate plugin already found interfaces. diff --git a/checks/if.include b/checks/if.include index 2bba1fc..1bebb26 100644 --- a/checks/if.include +++ b/checks/if.include @@ -126,24 +126,6 @@ def _snmp_scan_function_if_fortigate(oid): return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12356") -def _snmp_scan_function_if(oid): - return if64_disabled(host_name()) or not has_ifHCInOctets(oid) - - -def _if64_scan_function(oid, use_if64adm=False): - if any(( - if64_disabled(host_name()), - _snmp_scan_function_if_lancom(oid), - _snmp_scan_function_if_brocade(oid), - _snmp_scan_function_if_fortigate(oid), - _snmp_scan_function_if64_tplink(oid), - need_if64adm() != use_if64adm, - )): - return False - - return has_ifHCInOctets(oid) - - _SPECIFIC_IF_SCANS = collections.OrderedDict({ 'if_brocade': _snmp_scan_function_if_brocade, 'adva_fsp_if': _snmp_scan_function_adva_fsp_if, @@ -156,17 +138,35 @@ _SPECIFIC_IF_SCANS = collections.OrderedDict({ }) +def is_specific(oid): + return any(scan(oid) for scan in _SPECIFIC_IF_SCANS.values()) + + def get_snmp_if_scan_function(plugin_name): if plugin_name in _SPECIFIC_IF_SCANS: return _SPECIFIC_IF_SCANS[plugin_name] if plugin_name == 'if': - return _snmp_scan_function_if + + def wrapped_scan_function(oid): + if is_specific(oid): + return False + return if64_disabled(host_name()) or not has_ifHCInOctets(oid) + elif plugin_name == 'if64': - return _if64_scan_function + + def wrapped_scan_function(oid): + if if64_disabled(host_name()) or is_specific(oid): + return False + if need_if64adm(): + return False + return has_ifHCInOctets(oid) + else: raise NotImplementedError("unknown if plugin: %r" % plugin_name) + return wrapped_scan_function + def fix_if_64_highspeed(info): for line in info:

5 years, 7 months

7195 Jira: Notification plugin

by Ronny Bruska

Module: check_mk Branch: master Commit: 16b93365ba9f97daafe594704facc9cc906c55ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16b93365ba9f97… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Wed Mar 6 21:26:43 2019 +0100 7195 Jira: Notification plugin Check_MK now supports integration with Jira. You can create issues for Host an Service Problems and optional set a resolution on recovery notifications. In Jira you have to add two custom fields to your project screen as described [https://confluence.atlassian.com/adminjiraserver/adding-a-custom-field-9388… here]. In Check_MK, under "WATO - Notifications", create a new notification rule and select Jira. Parameters to set: JIRA URL: The URL to your Jira environment User Name: Jira username Password: Jira password Project ID: The Project ID the issues should be created in Issue type ID: The issue type ID Host custom field ID: The first custom field ID you created in Jira Service custom field ID: The second custom field ID you created in Jira Monitoring URL: URL of your Check_MK environment to create hyperlinks back to Check_MK (eg. https://server/site) Priority ID: The priority ID (optional) Summary for host notifications: The summary the created host issue should use (optional) Summary for service notifications: The summary the created service issue shoud use (optional) Label: Label for Jira issues. If not set, 'monitoring' will be used. (optional) Activate resultion with following resolution transistion ID: If set, the created issue will be resolved with the configured resolution ID (optional) Set optional timeout for connections to JIRA: Timeout in seconds, default is 10 (optional) You need different Jira IDs to open/resolve issues. There are different ways to get this IDs: LI: [https://confluence.atlassian.com/jirakb/how-to-get-project-id-from-the-jira… Jira_support] LI: Retrieve with the a script (example: project_id): F+:#!/usr/bin/env python F+: F+:import requests F+: F+:USER = "JIRA_USERNAME" F+:PW = "JIRA_PASSWORD" F+:PROJECT_KEY = "JIRA_PROJECT_NAME" F+:JIRA_SERVER = "https://jira.server.your-domain.de" F+: F+:sess = requests.Session() F+:sess.auth = (USER, PW) F+:resp = sess.get("%s/rest/api/2/project" % JIRA_SERVER, verify=False) F+: F+:project_id = [item["id"] for item in resp.json() if item["key"] == PROJECT_KEY][0] F+:print(project_id) For issuetype and priority ID use: F+:resp = sess.get("%s/rest/api/2/issuetype" % JIRA_SERVER) F+:resp = sess.get("%s/rest/api/2/priority" % JIRA_SERVER) More information about the Jira API can be found [https://docs.atlassian.com/software/jira/docs/api/REST/7.12.0 here]. CMK-1185 Change-Id: I26d7fd808e1d3c3665b82741a756e806b0a0489d --- .werks/7195 | 59 ++++++++ cmk/gui/plugins/wato/notifications.py | 126 +++++++++++++++++ cmk/notification_plugins/jira_issues.py | 155 +++++++++++++++++++++ notifications/jira_issues | 9 ++ tests/unit/cmk/gui/test_gui_config.py | 1 + .../cmk/gui/wato/test_notification_parameters.py | 1 + 6 files changed, 351 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=16b93365ba…

5 years, 7 months

7232 FIX Fixed wrong sorting of view titles on "edit view page"

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a7a1e2c59b615df1016cea141a580c5347c6fcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a7a1e2c59b615… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 8 12:16:05 2019 +0100 7232 FIX Fixed wrong sorting of view titles on "edit view page" Change-Id: I1b2ce0b95210c971c1a5700dd9d70adb1560f125 --- .werks/7232 | 11 +++++++++++ cmk/gui/table.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/7232 b/.werks/7232 new file mode 100644 index 0000000..eee4c0a --- /dev/null +++ b/.werks/7232 @@ -0,0 +1,11 @@ +Title: Fixed wrong sorting of view titles on "edit view page" +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1552037734 + + diff --git a/cmk/gui/table.py b/cmk/gui/table.py index 5d964fd..66846b6 100644 --- a/cmk/gui/table.py +++ b/cmk/gui/table.py @@ -475,7 +475,8 @@ def _sort_rows(rows, sort_col, sort_reverse): # see the table in the first place. try: rows.sort( - cmp=lambda a, b: utils.cmp_num_split(a[0][sort_col][0], b[0][sort_col][0]), + cmp=lambda a, b: utils.cmp_num_split( + html.strip_tags(a[0][sort_col][0]), html.strip_tags(b[0][sort_col][0])), reverse=sort_reverse == 1) except IndexError: pass

5 years, 7 months

7198 FIX Solaris Agent: fixed wrong path for top command

by Ronny Bruska

Module: check_mk Branch: master Commit: 52276803ae44f7c7b903bd28df24dffab05a95c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52276803ae44f7… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Fri Mar 8 09:27:19 2019 +0100 7198 FIX Solaris Agent: fixed wrong path for top command The agent tried to use /usr/local/top instead of /usr/local/bin/top. This has been fixed. Change-Id: I9ae909a9efefc4feec1d755258242323579ffc84 --- .werks/7198 | 12 ++++++++++++ agents/check_mk_agent.solaris | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/7198 b/.werks/7198 new file mode 100644 index 0000000..03d2e40 --- /dev/null +++ b/.werks/7198 @@ -0,0 +1,12 @@ +Title: Solaris Agent: fixed wrong path for top command +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1552033417 +Class: fix + +The agent tried to use /usr/local/top instead of /usr/local/bin/top. +This has been fixed. + diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 38dfa3d..e9ce799 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -320,11 +320,11 @@ fi # <<<solaris_mem>>> should be used if statgrab is missing and top is available. if ! type statgrab &>/dev/null; then - if [ -x /usr/bin/top ] || [ -x /usr/local/top ] + if [ -x /usr/bin/top ] || [ -x /usr/local/bin/top ] then echo "<<<solaris_mem>>>" if [ -x /usr/bin/top ]; then /usr/bin/top | grep '^Memory:'; fi - if [ -x /usr/local/bin/top ]; then /usr/bin/top | grep '^Memory:'; fi + if [ -x /usr/local/bin/top ]; then /usr/local/bin/top | grep '^Memory:'; fi fi fi

5 years, 7 months

ibm_svc_node: Fixed regression test

by Simon Betz

Module: check_mk Branch: master Commit: 63589f01374cef2da0e8d47b60069f1cc1d9f835 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63589f01374cef… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 8 09:51:46 2019 +0100 ibm_svc_node: Fixed regression test Change-Id: Iedae39983bcfb3580565ac7a08550974bdca0d1d --- checks/ibm_svc_node | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/ibm_svc_node b/checks/ibm_svc_node index 5e1bf8a..a702e54 100644 --- a/checks/ibm_svc_node +++ b/checks/ibm_svc_node @@ -87,7 +87,8 @@ def check_ibm_svc_node(item, _no_params, data): else: status = 1 - return status, ", ".join(messages) + # sorted is needed for deterministic test results + return status, ", ".join(sorted(messages)) check_info["ibm_svc_node"] = {

5 years, 7 months

if.include: refactor: make scan functions private

by Moritz Kiemer

Module: check_mk Branch: master Commit: 93f333f961fdcd60e297e8b6b0643192702d45e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93f333f961fdcd… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Mar 7 15:17:36 2019 +0100 if.include: refactor: make scan functions private Change-Id: I60763ecc4cccb08134cb03989b693d7162506108 --- checks/adva_fsp_if | 2 +- checks/emc_vplex_if | 2 +- checks/huawei_osn_if | 2 +- checks/if | 2 +- checks/if.include | 52 ++++++++++++++++++++++++++++++++++++++-------------- checks/if64 | 2 +- checks/if64_tplink | 2 +- checks/if64adm | 2 +- checks/if_brocade | 2 +- checks/if_fortigate | 2 +- checks/if_lancom | 2 +- 11 files changed, 48 insertions(+), 24 deletions(-) diff --git a/checks/adva_fsp_if b/checks/adva_fsp_if index 2792b99..0f84e7d 100644 --- a/checks/adva_fsp_if +++ b/checks/adva_fsp_if @@ -134,6 +134,6 @@ check_info['adva_fsp_if'] = { "4.1.2544.1.11.2.4.3.5.1.3", # opticalIfDiagInputPower ], ), - "snmp_scan_function": snmp_scan_function_adva_fsp_if, "includes": ["if.include"], + "snmp_scan_function": get_snmp_if_scan_function('adva_fsp_if'), } diff --git a/checks/emc_vplex_if b/checks/emc_vplex_if index aff53d2..a86eac3 100644 --- a/checks/emc_vplex_if +++ b/checks/emc_vplex_if @@ -76,7 +76,7 @@ check_info["emc_vplex_if"] = { "check_function": check_emc_vplex_if, "inventory_function": inventory_emc_vplex_if, "service_description": 'Interface %s', - 'snmp_scan_function': snmp_scan_function_emc_vplex_if, + 'snmp_scan_function': get_snmp_if_scan_function('emc_vplex_if'), "snmp_info": [ ( ".1.3.6.1.4.1.1139.21.2.2", diff --git a/checks/huawei_osn_if b/checks/huawei_osn_if index 2acc44a..17e966f 100644 --- a/checks/huawei_osn_if +++ b/checks/huawei_osn_if @@ -86,7 +86,7 @@ check_info['huawei_osn_if'] = { "4.944", # OPTIX-GLOBAL-NGWDM-MIB::sdh_pathDataPmMonValue.pmRXPBAD 13 "4.945", # OPTIX-GLOBAL-NGWDM-MIB::sdh_pathDataPmMonValue.pmTXPBAD 14 ]), - 'snmp_scan_function': snmp_scan_function_huawei_osn_if, + 'snmp_scan_function': get_snmp_if_scan_function('huawei_osn_if'), 'has_perfdata': True, 'includes': ['huawei_osn.include', 'if.include'], 'group': 'if', diff --git a/checks/if b/checks/if index 5e0b3f2..0d9bc47 100644 --- a/checks/if +++ b/checks/if @@ -71,7 +71,7 @@ check_info["if"] = { ]), # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 # use if64 if possible and not disabled - 'snmp_scan_function': snmp_scan_function_if, + 'snmp_scan_function': get_snmp_if_scan_function('if'), 'group': 'if', 'default_levels_variable': 'if_default_levels', } diff --git a/checks/if.include b/checks/if.include index 323c57c..2bba1fc 100644 --- a/checks/if.include +++ b/checks/if.include @@ -82,26 +82,26 @@ def need_if64adm(): return "portstates" in settings and '9' in settings["portstates"] -def snmp_scan_function_if_brocade(oid): +def _snmp_scan_function_if_brocade(oid): return "Brocade VDX Switch" in oid(".1.3.6.1.2.1.1.1.0") and (not if64_disabled( host_name())) and has_ifHCInOctets(oid) -def snmp_scan_function_if64adm(oid): +def _snmp_scan_function_if64adm(oid): if if64_disabled(host_name()) or not need_if64adm(): return False return has_ifHCInOctets(oid) -def snmp_scan_function_adva_fsp_if(oid): +def _snmp_scan_function_adva_fsp_if(oid): return oid(".1.3.6.1.2.1.1.1.0") == "Fiber Service Platform F7" -def snmp_scan_function_if64_tplink(oid): +def _snmp_scan_function_if64_tplink(oid): return ".4.1.11863." in oid(".1.3.6.1.2.1.1.2.0") and has_ifHCInOctets(oid) -def snmp_scan_function_if_lancom(oid): +def _snmp_scan_function_if_lancom(oid): sys_description = oid(".1.3.6.1.2.1.1.1.0") for name in ("LANCOM", "ELSA", "T-Systems"): if name in sys_description: @@ -113,30 +113,30 @@ def snmp_scan_function_if_lancom(oid): return has_ifHCInOctets(oid) -def snmp_scan_function_emc_vplex_if(oid): +def _snmp_scan_function_emc_vplex_if(oid): return oid(".1.3.6.1.2.1.1.1.0") == "" and oid(".1.3.6.1.4.1.1139.21.2.2.8.1.*") -def snmp_scan_function_huawei_osn_if(oid): +def _snmp_scan_function_huawei_osn_if(oid): # duplicate code from huawei_osn.include return ".1.3.6.1.4.1.2011.2.25.1" in oid(".1.3.6.1.2.1.1.2.0") -def snmp_scan_function_if_fortigate(oid): +def _snmp_scan_function_if_fortigate(oid): return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12356") -def snmp_scan_function_if(oid): +def _snmp_scan_function_if(oid): return if64_disabled(host_name()) or not has_ifHCInOctets(oid) -def if64_scan_function(oid, use_if64adm=False): +def _if64_scan_function(oid, use_if64adm=False): if any(( if64_disabled(host_name()), - snmp_scan_function_if_lancom(oid), - snmp_scan_function_if_brocade(oid), - snmp_scan_function_if_fortigate(oid), - snmp_scan_function_if64_tplink(oid), + _snmp_scan_function_if_lancom(oid), + _snmp_scan_function_if_brocade(oid), + _snmp_scan_function_if_fortigate(oid), + _snmp_scan_function_if64_tplink(oid), need_if64adm() != use_if64adm, )): return False @@ -144,6 +144,30 @@ def if64_scan_function(oid, use_if64adm=False): return has_ifHCInOctets(oid) +_SPECIFIC_IF_SCANS = collections.OrderedDict({ + 'if_brocade': _snmp_scan_function_if_brocade, + 'adva_fsp_if': _snmp_scan_function_adva_fsp_if, + 'if64_tplink': _snmp_scan_function_if64_tplink, + 'if_lancom': _snmp_scan_function_if_lancom, + 'emc_vplex_if': _snmp_scan_function_emc_vplex_if, + 'huawei_osn_if': _snmp_scan_function_huawei_osn_if, + 'if_fortigate': _snmp_scan_function_if_fortigate, + 'if64adm': _snmp_scan_function_if64adm, +}) + + +def get_snmp_if_scan_function(plugin_name): + if plugin_name in _SPECIFIC_IF_SCANS: + return _SPECIFIC_IF_SCANS[plugin_name] + + if plugin_name == 'if': + return _snmp_scan_function_if + elif plugin_name == 'if64': + return _if64_scan_function + else: + raise NotImplementedError("unknown if plugin: %r" % plugin_name) + + def fix_if_64_highspeed(info): for line in info: # TODO: Use six.string_types when this is a module. diff --git a/checks/if64 b/checks/if64 index 3a849fd..a67e2f6 100644 --- a/checks/if64 +++ b/checks/if64 @@ -41,7 +41,7 @@ check_info["if64"] = { 'has_perfdata': True, 'includes': ['if.include'], 'snmp_info': (".1.3.6.1.2.1", if64_snmp_end_oids), - 'snmp_scan_function': if64_scan_function, + 'snmp_scan_function': get_snmp_if_scan_function('if64'), 'group': 'if', 'node_info': True, 'default_levels_variable': 'if_default_levels', diff --git a/checks/if64_tplink b/checks/if64_tplink index d94c149..3fcb348 100644 --- a/checks/if64_tplink +++ b/checks/if64_tplink @@ -67,7 +67,7 @@ check_info["if64_tplink"] = { "4.1.11863.1.1.3.2.1.1.1.1.2", # special for TP Link BINARY("2.1.2.2.1.6"), # ifPhysAddress 19 ]), - 'snmp_scan_function': snmp_scan_function_if64_tplink, + 'snmp_scan_function': get_snmp_if_scan_function('if64_tplink'), 'group': 'if', 'default_levels_variable': 'if_default_levels', } diff --git a/checks/if64adm b/checks/if64adm index da6d8ed..8f18e0a 100644 --- a/checks/if64adm +++ b/checks/if64adm @@ -57,7 +57,7 @@ check_info["if64adm"] = { if64_snmp_end_oids + [ "2.2.1.7", # ifAdminStatus ]), - 'snmp_scan_function': snmp_scan_function_if64adm, + 'snmp_scan_function': get_snmp_if_scan_function('if64adm'), 'group': 'if', 'node_info': True, 'default_levels_variable': 'if_default_levels', diff --git a/checks/if_brocade b/checks/if_brocade index df4e778..0ca3801 100644 --- a/checks/if_brocade +++ b/checks/if_brocade @@ -94,7 +94,7 @@ check_info["if_brocade"] = { (".1.3.6.1.4.1.2356.11.1.3.56.1", [1, 3]) # brocade: SSID 21 ], # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 - 'snmp_scan_function': snmp_scan_function_if_brocade, + 'snmp_scan_function': get_snmp_if_scan_function('if_brocade'), 'group': 'if', 'default_levels_variable': 'if_default_levels', } diff --git a/checks/if_fortigate b/checks/if_fortigate index cb17108..5e2ed98 100644 --- a/checks/if_fortigate +++ b/checks/if_fortigate @@ -63,7 +63,7 @@ check_info["if_fortigate"] = { BINARY("2.2.1.6"), # ifPhysAddress 19 "31.1.1.1.15", # ifHighSpeed -1 (parse_if64 assumes this is the last element) ]), - 'snmp_scan_function': snmp_scan_function_if_fortigate, + 'snmp_scan_function': get_snmp_if_scan_function('if_fortigate'), 'has_perfdata': True, 'includes': ["if.include"], 'group': 'if', diff --git a/checks/if_lancom b/checks/if_lancom index 9116312..d676d0d 100644 --- a/checks/if_lancom +++ b/checks/if_lancom @@ -94,7 +94,7 @@ check_info["if_lancom"] = { (".1.3.6.1.4.1.2356.11.1.3.56.1", [1, 3]) # LANCOM: SSID 21 ], # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 - 'snmp_scan_function': snmp_scan_function_if_lancom, + 'snmp_scan_function': get_snmp_if_scan_function('if_lancom'), 'group': 'if', 'default_levels_variable': 'if_default_levels', }

5 years, 7 months

7065 FIX k8s_stats: fix crashes regarding timestamp parsing

by Tom Baerwinkel

Module: check_mk Branch: master Commit: a58db71ba9826a15af782869af9009e565f8f581 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a58db71ba9826a… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Mar 7 18:26:48 2019 +0100 7065 FIX k8s_stats: fix crashes regarding timestamp parsing The Kubernetes API provides timestamps for the k8s_stats checks in the RFC3339Nano format with different timezones and a varying number of trailing zeros in the seconds field. This lead to a crash of the k8s_stats.network check. To resolve this issues the timestamps are now converted to unix timestamps in the special agent. Change-Id: I2869540e2b6b73b0071379c307b4e2615f6235f4 --- .werks/7065 | 15 ++++++++ checks/k8s_stats | 7 +--- cmk/special_agents/agent_kubernetes.py | 11 +++++- .../unit/checks/generictests/datasets/k8s_stats.py | 2 +- .../special_agents/test_agent_kubernetes_nodes.py | 43 ++++++++++++++++++++++ 5 files changed, 70 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a58db71ba9…

5 years, 7 months

mk_filestats.py: fix typo in doc

by Moritz Kiemer

Module: check_mk Branch: master Commit: 9263e2567b50968643dffe07fb754824d0e46399 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9263e2567b5096… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Mar 8 08:08:14 2019 +0100 mk_filestats.py: fix typo in doc Change-Id: I03fe60203e48bbaa331f5277db9b7defb49d8e6c --- agents/plugins/mk_filestats.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_filestats.py b/agents/plugins/mk_filestats.py index c85a56b..be07131 100755 --- a/agents/plugins/mk_filestats.py +++ b/agents/plugins/mk_filestats.py @@ -96,7 +96,7 @@ described by the following four phases: checks only require this information, we can signifficantly reduce data. You should find an example configuration file at -'../cfg_examples/mk_filestats.cfg' relative to this file. +'../cfg_examples/filestats.cfg' relative to this file. """ import re import os

5 years, 7 months

← Newer
1
...
29
30
31
32
33
34
35
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019