Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64557 discussions

Check_MK Git: check_mk: Updated bug entries #0893

by Mathias Kettner

Module: check_mk Branch: master Commit: 0ffc94e071e43cac3c7d75b198e1f819e5ec0473 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ffc94e071e43c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 13:28:22 2013 +0100 Updated bug entries #0893 --- .bugs/893 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/893 b/.bugs/893 index d19bebf..2fe4513 100644 --- a/.bugs/893 +++ b/.bugs/893 @@ -1,9 +1,9 @@ Title: Disable view-reload in after-command-situation Component: multisite -State: open +Class: nastiness +State: done Date: 2013-06-13 12:05:04 Targetversion: 1.2.3 -Class: nastiness If you issue a command on an object you come to a page with a blue message and a link back to the view. @@ -13,3 +13,5 @@ If the reload happens the view data appears, but shouldn't The command button is still disabled. Disable view reload here. + +2013-12-18 13:28:13: changed state open -> done

10 years, 9 months

Check_MK Git: check_mk: FIX Tolerate debug output in check plugins when using CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c27471581e3f6385fc495798301492e533cda20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c27471581e3f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 13:25:38 2013 +0100 FIX Tolerate debug output in check plugins when using CMC When using the Check_MK Micro Core and at the same time check plugins output debug information to stdout, the communication with the core was garbled up and the check helper died with an exception. This fix eliminates any unauthorized output to stdout be removing the filedescriptor to a save place and replacing stdout with <tt>/dev/null</tt>. --- .werks/398 | 14 ++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 19 +++++++++++++------ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/.werks/398 b/.werks/398 new file mode 100644 index 0000000..592fd28 --- /dev/null +++ b/.werks/398 @@ -0,0 +1,14 @@ +Title: Tolerate debug output in check plugins when using CMC +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387369455 +Targetversion: future + +When using the Check_MK Micro Core and at the same time check plugins output +debug information to stdout, the communication with the core was garbled +up and the check helper died with an exception. This fix eliminates any +unauthorized output to stdout be removing the filedescriptor to a save place +and replacing stdout with <tt>/dev/null</tt>. diff --git a/ChangeLog b/ChangeLog index c5feb0d..73bfcd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... * 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory * 0354 FIX: Catch exception when check plugins do not return a state... + * 0398 FIX: Tolerate debug output in check plugins when using CMC... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/modules/check_mk.py b/modules/check_mk.py index 0db56b6..1b723b5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5111,6 +5111,17 @@ def do_check_keepalive(): signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc + # Prevent against plugins that output debug information (but shouldn't). + # Their stdout will interfer with communication with the Micro Core. + # We do this with a trick: + # 1. move the filedescriptor 1 to a parking position + # 2. re-open 0 on /dev/null + # 3. Send our answers to the Micro Core with the parked FD. + cmc_result_fd = os.dup(1) + devnull = os.open("/tmp/dev_null", os.O_WRONLY | os.O_CREAT) + os.dup2(devnull, 1) + os.close(devnull) + global total_check_output total_check_output = "" if opt_debug: @@ -5126,9 +5137,6 @@ def do_check_keepalive(): break hostname = hostname.strip() if hostname == "*": - if opt_debug: - sys.stdout.write("Restarting myself...\n") - sys.stdout.flush() os.execvp("cmk", sys.argv) elif not hostname: break @@ -5160,9 +5168,8 @@ def do_check_keepalive(): status = 3 total_check_output = "UNKNOWN - Check_MK timed out after %d seconds\n" % timeout - sys.stdout.write("%03d\n%08d\n%s" % + os.write(cmc_result_fd, "%03d\n%08d\n%s" % (status, len(total_check_output), total_check_output)) - sys.stdout.flush() total_check_output = "" cleanup_globals() @@ -5181,7 +5188,7 @@ def do_check_keepalive(): if opt_debug: raise total_check_output = "UNKNOWN - %s\n" % e - sys.stdout.write("%03d\n%08d\n%s" % + os.write(cmc_result_fd, "%03d\n%08d\n%s" % (3, len(total_check_output), total_check_output))

