Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6300 FIX win_printers: Added line break to section header;

by Simon Betz

otherwise the output format was broken in case of a Get-WMIObject failure Message-ID: <5b3b1800.8EL8CincHqiNZ3go%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 TW9kdWxlOiBjaGVja19tawpCcmFuY2g6IG1hc3RlcgpDb21taXQ6IDU2ZWY1YmRmMTY2Y2Yz OWQ0YTg5YzFiODZiZTcxYjAyNzQxNDM5ZTAKVVJMOiAgICBodHRwOi8vZ2l0Lm1hdGhpYXMt a2V0dG5lci5kZS9naXQvP3A9Y2hlY2tfbWsuZ2l0O2E9Y29tbWl0O2g9NTZlZjViZGYxNjZj ZjM5ZDRhODljMWI4NmJlNzFiMDI3NDE0MzllMAoKQXV0aG9yOiBTaW1vbiBCZXR6IDxzaUBt YXRoaWFzLWtldHRuZXIuZGU+CkRhdGU6ICAgVHVlIEp1bCAgMyAwODoyMzozMyAyMDE4ICsw MjAwCgo2MzAwIEZJWCB3aW5fcHJpbnRlcnM6IEFkZGVkIGxpbmUgYnJlYWsgdG8gc2VjdGlv biBoZWFkZXI7IG90aGVyd2lzZSB0aGUgb3V0cHV0IGZvcm1hdCB3YXMgYnJva2VuIGluIGNh c2Ugb2YgYSBHZXQtV01JT2JqZWN0IGZhaWx1cmUKCkNoYW5nZS1JZDogSWFhNTcxN2RiMTk2 NTU1ZTQ0MzY1ZDRiM2E2YTViYWZlMjYwMjYyN2QKCi0tLQoKIC53ZXJrcy82MzAwICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB8IDEwICsrKysrKysrKysKIGFnZW50cy93aW5kb3dz L3BsdWdpbnMvd2luX3ByaW50ZXJzLnBzMSB8ICAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDEx IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS8ud2Vya3MvNjMw MCBiLy53ZXJrcy82MzAwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY4 NGE5NzAKLS0tIC9kZXYvbnVsbAorKysgYi8ud2Vya3MvNjMwMApAQCAtMCwwICsxLDEwIEBA CitUaXRsZTogd2luX3ByaW50ZXJzOiBBZGRlZCBsaW5lIGJyZWFrIHRvIHNlY3Rpb24gaGVh ZGVyOyBvdGhlcndpc2UgdGhlIG91dHB1dCBmb3JtYXQgd2FzIGJyb2tlbiBpbiBjYXNlIG9m IGEgR2V0LVdNSU9iamVjdCBmYWlsdXJlCitMZXZlbDogMQorQ29tcG9uZW50OiBjaGVja3MK K0NvbXBhdGlibGU6IGNvbXBhdAorRWRpdGlvbjogY3JlCitWZXJzaW9uOiAxLjYuMGkxCitE YXRlOiAxNTMwNTk4ODExCitDbGFzczogZml4CisKKwpkaWZmIC0tZ2l0IGEvYWdlbnRzL3dp bmRvd3MvcGx1Z2lucy93aW5fcHJpbnRlcnMucHMxIGIvYWdlbnRzL3dpbmRvd3MvcGx1Z2lu cy93aW5fcHJpbnRlcnMucHMxCmluZGV4IDRmODZjMDEuLjQ3ZTZiYjkgMTAwNjQ0Ci0tLSBh L2FnZW50cy93aW5kb3dzL3BsdWdpbnMvd2luX3ByaW50ZXJzLnBzMQorKysgYi9hZ2VudHMv d2luZG93cy9wbHVnaW5zL3dpbl9wcmludGVycy5wczEKQEAgLTE3LDcgKzE3LDcgQEAgJHBz d2luZG93LmJ1ZmZlcnNpemUgPSAkbmV3c2l6ZQogDQogIyMjDQogDQotV3JpdGUtSG9zdCAt Tm9OZXdMaW5lICI8PDx3aW5fcHJpbnRlcnM+Pj4iDQorV3JpdGUtSG9zdCAiPDw8d2luX3By aW50ZXJzPj4+Ig0KICREYXRhX1NldDEgPSBHZXQtV01JT2JqZWN0IFdpbjMyX1BlcmZGb3Jt YXR0ZWREYXRhX1Nwb29sZXJfUHJpbnRRdWV1ZSB8IFNlbGVjdCBOYW1lLCBAe0V4cHJlc3Np b249eyRfLmpvYnN9O0xhYmVsPSJDdXJyZW50Sm9icyJ9DQogJERhdGFfU2V0MiA9IEdldC1X bWlPYmplY3Qgd2luMzJfcHJpbnRlciB8IHNlbGVjdCBuYW1lLCBwcmludGVyc3RhdHVzLCBk ZXRlY3RlZGVycm9yc3RhdGUNCiAkRGF0YV9TZXQyID0gR2V0LVdtaU9iamVjdCB3aW4zMl9w cmludGVyIHwgP3skXy5Qb3J0TmFtZSAtbm90bWF0Y2ggJ15UUyd9IHwgU2VsZWN0IG5hbWUs IHByaW50ZXJzdGF0dXMsIGRldGVjdGVkZXJyb3JzdGF0ZQ0KCg==

