Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 301ba732e3ec77e9550c5b58f61776befdf07f65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=301ba732e3ec77… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 30 14:16:02 2018 +0200 Use a recent version of googletest. There is no recent released version, only some vague commitment to make one "soon", see https://github.com/google/googletest/issues/1079. We can't wait for that, so we pick the current master at 0048647619. Note that according to the issue tracker/source code, the previous MinGW problems have been fixed, so we can nuke our own patch. Change-Id: I381a2b29d76da5ecba230122026df7ddcc9602ac --- agents/windows/chroot_version | 2 +- agents/windows/test/build-googletest | 14 +++----- omd/packages/googletest/README | 1 + .../googletest/googletest-0048647619.tar.gz | Bin 0 -> 980888 bytes .../googletest/googletest-release-1.8.0.tar.gz | Bin 1281617 -> 0 bytes ...-googletest-compilation-MinGW-gtest-port.h.diff | 38 --------------------- 6 files changed, 6 insertions(+), 49 deletions(-) diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index b4de394..48082f7 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -11 +12 diff --git a/agents/windows/test/build-googletest b/agents/windows/test/build-googletest index fba94c3..84eb4b9 100755 --- a/agents/windows/test/build-googletest +++ b/agents/windows/test/build-googletest @@ -2,21 +2,15 @@ # Build MinGW libraries for Google Test and Google Mock. set -e -version=1.8.0 +version=0048647619 [[ -z $CHROOT_BUILD_DIR ]] && exit 1 . $CHROOT_BUILD_DIR/agents/windows/build.sh parse-args "$@" cd $CHROOT_BUILD_DIR/agents/windows -tar xzf /$CHROOT_BUILD_DIR/omd/packages/googletest/googletest-release-${version}.tar.gz -cd googletest-release-${version} - -# Fix googletest compilation with MinGW, see -# https://github.com/google/googletest/issues/606 -cd googletest/include/gtest/internal -patch gtest-port.h < /$CHROOT_BUILD_DIR/omd/packages/googletest/patches/0001-Fix-googletest-compilation-MinGW-gtest-port.h.diff -cd - +tar xzf /$CHROOT_BUILD_DIR/omd/packages/googletest/googletest-${version}.tar.gz +cd googletest-${version} for project in test mock ; do cd google${project} @@ -44,4 +38,4 @@ for project in test mock ; do done cd .. -rm -rf googletest-release-${version} +rm -rf googletest-${version} diff --git a/omd/packages/googletest/README b/omd/packages/googletest/README new file mode 100644 index 0000000..3277d0e --- /dev/null +++ b/omd/packages/googletest/README @@ -0,0 +1 @@ +( VERSION=0048647619; git archive --prefix=googletest-$VERSION/ -o ~/git/check_mk/omd/packages/googletest/googletest-$VERSION.tar.gz $VERSION ) diff --git a/omd/packages/googletest/googletest-0048647619.tar.gz b/omd/packages/googletest/googletest-0048647619.tar.gz new file mode 100644 index 0000000..890ef7b Binary files /dev/null and b/omd/packages/googletest/googletest-0048647619.tar.gz differ diff --git a/omd/packages/googletest/googletest-release-1.8.0.tar.gz b/omd/packages/googletest/googletest-release-1.8.0.tar.gz deleted file mode 100644 index a40df33..0000000 Binary files a/omd/packages/googletest/googletest-release-1.8.0.tar.gz and /dev/null differ diff --git a/omd/packages/googletest/patches/0001-Fix-googletest-compilation-MinGW-gtest-port.h.diff b/omd/packages/googletest/patches/0001-Fix-googletest-compilation-MinGW-gtest-port.h.diff deleted file mode 100644 index 6859bc1..0000000 --- a/omd/packages/googletest/patches/0001-Fix-googletest-compilation-MinGW-gtest-port.h.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- googletest-release-1.8.0/googletest/include/gtest/internal/gtest-port.h 2016-07-14 19:15:38.000000000 +0200 -+++ googletest-release-1.8.0-MinGW-patched/googletest/include/gtest/internal/gtest-port.h 2017-09-13 11:23:52.543574218 +0200 -@@ -604,7 +604,7 @@ - || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL) - #endif // GTEST_HAS_PTHREAD - --#if GTEST_HAS_PTHREAD -+#if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW - // gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is - // true. - # include <pthread.h> // NOLINT -@@ -1441,7 +1441,7 @@ - - // Defines synchronization primitives. - #if GTEST_IS_THREADSAFE --# if GTEST_HAS_PTHREAD -+# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW - // Sleeps for (roughly) n milliseconds. This function is only for testing - // Google Test's own constructs. Don't use it in user tests, either - // directly or indirectly. -@@ -1458,7 +1458,7 @@ - // Notification has already been imported into the namespace. - // Nothing to do here. - --# elif GTEST_HAS_PTHREAD -+# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW - // Allows a controller thread to pause execution of newly created - // threads until notified. Instances of this class must be created - // and destroyed in the controller thread. -@@ -1918,7 +1918,7 @@ - GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal); - }; - --# elif GTEST_HAS_PTHREAD -+# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW - - // MutexBase and Mutex implement mutex on pthreads-based platforms. - class MutexBase {

