Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

Use Bandit from the virtual environment, not a random global one. Test the right files.

by Sven Panne

Module: check_mk Branch: master Commit: 49a80c0f23391f8f911baeb34799a1d252fd0b58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49a80c0f23391f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 29 10:45:33 2018 +0100 Use Bandit from the virtual environment, not a random global one. Test the right files. The config has been regenrated from the new Bandit version, and we included a workaround for a strange performance problem. Change-Id: Idb673b98ab03da746a0db33bdadc29662ae92b3c --- bandit.yaml | 386 ++++++++++++++++++++++++++++++++++++++++++++----------- tests/.gitignore | 1 + tests/Makefile | 41 ++++-- 3 files changed, 339 insertions(+), 89 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=49a80c0f23…

5 years, 7 months

6646 FIX CPU utilization per process can be weighted by total CPU number

by Óscar Nájera

Module: check_mk Branch: master Commit: 8b28cb94e8f6725f5b91825738f478423bf18081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b28cb94e8f672… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Oct 26 16:20:27 2018 +0200 6646 FIX CPU utilization per process can be weighted by total CPU number Processes that where monitored on CPU utilization did not have a consistent behavior. On windows systems 100% CPU utilization implied all cores in the system where at max load. On other systems every core contributed with a 100% at full load, thus the maximum load was N*100%. This was also inconsistent with the system wide CPU utilization check where, 100% is all cores at full load. Consistency is brought is this werk, where 100% is all cores at full load by default. For backwards compatibility with previous configurations, where threshold rules where explicitly configured, the old behavior continues to be used until the user explicitly chooses a particular behavior. This option is available under CPU rescale maximum load in the process discovery rules. CMK-695 Change-Id: I63d420c74f2bbf762dec4615b49518e03e32404e --- .werks/6646 | 24 +++++++ checks/ps | 2 +- checks/ps.include | 46 +++++++++---- cmk/gui/plugins/wato/check_parameters.py | 35 +++++++--- tests/unit/checks/test_ps.py | 109 ++++++++++++++++++++++++++----- 5 files changed, 177 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8b28cb94e8…

5 years, 7 months

Upperlevels with human readable representation

by Óscar Nájera