6 years, 2 months

Add missing bracket in check_http

by Tom Baerwinkel

Module: check_mk Branch: master Commit: d83f5df82c2cd446acf5fd3d7f2e1c056b84ec5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d83f5df82c2cd4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jul 2 16:54:43 2018 +0200 Add missing bracket in check_http Change-Id: Idfb029c1e9a3a9e98da47699992e5dcce7ae5088 --- checks/check_http | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/check_http b/checks/check_http index d1b1fcf..60fa94f 100644 --- a/checks/check_http +++ b/checks/check_http @@ -153,7 +153,7 @@ def _url_args(address_family, address, settings): args += ['-R'] else: args += ['-r'] - args += [settings['expect_regex'][0]) + args += [settings['expect_regex'][0]] if settings['expect_regex'][2]: args += ['--invert-regex']

6 years, 2 months

check_http: separate the argument parsing for urls and certificates

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 269442c7eba2c57b710422d0e8830c8a94c095d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=269442c7eba2c5… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jun 28 16:50:43 2018 +0200 check_http: separate the argument parsing for urls and certificates Change-Id: I6441ac34ce312a19d45aafa2c71c93319ddd7dd6 --- checks/check_http | 139 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 47 deletions(-) diff --git a/checks/check_http b/checks/check_http index 85d3232..d1b1fcf 100644 --- a/checks/check_http +++ b/checks/check_http @@ -24,52 +24,42 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def check_http_arguments(params): - description, settings = params - args = [] - if "verbose" in settings: - args += [ "-v" ] +def _is_certificate_check(settings): + return "cert_days" in settings - if "vhost" in settings: - args += [ "-H", settings["vhost"] ] - - if "virthost" in settings: - vhost, omit_ip = settings["virthost"] - args += [ "-H", vhost ] - else: - omit_ip = False - - if "uri" in settings: - args += [ '-u', settings["uri"] ] - - if "port" in settings: - args += [ '-p', settings["port"] ] +def _get_family_and_address(settings): # Use the address family of the monitored host by default - address_family = settings.get("address_family") - if address_family == None: - address_family = is_ipv6_primary(host_name()) and "ipv6" or "ipv4" + family = settings.get("address_family") + if family == None: + family = is_ipv6_primary(host_name()) and "ipv6" or "ipv4" - if address_family == "ipv6": - args.append("-6") + if family == "ipv6": address = "$_HOSTADDRESS_6$" else: address = "$_HOSTADDRESS_4$" - ssl = settings.get("ssl") - if ssl in [ True, "auto" ]: - args.append('--ssl') - elif ssl: - args.append('--ssl=%s' % ssl) + return family, address + + +def _certificate_args(address_family, address, settings): + args = [] if "cert_host" in settings: - omit_ip = True if settings.get("sni"): args += [ '-H', settings['cert_host'] ] else: - args += [ '-H', address ] args += [ '-I', settings['cert_host'] ] + args += [ '-H', address ] + else: + args += [ "-I", address ] + + if address_family == 'ipv6': + args += ['-6'] + + if "port" in settings: + args += [ '-p', settings["port"] ] if "cert_days" in settings: # legacy behavior @@ -79,8 +69,49 @@ def check_http_arguments(params): warn, crit = settings["cert_days"] args += [ '-C', '%d,%d' % (warn, crit) ] - if settings.get("sni"): - args.append('--sni') + if "sni" in settings: + args += ['--sni'] + + return args + + +def _url_args(address_family, address, settings): + def _omit_ip(settings): + if "virthost" in settings: + return settings["virthost"][1] + return False + + args = [] + + if (not _omit_ip(settings)) and ("proxy" not in settings): + args += [ "-I", address ] + elif "proxy" in settings: + args += [ "-I", settings["proxy"] ] + + if "vhost" in settings: + args += [ "-H", settings["vhost"] ] + + if "virthost" in settings: + vhost = settings["virthost"][0] + args += [ "-H", vhost ] + + if address_family == 'ipv6': + args += ['-6'] + + if "port" in settings: + args += [ '-p', settings["port"] ] + + if "uri" in settings: + args += [ '-u', settings["uri"] ] + + ssl = settings.get("ssl") + if ssl in [ True, "auto" ]: + args += ['--ssl'] + elif ssl: + args += ['--ssl=%s' % ssl] + + if "sni" in settings: + args += ['--sni'] if "response_time" in settings: args += [ '-w', '%f' % (settings["response_time"][0]/1000.0), @@ -117,17 +148,17 @@ def check_http_arguments(params): if "expect_regex" in settings: if len(settings['expect_regex']) >= 4 and settings['expect_regex'][3]: - args += [ '-l' ] + args += ['-l'] if settings['expect_regex'][1]: - args += [ '-R' ] + args += ['-R'] else: - args += [ '-r' ] - args += [ settings['expect_regex'][0] ] + args += ['-r'] + args += [settings['expect_regex'][0]) if settings['expect_regex'][2]: - args += [ '--invert-regex' ] + args += ['--invert-regex'] if settings.get("extended_perfdata"): - args += [ '--extended-perfdata' ] + args += ['--extended-perfdata'] if "post_data" in settings: data, content_type = settings["post_data"] @@ -137,7 +168,7 @@ def check_http_arguments(params): args += [ '-j', settings["method"] ] if settings.get("no_body"): - args += [ '--no-body' ] + args += ['--no-body'] if "page_size" in settings: args += [ '-m', '%d:%d' % settings["page_size"] ] @@ -145,18 +176,32 @@ def check_http_arguments(params): if "max_age" in settings: args += [ '-M', settings["max_age"] ] + # FIXME: This option is deprecated. According to the monitoring-plugins + # the "urlize" plugin should be used. if settings.get("urlize"): - args += [ '-L' ] + args += ['-L'] - if (not omit_ip) and ("proxy" not in settings): - args = [ "-I", address ] + args - elif "proxy" in settings: - args = [ "-I", settings["proxy"] ] + args + if "verbose" in settings: + args += ["-v"] + + return args + + +def check_http_arguments(params): + description, settings = params + args = [] + + address_family, address = _get_family_and_address(settings) + + if _is_certificate_check(settings): + args += _certificate_args(address_family, address, settings) + else: + args += _url_args(address_family, address, settings) return args -def check_http_desc(params): +def check_http_description(params): description, settings = params if description.startswith("^"): @@ -174,7 +219,7 @@ def check_http_desc(params): active_check_info['http'] = { "command_line" : '$USER1$/check_http $ARG1$', "argument_function" : check_http_arguments, - "service_description" : check_http_desc, + "service_description" : check_http_description, "has_perfdata" : True, }