6 years, 1 month

Moved host/ cluster implementation specific things out of abstract CreateHostMode()

by Lars Michelsen

Module: check_mk Branch: master Commit: 02518d01059d53e4d6774337343411b6da52709b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02518d01059d53… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 23:38:35 2018 +0200 Moved host/cluster implementation specific things out of abstract CreateHostMode() Change-Id: I3a993c47a8e5541f91c6f15ba756bb41650a682a --- cmk/gui/wato/__init__.py | 63 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 7 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index a55e748..c8354ee 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -1675,6 +1675,24 @@ class ModeEditHost(HostMode): class CreateHostMode(HostMode): + @classmethod + @abc.abstractmethod + def _init_new_host_object(cls): + raise NotImplementedError() + + + @classmethod + @abc.abstractmethod + def _host_type_name(cls): + raise NotImplementedError() + + + @classmethod + @abc.abstractmethod + def _verify_host_type(cls, host): + raise NotImplementedError() + + def _from_vars(self): if html.var("clone") and self._init_host(): self._mode = "clone" @@ -1692,21 +1710,17 @@ class CreateHostMode(HostMode): raise MKAuthException(_("Sorry, you are not allowed to clone hosts.")) host = watolib.Folder.current().host(clonename) - - if isinstance(self, ModeCreateCluster) != host.is_cluster(): - raise MKGeneralException(_("Can not clone a cluster host as regular host or vice versa")) - + self._verify_host_type(host) return host else: - return watolib.Host(folder=watolib.Folder.current(), host_name=html.var("host"), attributes={}, - cluster_nodes=[] if isinstance(self, ModeCreateCluster) else None) + return self._init_new_host_object() def action(self): if not html.transaction_valid(): return "folder" - attributes = watolib.collect_attributes("host" if not self._is_cluster() else "cluster") + attributes = watolib.collect_attributes(self._host_type_name()) cluster_nodes = self._get_cluster_nodes() hostname = html.var("host") @@ -1760,6 +1774,24 @@ class ModeCreateHost(CreateHostMode): return _("Create new host") + @classmethod + def _init_new_host_object(cls): + return watolib.Host(folder=watolib.Folder.current(), host_name=html.var("host"), + attributes={}, cluster_nodes=None) + + + @classmethod + def _host_type_name(cls): + return "host" + + + @classmethod + def _verify_host_type(cls, host): + if host.is_cluster(): + raise MKGeneralException(_("Can not clone a cluster host as regular host")) + + + @mode_registry.register class ModeCreateCluster(CreateHostMode): @@ -1784,6 +1816,23 @@ class ModeCreateCluster(CreateHostMode): return _("Create new cluster") + @classmethod + def _init_new_host_object(cls): + return watolib.Host(folder=watolib.Folder.current(), host_name=html.var("host"), + attributes={}, cluster_nodes=[]) + + + @classmethod + def _host_type_name(cls): + return "cluster" + + + @classmethod + def _verify_host_type(cls, host): + if not host.is_cluster(): + raise MKGeneralException(_("Can not clone a regular host as cluster host")) + + #. # .--Rename Host---------------------------------------------------------. # | ____ _ _ _ |

6 years, 1 month

Moved code to helper functions

by Lars Michelsen