Module: check_mk Branch: master Commit: 9f8c194a91278e72f22221ae5896674c5ea1809f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f8c194a91278e… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Oct 29 14:46:56 2018 +0100 Upperlevels with human readable representation Change-Id: I56f15451241d68b26fa711abeebbe2c93e4519d7 --- checks/ps.include | 25 ++++++++++++++++--------- tests/unit/checks/test_ps.py | 14 ++++++++++---- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index ebb4d1d..9b8b7a2 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -377,7 +377,7 @@ def check_ps_common(item, params, parsed, cpu_cores=1, info_name="process", tota yield 0, infotext -def upperlevels(value, warn, crit): +def upperlevels(value, warn, crit, readable=str): infotext = '' if value >= crit: state = 2 @@ -386,7 +386,7 @@ def upperlevels(value, warn, crit): else: state = 0 if state: - infotext = ": (warn/crit at %d/%d)" % (warn, crit) + infotext = ": (warn/crit at %s/%s)" % tuple(map(readable, (warn, crit))) return state, infotext @@ -432,8 +432,11 @@ def memory_check(processes, params): infotext = "%s %s" % (get_bytes_human_readable(size * 1024.0), title) warn_levels, crit_levels = params.get(levels, (None, None)) - state, levelstext = upperlevels(size * 1024, warn_levels, - crit_levels) if levels in params else (0, "") + if levels in params: + state, levelstext = upperlevels(size * 1024, warn_levels, crit_levels, + get_bytes_human_readable) + else: + state, levelstext = 0, "" yield state, infotext + levelstext, [(metric, size, warn_levels, crit_levels)] @@ -446,7 +449,8 @@ def memory_perc_check(processes, params, total_ram): else: resident_perc = 100 * float(processes.resident_size * 1024) / total_ram infotext = "%s of total RAM" % get_percent_human_readable(resident_perc) - state, levelstext = upperlevels(resident_perc, warn_perc, crit_perc) + state, levelstext = upperlevels(resident_perc, warn_perc, crit_perc, + get_percent_human_readable) infotext += levelstext return state, infotext @@ -467,8 +471,9 @@ def cpu_check(percent_cpu, item, params): perf_data.append(("pcpuavg", avg_cpu, warn_cpu, crit_cpu, 0, params["cpu_average"])) percent_cpu = avg_cpu # use this for level comparison - state, levelstext = upperlevels(percent_cpu, warn_cpu, - crit_cpu) if "cpulevels" in params else (0, "") + state, levelstext = upperlevels(percent_cpu, warn_cpu, crit_cpu, + get_percent_human_readable) if "cpulevels" in params else (0, + "") return state, infotext + levelstext, perf_data @@ -485,7 +490,8 @@ def individual_process_check(processes, params): elif the_item.startswith("cpu usage"): cpu_usage += value - state, levelstext = upperlevels(cpu_usage, warn_cpu_single, crit_cpu_single) + state, levelstext = upperlevels(cpu_usage, warn_cpu_single, crit_cpu_single, + get_percent_human_readable) process_description = name + " with PID %s" % pid if pid else "" infotext = "%.1f%% CPU for %s%s" % (cpu_usage, process_description, levelstext) yield state, infotext @@ -502,7 +508,8 @@ def uptime_check(times, params): if "max_age" in params: warn_age, crit_age = params["max_age"] - state, levelstext = upperlevels(times.max_elapsed, warn_age, crit_age) + state, levelstext = upperlevels(times.max_elapsed, warn_age, crit_age, + get_age_human_readable) infotext += levelstext return state, infotext diff --git a/tests/unit/checks/test_ps.py b/tests/unit/checks/test_ps.py index 3ab750f..99d1b1d 100644 --- a/tests/unit/checks/test_ps.py +++ b/tests/unit/checks/test_ps.py @@ -213,6 +213,8 @@ PS_DISCOVERY_WATO_RULES = [ "cpu_average": 15, "process_info": "html", "resident_levels_perc": (25.0, 50.0), + "virtual_levels": (1024**3, 2*1024**3), + "resident_levels": (1024**3, 2*1024**3), }, "icon": "emacs.png", "descr": "emacs", @@ -270,6 +272,8 @@ PS_DISCOVERY_SPECS = [ "cpu_average": 15, "process_info": "html", "resident_levels_perc": (25.0, 50.0), + "virtual_levels": (1024**3, 2*1024**3), + "resident_levels": (1024**3, 2*1024**3), }), ("cron", "~.*cron", "root", None, { "max_age": (3600, 7200), @@ -351,6 +355,8 @@ PS_DISCOVERED_ITEMS = [ "icon": "emacs.png", "user": "on", "process_info": "html", + "virtual_levels": (1024**3, 2*1024**3), + "resident_levels": (1024**3, 2*1024**3), }), ("firefox is on fire", { "process": "~.*firefox", @@ -409,9 +415,9 @@ def test_replace_service_description_exception(check_manager): check_results = [ CheckResult([ (0, "1 process", [("count", 1, 100000, 100000, 0)]), - (0, "1.00 GB virtual", [("vsz", 1050360, None, None, None, None)]), - (0, "296.14 MB physical", [("rss", 303252, None, None, None, None)]), - (1, "28.9% of total RAM: (warn/crit at 25/50)"), + (1, "1.00 GB virtual: (warn/crit at 1.00 GB/2.00 GB)", [("vsz", 1050360, 1073741824, 2147483648, None, None)]), + (0, "296.14 MB physical", [("rss", 303252, 1073741824, 2147483648, None, None)]), + (1, "28.9% of total RAM: (warn/crit at 25.0%/50.0%)"), (0, "0.0% CPU (15 min average: 0.0%)", [("pcpu", 0.0, None, None, None, None), ("pcpuavg", 0.0, None, None, 0, 15)]), (0, "running for 27 h", []), @@ -444,7 +450,7 @@ check_results = [ (0, "0.0% CPU for svchost.exe with PID 764"), (1, "1204 process handles: (warn/crit at 1000/2000)", [("process_handles", 1204, 1000, 2000, None, None)]), - (1, "youngest running for 12.0 s, oldest running for 71 m: (warn/crit at 3600/7200)", []), + (1, "youngest running for 12.0 s, oldest running for 71 m: (warn/crit at 60 m/120 m)", []), ]), CheckResult([ (0, "1 process", [("count", 1, 100000, 100000, 0, None)]),

5 years, 7 months

Removed accidental leftover.

by Sven Panne

Module: check_mk Branch: master Commit: a7506e5ce6237772e35897ad6898c35b5e90c905 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7506e5ce62377… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 31 09:59:20 2018 +0100 Removed accidental leftover. Change-Id: I11e017fbcf418ed66155535e0b000768996af072 --- omd/packages/googletest/googletest-0048647619.tar.gz | Bin 980888 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/googletest/googletest-0048647619.tar.gz b/omd/packages/googletest/googletest-0048647619.tar.gz deleted file mode 100644 index 890ef7b..0000000 Binary files a/omd/packages/googletest/googletest-0048647619.tar.gz and /dev/null differ

5 years, 7 months

CMK-1134 update all python packages

by Alex Zurhake

Module: check_mk Branch: master Commit: 1a4b1040c783ab557c764284450c7946b303ada7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a4b1040c783ab… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Oct 25 14:58:51 2018 +0200 CMK-1134 update all python packages Some patches are not needed anymore, since the fix is upstream: deleted: patches/0007-psycopg-wrong-ifdef.dif deleted: patches/0016-make-psycopg2-build-with-ubuntu-bionic.dif Change-Id: Ic0a286c085e2dc92810d79fd598f5b098bfbf92d --- Pipfile | 48 +- Pipfile.lock | 604 ++++++++++++--------- omd/packages/python-modules/Makefile | 51 +- .../patches/0006-pyOpenSSL_with_0.9.8.dif | 22 +- .../patches/0007-psycopg-wrong-ifdef.dif | 19 - ...0016-make-psycopg2-build-with-ubuntu-bionic.dif | 31 -- .../patches/0017-find-omd-snap7-library.dif | 5 +- .../{Pillow-5.1.0.tar.gz => Pillow-5.3.0.tar.gz} | Bin 14286366 -> 15553718 bytes omd/packages/python-modules/src/adal-1.1.0.tar.gz | Bin 32978 -> 0 bytes omd/packages/python-modules/src/adal-1.2.0.tar.gz | Bin 0 -> 33110 bytes .../python-modules/src/azure-common-1.1.15.zip | Bin 15887 -> 0 bytes .../python-modules/src/azure-common-1.1.16.zip | Bin 0 -> 15305 bytes ...pute-4.1.0.zip => azure-mgmt-compute-4.3.1.zip} | Bin 2199016 -> 2552116 bytes .../python-modules/src/certifi-2018.10.15.tar.gz | Bin 0 -> 145887 bytes .../python-modules/src/certifi-2018.8.24.tar.gz | Bin 146866 -> 0 bytes .../python-modules/src/keyring-13.2.1.tar.gz | Bin 43140 -> 0 bytes .../python-modules/src/keyring-15.1.0.tar.gz | Bin 0 -> 42891 bytes .../python-modules/src/msrest-0.5.5.tar.gz | Bin 38505 -> 0 bytes .../python-modules/src/msrest-0.6.1.tar.gz | Bin 0 -> 54335 bytes .../python-modules/src/paramiko-2.1.2.tar.gz | Bin 1196746 -> 0 bytes .../python-modules/src/paramiko-2.4.2.tar.gz | Bin 0 -> 1207299 bytes omd/packages/python-modules/src/pbr-4.0.3.tar.gz | Bin 108684 -> 0 bytes omd/packages/python-modules/src/pbr-5.1.0.tar.gz | Bin 0 -> 114412 bytes omd/packages/python-modules/src/pip-10.0.1.tar.gz | Bin 1246072 -> 0 bytes omd/packages/python-modules/src/pip-18.1.tar.gz | Bin 0 -> 1259370 bytes .../python-modules/src/psutil-5.4.5.tar.gz | Bin 418003 -> 0 bytes .../python-modules/src/psutil-5.4.7.tar.gz | Bin 0 -> 420300 bytes .../python-modules/src/pyOpenSSL-16.2.0.tar.gz | Bin 167305 -> 0 bytes .../python-modules/src/pyOpenSSL-18.0.0.tar.gz | Bin 0 -> 167296 bytes .../python-modules/src/pyasn1-0.4.3.tar.gz | Bin 118494 -> 0 bytes .../python-modules/src/pyasn1-0.4.4.tar.gz | Bin 0 -> 118725 bytes .../python-modules/src/pycryptodomex-3.4.7.tar.gz | Bin 6483404 -> 0 bytes .../python-modules/src/pycryptodomex-3.6.6.tar.gz | Bin 0 -> 7137201 bytes .../python-modules/src/pymssql-2.1.4.tar.gz | Bin 0 -> 691589 bytes omd/packages/python-modules/src/pysmi-0.3.0.tar.gz | Bin 92850 -> 0 bytes omd/packages/python-modules/src/pysmi-0.3.2.tar.gz | Bin 0 -> 93256 bytes .../python-modules/src/python-snap7-0.10.tar.gz | Bin 0 -> 32744 bytes .../python-modules/src/python-snap7-0.9.tar.gz | Bin 30789 -> 0 bytes .../python-modules/src/reportlab-3.4.0.tar.gz | Bin 1995779 -> 0 bytes .../python-modules/src/reportlab-3.5.9.tar.gz | Bin 0 -> 2837351 bytes .../python-modules/src/requests-2.19.1.tar.gz | Bin 131068 -> 0 bytes .../python-modules/src/requests-2.20.0.tar.gz | Bin 0 -> 111179 bytes .../src/requests-kerberos-0.11.0.tar.gz | Bin 10742 -> 0 bytes .../src/requests-kerberos-0.12.0.tar.gz | Bin 0 -> 11257 bytes omd/packages/python-modules/src/scandir-1.7.tar.gz | Bin 32812 -> 0 bytes .../python-modules/src/scandir-1.9.0.tar.gz | Bin 0 -> 33315 bytes .../python-modules/src/setuptools-39.2.0.zip | Bin 851112 -> 0 bytes .../python-modules/src/setuptools-40.4.3.zip | Bin 0 -> 854871 bytes .../python-modules/src/setuptools_scm-2.1.0.tar.gz | Bin 32776 -> 0 bytes .../python-modules/src/setuptools_scm-3.1.0.tar.gz | Bin 0 -> 35585 bytes .../python-modules/src/simplejson-3.15.0.tar.gz | Bin 80963 -> 0 bytes .../python-modules/src/simplejson-3.16.0.tar.gz | Bin 0 -> 81203 bytes .../python-modules/src/tinkerforge-2.1.15.tar.gz | Bin 191508 -> 0 bytes .../python-modules/src/tinkerforge-2.1.19.tar.gz | Bin 0 -> 307996 bytes .../python-modules/src/urllib3-1.23.tar.gz | Bin 228314 -> 0 bytes .../python-modules/src/urllib3-1.24.tar.gz | Bin 0 -> 229200 bytes 56 files changed, 406 insertions(+), 374 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1a4b1040c7…

