Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

Updated werk 4880; By the way: Thanks to comNET for the latest check plugin patches, burger&beer

by Simon Betz

Module: check_mk Branch: master Commit: 560e4fd669c25aae2f15269be27560a9b0c52640 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=560e4fd669c25a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 29 10:00:14 2017 +0200 Updated werk 4880; By the way: Thanks to comNET for the latest check plugin patches, burger&beer Change-Id: If94137a303d636d2b7496779a72c51af9f66aeec --- .werks/4880 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4880 b/.werks/4880 index 3c7bd25..af69787 100644 --- a/.werks/4880 +++ b/.werks/4880 @@ -1,4 +1,4 @@ -Title: wut_webtherm: Fixed missing device type and enabled performance data for humidity +Title: wut_webtherm, wut_webtherm.humidity: Fixed missing device type and enabled performance data for humidity Level: 1 Component: checks Compatible: compat

6 years, 12 months

4920 FIX Fixed error when user is not permitted to open a folder for reading

by Lars Michelsen

Module: check_mk Branch: master Commit: 1823bb8f13da9542a77c2ab47799154e21e84c99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1823bb8f13da95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 29 09:24:16 2017 +0200 4920 FIX Fixed error when user is not permitted to open a folder for reading Change-Id: I57d7b52e81b1cbc022c555f2bdf14837bcace5e7 --- .werks/4920 | 10 ++++++++++ web/htdocs/wato.py | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/4920 b/.werks/4920 new file mode 100644 index 0000000..37d8baa --- /dev/null +++ b/.werks/4920 @@ -0,0 +1,10 @@ +Title: Fixed error when user is not permitted to open a folder for reading +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498721037 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8694d2a..d9c7d7f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -543,9 +543,8 @@ def mode_folder(phase): folder.show_breadcrump() if not folder.may("read"): - html.message(html.render_img(folder.reason_why_may_not("read"), - class_="authicon", - src="images/icon_autherr.png")) + html.message(html.render_img("images/icon_autherr.png", class_="authicon") + + " " + folder.reason_why_may_not("read")) folder.show_locking_information() show_subfolders_of(folder)

6 years, 12 months

4822 FIX mk_tsm: Made query for storagepools more robust

by Marcel Arentz

Module: check_mk Branch: master Commit: 6a42ac4df3b88c80fde38efce8d721685b10804a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a42ac4df3b88c… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Jun 14 14:26:25 2017 +0200 4822 FIX mk_tsm: Made query for storagepools more robust A migrated Pool vanished in the output and produced in consequence an UNKNOWN. Thanks to Thorsten Hintemann this has been fixed know. Change-Id: I2b47afe5fffe31d5aec9715266d2afd62913fcb1 --- .werks/4822 | 11 +++++++++++ agents/plugins/mk_tsm | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4822 b/.werks/4822 new file mode 100644 index 0000000..9a77ba3 --- /dev/null +++ b/.werks/4822 @@ -0,0 +1,11 @@ +Title: mk_tsm: Made query for storagepools more robust +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1497442952 +Class: fix + +A migrated Pool vanished in the output and produced in consequence an +UNKNOWN. Thanks to Thorsten Hintemann this has been fixed know. diff --git a/agents/plugins/mk_tsm b/agents/plugins/mk_tsm index b4faa16..d09de95 100755 --- a/agents/plugins/mk_tsm +++ b/agents/plugins/mk_tsm @@ -65,7 +65,7 @@ EOF # Occupancy echo '<<<tsm_storagepools:sep(9)>>>' $dsmcmd <<EOF | sed -n "/^FOO/s//$INST/p" -SELECT 'FOO', type, stgpool_name, sum(logical_mb) from occupancy group by type, stgpool_name +SELECT 'FOO' as foo,COALESCE(type,'Unknown') as type,stgpools.stgpool_name, sum(coalesce(logical_mb,0)) as SUM_LOGICAL_MB from occupancy full outer join stgpools on occupancy.stgpool_name=stgpools.stgpool_name group by stgpools.stgpool_name,type EOF }

6 years, 12 months

Added werk 4881

by Simon Betz