Module: check_mk Branch: master Commit: e40cd5b84d7bc684ad76dde0ac1dc92b077a065f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e40cd5b84d7bc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 22:11:54 2018 +0200 Moved code to helper functions Change-Id: Ie1f23d11120592925c432e10d276f5e6e839e914 --- cmk/tty.py | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/cmk/tty.py b/cmk/tty.py index df0fa97..d054122 100644 --- a/cmk/tty.py +++ b/cmk/tty.py @@ -106,32 +106,36 @@ def get_size(): return (24, 80) -# TODO: Is this a good place? -# TODO: Cleanup this function! -def print_table(headers, colors, rows, indent = ""): +def print_table(headers, colors, rows, indent=""): num_columns = len(headers) + lengths = _column_lengths(headers, rows, num_columns) + fmt = _row_template(lengths, colors, indent) - def make_utf8(x): - if type(x) == unicode: - return x.encode('utf-8') - else: - return "%s" % (x,) + for index, row in enumerate([ headers ] + rows): + sys.stdout.write(fmt % tuple(_make_utf8(c) for c in row[:num_columns])) + if index == 0: + sys.stdout.write(fmt % tuple("-" * l for l in lengths)) + +def _column_lengths(headers, rows, num_columns): lengths = [ len(h) for h in headers ] for row in rows: for index, column in enumerate(row[:num_columns]): - lengths[index] = max(len(make_utf8(column)), lengths[index]) + lengths[index] = max(len(_make_utf8(column)), lengths[index]) + return lengths + +def _row_template(lengths, colors, indent): fmt = indent sep = "" for l,c in zip(lengths, colors): fmt += c + sep + "%-" + str(l) + "s" + normal sep = " " - - first = True fmt += "\n" - for row in [ headers ] + rows: - sys.stdout.write(fmt % tuple(make_utf8(c) for c in row[:num_columns])) - if first: - first = False - sys.stdout.write(fmt % tuple("-" * l for l in lengths)) + return fmt + + +def _make_utf8(x): + if type(x) == unicode: + return x.encode('utf-8') + return str(x)

6 years, 1 month

Add some verbose diagnose output

by Lars Michelsen

Module: check_mk Branch: master Commit: aba4f336b737402a986d10d8ce280bc3c703238e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aba4f336b73740… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 12:08:34 2018 +0200 Add some verbose diagnose output Change-Id: I6ef902ff2074205cf2354355475c536f4c1ec700 --- cmk/cpu_tracking.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmk/cpu_tracking.py b/cmk/cpu_tracking.py index a839d42..d1768ea 100644 --- a/cmk/cpu_tracking.py +++ b/cmk/cpu_tracking.py @@ -27,6 +27,8 @@ import os import time +import cmk_base.console as console + try: _ except NameError: @@ -37,6 +39,7 @@ current_phase = None def start(initial_phase): global times, last_time_snapshot, current_phase, phase_stack times = {} + console.vverbose("[cpu_tracking] Start with phase '%s'\n" % initial_phase) last_time_snapshot = _time_snapshot() current_phase = initial_phase phase_stack = [] @@ -44,24 +47,28 @@ def start(initial_phase): def end(): + console.vverbose("[cpu_tracking] End\n") set_phase(None) def set_phase(phase): global current_phase if current_phase != None: + console.vverbose("[cpu_tracking] Set phase: %s (previous %s)\n" % (phase, current_phase)) _add_times_to_phase() current_phase = phase def push_phase(phase): if current_phase != None: + console.vverbose("[cpu_tracking] Push phase (Stack: %r)\n" % phase_stack) phase_stack.append(current_phase) set_phase(phase) def pop_phase(): if current_phase != None: + console.vverbose("[cpu_tracking] Pop current phase (Stack: %r)\n" % phase_stack) if len(phase_stack) == 1: set_phase(None) else:

6 years, 1 month

