Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

5708 FIX df: Fix incorrect values being reported on devices with btrfs

by Konstantin Büttner

Module: check_mk Branch: master Commit: c446bc5d6948a8bb5d97a311be7631411f3a557a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c446bc5d6948a8… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Sun Jan 28 11:54:06 2018 +0100 5708 FIX df: Fix incorrect values being reported on devices with btrfs This fixes a bug introduced with Werk #4806. Change-Id: I5211446f2c72ba118363e39629197a81173636d3 --- .werks/5708 | 10 ++++++++++ checks/df | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/5708 b/.werks/5708 new file mode 100644 index 0000000..dc81f59 --- /dev/null +++ b/.werks/5708 @@ -0,0 +1,10 @@ +Title: df: Fix incorrect values being reported on devices with btrfs +Level: 2 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517136798 +Class: fix + +This fixes a bug introduced with Werk #4806. diff --git a/checks/df b/checks/df index 0f26539..c0dfbc3 100644 --- a/checks/df +++ b/checks/df @@ -123,6 +123,8 @@ def parse_df(info): if device not in btrfs_devices: btrfs_devices.add(device) mountpoint = "btrfs " + device + else: + continue else: mountpoint = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with /

6 years, 7 months

Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5754e82f94f5f39ae80002cccb17945ac0483631 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5754e82f94f5f3… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Sun Jan 28 11:52:57 2018 +0100 Reserved 10 Werk IDS Change-Id: Ibb3cf224d8a097d84b8a59683d8d44f607ac0931 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 2a71636..028dd10 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5708 +5718

6 years, 7 months