10 years, 9 months

Check_MK Git: check_mk: FIX mrpe: tolerate performance variable names with spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: c59707c214bf3f2c534a7231995762cc4a15ca23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c59707c214bf3f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 12:59:05 2013 +0100 FIX mrpe: tolerate performance variable names with spaces Some bizarre legacy check plugins use spaces in the names of their performance variables. Nagios allows this under certain circumstances. The <tt>mrpe</tt> check would fail with an exception, though. The fix now tolerates spaces, but uses just the last component of the variable name in that case. All RRD graphs will be created correctly, though with an incomplete name. In most cases that should be OK. --- .werks/397 | 16 ++++++++++++++++ ChangeLog | 1 + checks/mrpe | 9 +++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.werks/397 b/.werks/397 new file mode 100644 index 0000000..849b04c --- /dev/null +++ b/.werks/397 @@ -0,0 +1,16 @@ +Title: mrpe: tolerate performance variable names with spaces +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387367800 +Targetversion: future + +Some bizarre legacy check plugins use spaces in the names of their performance +variables. Nagios allows this under certain circumstances. The <tt>mrpe</tt> +check would fail with an exception, though. + +The fix now tolerates spaces, but uses just the last component of the variable +name in that case. All RRD graphs will be created correctly, though with an +incomplete name. In most cases that should be OK. diff --git a/ChangeLog b/ChangeLog index 894ed98..c5feb0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 0350 FIX: nfsmounts: correctly handle mount points with spaces... * 0387 FIX: df*: Negative filesystem space levels get a more clear text in check output... * 0351 FIX: local: Catch invalid state codes and map to 3 (UNKNOWN)... + * 0397 FIX: mrpe: tolerate performance variable names with spaces... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/mrpe b/checks/mrpe index 986e73b..23be768 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -44,7 +44,6 @@ def mrpe_parse_perfdata(perfinfo): def check_mrpe(item, params, info): - # This check is cluster-aware. An item might be found # more than once. In that case we use the best of the # multiple statuses. @@ -91,7 +90,13 @@ def check_mrpe(item, params, info): if best_state in [ None, 2 ] \ or (state < best_state and state != 2): infotext = "\\n".join(output) - perf_parsed = map(mrpe_parse_perfdata, perfdata) + perf_parsed = [] + for perfvalue in perfdata: + try: + perf_parsed.append(mrpe_parse_perfdata(perfvalue)) + except: + pass + # name of check command needed for PNP to choose the correct template if check_name: perf_parsed.append(check_name)

10 years, 9 months

Check_MK Git: check_mk: cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well

by Mathias Kettner