5 years, 7 months

Revert superfluous Dockerfile "fixes".

by Sven Panne

Module: check_mk Branch: master Commit: 2b903843012387113f2220b5b819aa072e1019ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b903843012387… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 30 15:24:09 2018 +0100 Revert superfluous Dockerfile "fixes". This reverts commit fd72273d83bc014b0e2f8f7a429d90236afc890a. This reverts commit 849f6f1e048f6d8bd82f1d95d26dacdf06e16427. This reverts commit bd893f00a59eb8c8e0bf908e08167f54fff2d79b. --- docker/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 91410ae..74d228e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,12 +31,10 @@ COPY needed-packages /needed-packages # Then fetch the package and install it. This will make sure all Check_MK # containers will share all dependencies, including this step. # hadolint ignore=SC2046,DL3008 -# Add sources.list since 'deb http://deb.debian.org/debian stretch main' is not always resolved correctly RUN set -e \ && echo "exit 101" > /usr/sbin/policy-rc.d \ && chmod +x /usr/sbin/policy-rc.d \ && export DEBIAN_FRONTEND=noninteractive \ - && echo 'deb http://ftp.de.debian.org/debian stretch main' > /etc/apt/sources.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \

5 years, 7 months

fix-.venv-target: Use pipenv sync to install python packages exactly as