Module: check_mk Branch: master Commit: 2d4a5b713270e14715db065b88402d00964ca70c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d4a5b713270e1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 28 16:59:40 2017 +0200 Added werk 4881 Change-Id: Icf056126b36ed9c3ad0178256eda9cfdaa1babdd --- .werks/4881 | 10 ++++++++++ checks/multipath | 33 ++++++++++++++++----------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.werks/4881 b/.werks/4881 new file mode 100644 index 0000000..6d9dff3 --- /dev/null +++ b/.werks/4881 @@ -0,0 +1,10 @@ +Title: multipath: Fixed service details: Number of paths were interpreted as expected paths +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498660809 +Class: fix + + diff --git a/checks/multipath b/checks/multipath index 9e68d0f..14a6403 100644 --- a/checks/multipath +++ b/checks/multipath @@ -142,12 +142,6 @@ inventory_multipath_rules = [] # `-+- policy='round-robin 0' prio=0 status=enabled # `- 20:0:0:1 sdi 8:128 active undef running -# Here another one from Dell -# Dell_Internal_Dual_SD_0123456789AB-0:0 dm-2 Dell ,Internal Dual SD -# size=972M features='0' hwhandler='0' wp=rw -# `-+- policy='service-time 0' prio=0 status=active -# `- 1:0:0:0 sdb 8:16 active undef running - # And a completely new situation: # <<<multipath>>> # Nov 05 17:17:03 | DM multipath kernel driver not loaded @@ -309,9 +303,9 @@ def check_multipath(item, params, parsed): uuid = mmap.get('uuid') if item == uuid and alias: - aliasinfo = "(%s):" % alias + aliasinfo = "(%s): " % alias elif item == alias and uuid: - aliasinfo = "(%s):" % uuid + aliasinfo = "(%s): " % uuid else: aliasinfo = "" @@ -321,39 +315,44 @@ def check_multipath(item, params, parsed): num_broken = len(broken_paths) num_active = num_paths - num_broken - yield 0, "%s paths active: %s, expected paths: %d" % \ - (aliasinfo, num_active, num_paths) + infotext = "%sPaths active: %s/%s" % \ + (aliasinfo, num_active, num_paths) if isinstance(params, tuple): warn, crit = params warn_num = (warn / 100.0) * num_paths crit_num = (crit / 100.0) * num_paths - if num_active <= crit_num: + if num_active < crit_num: state = 2 - elif num_active <= warn_num: + elif num_active < warn_num: state = 1 else: state = 0 if state > 0: - yield state, "(warn, crit at %d/%d)" % (warn_num, crit_num) + infotext += " (warn/crit below %d/%d)" % (warn_num, crit_num) + yield state, infotext + else: if isinstance(params, int): expected_paths = params else: expected_paths = 2 + + infotext += ", Expected paths: %s" % expected_paths if num_active < expected_paths: state = 2 + infotext += " (crit below %d)" % expected_paths elif num_active > expected_paths: state = 1 + infotext += " (crit at %d)" % expected_paths else: state = 0 - - if state > 0: - yield state, "(crit if less than %d)" % expected_paths + yield state, infotext if num_broken > 0: - yield 0, "broken paths: %s" % ",".join(broken_paths) + yield 0, "Broken paths: %s" % ",".join(broken_paths) + check_info["multipath"] = { 'check_function' : check_multipath,

6 years, 12 months

4737 cisco_asa_failover: Now roles of cluster and state of failover is configurable

by Marcel Arentz

Module: check_mk Branch: master Commit: 0ba856768a9a273b54a5f58407ac39c28f6b70c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ba856768a9a27… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon May 22 16:52:51 2017 +0200 4737 cisco_asa_failover: Now roles of cluster and state of failover is configurable The roles of primary and secondary devices can now be configured. Defaults are "active" for primary and "standby" for secondary. Also the state if a failover takes place can be set. Change-Id: If51bdc7a6a272ec6066c706cf3ce51c85e1fd77a --- .werks/4737 | 12 ++++ checkman/cisco_asa_conn | 18 +++++ checkman/cisco_asa_failover | 2 + checks/cisco_asa_conn | 95 +++++++++++++++++++++++++++ checks/cisco_asa_failover | 123 ++++++++++++++++++----------------- web/plugins/wato/check_parameters.py | 39 +++++++++++ 6 files changed, 231 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0ba856768a…