5494 FIX nfsmounts, cifsmounts: increase timeout of nfsmounts and deliver correct status details

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 6d9be301baf2fb80116d80ffa1b9554168d4e7db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d9be301baf2fb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jan 26 13:51:47 2018 +0100 5494 FIX nfsmounts, cifsmounts: increase timeout of nfsmounts and deliver correct status details The waiting time of nfsmounts was increased to prevent agent timeouts. Furthermore, the common check function was rewritten to deliver correct error messages in the status details. E.g. a timeout in the agent now shows the message "Server not responding" instead of "Stale fs handle". Change-Id: Id9d5c4f9f6a0374c4e33105126c7df0dc7898747 --- .werks/5494 | 13 ++++ agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.linux | 4 +- agents/check_mk_agent.openwrt | 4 +- checks/network_fs.include | 77 +++++++++---------- .../checks/test_nfsmounts_and_cifsmounts_check.py | 86 ++++++++++++++++++++++ 6 files changed, 139 insertions(+), 47 deletions(-) diff --git a/.werks/5494 b/.werks/5494 new file mode 100644 index 0000000..689be75 --- /dev/null +++ b/.werks/5494 @@ -0,0 +1,13 @@ +Title: nfsmounts, cifsmounts: increase timeout of nfsmounts and deliver correct status details +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516970190 +Class: fix + +The waiting time of nfsmounts was increased to prevent agent timeouts. +Furthermore, the common check function was rewritten to deliver correct error +messages in the status details. E.g. a timeout in the agent now shows the +message "Server not responding" instead of "Stale fs handle". diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index a823d5a..ef7db0d 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -143,7 +143,7 @@ if type stat >/dev/null 2>&1 ; then mount | grep ' nfs' | awk '{print $3;}' | \ while read MP do - waitmax 2 stat -f -c '"'$MP' ok - - - -"' "$MP" || \ + waitmax 5 stat -f -c '"'$MP' ok - - - -"' "$MP" || \ echo "$MP hanging 0 0 0 0" done echo '<<<cifsmounts>>>' diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8354e1a..f857fc1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -331,10 +331,10 @@ then while read MP do if [ $STAT_VERSION != $STAT_BROKE ]; then - waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ + waitmax -s 9 5 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ echo "$MP hanging 0 0 0 0" else - waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ + waitmax -s 9 5 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ printf '\n'|| echo "$MP hanging 0 0 0 0" fi done diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 163e696..d9eb644 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -281,10 +281,10 @@ then if [ ! -r $MP ]; then echo "$MP Permission denied" if [ $STAT_VERSION != $STAT_BROKE ]; then - waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ + waitmax -s 9 5 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ echo "$MP hanging 0 0 0 0" else - waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ + waitmax -s 9 5 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ printf '\n'|| echo "$MP hanging 0 0 0 0" fi done diff --git a/checks/network_fs.include b/checks/network_fs.include index a52dd15..c4ad622 100644 --- a/checks/network_fs.include +++ b/checks/network_fs.include @@ -52,45 +52,38 @@ def inventory_network_fs_mounts(parsed): def check_network_fs_mounts(item, params, parsed): - if item in parsed: - attrs = parsed[item] - state = attrs["state"] - data = attrs.get("data") - - if state == "Permission denied" or data is None: - return 2, "Permissions denied" - - size_blocks_, unused_, free_blocks_, block_size_ = data - if size_blocks_ == "-": - if state == 'ok': - return 0, "mount seems OK" - else: - return 2, "Server not responding" - - size_blocks = int(size_blocks_) - free_blocks = int(free_blocks_) # for non-root user - blocksize = int(block_size_) - - if size_blocks <= 0 or free_blocks < 0 or blocksize > 1024*1024: - return 2, "Stale fs handle" - - size_bytes = size_blocks * blocksize - free_bytes = free_blocks * blocksize - used_bytes = size_bytes - free_bytes - used_perc = 100.0 * used_bytes / size_bytes - perfdata = None - if params is not None and params.get("has_perfdata"): - perfdata = [("fs_size", size_bytes), ("fs_used", used_bytes)] - - if state == 'ok': - if size_bytes == 0: - return 0, "server is responding", perfdata - - return 0, "%.1f%% used (%s of %s)" % \ - (used_perc, get_bytes_human_readable(used_bytes), - get_bytes_human_readable(size_bytes)), perfdata - - else: - return 2, "server not responding", perfdata - - return 3, "%s not mounted" % item + attrs = parsed.get(item) + if not attrs: + return 3, "%s not mounted" % item + + state = attrs["state"] + if state == "Permission denied": + return 2, "Permission denied" + elif state == "hanging": + return 2, "Server not responding" + elif state != 'ok': + return 2, "Unknown state" + + data = attrs["data"] + if data == ['-', '-', '-', '-']: + return 0, "Mount seems OK" + size_blocks, _, free_blocks, blocksize = map(int, data) + + if size_blocks <= 0 or free_blocks < 0 or blocksize > 1024 * 1024: + return 2, "Stale fs handle" + + size_bytes = size_blocks * blocksize + free_bytes = free_blocks * blocksize + used_bytes = size_bytes - free_bytes + used_perc = 100.0 * used_bytes / size_bytes + + perfdata = None + if params is not None and params.get("has_perfdata"): + perfdata = [("fs_size", size_bytes), ("fs_used", used_bytes)] + + infotext = "%.1f%% used (%s of %s)" % ( + used_perc, + get_bytes_human_readable(used_bytes), + get_bytes_human_readable(size_bytes) + ) + return 0, infotext, perfdata diff --git a/tests/checks/test_nfsmounts_and_cifsmounts_check.py b/tests/checks/test_nfsmounts_and_cifsmounts_check.py new file mode 100644 index 0000000..8a2a9bd --- /dev/null +++ b/tests/checks/test_nfsmounts_and_cifsmounts_check.py @@ -0,0 +1,86 @@ +import pytest +from checktestlib import BasicCheckResult, PerfValue + +# since both nfsmounts and cifsmounts use the parse, inventory +# and check functions from network_fs.include unchanged we test +# both checks here. + +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize("info,discovery_expected,check_expected", [ + ( # no info + [], + [], + (['', None, BasicCheckResult(3, ' not mounted', None)],) + ), + ( # single mountpoint with data + [[u'/ABCshare', u'ok', u'491520', u'460182', u'460182', u'65536']], + [('/ABCshare', None)], + [('/ABCshare', {}, BasicCheckResult(0, "6.4% used (1.91 GB of 30.00 GB)", None)), + ('/ZZZshare', {}, BasicCheckResult(3, "/ZZZshare not mounted", None))] + ), + ( # two mountpoints with empty data + [[u'/AB', u'ok', u'-', u'-', u'-', u'-'], + [u'/ABC', u'ok', u'-', u'-', u'-', u'-']], + [('/AB', None), + ('/ABC', None)], + [('/AB', {}, BasicCheckResult(0, "Mount seems OK", None)), + ('/ABC', {}, BasicCheckResult(0, "Mount seems OK", None))] + ), + ( # Mountpoint with spaces and permission denied + [[u'/var/dba', u'export', u'Permission', u'denied'], + [u'/var/dbaexport', u'ok', u'201326592', u'170803720', u'170803720', u'32768']], + [('/var/dbaexport', None), + ('/var/dba export', None)], + [('/var/dba export', {}, BasicCheckResult(2, 'Permission denied', None)), + ('/var/dbaexport', {}, BasicCheckResult(0, '15.2% used (931.48 GB of 6.00 TB)', None))] + ), + ( # with perfdata + [[u'/PERFshare', u'ok', u'491520', u'460182', u'460182', u'65536']], + [('/PERFshare', None)], + [('/PERFshare', {'has_perfdata': True}, + BasicCheckResult(0, "6.4% used (1.91 GB of 30.00 GB)", [ + PerfValue('fs_size', 491520 * 65536), PerfValue('fs_used', 491520 * 65536 - 460182 * 65536) + ]))] + ), + ( # state == 'hanging' + [[u'/test', u'hanging', u'hanging', u'0', u'0', u'0', u'0']], + [('/test hanging', None)], + [('/test hanging', {'has_perfdata': True}, + BasicCheckResult(2, "Server not responding", None))] + ), + ( # unknown state + [[u'/test', u'unknown', u'unknown', u'1', u'1', u'1', u'1']], + [('/test unknown', None)], + [('/test unknown', {}, BasicCheckResult(2, "Unknown state", None))] + ), + ( # zero block size + [[u'/test', u'perfdata', u'ok', u'0', u'460182', u'460182', u'0']], + [('/test perfdata', None)], + [('/test perfdata', {'has_perfdata': True}, + # TODO: display a better error message + #BasicCheckResult(0, "server is responding", [PerfValue('fs_size', 0), PerfValue('fs_used', 0)]))] + BasicCheckResult(2, "Stale fs handle", None))] + ), +]) +def test_nfsmounts(check_manager, info, discovery_expected, check_expected): + check_nfs = check_manager.get_check("nfsmounts") + check_cifs = check_manager.get_check("cifsmounts") + + # assure that the code of both checks is identical + assert (check_nfs.info['parse_function'].func_code.co_code == + check_cifs.info['parse_function'].func_code.co_code) + assert (check_nfs.info['inventory_function'].func_code.co_code == + check_cifs.info['inventory_function'].func_code.co_code) + assert (check_nfs.info['check_function'].func_code.co_code == + check_cifs.info['check_function'].func_code.co_code) + + parsed = check_nfs.run_parse(info) + + discovery = list(check_nfs.run_discovery(parsed)) + assert discovery == discovery_expected + + for item, params, result_expected in check_expected: + result = BasicCheckResult(*check_nfs.run_check(item, params, parsed)) + assert result == result_expected