6376 FIX Analyze configuration: Fixed "Apache number of processes" on SLES

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d117f66ee69de0b21655eb40185f5414f7e881d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d117f66ee69de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 23:00:56 2018 +0200 6376 FIX Analyze configuration: Fixed "Apache number of processes" on SLES An exception could occur for the test "Apache number of processes" on at least SLES12: CRIT: Failed to execute the test ACTestApacheNumberOfProcesses: Traceback (most recent call last): File "/omd/sites/TESTSITE/share/check_mk/web/htdocs/watolib.py", line 9591, in run total_result = ACResult.merge(*list(self.execute())) File "/omd/sites/TESTSITE/share/check_mk/web/plugins/wato/ac_tests.py", line 388, in execute average_process_size = self._get_average_process_size() File "/omd/sites/TESTSITE/share/check_mk/web/plugins/wato/ac_tests.py", line 408, in _get_average_process_size sizes.append(int(summary_line.split()[3][:-1])*1024.0) ValueError: invalid literal for int() with base 10: 'readonly-private' Change-Id: I8ab0e3a43985bcd8d803a4bd2909eb2166aee50a --- .werks/6376 | 22 ++++++++++++++++++++++ cmk/gui/plugins/wato/ac_tests.py | 26 ++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/.werks/6376 b/.werks/6376 new file mode 100644 index 0000000..d91d799 --- /dev/null +++ b/.werks/6376 @@ -0,0 +1,22 @@ +Title: Analyze configuration: Fixed "Apache number of processes" on SLES +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532725076 + +An exception could occur for the test "Apache number of processes" on at +least SLES12: + +CRIT: +Failed to execute the test ACTestApacheNumberOfProcesses: Traceback (most recent call last): +File "/omd/sites/TESTSITE/share/check_mk/web/htdocs/watolib.py", line 9591, in run +total_result = ACResult.merge(*list(self.execute())) +File "/omd/sites/TESTSITE/share/check_mk/web/plugins/wato/ac_tests.py", line 388, in execute +average_process_size = self._get_average_process_size() +File "/omd/sites/TESTSITE/share/check_mk/web/plugins/wato/ac_tests.py", line 408, in _get_average_process_size +sizes.append(int(summary_line.split()[3][:-1])*1024.0) +ValueError: invalid literal for int() with base 10: 'readonly-private' diff --git a/cmk/gui/plugins/wato/ac_tests.py b/cmk/gui/plugins/wato/ac_tests.py index d50cc70..1e4c544 100644 --- a/cmk/gui/plugins/wato/ac_tests.py +++ b/cmk/gui/plugins/wato/ac_tests.py @@ -501,8 +501,7 @@ class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest): sizes = [] for pid in subprocess.check_output(["ps", "--ppid", "%d" % ppid, "h", "o", "pid"]).splitlines(): - summary_line = subprocess.check_output(["pmap", "-d", "%d" % int(pid)]).splitlines()[-1] - sizes.append(int(summary_line.split()[3][:-1])*1024.0) + sizes.append(self._get_process_size(pid)) if not sizes: raise MKGeneralException(_("Failed to estimate the apache process size")) @@ -510,6 +509,29 @@ class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest): return sum(sizes) / float(len(sizes)) + def _get_process_size(self, pid): + # Summary line seems to be different on the supported distros + # Ubuntu 17.10 (pmap from procps-ng 3.3.12): + # mapped: 25036K writeable/private: 2704K shared: 28K + # SLES12 + # 4020K writable-private, 102960K readonly-private, 1856K shared, and 636K referenced + # SLES12SP3 (pmap using library of procps-ng 3.3.9) + # 2784K writable-private, 21052K readonly-private, and 28K shared + # CentOS 5.5 (pmap procps version 3.2.7) + # mapped: 66176K writeable/private: 548K shared: 28K + # CentOS 7 (pmap from procps-ng 3.3.10) + # mapped: 115524K writeable/private: 684K shared: 28K + summary_line = subprocess.check_output(["pmap", "-d", "%d" % int(pid)]).splitlines()[-1] + + parts = summary_line.split() + if parts[1] == "writable-private,": + writable_private = parts[0] + else: + writable_private = parts[3] + + return int(writable_private[:-1]) * 1024.0 + + class ACTestApacheProcessUsage(ACTest, BPApacheTest): def category(self):

6 years, 1 month

Fixed wrong maximum column length calculation

by Lars Michelsen