6 years, 2 months

Trial balloon: Disable spell checking to see if it speeds up pylint significantly.

by Sven Panne

Module: check_mk Branch: master Commit: 7656b3cdf868a7d788d9351baa8fd3bede5f76c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7656b3cdf868a7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 2 16:16:45 2018 +0200 Trial balloon: Disable spell checking to see if it speeds up pylint significantly. Change-Id: I8b0396aaeda256e8e580a1c46b03fd6fb8b565fb --- tests/pylint/pylintrc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 495eed1..78976b0 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -95,8 +95,9 @@ disable= wildcard-import, wrong-import-order, wrong-import-position, - wrong-spelling-in-comment, - wrong-spelling-in-docstring, +# Trial balloon: Disable spell checking to see if it speeds up pylint significantly. +# wrong-spelling-in-comment, +# wrong-spelling-in-docstring, [TYPECHECK] # rrdtool @@ -129,10 +130,10 @@ additional-builtins=html,_,_u,current_language,HTML # List of note tags to take in consideration, separated by a comma. notes=FIXME,TODO -[SPELLING] -spelling-dict=en_US +#[SPELLING] +#spelling-dict=en_US # List of comma separated words that should not be checked. -spelling-ignore-words= +#spelling-ignore-words= # A path to a file that contains private dictionary; one word per line. #spelling-private-dict-file= # Tells whether to store unknown words to indicated private dictionary in