Module: check_mk Branch: master Commit: e304bdc6d5247363a9e6546dfdb68ce5da77dab4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e304bdc6d52473… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 12:20:49 2013 +0100 cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well Some of the devices are named <tt>Rittal CMC-III-PU</tt> instead of <tt>Rittal CMC III PU</tt>. Those are now also detected by the SNM scan. --- .werks/396 | 11 +++++++++++ ChangeLog | 1 + checks/cmciii_access | 2 +- checks/cmciii_io | 2 +- checks/cmciii_psm_current | 2 +- checks/cmciii_psm_plugs | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/396 b/.werks/396 new file mode 100644 index 0000000..79c4f4a --- /dev/null +++ b/.werks/396 @@ -0,0 +1,11 @@ +Title: cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387365574 +Targetversion: future + +Some of the devices are named <tt>Rittal CMC-III-PU</tt> instead of <tt>Rittal +CMC III PU</tt>. Those are now also detected by the SNM scan. diff --git a/ChangeLog b/ChangeLog index 833dab6..894ed98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 0377 check_http: Certificate Age mode now supports SNI... * 0317 emc_isilon: New checks for EMC Isilon Storage System * 0395 cmctc.temp: also detect older CMC devices + * 0396 cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checks/cmciii_access b/checks/cmciii_access index cd855d4..90ac668 100644 --- a/checks/cmciii_access +++ b/checks/cmciii_access @@ -56,7 +56,7 @@ check_info['cmciii_access'] = { "inventory_function" : inventory_cmciii_access, "has_perfdata" : False, "service_description" : "%s", - "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0").replace("-", " "), "snmp_info" : [ [".1.3.6.1.4.1.2606.7.4.2.2.1", [ "10", OID_END ] ], [".1.3.6.1.4.1.2606.7.4.1.2.1", ( "2", "3" ) ] diff --git a/checks/cmciii_io b/checks/cmciii_io index 8b5bb5c..3c42296 100644 --- a/checks/cmciii_io +++ b/checks/cmciii_io @@ -76,7 +76,7 @@ check_info['cmciii_io'] = { "inventory_function" : inventory_cmciii_io, "has_perfdata" : False, "service_description" : "IO Unit %s", - "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0").replace("-", " "), "snmp_info" : ( ".1.3.6.1.4.1.2606.7.4.2.2.1.10", [OID_END]+range(1,9) # read complete subtree :( ) diff --git a/checks/cmciii_psm_current b/checks/cmciii_psm_current index b2c8bff..57eedbb 100644 --- a/checks/cmciii_psm_current +++ b/checks/cmciii_psm_current @@ -65,7 +65,7 @@ check_info['cmciii_psm_current'] = { "inventory_function" : inventory_cmciii_psm_current, "has_perfdata" : True, "service_description" : "PSM %s", - "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0").replace("-", " "), "snmp_info" : ( ".1.3.6.1.4.1.2606.7.4.2.2.1.10", [OID_END]+range(1,9) # read complete subtree :( ) diff --git a/checks/cmciii_psm_plugs b/checks/cmciii_psm_plugs index 7f5131c..544790e 100644 --- a/checks/cmciii_psm_plugs +++ b/checks/cmciii_psm_plugs @@ -61,7 +61,7 @@ check_info['cmciii_psm_plugs'] = { "inventory_function" : inventory_cmciii_psm_plugs, "has_perfdata" : False, "service_description" : "PSM Plug %s", - "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0").replace("-", " "), "snmp_info" : ( ".1.3.6.1.4.1.2606.7.4.2.2.1.10", [OID_END]+range(1,6) # read complete subtree :( )

10 years, 9 months

Check_MK Git: check_mk: cmctc.temp: also detect older CMC devices

by Mathias Kettner

Module: check_mk Branch: master Commit: 7655bb6ff071a1123b57c3033270d9d2ed132800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7655bb6ff071a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 12:12:37 2013 +0100 cmctc.temp: also detect older CMC devices --- .werks/395 | 10 ++++++++++ ChangeLog | 1 + checks/cmctc | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/395 b/.werks/395 new file mode 100644 index 0000000..326b813 --- /dev/null +++ b/.werks/395 @@ -0,0 +1,10 @@ +Title: cmctc.temp: also detect older CMC devices +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387365130 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index 1a7a1cb..833dab6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 0373 wut_webtherm: Supporting several other devices now * 0377 check_http: Certificate Age mode now supports SNI... * 0317 emc_isilon: New checks for EMC Isilon Storage System + * 0395 cmctc.temp: also detect older CMC devices * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checks/cmctc b/checks/cmctc index e262d80..124d297 100644 --- a/checks/cmctc +++ b/checks/cmctc @@ -82,7 +82,8 @@ check_info['cmctc.temp'] = { "has_perfdata" : True, "service_description" : "Temperature %s", "group" : "room_temperature", - "snmp_scan_function" : lambda oid: "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") or \ + "Rittal CMC" in oid(".1.3.6.1.2.1.1.1.0"), "snmp_info" : ( # Base to all IO units ".1.3.6.1.4.1.2606.4.2",

10 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: b4b20ea7814cd779217509e9673bf818be51c3a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4b20ea7814cd7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 12:11:40 2013 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e537bfe..21c8d99 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -395 +415

10 years, 9 months

Check_MK Git: check_mk: FIX Catch exception when check plugins do not return a state

by Mathias Kettner

Module: check_mk Branch: master Commit: 13ae029a307379eca6d70408b3b1e027b3be8198 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13ae029a307379… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 11:51:54 2013 +0100 FIX Catch exception when check plugins do not return a state When a broken check plugin does not return a proper state then Check_MK broke with an exception. This is now better handled. The check now goes into <i>UNKNOWN</i> state with the message <tt>Check plugin did not return any result</tt>. --- .werks/354 | 13 +++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 3 +++ 3 files changed, 17 insertions(+) diff --git a/.werks/354 b/.werks/354 new file mode 100644 index 0000000..84ee214 --- /dev/null +++ b/.werks/354 @@ -0,0 +1,13 @@ +Title: Catch exception when check plugins do not return a state +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387363842 +Targetversion: future + +When a broken check plugin does not return a proper state then +Check_MK broke with an exception. This is now better handled. +The check now goes into <i>UNKNOWN</i> state with the message +<tt>Check plugin did not return any result</tt>. diff --git a/ChangeLog b/ChangeLog index adecfc7..1a7a1cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 0087 FIX: Fixed possible locking issue when using datasource program with long output... * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... * 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory + * 0354 FIX: Catch exception when check plugins do not return a state... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 11028ab..bab5a00 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1215,6 +1215,9 @@ def convert_perf_data(p): def submit_check_result(host, servicedesc, result, sa): + if not result: + result = 3, "Check plugin did not return any result" + if len(result) >= 3: state, infotext, perfdata = result[:3] else:

10 years, 9 months

Check_MK Git: check_mk: fix of werk 89: CSV export of event console now really works

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 069248182ecc37c4d53718503afe049760bb2548 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=069248182ecc37… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Dec 18 11:20:29 2013 +0100 fix of werk 89: CSV export of event console now really works --- web/plugins/views/webservice.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index f25e424..cbc9a1d 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -134,6 +134,7 @@ def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxe else: html.write(csv_separator) content = p[0]["name"] + content = type(content) in [ int, float ] and str(content) or content stripped = html.strip_tags(content).replace('\n', '').replace('"', '""') html.write('"%s"' % stripped.encode("utf-8")) @@ -146,6 +147,7 @@ def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxe else: html.write(csv_separator) tdclass, content = paint_painter(p[0], row) + content = type(content) in [ int, float ] and str(content) or content stripped = html.strip_tags(content).replace('\n', '').replace('"', '""') html.write('"%s"' % stripped.encode("utf-8"))

10 years, 9 months

Check_MK Git: check_mk: Fix small layout problem at bottom of sidebar

by Mathias Kettner

Module: check_mk Branch: master Commit: 56c327bba38f6f44653e14ea3cfc52624f19ac3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56c327bba38f6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 11:07:33 2013 +0100 Fix small layout problem at bottom of sidebar --- web/htdocs/sidebar.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 7a98cdb..0329e3f 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -152,6 +152,10 @@ div.snapin { overflow: hidden; } +div.snapin:last-child { + margin-bottom: 10px; +} + /* Header of the snapin */ div.snapin div.head { width: 260px;

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #1026

by Mathias Kettner

Module: check_mk Branch: master Commit: 0a1fdda62621b5f5b317d24cb58f43d683e9ac45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a1fdda62621b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 18 10:54:16 2013 +0100 Updated bug entries #1026 --- .bugs/1026 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/1026 b/.bugs/1026 index 4e63e8a..91ade01 100644 --- a/.bugs/1026 +++ b/.bugs/1026 @@ -3,7 +3,7 @@ Component: checks State: open Date: 2013-11-22 13:15:25 Targetversion: 1.2.3i6 -Class: nastiness +Class: feature The check is currently only using absolute levels, which is OK for the first moment, but in fact it is not really a problem when having several hundret mails in the queue, as long

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits