Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: ed534c6a20309cc04d88793afc9022a8aa3a608c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed534c6a20309c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 11 15:14:07 2018 +0200 added #WK6664 Change-Id: Iff615318e2664d05b7fb4daecc82924fd7ad0086 --- .werks/6664 | 11 +++++++++++ cmk/gui/wato/__init__.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6664 b/.werks/6664 new file mode 100644 index 0000000..1270495 --- /dev/null +++ b/.werks/6664 @@ -0,0 +1,11 @@ +Title: WATO notification rules configuration: expansion of condition elements did not work for user rules +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539155306 + + diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 92701fd..09f171e 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -7181,7 +7181,7 @@ class NotificationsMode(EventsMode): num_conditions = len([key for key in rule if key.startswith("match_")]) if num_conditions: title = _("%d conditions") % num_conditions - html.begin_foldable_container(treename="rule_%d" % nr, + html.begin_foldable_container(treename="rule_%s_%d" % (userid, nr), id_="%s" % nr, isopen=False, title=title,

5 years, 8 months

store unlock: Use same logic for release_all_locks() and release_lock()

by Lars Michelsen

Module: check_mk Branch: master Commit: 5dea7b935516a97d8e385dff69edfafed458b92e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dea7b935516a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 7 11:50:32 2018 +0200 store unlock: Use same logic for release_all_locks() and release_lock() The previous implementation of release_lock() could fail in case the file handle was closed before calling release_lock() because release_lock() did not ignore already closed files. Change-Id: Ib6de4e1e4e57d2437051ca60d9bd4486a0033034 --- cmk/store.py | 25 ++++++++++++++----------- tests/unit/cmk/test_store.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/cmk/store.py b/cmk/store.py index 3bcdf86..fbc3fad 100644 --- a/cmk/store.py +++ b/cmk/store.py @@ -315,10 +315,19 @@ def release_lock(path): return # no unlocking needed for lock_path, fd in g_aquired_locks: - if lock_path == path: - fcntl.flock(fd, fcntl.LOCK_UN) + if lock_path != path: + continue + + try: os.close(fd) - g_aquired_locks.remove((lock_path, fd)) + except OSError as e: + if e.errno == 9: # OSError: [Errno 9] Bad file descriptor + pass + else: + raise + + g_aquired_locks.remove((lock_path, fd)) + break g_locked_paths.remove(path) @@ -330,14 +339,8 @@ def have_lock(path): def release_all_locks(): global g_aquired_locks, g_locked_paths - for _unused_path, fd in g_aquired_locks: - try: - os.close(fd) - except OSError, e: - if e.errno == 9: # OSError: [Errno 9] Bad file descriptor - pass - else: - raise + for path, _unused_fd in g_aquired_locks: + release_lock(path) g_aquired_locks = [] g_locked_paths = [] diff --git a/tests/unit/cmk/test_store.py b/tests/unit/cmk/test_store.py index e577e29..cd67da8 100644 --- a/tests/unit/cmk/test_store.py +++ b/tests/unit/cmk/test_store.py @@ -150,6 +150,22 @@ def test_release_lock(tmpdir): assert store.have_lock(path) == False +def test_release_lock_already_closed(tmpdir): + locked_file = tmpdir.join("locked_file") + locked_file.write("") + + path = "%s" % locked_file + + assert store.have_lock(path) == False + store.aquire_lock(path) + assert store.have_lock(path) == True + + os.close([ fd for p, fd in store.g_aquired_locks if p == path ][0]) + + store.release_lock(path) + assert store.have_lock(path) == False + + def test_release_all_locks(tmpdir): locked_file1 = tmpdir.join("locked_file1") locked_file1.write("") @@ -172,6 +188,21 @@ def test_release_all_locks(tmpdir): assert store.have_lock(path2) == False +def test_release_all_locks_already_closed(tmpdir): + locked_file = tmpdir.join("locked_file") + locked_file.write("") + + path = "%s" % locked_file + + assert store.have_lock(path) == False + store.aquire_lock(path) + assert store.have_lock(path) == True + + os.close([ fd for p, fd in store.g_aquired_locks if p == path ][0]) + + store.release_all_locks() + assert store.have_lock(path) == False + class LockTestThread(threading.Thread): def __init__(self, store, path):

5 years, 8 months

6668 FIX WATO API: fixed broken configuration when setting cluster nodes in edit_host/ add_host API call

by Andreas Boesl

Module: check_mk Branch: master Commit: cb975c8808bbaa51608064451806d5eeed3a886a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb975c8808bbaa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 11 14:48:09 2018 +0200 6668 FIX WATO API: fixed broken configuration when setting cluster nodes in edit_host/add_host API call Change-Id: I792f6369d6eb15b61bb1646fd3cddd5b3b33bb1e --- .werks/6668 | 11 +++++++++++ cmk/gui/plugins/webapi/webapi.py | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/.werks/6668 b/.werks/6668 new file mode 100644 index 0000000..fdcf628 --- /dev/null +++ b/.werks/6668 @@ -0,0 +1,11 @@ +Title: WATO API: fixed broken configuration when setting cluster nodes in edit_host/add_host API call +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539262029 + + diff --git a/cmk/gui/plugins/webapi/webapi.py b/cmk/gui/plugins/webapi/webapi.py index efec628..f1b94b2 100644 --- a/cmk/gui/plugins/webapi/webapi.py +++ b/cmk/gui/plugins/webapi/webapi.py @@ -267,6 +267,8 @@ class APICallHosts(APICallCollection): watolib.Folder.create_missing_folders(folder_path) # Add host + if cluster_nodes: + cluster_nodes = map(str, cluster_nodes) watolib.Folder.folder(folder_path).create_hosts([(hostname, attributes, cluster_nodes)]) @@ -300,6 +302,9 @@ class APICallHosts(APICallCollection): if not cluster_nodes: cluster_nodes = host.cluster_nodes() + if cluster_nodes: + cluster_nodes = map(str, cluster_nodes) + host.edit(current_attributes, cluster_nodes)

5 years, 8 months

Fixed LDAP SSL analyze configuration test after 1.6 refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: b716ca5ded4a5d65c23c3fceeac78009e98afa5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b716ca5ded4a5d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 7 18:54:25 2018 +0200 Fixed LDAP SSL analyze configuration test after 1.6 refactoring Change-Id: I4c4c8fc07a4903993452811523cb27586132e3af --- cmk/gui/plugins/userdb/ldap_connector.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 8af2b1a..44fe9e8 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -261,7 +261,7 @@ class LDAPUserConnector(UserConnector): def _format_ldap_uri(self, server): - if self._use_ssl(): + if self.use_ssl(): uri = 'ldaps://' else: uri = 'ldap://' @@ -381,7 +381,7 @@ class LDAPUserConnector(UserConnector): return servers - def _use_ssl(self): + def use_ssl(self): return 'use_ssl' in self._config

5 years, 8 months

6801 fortigate_ipsecvpn: Tunnels which are down or ignored are listed in the long output

by Simon Betz

Module: check_mk Branch: master Commit: b96005263dddc1e5ab488aa7883c8c837bde9ce7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b96005263dddc1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 11 12:41:56 2018 +0200 6801 fortigate_ipsecvpn: Tunnels which are down or ignored are listed in the long output Change-Id: I184807c7e3fa9444747e8408829e4ef6fa6ac133 --- .werks/6801 | 10 ++++++++++ checks/fortigate_ipsecvpn | 23 ++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.werks/6801 b/.werks/6801 new file mode 100644 index 0000000..1b7a766 --- /dev/null +++ b/.werks/6801 @@ -0,0 +1,10 @@ +Title: fortigate_ipsecvpn: Tunnels which are down or ignored are listed in the long output +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1539254475 +Class: feature + + diff --git a/checks/fortigate_ipsecvpn b/checks/fortigate_ipsecvpn index cd892df..2be2bee 100644 --- a/checks/fortigate_ipsecvpn +++ b/checks/fortigate_ipsecvpn @@ -56,14 +56,8 @@ def check_fortigate_ipsecvpn(item, params, info): num_ignored = len(tunnels_ignored) num_down_and_not_ignored = num_down - num_ignored - infotext = "Total: %d, Up: %d, Down: %d" % \ - (num_total, num_up, num_down) - - if tunnels_down: - infotext += " (%s)" % ", ".join(tunnels_down) - - if num_ignored: - infotext += ", Ignored: %d (%s)" % (num_ignored, ", ".join(tunnels_ignored)) + infotext = "Total: %d, Up: %d, Down: %d, Ignored: %s"\ + % (num_total, num_up, num_down, num_ignored) warn, crit = params.get("levels", (None, None)) status = 0 @@ -74,7 +68,18 @@ def check_fortigate_ipsecvpn(item, params, info): if status: infotext += " (warn/crit at %s/%s)" % (warn, crit) - return status, infotext, [('active_vpn_tunnels', num_up, '', '', 0, num_total)] + yield status, infotext, [('active_vpn_tunnels', num_up, '', '', 0, num_total)] + + long_output = [] + for title, tunnels in [ + ("Down", tunnels_down), + ("Ignored", tunnels_ignored), + ]: + if tunnels: + long_output.append("%s:" % title) + long_output.append(", ".join(tunnels)) + if long_output: + yield 0, "\n%s" % "\n".join(long_output) check_info["fortigate_ipsecvpn"] = {

5 years, 8 months

fileinfo: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 019d21a1ca0a8d0155157d708df1c29fcad2b2f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=019d21a1ca0a8d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 11 13:05:58 2018 +0200 fileinfo: Minor cleanup Change-Id: I12fd5393fc8fde189947f2c002fa3e37c5337b2f --- checks/fileinfo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/fileinfo b/checks/fileinfo index ac6d27a..c5bec7e 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -442,7 +442,8 @@ def fileinfo_check_function(check_definition, params, outof_range_txt): def _fileinfo_check_file(value, params, key): - if type(value) not in [long, int]: # because strings go into infos but not into perfdata + if not isinstance(value, (long, int)): + # because strings go into infos but not into perfdata return [] results = [] for how, comp_text, cfunc in [

5 years, 8 months

Adapted werk

by Simon Betz

Module: check_mk Branch: master Commit: 5e1df7c292db89ba5273fb18d725f3c6d7276255 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e1df7c292db89… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 11 11:07:53 2018 +0200 Adapted werk Change-Id: I02d1c625671e7ffc42a43f06fcf5730cc901aed4 --- .werks/6493 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/6493 b/.werks/6493 index c55e96c..c764328 100644 --- a/.werks/6493 +++ b/.werks/6493 @@ -1,7 +1,7 @@ Title: netscaler_vserver: Discovers readable names Level: 1 Component: checks -Compatible: compat +Compatible: incomp Edition: cre Version: 1.6.0i1 Date: 1536583837

5 years, 8 months

agent_ucs_bladecenter: Cleaned up headers and fields

by Simon Betz

Module: check_mk Branch: master Commit: e4c59e91a86d5fe9abd7388983ba18e816e8e555 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4c59e91a86d5f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 1 16:09:58 2018 +0200 agent_ucs_bladecenter: Cleaned up headers and fields Change-Id: Ic062e2e3ab53ff3920168cb403b60bc200520363 --- agents/special/agent_ucs_bladecenter | 83 ++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/agents/special/agent_ucs_bladecenter b/agents/special/agent_ucs_bladecenter index 3c7a430..614f5cd 100755 --- a/agents/special/agent_ucs_bladecenter +++ b/agents/special/agent_ucs_bladecenter @@ -159,23 +159,22 @@ class Server(object): handle = Server(host_address) handle.login(opt_username, opt_password) -for entry, fields in [ - ## FANS - ("<<<ucs_bladecenter_fans:sep(9)>>>", None), +entities = [ + ## FANS + ("ucs_bladecenter_fans", [ ("equipmentFan", ["Dn", "Model", "OperState"]), ("equipmentFanModuleStats", ["Dn", "AmbientTemp"]), ("equipmentNetworkElementFanStats", ["Dn", "SpeedAvg"]), ("equipmentRackUnitFanStats", ["Dn", "SpeedAvg"]), ("equipmentFanStats", ["Dn", "SpeedAvg"]), - - ### PSU - ("<<<ucs_bladecenter_psu:sep(9)>>>", None), + ]), + ### PSU + ("ucs_bladecenter_psu", [ ("equipmentPsuInputStats", ["Dn", "Current", "PowerAvg", "Voltage"]), ("equipmentPsuStats", ["Dn", "AmbientTemp", "Output12vAvg", "Output3v3Avg"]), - - # NETWORK - ("<<<ucs_bladecenter_if:sep(9)>>>", None), - + ]), + # NETWORK + ("ucs_bladecenter_if", [ # Fibrechannel ("fcStats", ["Dn", "BytesRx", "BytesTx", "PacketsRx", "PacketsTx", "Suspect"]), ("fcErrStats", ["Dn", "Rx", "Tx", "CrcRx", "DiscardRx", "DiscardTx"]), @@ -197,39 +196,39 @@ for entry, fields in [ ("fabricDceSwSrvEp", ["Dn", "EpDn", "AdminState", "OperState", "PortId", "SwitchId", "SlotId"]), ("fabricDceSwSrvPc", ["Dn", "AdminState", "OperState", "OperSpeed", "Name", "PortId"]), ("fabricDceSwSrvPcEp", ["Dn", "EpDn", "AdminState", "OperState", "PortId", "SwitchId", "SlotId"]), - - # Fault Instances - ("<<<ucs_bladecenter_faultinst:sep(9)>>>", None), + ]), + # Fault Instances + ("ucs_bladecenter_faultinst", [ ("faultInst", ["Dn", "Descr", "Severity"]), - - # TopSystem Info - ("<<<ucs_bladecenter_topsystem:sep(9)>>>", None), + ]), + # TopSystem Info + ("ucs_bladecenter_topsystem", [ ("topSystem", ["Address", "CurrentTime", "Ipv6Addr", "Mode", "Name", "SystemUpTime"]), - ]: - try: - if fields == None: - # Just a new section header... - print entry - continue - - response = handle.get_class(entry) - elements = get_pattern('<%(entry)s (.*?)/>' % {"entry": entry}, response) - for element in elements: - sys.stdout.write("%s\t" % entry) - values = [] - for field in fields: - tmp_field = field[0].lower()+ field[1:] # workaround - value = get_pattern('%s="(.*?)"' % tmp_field, element)[0] - if value: - values.append("%s %s" % (field, value)) - print "\t".join(values) - except Exception, e: - print e - if opt_debug: - try: - handle.Logout() - except: - pass - raise + ]), +] + +for header, entries in entities: + sys.stdout.write("<<<%s:sep(9)>>>\n" % header) + for entry, fields in entries: + try: + response = handle.get_class(entry) + elements = get_pattern('<%(entry)s (.*?)/>' % {"entry": entry}, response) + for element in elements: + sys.stdout.write("%s\t" % entry) + values = [] + for field in fields: + tmp_field = field[0].lower()+ field[1:] # workaround + value = get_pattern('%s="(.*?)"' % tmp_field, element)[0] + if value: + values.append("%s %s" % (field, value)) + sys.stdout.write("%s\n" % "\t".join(values)) + except Exception, e: + sys.stderr.write("%s\n" % e) + if opt_debug: + try: + handle.Logout() + except: + pass + raise handle.Logout()

5 years, 8 months

6778 FIX Additional fix for URL redirect from /[site]/ to /[site]/check_mk /

by Lars Michelsen

Module: check_mk Branch: master Commit: 1553be8b7c72933d276fe76d1ced67306e05bfcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1553be8b7c7293… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 11 08:54:47 2018 +0200 6778 FIX Additional fix for URL redirect from /[site]/ to /[site]/check_mk/ The werk #6773 changed the behaviour of the URL redirect from <tt>/[site]/</tt> or <tt>/[site]</tt> to <tt>/[site]/check_mk/</tt>. The change tried to respect custom ports but was breaking some specific reverse proxy setups. We have now again changed this setting to completely ignore the protocl, host and port when producing the redirect answer which makes the client responsible for adding the correct protocol, host and port. Change-Id: I81df7b425615bc32a3c2464ca82131ff0b011439 --- .werks/6778 | 16 ++++++++++++++++ omd/packages/omd/skel/etc/apache/conf.d/omd.conf | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6778 b/.werks/6778 new file mode 100644 index 0000000..1b4f22f --- /dev/null +++ b/.werks/6778 @@ -0,0 +1,16 @@ +Title: Additional fix for URL redirect from /[site]/ to /[site]/check_mk/ +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1539180918 + +The werk #6773 changed the behaviour of the URL redirect from <tt>/[site]/</tt> or <tt>/[site]</tt> +to <tt>/[site]/check_mk/</tt>. The change tried to respect custom ports but was breaking some +specific reverse proxy setups. + +We have now again changed this setting to completely ignore the protocl, host and port when producing the +redirect answer which makes the client responsible for adding the correct protocol, host and port. diff --git a/omd/packages/omd/skel/etc/apache/conf.d/omd.conf b/omd/packages/omd/skel/etc/apache/conf.d/omd.conf index 607f56d..00ef903 100644 --- a/omd/packages/omd/skel/etc/apache/conf.d/omd.conf +++ b/omd/packages/omd/skel/etc/apache/conf.d/omd.conf @@ -9,7 +9,7 @@ RewriteCond %{HTTP:X-Forwarded-Proto} =https [OR] RewriteCond %{HTTPS} =on RewriteRule ^/###SITE###(/?|/check_mk)$ - [env=proto:https] -RewriteRule ^/###SITE###(/?|/check_mk)$ %{ENV:proto}://%{HTTP_HOST}/###SITE###/check_mk/ [R=302,L] +RewriteRule ^/###SITE###(/?|/check_mk)$ /###SITE###/check_mk/ [R=302,L] Alias /###SITE###/omd "###ROOT###/share/omd/htdocs"

5 years, 8 months

Fix paths in pylint error messages.

by Sven Panne

Module: check_mk Branch: master Commit: 0d8e18410a69433b47d1bb9a1182421d3c82d398 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d8e18410a6943… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 10 16:58:39 2018 +0200 Fix paths in pylint error messages. Change-Id: If50672bdc08a1d7368cf0f7f37300ae2d2854775 --- tests/testlib/pylint_cmk.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index f820d2d..418b2ec 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -28,10 +28,7 @@ def check_files(base_dir): def add_file(f, path): - # Change path to be relative to "workdir" /home/git or the workdir - # in the build system. - relpath = os.path.relpath(os.path.realpath(path), - os.path.dirname(os.path.dirname(os.getcwd()))) + relpath = os.path.relpath(os.path.realpath(path), cmk_path()) f.write("# -*- encoding: utf-8 -*-") f.write("#\n") f.write("# ORIG-FILE: " + relpath + "\n") @@ -118,11 +115,6 @@ def is_python_file(path): # to real modules class CMKFixFileMixin(object): def handle_message(self, msg): - # This hack is not needed for already modularized paths - if msg.abspath.startswith(cmk_path()): - super(CMKFixFileMixin, self).handle_message(msg) - return - new_path, new_line = self._orig_location_from_compiled_file(msg) if new_path == None: @@ -137,13 +129,7 @@ class CMKFixFileMixin(object): def _change_path_to_repo_path(self, msg): - abspath = os.path.join(os.getcwd(), msg.abspath) - parts = abspath.split("/") - while parts and parts[0] not in ["check_mk", "cmc"]: - parts.pop(0) - - if parts: - return "/".join(parts) + return os.path.relpath(msg.abspath, cmk_path()) def _orig_location_from_compiled_file(self, msg):

5 years, 8 months

← Newer
1
...
19
20
21
22
23
24
25
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018