6 years, 2 months

6014 FIX Fixed handling of expected regular messages

by Sven Panne

Module: check_mk Branch: master Commit: a2eb5c1ec298cbeee0e53789fb4482240eb60e14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2eb5c1ec298cb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 2 15:35:51 2018 +0200 6014 FIX Fixed handling of expected regular messages If expected regular messages did not arrive at the event console and the resulting new event was not merged with a previous one, the EC could go into an endless loop, logging Python exceptions all the time. This has been fixed. Change-Id: I2a307671f6476ef7e099d4cd3a8b90450a7e597a --- .werks/6014 | 13 +++++++++++++ cmk/ec/main.py | 2 ++ 2 files changed, 15 insertions(+) diff --git a/.werks/6014 b/.werks/6014 new file mode 100644 index 0000000..7a56f46 --- /dev/null +++ b/.werks/6014 @@ -0,0 +1,13 @@ +Title: Fixed handling of expected regular messages +Level: 2 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530538326 +Class: fix + +If expected regular messages did not arrive at the event console and the +resulting new event was not merged with a previous one, the EC could go into +an endless loop, logging Python exceptions all the time. This has been +fixed. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index fcf02ea..583f63c 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1293,6 +1293,8 @@ class EventServer(ECServerThread): "facility": 1, # user "match_groups": (), "match_groups_syslog_application": (), + "core_host": "", + "host_in_downtime": False, } self._add_rule_contact_groups_to_event(rule, event) self.rewrite_event(rule, event, {})

6 years, 2 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 552a0dbdb766fbd39d591e3508b875f45c720c62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=552a0dbdb766fb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 2 14:45:39 2018 +0200 Reserved 20 Werk IDS Change-Id: Ic8bc779f3f62957cfcc6ec4ebac294c0f7b99a03 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b0eb089..1862ace 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6299 +6319

6 years, 2 months

Revert "6224 FIX Prevent multiple mkeventd' s from being started in some situations"

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5d4651827f780f89e022f34a59d76f05b1788ff3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d4651827f780f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 2 14:19:27 2018 +0200 Revert "6224 FIX Prevent multiple mkeventd's from being started in some situations" This reverts commit c4fb0ca6804178c7064e11163d5cc564f1668788. There is more to this issue, and the init script is likely innocent --- .werks/6224 | 16 ---------------- omd/packages/check_mk/skel/etc/init.d/mkeventd | 3 +++ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.werks/6224 b/.werks/6224 deleted file mode 100644 index 927f217..0000000 --- a/.werks/6224 +++ /dev/null @@ -1,16 +0,0 @@ -Title: Prevent multiple mkeventd's from being started in some situations -Level: 1 -Component: ec -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.6.0i1 -Date: 1530107013 - -In rare circumstances, a non-responsive mkeventd process would stick -around after an OMD restart, and the new one would not be aware of -the other one's existance due to duplicated cleanup of the PID file -in the Event Console's init script and the process itself respectively. - -We remove the cleanup in the init script, as it is more coarse. diff --git a/omd/packages/check_mk/skel/etc/init.d/mkeventd b/omd/packages/check_mk/skel/etc/init.d/mkeventd index 6395e27..e84279c 100755 --- a/omd/packages/check_mk/skel/etc/init.d/mkeventd +++ b/omd/packages/check_mk/skel/etc/init.d/mkeventd @@ -74,6 +74,9 @@ case "$1" in exit 1 fi done + else + # Remove the stale pidfile to have a clean state after this + rm $PIDFILE fi echo 'OK' fi