6 years, 12 months

New werk 4880

by Simon Betz

Module: check_mk Branch: master Commit: 6543d656cb8cf23956e675728a3e1afbbfbbfc36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6543d656cb8cf2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 28 16:06:20 2017 +0200 New werk 4880 Change-Id: Iacac06518e36331a66ecf1388a9445a81045f6c3 --- .werks/4880 | 10 ++++++++++ checks/wut_webtherm | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4880 b/.werks/4880 new file mode 100644 index 0000000..3c7bd25 --- /dev/null +++ b/.werks/4880 @@ -0,0 +1,10 @@ +Title: wut_webtherm: Fixed missing device type and enabled performance data for humidity +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498658718 +class: fix + + diff --git a/checks/wut_webtherm b/checks/wut_webtherm index f366d34..5b53eaf 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -100,7 +100,7 @@ check_info["wut_webtherm"] = { 'check_function' : check_wut_webtherm, 'service_description' : 'Temperature %s', 'has_perfdata' : True, - 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2', ['1', '2', '3', '6', '7', '8', '9', '16', '18', '36', '37'], [ + 'snmp_info' : ('.1.3.6.1.4.1.5040.1.2', ['1', '2', '3', '6', '7', '8', '9', '16', '18', '36', '37', '42'], [ '1.2.1.1', # WebGraph-Thermo-Hygro-Barometer-MIB::wtWebGraphThermoBaroSensorNo '1.3.1.1', # WebGraph-Thermo-Hygro-Barometer-MIB::wtWebGraphThermoBaroTempValue '1.8.1.1', # WebGraph-Thermo-Hygro-Barometer-MIB::wtWebGraphThermoBaroTempValuePkt @@ -166,6 +166,7 @@ check_info["wut_webtherm.humidity"] = { "check_function" : check_wut_webtherm_humidity, "service_description" : "Humidity %s", "includes" : [ "humidity.include" ], + 'has_perfdata' : True, "group" : "humidity", }

6 years, 12 months

4879 FIX akcp_sensor_humidity, akcp_exp_humidity: Fixed wrong order of level evaluation

by Simon Betz

Module: check_mk Branch: master Commit: c606da0425db2f0fdf0bd9aa7ddefd31602a18b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c606da0425db2f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 28 16:00:06 2017 +0200 4879 FIX akcp_sensor_humidity, akcp_exp_humidity: Fixed wrong order of level evaluation Change-Id: Ie471b11051f7820eaffe3941bb0a46647c805b6a --- .werks/4879 | 11 +++++++++++ checks/akcp_sensor.include | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4879 b/.werks/4879 new file mode 100644 index 0000000..dac8c97 --- /dev/null +++ b/.werks/4879 @@ -0,0 +1,11 @@ +Title: akcp_sensor_humidity, akcp_exp_humidity: Fixed wrong order of level evaluation +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498658323 + + diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index 427d00f..3be3cc1 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -106,12 +106,12 @@ def check_akcp_humidity(item, params, info): if humidity <= crit_lower: return 2, infotext + belowtext, perfdata + elif humidity >= crit: + return 2, infotext + abovetext, perfdata elif humidity <= warn_lower: return 1, infotext + belowtext, perfdata elif humidity >= warn: return 1, infotext + abovetext, perfdata - elif humidity >= crit: - return 2, infotext + abovetext, perfdata else: return 0, infotext, perfdata

6 years, 12 months

4919 FIX Service discovery: Fixed disabling services with backslashes in description

by Lars Michelsen

Module: check_mk Branch: master Commit: cd03e2b5462705f70915e1331a2d0c4de0ad985c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd03e2b5462705… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 28 15:41:37 2017 +0200 4919 FIX Service discovery: Fixed disabling services with backslashes in description Change-Id: I5f3ed847824200f936c38fd76d7abd9167bcf06b --- .werks/4919 | 11 +++++++++++ web/htdocs/wato.py | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/4919 b/.werks/4919 new file mode 100644 index 0000000..db6fccf --- /dev/null +++ b/.werks/4919 @@ -0,0 +1,11 @@ +Title: Service discovery: Fixed disabling services with backslashes in description +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498657276 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c86a15b..8694d2a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2874,6 +2874,9 @@ class ModeDiscovery(WatoMode): if not services: return + def _compile_patterns(services): + return [ ("%s$" % s.replace("\\", "\\\\")) for s in services ] + rulesets = AllRulesets() rulesets.load() @@ -2882,7 +2885,7 @@ class ModeDiscovery(WatoMode): except KeyError: ruleset = Ruleset("ignored_services") - service_patterns = [ ("%s$" % s) for s in services ] + service_patterns = _compile_patterns(services) self._remove_from_rule_of_host(ruleset, service_patterns, value=not value) # Check whether or not the service still needs a host specific setting after removing @@ -2894,7 +2897,7 @@ class ModeDiscovery(WatoMode): or value == value_without_host_rule: services.remove(service) - service_patterns = [ ("%s$" % s) for s in services ] + service_patterns = _compile_patterns(services) self._update_rule_of_host(ruleset, service_patterns, value=value) rulesets.save_folder(self._host.folder())

6 years, 12 months

Removed currently not needed prlimit

by Lars Michelsen

Module: check_mk Branch: master Commit: 0461f294404e9ea3011431ea6bcac3a996f15197 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0461f294404e9e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 28 14:49:56 2017 +0200 Removed currently not needed prlimit Change-Id: I386480a418042c35f478dc5781d56b709db85b0d --- tests/livestatus/test_liveproxyd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index 347e424..39bfbf5 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -130,8 +130,8 @@ def test_large_number_of_sites(default_cfg, site): _toggle_liveproxyd(site, use_liveproxyd=True) # Increase nofiles limit of CMC to prevent that it runs in "too many open files" resource limits - exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() - assert exit_code == 0 + #exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() + #assert exit_code == 0 site_sockets, num_sites, num_channels = {}, 200, 3 for site_num in range(num_sites):

6 years, 12 months

4938 FIX Make sure that a notification has the plugin output available

by Sven Panne

Module: check_mk Branch: master Commit: 8a2a89c0ccd7e0f11316a6731c94cbfe1b8837d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a2a89c0ccd7e0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 28 13:40:44 2017 +0200 4938 FIX Make sure that a notification has the plugin output available Plugin output in notifications can be either host-related or service-related. Make sure that the resulting notification has always access to the right kind. Previously notifications triggered e.g. by the event console could have an empty plugin output. Note: This was a bug introduced in 1.4.0p6, earlier versions were not affected. Change-Id: I56d7c69bea3a3a653953edee7b10b107ab0c1901 --- .werks/4938 | 16 ++++++++++++++++ modules/events.py | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/4938 b/.werks/4938 new file mode 100644 index 0000000..9c051cb --- /dev/null +++ b/.werks/4938 @@ -0,0 +1,16 @@ +Title: Make sure that a notification has the plugin output available +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498649743 +Class: fix + +Plugin output in notifications can be either host-related or service-related. +Make sure that the resulting notification has always access to the right +kind. Previously notifications triggered e.g. by the event console could +have an empty plugin output. + +Note: This was a bug introduced in 1.4.0p6, earlier versions were not +affected. diff --git a/modules/events.py b/modules/events.py index 3d21fa9..8f16144 100644 --- a/modules/events.py +++ b/modules/events.py @@ -337,7 +337,8 @@ def complete_raw_context(raw_context, with_dump, event_log): raw_context['HOSTFORURL'] = urllib.quote(raw_context['HOSTNAME']) # Add HTML formated plugin output - raw_context["HOSTOUTPUT_HTML"] = format_plugin_output(raw_context["HOSTOUTPUT"]) + if "HOSTOUTPUT" in raw_context: + raw_context["HOSTOUTPUT_HTML"] = format_plugin_output(raw_context["HOSTOUTPUT"]) if raw_context["WHAT"] == "SERVICE": raw_context["SERVICEOUTPUT_HTML"] = format_plugin_output(raw_context["SERVICEOUTPUT"]) raw_context["LONGSERVICEOUTPUT_HTML"] = format_plugin_output(raw_context["LONGSERVICEOUTPUT"])

6 years, 12 months

← Newer
1
2
3
4
5
6
7
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017