Module: check_mk Branch: master Commit: d7c3d3591a4cb452bfa73c5af4937d36a2f428e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7c3d3591a4cb4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 22:05:06 2018 +0200 Fixed wrong maximum column length calculation Change-Id: I435ee12143f8a6b278ada9513339b16ef701f893 --- cmk/tty.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmk/tty.py b/cmk/tty.py index e9f2a4d..df0fa97 100644 --- a/cmk/tty.py +++ b/cmk/tty.py @@ -109,7 +109,7 @@ def get_size(): # TODO: Is this a good place? # TODO: Cleanup this function! def print_table(headers, colors, rows, indent = ""): - lengths = [ len(h) for h in headers ] + num_columns = len(headers) def make_utf8(x): if type(x) == unicode: @@ -117,8 +117,10 @@ def print_table(headers, colors, rows, indent = ""): else: return "%s" % (x,) + lengths = [ len(h) for h in headers ] for row in rows: - lengths = [ max(len(make_utf8(c)), l) for c, l in zip(row, lengths) ] + for index, column in enumerate(row[:num_columns]): + lengths[index] = max(len(make_utf8(column)), lengths[index]) fmt = indent sep = "" @@ -129,7 +131,7 @@ def print_table(headers, colors, rows, indent = ""): first = True fmt += "\n" for row in [ headers ] + rows: - sys.stdout.write(fmt % tuple(make_utf8(c) for c in row[:len(headers)])) + sys.stdout.write(fmt % tuple(make_utf8(c) for c in row[:num_columns])) if first: first = False sys.stdout.write(fmt % tuple("-" * l for l in lengths))

6 years, 1 month

Add some basic unit tests for cmk.cpu_tracking

by Lars Michelsen

Module: check_mk Branch: master Commit: 82ac49a36583d662ddc9ca49eea66eaa01bc85ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82ac49a36583d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 13:41:15 2018 +0200 Add some basic unit tests for cmk.cpu_tracking Change-Id: I5a27c43e092df07143e122263c1d5634b76d6355 --- tests/unit/cmk/test_cpu_tracking.py | 85 +++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/tests/unit/cmk/test_cpu_tracking.py b/tests/unit/cmk/test_cpu_tracking.py new file mode 100644 index 0000000..48e29ed --- /dev/null +++ b/tests/unit/cmk/test_cpu_tracking.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python + +import time + +import cmk.cpu_tracking as cpu_tracking + +def test_cpu_tracking_initial_times(): + assert cpu_tracking.get_times() == {} + + +def test_cpu_tracking_initial_state(): + assert cpu_tracking._is_not_tracking() + + +def test_pop_without_tracking(): + assert cpu_tracking._is_not_tracking() + cpu_tracking.pop_phase() + assert cpu_tracking._is_not_tracking() + + +def test_push_without_tracking(): + cpu_tracking.push_phase("bla") + assert cpu_tracking._is_not_tracking() + + +def test_cpu_tracking_simple(monkeypatch): + monkeypatch.setattr("time.time", lambda: 0.0) + cpu_tracking.start("busy") + assert cpu_tracking.get_times() == {} + monkeypatch.setattr("time.time", lambda: 1.0) + cpu_tracking.end() + + times = cpu_tracking.get_times() + + assert len(times) == 2 + assert len(times["TOTAL"]) == 5 + assert times["TOTAL"][4] == 1.0 + assert times["busy"][4] == 1.0 + + +def test_cpu_tracking_multiple_phases(monkeypatch): + monkeypatch.setattr("time.time", lambda: 0.0) + cpu_tracking.start("busy") + monkeypatch.setattr("time.time", lambda: 2.0) + + cpu_tracking.push_phase("agent") + monkeypatch.setattr("time.time", lambda: 5.0) + cpu_tracking.pop_phase() + + cpu_tracking.push_phase("snmp") + monkeypatch.setattr("time.time", lambda: 7.0) + cpu_tracking.pop_phase() + + cpu_tracking.end() + + times = cpu_tracking.get_times() + assert len(times) == 4 + + assert times["TOTAL"][4] == 7.0 + assert times["busy"][4] == 2.0 + assert times["snmp"][4] == 2.0 + assert times["agent"][4] == 3.0 + + +def test_cpu_tracking_add_times(monkeypatch): + monkeypatch.setattr("time.time", lambda: 0.0) + cpu_tracking.start("busy") + monkeypatch.setattr("time.time", lambda: 2.0) + + cpu_tracking.push_phase("agent") + monkeypatch.setattr("time.time", lambda: 5.0) + cpu_tracking.pop_phase() + + cpu_tracking.push_phase("agent") + monkeypatch.setattr("time.time", lambda: 7.0) + cpu_tracking.pop_phase() + + cpu_tracking.end() + + times = cpu_tracking.get_times() + assert len(times) == 3 + + assert times["TOTAL"][4] == 7.0 + assert times["busy"][4] == 2.0 + assert times["agent"][4] == 5.0