6 years, 2 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: bc10d03ca554adab6b7c44fbf7aeba8300aa3579 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc10d03ca554ad… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 2 13:40:55 2018 +0200 Minor cleanup Change-Id: Ib531411bd24e8d22e361f852c609d56935cc0414 --- agents/plugins/mk_oracle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 19f2f17..5ce0737 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -345,7 +345,7 @@ logging () { echo "$header" >> "$log_file" else for arg in "${args[@]:1}"; do - echo "${header} $(echo "$arg" | tr '\n' ' ' | sed 's/\s*$//')" >> "$log_file" + echo "${header} $arg" >> "$log_file" done fi

6 years, 2 months

Change-Id: I4354b08b8b82f1716c7a2c4c236d69449011afe2

by Moritz Kiemer

Module: check_mk Branch: master Commit: d0b615525cf6f2c6a9773cd6f6cdace2424b4eac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0b615525cf6f2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jul 2 12:46:49 2018 +0200 Change-Id: I4354b08b8b82f1716c7a2c4c236d69449011afe2 checktestlib: Include corner case of discovering nothing. --- tests/unit/checks/checktestlib.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 4ce9598..94f4feb 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -220,6 +220,9 @@ class DiscoveryResult(object): # TODO: Add some more consistency checks here. def __init__(self, result): self.entries = [] + if result is None: + # discovering nothing is valid! + return for entry in result: self.entries.append(DiscoveryEntry(entry)) self.entries.sort(key=repr)

6 years, 2 months

6148 FIX solaris_fmadm: Some 'fmadm' versions provide a different output format. This may lead to empty service details if the agent reports any problems

by Simon Betz

Module: check_mk Branch: master Commit: 9aa7a2f6e53a7c2e363f4938814c1d8073dc7181 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9aa7a2f6e53a7c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 2 12:18:21 2018 +0200 6148 FIX solaris_fmadm: Some 'fmadm' versions provide a different output format. This may lead to empty service details if the agent reports any problems Change-Id: I7cf457f3de8d2fb8139f37a73287d9677259fc8c --- .werks/6148 | 11 +++++ checks/solaris_fmadm | 114 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 114 insertions(+), 11 deletions(-) diff --git a/.werks/6148 b/.werks/6148 new file mode 100644 index 0000000..5921f26 --- /dev/null +++ b/.werks/6148 @@ -0,0 +1,11 @@ +Title: solaris_fmadm: Some 'fmadm' versions provide a different output format. This may lead to empty service details if the agent reports any problems +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530526135 + + diff --git a/checks/solaris_fmadm b/checks/solaris_fmadm index 8db116f..343e631 100644 --- a/checks/solaris_fmadm +++ b/checks/solaris_fmadm @@ -30,6 +30,7 @@ # From https://docs.oracle.com/cd/E23824_01/html/821-1451/glisy.html # One fault: +# <<<solaris_fmadm:sep(58)>>> # --------------- ------------------------------------ -------------- --------- # TIME EVENT-ID MSG-ID SEVERITY # --------------- ------------------------------------ -------------- --------- @@ -62,6 +63,7 @@ # procedures and policies regarding this diagnosis. # Multiple faults: +# <<<solaris_fmadm:sep(58)>>> # --------------- ------------------------------------ -------------- ------- # TIME EVENT-ID MSG-ID SEVERITY # --------------- ------------------------------------ -------------- ------- @@ -95,14 +97,103 @@ # http://sun.com/msg/PCIEX-8000-5Y for the latest service # procedures and policies regarding this diagnosis. +# Newer outputs: +# <<<solaris_fmadm:sep(58)>>> +# --------------- ------------------------------------ -------------- --------- +# TIME EVENT-ID MSG-ID SEVERITY +# --------------- ------------------------------------ -------------- --------- +# Jun 05 22:11:06 66b65c7f-33c4-4625-94dc-b35e1926ab47 PCIEX-8000-YJ Major +# +# Problem Status : isolated +# Diag Engine : eft / 1.16 +# System +# Manufacturer : unknown +# Name : SPARC-Enterprise-M4000-Server +# Part_Number : unknown +# Serial_Number : BCF1030049 +# Host_ID : 856ec4fa +# +# ---------------------------------------- +# Suspect 1 of 3 : +# Problem class : fault.io.pciex.device-pcie-ce +# Certainty : 40% +# Affects : dev:////pci@0,600000/pci@0/pci@9/SUNW,emlxs@0 +# Status : faulted and taken out of service +# +# FRU +# Status : faulty +# Location : "/SYS/iou#0-pci#1" +# Manufacturer : unknown +# Name : unknown +# Part_Number : unknown +# Revision : unknown +# Serial_Number : unknown +# Chassis +# Manufacturer : unknown +# Name : SPARC-Enterprise-M4000-Server +# Part_Number : unknown +# Serial_Number : BCF1030049 +# ---------------------------------------- +# Suspect 2 of 3 : +# Problem class : fault.io.pciex.device-pcie-ce +# Certainty : 40% +# Affects : dev:////pci@0,600000/pci@0/pci@9 +# Status : faulted and taken out of service +# +# FRU +# Status : faulty +# FMRI : "hc:///compon"nt=iou#0" +# Manufacturer : unknown +# Name : unknown +# Part_Number : unknown +# Revision : unknown +# Serial_Number : unknown +# Chassis +# Manufacturer : unknown +# Name : unknown +# Part_Number : unknown +# Serial_Number : unknown +# Resource +# Location : "iou#0-pci#1" +# ... -def inventory_solaris_fmadm(info): - return [ (None, None) ] +def parse_solaris_fmadm(info): + if len(info) < 4: + return {} -def check_solaris_fmadm(_no_item, params, info): - if not info: - return 0, "No faults detected" + event = [] + for entry in ":".join(info[3]).split(): + if entry: + event.append(entry) + + parsed = { + "event" : { + "time" : " ".join(event[:-3]), + "id" : event[-3], + "msg" : event[-2], + "severity": event[-1].lower(), + }, + "problems": [], + } + + # Skip header + for line in info[4:]: + stripped = map(lambda x: x.strip(), line) + if stripped[0] in ["Problem class", "Fault class"]: + parsed["problems"].append(":".join(stripped[1:])) + + return parsed + + +def inventory_solaris_fmadm(parsed): + return [(None, None)] + + +def check_solaris_fmadm(_no_item, params, parsed): + if not parsed: + yield 0, "No faults detected" + return map_state = { "minor" : (1, "minor"), @@ -110,16 +201,17 @@ def check_solaris_fmadm(_no_item, params, info): "critical" : (2, "critical"), } - infotext = "" - state, state_readable = map_state.get(info[3][-1].split(" ")[-1].lower(), (3, "unknown")) - for line in info[4:]: - if line[0].strip().lower() == "fault class": - infotext += "Status: %s, Name: %s" % (state_readable, line[1].strip()) + event = parsed["event"] + state, state_readable = map_state.get(event["severity"], (3, "unknown")) + yield state, "Severity: %s (%s)" % (state_readable, event["time"]) - return state, infotext + problems = parsed["problems"] + if problems: + yield 0, "Problems: %s" % ", ".join(problems) check_info['solaris_fmadm'] = { + 'parse_function' : parse_solaris_fmadm, 'inventory_function' : inventory_solaris_fmadm, 'check_function' : check_solaris_fmadm, 'service_description' : 'FMD Status',

6 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018