6 years, 7 months

5658 FIX Fixed possible "TypeError" on "Agent update status" view

by Lars Michelsen

Module: check_mk Branch: master Commit: 7de92fdc9c2840c581517d72d149ecbd9e6b91fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7de92fdc9c2840… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 26 13:03:08 2018 +0100 5658 FIX Fixed possible "TypeError" on "Agent update status" view The exception "TypeError: expected string or buffer" could occur when using the service grouping feature (Global settings > Grouping of services in table views). Change-Id: I9c9df19a548881faf4db4f48b4ef01d0fbe68e59 --- .werks/5658 | 12 ++++++++++++ web/plugins/views/layouts.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5658 b/.werks/5658 new file mode 100644 index 0000000..747990d --- /dev/null +++ b/.werks/5658 @@ -0,0 +1,12 @@ +Title: Fixed possible "TypeError" on "Agent update status" view +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i3 +Date: 1516968100 + +The exception "TypeError: expected string or buffer" could occur +when using the service grouping feature (Global settings > Grouping of services in table views). diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index d0824aa..cad67f9 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -336,7 +336,7 @@ def calculate_grouping_of_services(rows): def try_to_match_group(row): for group_spec in config.service_view_grouping: - if row.get('service_description', '') != '' \ + if row.get('service_description') \ and re.match(group_spec["pattern"], row["service_description"]): return group_spec

6 years, 7 months