by Alex Zurhake

Module: check_mk Branch: master Commit: 9051c48ef4bbe870ed3073c2679557da341742e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9051c48ef4bbe8… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Oct 29 11:29:42 2018 +0100 fix-.venv-target: Use pipenv sync to install python packages exactly as specified in Pipfile.lock (fastest way). Change-Id: I2596f811b355eb7937385eda15c7159b5a5016fe --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 330a7df..bebb292 100644 --- a/Makefile +++ b/Makefile @@ -500,9 +500,11 @@ Pipfile.lock: Pipfile rm -rf .venv .venv: Pipfile.lock - $(PIPENV) install --dev - $(PIPENV) clean -# TODO: Part 2 of the hack for the Pipfile.lock target. +# Remake .venv everytime Pipfile or Pipfile.lock are updated. Using the 'sync' +# mode installs the dependencies exactly as speciefied in the Pipfile.lock. +# This is extremely fast since the dependencies do not have to be resolved. + $(RM) -r .venv + $(PIPENV) sync --dev touch .venv # This dummy rule is called from subdirectories whenever one of the

5 years, 7 months

Yet another attempt to unbreak the nightly build...

by Sven Panne

Module: check_mk Branch: master Commit: fd72273d83bc014b0e2f8f7a429d90236afc890a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd72273d83bc01… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 30 07:57:24 2018 +0100 Yet another attempt to unbreak the nightly build... Change-Id: I7d8f723c12c8018126a6d36c4b5f9b64af966b5f --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 79a0007..91410ae 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,7 +36,7 @@ RUN set -e \ && echo "exit 101" > /usr/sbin/policy-rc.d \ && chmod +x /usr/sbin/policy-rc.d \ && export DEBIAN_FRONTEND=noninteractive \ - && echo 'ftp.de.debian.org/debian stretch main' > /etc/apt/sources.list \ + && echo 'deb http://ftp.de.debian.org/debian stretch main' > /etc/apt/sources.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \

5 years, 7 months

Unbreak Dockerfile.

by Sven Panne

Module: check_mk Branch: master Commit: 849f6f1e048f6d8bd82f1d95d26dacdf06e16427 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=849f6f1e048f6d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 29 17:00:16 2018 +0100 Unbreak Dockerfile. Change-Id: I17451e8746207ba6fc6b7dcd66fe05bf18d8b0ac --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9018231..79a0007 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,7 +36,7 @@ RUN set -e \ && echo "exit 101" > /usr/sbin/policy-rc.d \ && chmod +x /usr/sbin/policy-rc.d \ && export DEBIAN_FRONTEND=noninteractive \ - && echo 'ftp.de.debian.org/debian stretch main' > /etc/apt/sources.list + && echo 'ftp.de.debian.org/debian stretch main' > /etc/apt/sources.list \ && apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \

5 years, 7 months

Refactor PS check for better readability. Include unit tests

by Óscar Nájera

Module: check_mk Branch: master Commit: c8bf878ff73bd8bf3bfc4dc6970ec4cd1ab89901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8bf878ff73bd8… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Oct 11 17:13:48 2018 +0200 Refactor PS check for better readability. Include unit tests This is a squashed commit of all changes. There are no functionalities in here. Some bugs where fixed. Moving a lot of stuff around Some moving and splitting try on win bug PS info namedtuple and yapf Separated linux process treatment separate win process part Shortening and moving plus test Moving stuff Cleaning tests Solaris fix and organize parse tests bug fix move nametuple process drop grabbed user in discovery Drop extended_perf data variable memory and time named tuples join process matches logic memory and time wato rules Test on deprecated windows agent All outputs parsing tests Refactor wmic info merger Refactoring discovery Services description First tests on inventory process matches test Test discovery function Test check More tests on check CMK-695 Check common refactoring test cleanup params cleanup for consistency Drop unused variables clean todo comments cpu utilization refactor lifetimes to independent functions minor drop count variable Process aggregator class Moving stuff CMK-695 Change-Id: Iba2e71df2341cca8cc22ce4ffece4f159d2881a0 --- agents/check_mk_agent.solaris | 1 - checks/ps | 200 +++++----- checks/ps.include | 834 ++++++++++++++++++++++-------------------- cmk_base/check_api.py | 2 +- cmk_base/config.py | 2 +- tests/unit/checks/test_ps.py | 470 ++++++++++++++++++++++++ 6 files changed, 1024 insertions(+), 485 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c8bf878ff7…

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018