6 years, 1 month

Renamed cpu_tracking.set_phase to be module internal

by Lars Michelsen

Module: check_mk Branch: master Commit: 007e0eb247b220c5795b88fa6355898c3324af06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=007e0eb247b220… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 12:11:57 2018 +0200 Renamed cpu_tracking.set_phase to be module internal Change-Id: I69a56729adffe2503948090a6c292ff50d100a91 --- cmk/cpu_tracking.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/cmk/cpu_tracking.py b/cmk/cpu_tracking.py index d1768ea..102445b 100644 --- a/cmk/cpu_tracking.py +++ b/cmk/cpu_tracking.py @@ -34,6 +34,10 @@ try: except NameError: _ = lambda x: x # Fake i18n when not available +# TODO: Move state out of module scope +# TODO: This should be rewritten to a context manager object. See cmk.profile for +# an example how it could look like. + current_phase = None def start(initial_phase): @@ -43,36 +47,28 @@ def start(initial_phase): last_time_snapshot = _time_snapshot() current_phase = initial_phase phase_stack = [] - set_phase(initial_phase) + _set_phase(initial_phase) def end(): console.vverbose("[cpu_tracking] End\n") - set_phase(None) - - -def set_phase(phase): - global current_phase - if current_phase != None: - console.vverbose("[cpu_tracking] Set phase: %s (previous %s)\n" % (phase, current_phase)) - _add_times_to_phase() - current_phase = phase + _set_phase(None) def push_phase(phase): if current_phase != None: console.vverbose("[cpu_tracking] Push phase (Stack: %r)\n" % phase_stack) phase_stack.append(current_phase) - set_phase(phase) + _set_phase(phase) def pop_phase(): if current_phase != None: console.vverbose("[cpu_tracking] Pop current phase (Stack: %r)\n" % phase_stack) if len(phase_stack) == 1: - set_phase(None) + _set_phase(None) else: - set_phase(phase_stack[-1]) + _set_phase(phase_stack[-1]) del phase_stack[-1] @@ -81,6 +77,14 @@ def get_times(): return times +def _set_phase(phase): + global current_phase + if current_phase != None: + console.vverbose("[cpu_tracking] Set phase: %s (previous %s)\n" % (phase, current_phase)) + _add_times_to_phase() + current_phase = phase + + def _add_times_to_phase(): global last_time_snapshot new_time_snapshot = _time_snapshot()

6 years, 1 month

Add missing initial definitions of module globals

by Lars Michelsen

Module: check_mk Branch: master Commit: 5952a3ac69a6b3b32eaf2d9801739450f63945fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5952a3ac69a6b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 12:14:06 2018 +0200 Add missing initial definitions of module globals Change-Id: I8057c46f6b231767fbf78517eba5508e64def2a6 --- cmk/cpu_tracking.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmk/cpu_tracking.py b/cmk/cpu_tracking.py index 102445b..d09de20 100644 --- a/cmk/cpu_tracking.py +++ b/cmk/cpu_tracking.py @@ -38,6 +38,9 @@ except NameError: # TODO: This should be rewritten to a context manager object. See cmk.profile for # an example how it could look like. +times = {} +last_time_snapshot = [] +phase_stack = [] current_phase = None def start(initial_phase):

6 years, 1 month

6374 FIX Fixed wrong Check_MK service execution time calculation with special agents

by Lars Michelsen

Module: check_mk Branch: master Commit: f8f4ffb6678d03181ff547983fe9a4f74ef5d8b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8f4ffb6678d03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 13:49:56 2018 +0200 6374 FIX Fixed wrong Check_MK service execution time calculation with special agents When hosts are checked using multiple agents the times of special agents was not accounted correctly. This resulted in wrong numbers being reported in the "execution time" output and wrong values in the graphs. Change-Id: Idaf4999447be05e7f196b249cceb22822c254b15 --- .werks/6374 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/6374 b/.werks/6374 new file mode 100644 index 0000000..c3fa18d --- /dev/null +++ b/.werks/6374 @@ -0,0 +1,13 @@ +Title: Fixed wrong Check_MK service execution time calculation with special agents +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532692099 + +When hosts are checked using multiple agents the times of special agents +was not accounted correctly. This resulted in wrong numbers being reported +in the "execution time" output and wrong values in the graphs.

6 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018