5659 FIX Master control snapin: Improved handling of half configured sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 4fb2eb5e15477b19fa169034ab8e8fc25bb81bd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fb2eb5e15477b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 26 13:06:26 2018 +0100 5659 FIX Master control snapin: Improved handling of half configured sites Change-Id: I023c6ea92b177b71e5025d375112d13d3a5d01bb --- .werks/5659 | 11 +++++++++++ web/plugins/sidebar/shipped.py | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/.werks/5659 b/.werks/5659 new file mode 100644 index 0000000..06b3c2d --- /dev/null +++ b/.werks/5659 @@ -0,0 +1,11 @@ +Title: Master control snapin: Improved handling of half configured sites +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1516968363 + + diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 828e96c..dff3f4c 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1335,6 +1335,12 @@ def render_master_control(): elif site_state["state"] == "disabled": html.show_info(_("Site is disabled")) + elif site_state["state"] == "unknown": + if site_state.get("exception"): + html.show_error(site_state["exception"]) + else: + html.show_error(_("Site state is unknown")) + else: is_cmc = site_state["program_version"].startswith("Check_MK ")

6 years, 7 months

Fixed unhandled tdclass for some cells in inventory tree

by Simon Betz

Module: check_mk Branch: master Commit: 139fdd8824e6af246cad4146dd0c189fbb3741de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=139fdd8824e6af… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 26 12:06:44 2018 +0100 Fixed unhandled tdclass for some cells in inventory tree Change-Id: I857a612227374fb0d52758e4be394110771f7ac0 --- web/plugins/views/inventory.py | 61 +++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index a47da9f..2db4ae7 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -71,7 +71,10 @@ def _paint_host_inventory_tree_value(struct_tree, parsed_path, invpath, attribut if child is None: return "", "" with html.plugged(): - show_child_value(invpath, child.get_child_data().get(attributes_key)) + if invpath.endswith(".") or invpath.endswith(":"): + invpath = invpath[:-1] + show_child_value(child.get_child_data().get(attributes_key), + inv_display_hint(invpath)) code = html.drain() return "invtree", code @@ -133,7 +136,7 @@ def cmp_inventory_node(a, b, invpath): # Convert .foo.bar:18.test to .foo.bar:*.test def inv_display_hint(invpath): - r = regex(":[0-9]+") + r = regex(".[0-9]+") invpath = r.sub(":*", invpath) hint = inventory_displayhints.get(invpath, {}) @@ -1319,10 +1322,7 @@ def render_inv_dicttable(*args): pass -def show_child_value(invpath, value): - if invpath.endswith(".") or invpath.endswith(":"): - invpath = invpath[:-1] - hint = inv_display_hint(invpath) +def show_child_value(value, hint): if "paint_function" in hint: tdclass, code = hint["paint_function"](value) html.write(code) @@ -1450,15 +1450,26 @@ class NodeRenderer(object): for index, entry in enumerate(data): html.open_tr(class_="even0") for title, key in titles: - html.open_td() - self._show_numeration_value("%s%d.%s" % \ - (invpath, index, key), entry.get(key)) + value = entry.get(key) + sub_invpath = "%s%d.%s" % (invpath, index, key) + hint = inv_display_hint(sub_invpath) + if "paint_function" in hint: + #FIXME At the moment we need it to get tdclass + # Clean this up one day. + # The value is not really needed, but we need to deal with the delta mode + unused_value = value[1] if type(value) == tuple else value + tdclass, _ = hint["paint_function"](unused_value) + else: + tdclass = None + + html.open_td(class_=tdclass) + self._show_numeration_value(value, hint) html.close_td() html.close_tr() html.close_table() - def _show_numeration_value(self, sub_invpath, value): + def _show_numeration_value(self, value, hint): raise NotImplementedError() # ---attributes----------------------------------------------------------- @@ -1469,17 +1480,19 @@ class NodeRenderer(object): for key, value in attributes.get_child_data().iteritems(): sub_invpath = "%s.%s" % (invpath, key) icon, title = inv_titleinfo(sub_invpath, key) + hint = inv_display_hint(sub_invpath) + html.open_tr() html.open_th(title=sub_invpath) html.write(title) html.close_th() html.open_td() - self._show_attribute(sub_invpath, value) + self._show_attribute(value, hint) html.close_td() html.close_tr() html.close_table() - def _show_attribute(self, invpath, value): + def _show_attribute(self, value, hint): raise NotImplementedError() # ---helper--------------------------------------------------------------- @@ -1493,39 +1506,39 @@ class NodeRenderer(object): class AttributeRenderer(NodeRenderer): - def _show_numeration_value(self, invpath, value): - show_child_value(invpath, value) + def _show_numeration_value(self, value, hint): + show_child_value(value, hint) - def _show_attribute(self, invpath, value): - show_child_value(invpath, value) + def _show_attribute(self, value, hint): + show_child_value(value, hint) class DeltaNodeRenderer(NodeRenderer): - def _show_numeration_value(self, invpath, value): + def _show_numeration_value(self, value, hint): if value is None: value = (None, None) - self._show_attribute(invpath, value) + self._show_attribute(value, hint) - def _show_attribute(self, invpath, value): + def _show_attribute(self, value, hint): old, new = value if old is None and new is not None: html.open_span(class_="invnew") - show_child_value(invpath, new) + show_child_value(new, hint) html.close_span() elif old is not None and new is None: html.open_span(class_="invold") - show_child_value(invpath, old) + show_child_value(old, hint) html.close_span() elif old is not None and new is not None: html.open_span(class_="invold") - show_child_value(invpath, old) + show_child_value(old, hint) html.close_span() html.write(u" → ") html.open_span(class_="invnew") - show_child_value(invpath, new) + show_child_value(new, hint) html.close_span() elif old == new: - show_child_value(invpath, old) + show_child_value(old, hint)

6 years, 7 months

Fix issues with concurrent test jobs trying to install debian packages

by Lars Michelsen

Module: check_mk Branch: master Commit: e864dff6ace99c650691a7ff3d0782dc8d8c2f6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e864dff6ace99c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 26 11:19:45 2018 +0100 Fix issues with concurrent test jobs trying to install debian packages Change-Id: I253dc471fc29348b36148f857697e52110cd5949 --- tests/testlib/__init__.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 28ed02f..88654ad 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -196,11 +196,13 @@ class CMKVersion(object): print("Waiting for other dpkg process to complete...\n") time.sleep(1) - cmd = "sudo /usr/bin/gdebi --non-interactive %s" % temp_package_path - print(cmd) - sys.stdout.flush() - if os.system(cmd) >> 8 != 0: - raise Exception("Failed to install package: %s" % temp_package_path) + # Improve the protection against other test runs installing packages + with lockfile.FileLock("/tmp/cmk-test-install-version.lock"): + cmd = "sudo /usr/bin/gdebi --non-interactive %s" % temp_package_path + print(cmd) + sys.stdout.flush() + if os.system(cmd) >> 8 != 0: + raise Exception("Failed to install package: %s" % temp_package_path) os.unlink(temp_package_path)

6 years, 7 months

Fixed duplicate html.write call

by Simon Betz

Module: check_mk Branch: master Commit: 93afb0eab9245a3f884aa87a97daba891ef8bc63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93afb0eab9245a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 26 11:13:27 2018 +0100 Fixed duplicate html.write call Change-Id: Ia10c9c881417a7194e09d1caa926e4328c271205 --- web/plugins/views/inventory.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index bb53846..a47da9f 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -1494,11 +1494,11 @@ class NodeRenderer(object): class AttributeRenderer(NodeRenderer): def _show_numeration_value(self, invpath, value): - html.write(show_child_value(invpath, value)) + show_child_value(invpath, value) def _show_attribute(self, invpath, value): - html.write(show_child_value(invpath, value)) + show_child_value(invpath, value) @@ -1506,26 +1506,26 @@ class DeltaNodeRenderer(NodeRenderer): def _show_numeration_value(self, invpath, value): if value is None: value = (None, None) - html.write(self._show_attribute(invpath, value)) + self._show_attribute(invpath, value) def _show_attribute(self, invpath, value): old, new = value if old is None and new is not None: html.open_span(class_="invnew") - html.write(show_child_value(invpath, new)) + show_child_value(invpath, new) html.close_span() elif old is not None and new is None: html.open_span(class_="invold") - html.write(show_child_value(invpath, old)) + show_child_value(invpath, old) html.close_span() elif old is not None and new is not None: html.open_span(class_="invold") - html.write(show_child_value(invpath, old)) + show_child_value(invpath, old) html.close_span() html.write(u" → ") html.open_span(class_="invnew") - html.write(show_child_value(invpath, new)) + show_child_value(invpath, new) html.close_span() elif old == new: - html.write(show_child_value(invpath, old)) + show_child_value(invpath, old)

6 years, 7 months

5699 FIX Windows agent crashed at non-existent Skype perf counter

by Jukka Aro

Module: check_mk Branch: master Commit: 068cd0820e0f722b706d12b57daca4abb62f21ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=068cd0820e0f72… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 26 10:13:36 2018 +0100 5699 FIX Windows agent crashed at non-existent Skype perf counter Werk #5410 fixed a number of problems related to section Skype. It also enabled the agent to run further than it was earlier capable of and revealed some other old problems, this crash, among others. The extent of the problem is not exactly known but it is likely that the crash was restricted to some Windows versions only, at least Windows Server 2012 R2 was having the crash under certain circumstances. --- .werks/5699 | 16 ++++++++++++++++ agents/windows/PerfCounterCommon.h | 5 +++++ agents/windows/build_version | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/5699 b/.werks/5699 new file mode 100644 index 0000000..e044683 --- /dev/null +++ b/.werks/5699 @@ -0,0 +1,16 @@ +Title: Windows agent crashed at non-existent Skype perf counter +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1516959650 + +Werk #5410 fixed a number of problems related to section Skype. It also +enabled the agent to run further than it was earlier capable of and +revealed some other old problems, this crash, among others. The extent +of the problem is not exactly known but it is likely that the crash was +restricted to some Windows versions only, at least Windows Server 2012 +R2 was having the crash under certain circumstances. diff --git a/agents/windows/PerfCounterCommon.h b/agents/windows/PerfCounterCommon.h index be497ed..2da70e2 100644 --- a/agents/windows/PerfCounterCommon.h +++ b/agents/windows/PerfCounterCommon.h @@ -42,8 +42,13 @@ size_t string_length<wchar_t>(const wchar_t *s); // retrieve the next line from a multi-sz registry key template <typename CharT> const CharT *get_next_multi_sz(const std::vector<CharT> &data, size_t &offset) { + if (data.size() < offset + 1) { + return nullptr; + } + const CharT *next = &data[offset]; size_t len = string_length(next); + if ((len == 0) || (offset + (len * sizeof(CharT)) > data.size())) { // the second condition would only happen with an invalid registry value // but that's not unheard of diff --git a/agents/windows/build_version b/agents/windows/build_version index 311e81e..6585a1d 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3080 +3082

6 years, 7 months

Tests: Use older daily builds if today's build is unavailable

by Konstantin Büttner

Module: check_mk Branch: master Commit: c39d6d0d01436a55145d162340d47284baab587d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c39d6d0d01436a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 26 10:58:21 2018 +0100 Tests: Use older daily builds if today's build is unavailable Change-Id: I2a9fb3bae37816db648dc9db9a87bcc07c037b4d --- tests/testlib/__init__.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 19612fa..28ed02f 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -74,14 +74,15 @@ class CMKVersion(object): self._edition = edition self._branch = branch - self.set_version(version, branch) - if len(edition) != 3: raise Exception("Invalid edition: %s. Must be short notation (cee, cre, ...)") self.edition_short = edition self._credentials = ("d-vonheute", "lOBFsgAH") + self.set_version(version, branch) + + def get_default_version(self): if os.path.exists("/etc/alternatives/omd"): @@ -93,12 +94,18 @@ class CMKVersion(object): def set_version(self, version, branch): if version in [ CMKVersion.DAILY, CMKVersion.GIT ]: - date_part = time.strftime("%Y.%m.%d") + for days_ago in range(7): # Try a week's worth of versions. If none of these exist, there's likely another issue at play. + localtime = time.localtime(time.time() - 60*60*24*days_ago) - if branch != "master": - self.version = "%s-%s" % (branch, date_part) - else: - self.version = date_part + date_part = time.strftime("%Y.%m.%d", localtime) + + if branch != "master": + self.version = "%s-%s" % (branch, date_part) + else: + self.version = date_part + + if self._version_available(): + break elif version == CMKVersion.DEFAULT: self.version = self.get_default_version() @@ -167,6 +174,12 @@ class CMKVersion(object): return os.path.exists(self.version_path()) + def _version_available(self): + response = requests.head(self.package_url(), auth=self._credentials, verify=False) + available_on_server = response.status_code == 200 + return self.is_installed() or available_on_server + + def install(self): temp_package_path = "/tmp/%s" % self.package_name()

6 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018