Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Unreachable tests: Tell nagios to check for commands more often

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e22df6ef1de1700f6f3be4056a8d93cd56e7f44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e22df6ef1de17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 13 13:16:05 2017 +0100 Unreachable tests: Tell nagios to check for commands more often Change-Id: Ibf22df96bd2a0c6755123c18dcdd88a45b6ec292 --- tests/notifications/test_unreachable_notifications.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/notifications/test_unreachable_notifications.py b/tests/notifications/test_unreachable_notifications.py index 4a8ecf6..8717275 100644 --- a/tests/notifications/test_unreachable_notifications.py +++ b/tests/notifications/test_unreachable_notifications.py @@ -62,6 +62,9 @@ def scenario(request, web, site): } web.set_ruleset("extra_host_conf:notification_options", rule_result) + # Make nagios check more often for incoming commands + site.write_file("etc/nagios/nagios.d/zzz_test_unreachable_notifications.cfg", + "command_check_interval=1s\n") web.activate_changes() @@ -80,9 +83,13 @@ def scenario(request, web, site): site.live.command("[%d] ENABLE_HOST_CHECK;notify-test-child" % time.time()) site.live.command("[%d] ENABLE_HOST_CHECK;notify-test-parent" % time.time()) + site.delete_file("etc/nagios/nagios.d/zzz_test_unreachable_notifications.cfg") + web.delete_host("notify-test-child") web.delete_host("notify-test-parent") + web.activate_changes() + @pytest.fixture(scope="function") def initial_state(site, scenario):

6 years, 10 months

Adapted werk

by Simon Betz

Module: check_mk Branch: master Commit: c8e1483b2dce8dfbf29b7e7ba60a99edd8b74e5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8e1483b2dce8d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 13 12:33:14 2017 +0100 Adapted werk Change-Id: I5b19c66589b16dac006055d33436a913332f54ee --- .werks/5443 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5443 b/.werks/5443 index 9c1c984..39dcf37 100644 --- a/.werks/5443 +++ b/.werks/5443 @@ -1,4 +1,4 @@ -Title: cisco_redundancy: Discover 'Redundancy Framework Status' service if devices supports that. +Title: cisco_redundancy: Discover 'Redundancy Framework Status' service if device supports that. Level: 1 Component: checks Class: fix

6 years, 10 months

5443 FIX cisco_redundancy: Discover 'Redundancy Framework Status' service if devices supports that.

by Simon Betz

Module: check_mk Branch: master Commit: f8d2a2fad05ef8dd3be33a46cedd820feb001e05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8d2a2fad05ef8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 13 12:31:56 2017 +0100 5443 FIX cisco_redundancy: Discover 'Redundancy Framework Status' service if devices supports that. Change-Id: Id0e3415377961e9fed69742bf71a109699bbd997 --- .werks/5443 | 11 +++++++++++ checks/cisco_redundancy | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/5443 b/.werks/5443 new file mode 100644 index 0000000..9c1c984 --- /dev/null +++ b/.werks/5443 @@ -0,0 +1,11 @@ +Title: cisco_redundancy: Discover 'Redundancy Framework Status' service if devices supports that. +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1510572474 + + diff --git a/checks/cisco_redundancy b/checks/cisco_redundancy index c72ce13..f09b7f4 100644 --- a/checks/cisco_redundancy +++ b/checks/cisco_redundancy @@ -34,7 +34,14 @@ def inventory_cisco_redundancy(info): - return [(None, {"init_states" : info[0][:5]})] + try: + swact_reason = info[0][5] + except IndexError: + pass + else: + if swact_reason != "1": + return [(None, {"init_states" : info[0][:5]})] + return [] def check_cisco_redundancy(_no_item, params, info):

6 years, 10 months

Temporarily disable site cleanup after testing

by Lars Michelsen

Module: check_mk Branch: master Commit: 040d864007bd85fb0f56bc60f2066d0dbcb6c1af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=040d864007bd85… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 13 10:31:45 2017 +0100 Temporarily disable site cleanup after testing Change-Id: I63a3f4f0bf79b3dbfd502458cacaeabc0867cb7a --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0d08e63..a7c93d8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -68,7 +68,7 @@ def setup_site_and_switch_user(): sys.stdout.write("Cleaning up after testing\n") sys.stdout.write("===============================================\n") - site.rm_if_not_reusing() + #site.rm_if_not_reusing() sys.exit(exit_code)

6 years, 10 months

5435 FIX Fixed "omd update" problems when updating from 1.4.0p17 or older

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ae53624a16c240bba4017be07f8831a2beffd0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ae53624a16c24… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 13 09:58:24 2017 +0100 5435 FIX Fixed "omd update" problems when updating from 1.4.0p17 or older When executing "omd update" as site user to update a site from 1.4.0p17 or older an error could occur blocking the update. The message looks like this: <pre> Traceback (most recent call last): File "/omd/versions/1.4.0p17.cee/bin/omd", line 52, in <module> import tarfile, fnmatch File "/omd/versions/1.4.0p17.cee/lib/python2.7/tarfile.py", line 52, in <module> import copy File "/omd/versions/1.4.0p17.cee/lib/python2.7/copy.py", line 52, in <module> import weakref File "/omd/versions/1.4.0p17.cee/lib/python2.7/weakref.py", line 14, in <module> from _weakref import ( ImportError: cannot import name _remove_dead_weakref </pre> This issue was caused by a mixup of python versions during the update which has been fixed now by using the correct libraries during the update. To workaround this issue, you could run the "omd update" command as root user instead of the site user. Change-Id: I09048fcc4151b4ba189db8c4890d5646f0b51f36 --- .werks/5435 | 31 +++++++++++++++++++++++++++++++ omd/packages/omd/omd | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/.werks/5435 b/.werks/5435 new file mode 100644 index 0000000..7f84903 --- /dev/null +++ b/.werks/5435 @@ -0,0 +1,31 @@ +Title: Fixed "omd update" problems when updating from 1.4.0p17 or older +Level: 2 +Component: omd +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510563044 +Class: fix + +When executing "omd update" as site user to update a site from 1.4.0p17 +or older an error could occur blocking the update. The message looks like +this: + +<pre> +Traceback (most recent call last): + File "/omd/versions/1.4.0p17.cee/bin/omd", line 52, in <module> + import tarfile, fnmatch + File "/omd/versions/1.4.0p17.cee/lib/python2.7/tarfile.py", line 52, in <module> + import copy + File "/omd/versions/1.4.0p17.cee/lib/python2.7/copy.py", line 52, in <module> + import weakref + File "/omd/versions/1.4.0p17.cee/lib/python2.7/weakref.py", line 14, in <module> + from _weakref import ( +ImportError: cannot import name _remove_dead_weakref +</pre> + +This issue was caused by a mixup of python versions during the update which has +been fixed now by using the correct libraries during the update. + +To workaround this issue, you could run the "omd update" command as root user instead +of the site user. diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index cca5b31..edd16cc 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -24,6 +24,31 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# This hack here is needed to prevent "omd update" problems when updating +# as site user from 1.4 versions older than 1.4.0p17. +# Previous versios did not unset PYTHONPATH/LD_LIBRARY_PATH before execv() +# to the newer version "omd" command which made the newer OMD load the old +# python libraries. Newer versions unset these variables before, so this +# additional execv() is only needed when updating from older versions. +import os, sys +if sys.argv[1] == "update" and sys.version_info[2] != 14: + # Prevent inheriting environment variables from this versions/site environment + # into the execed omd call. The OMD call must import the python version related + # modules and libaries. This only works when PYTHONPATH and LD_LIBRARY_PATH are + # not already set when calling "omd update" + try: + del os.environ["PYTHONPATH"] + except KeyError: + pass + + try: + del os.environ["LD_LIBRARY_PATH"] + except KeyError: + pass + os.execv(sys.argv[0], sys.argv) + bail_out("Cannot run execv() %s" % sys.argv[0]) + + import sys, os, shutil, pwd, grp, re, time, pprint, tty, termios, traceback import string import random @@ -4021,6 +4046,21 @@ def exec_other_omd(version): # Rerun with omd of other version omd_path = "/omd/versions/%s/bin/omd" % version if os.path.exists(omd_path): + if command == "update": + # Prevent inheriting environment variables from this versions/site environment + # into the execed omd call. The OMD call must import the python version related + # modules and libaries. This only works when PYTHONPATH and LD_LIBRARY_PATH are + # not already set when calling "omd update" + try: + del os.environ["PYTHONPATH"] + except KeyError: + pass + + try: + del os.environ["LD_LIBRARY_PATH"] + except KeyError: + pass + os.execv(omd_path, sys.argv) bail_out("Cannot run bin/omd of version %s." % version) else:

6 years, 10 months

Updated .f12 file

by Lars Michelsen

Module: check_mk Branch: master Commit: 036ac1559219c75ed7c1c80548f7a640eb43d24f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=036ac1559219c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 13 09:50:38 2017 +0100 Updated .f12 file Change-Id: I8b35a963f0c0c6da87c9e9dc3d2d3398df411306 --- omd/packages/omd/.f12 | 1 - 1 file changed, 1 deletion(-) diff --git a/omd/packages/omd/.f12 b/omd/packages/omd/.f12 index 0548e2c..13156a6 100755 --- a/omd/packages/omd/.f12 +++ b/omd/packages/omd/.f12 @@ -8,7 +8,6 @@ ROOT=/omd/sites/$SITE # Little install helper used during development and test sudo cp -v index.py $ROOT/share/omd/htdocs/index.py sudo cp -v logout.php $ROOT/share/omd/htdocs/logout.php -sudo cp -v img/* $ROOT/share/omd/htdocs/img/ sudo rm -vf $ROOT/share/man/man8/omd.8.gz sudo cp -v omd.8 $ROOT/share/man/man8/omd.8 sudo gzip $ROOT/share/man/man8/omd.8

6 years, 10 months

Windows agent: clang-format C++ code

by Jukka Aro

Module: check_mk Branch: master Commit: 73b1b757f964e17e30b389458a4707adebe0c739 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73b1b757f964e1… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Nov 13 08:33:42 2017 +0100 Windows agent: clang-format C++ code Change-Id: I0d71a9ba508282be26666e7c5e782333af8572c6 --- agents/windows/CrashHandler.cc | 4 ++-- agents/windows/PerfCounter.cc | 3 ++- agents/windows/PerfCounter.h | 4 ++-- agents/windows/PerfCounterCommon.cc | 14 ++++++++---- agents/windows/PerfCounterCommon.h | 31 +++++++++++++++++---------- agents/windows/check_mk_agent.cc | 25 +++++++++++---------- agents/windows/sections/SectionEventlog.cc | 11 ++++++---- agents/windows/sections/SectionPerfcounter.cc | 3 ++- agents/windows/sections/SectionPerfcounter.h | 3 ++- agents/windows/sections/SectionSkype.cc | 19 ++++++++++------ agents/windows/wmitest.cc | 2 +- 11 files changed, 72 insertions(+), 47 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=73b1b757f9…

6 years, 10 months

cmk-update-agent: Support build of cmk-update-agent within chroot-jail

by Andreas Umbreit

Module: check_mk Branch: master Commit: f2b93112c136c774a723e782cd1577cfe65fa8f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2b93112c136c7… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Nov 3 09:16:25 2017 +0100 cmk-update-agent: Support build of cmk-update-agent within chroot-jail - Use chroot jail from windows agent build - Add needed depencencies to windows agent make-chroot script - Make windows agent chroot scripts independend of current working directory - Update windows agent updater makefiles to support a parallel and incremental build - Update .gitignore files for a clean build on buildserver Change-Id: I7a7110e3427446288288ce158f2373792269f2c7 --- agents/windows/chroot_version | 2 +- agents/windows/do-chroot | 22 +++- .../windows/frozen_binaries/pyinstaller-deps.make | 122 +++++++++++++-------- agents/windows/make-chroot | 9 +- 4 files changed, 97 insertions(+), 58 deletions(-) diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index 1e8b314..7f8f011 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -6 +7 diff --git a/agents/windows/do-chroot b/agents/windows/do-chroot index 35ac818..5d7134c 100755 --- a/agents/windows/do-chroot +++ b/agents/windows/do-chroot @@ -7,7 +7,8 @@ CMD="$1" export HOSTNAME=cmk-windows-agent-chroot unset LANG -BASE="$(realpath ../..)" +SCRIPT_DIR="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" +BASE="$(realpath $SCRIPT_DIR/../..)" if [ -z $CHROOT_PATH ]; then echo "ERROR: CHROOT_PATH not set" @@ -48,11 +49,20 @@ else EXIT_CODE=$? fi -umount $CHROOT_PATH/$CHROOT_BUILD_DIR +function unmount() +{ + target=$1 + umount $target + if [ $? != 0 ] ; then + echo "retrying after 5 seconds..." + sleep 5 + umount $target && echo "successful" + fi +} -umount $CHROOT_PATH/dev/pts -sleep 4 -umount $CHROOT_PATH/dev -umount $CHROOT_PATH/proc +unmount $CHROOT_PATH/dev/pts +unmount $CHROOT_PATH/dev +unmount $CHROOT_PATH/proc +unmount $CHROOT_PATH/$CHROOT_BUILD_DIR exit $EXIT_CODE diff --git a/agents/windows/frozen_binaries/pyinstaller-deps.make b/agents/windows/frozen_binaries/pyinstaller-deps.make index fb9a930..9768246 100644 --- a/agents/windows/frozen_binaries/pyinstaller-deps.make +++ b/agents/windows/frozen_binaries/pyinstaller-deps.make @@ -8,72 +8,98 @@ PLUGINS_DIR = $(shell realpath ./../../plugins) # This package list originates from resolving the dependencies of the packages # pyinstaller, pyopenssl, requests. The required packages are explicitly listed # in favor of providing a working setup for a pyinstaller build with python 2.7 + +asn1crypto = src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl +certifi = src/pip/certifi-2017.7.27.1-py2.py3-none-any.whl +cffi = src/pip/cffi-1.10.0-cp27-cp27m-win32.whl +chardet = src/pip/chardet-3.0.4-py2.py3-none-any.whl +crytography = src/pip/cryptography-2.0.3-cp27-cp27m-win32.whl +enum34 = src/pip/enum34-1.1.6-py2-none-any.whl +future = src/pip/future-0.16.0.tar.gz +idna = src/pip/idna-2.6-py2.py3-none-any.whl +ipaddress = src/pip/ipaddress-1.0.18-py2-none-any.whl +pycparser = src/pip/pycparser-2.18.tar.gz +PyInstaller = src/pip/PyInstaller-3.2.1.tar.bz2 +pyOpenSSL = src/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl +pypiwin32 = src/pip/pypiwin32-219-cp27-none-win32.whl +requests = src/pip/requests-2.18.4-py2.py3-none-any.whl +setuptools = src/pip/setuptools-36.2.7-py2.py3-none-any.whl +six = src/pip/six-1.10.0-py2.py3-none-any.whl +urllib3 = src/pip/urllib3-1.22-py2.py3-none-any.whl + PYTHON_PACKAGES = \ -src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl \ -src/pip/certifi-2017.7.27.1-py2.py3-none-any.whl \ -src/pip/cffi-1.10.0-cp27-cp27m-win32.whl \ -src/pip/chardet-3.0.4-py2.py3-none-any.whl \ -src/pip/cryptography-2.0.3-cp27-cp27m-win32.whl \ -src/pip/enum34-1.1.6-py2-none-any.whl \ -src/pip/future-0.16.0.tar.gz \ -src/pip/idna-2.6-py2.py3-none-any.whl \ -src/pip/ipaddress-1.0.18-py2-none-any.whl \ -src/pip/pycparser-2.18.tar.gz \ -src/pip/PyInstaller-3.2.1.tar.bz2 \ -src/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl \ -src/pip/pypiwin32-219-cp27-none-win32.whl \ -src/pip/requests-2.18.4-py2.py3-none-any.whl \ -src/pip/setuptools-36.2.7-py2.py3-none-any.whl \ -src/pip/six-1.10.0-py2.py3-none-any.whl \ -src/pip/urllib3-1.22-py2.py3-none-any.whl + $(asn1crypto) \ + $(certifi) \ + $(cffi) \ + $(chardet) \ + $(crytography) \ + $(enum34) \ + $(future) \ + $(idna) \ + $(ipaddress) \ + $(pycparser) \ + $(PyInstaller) \ + $(pyOpenSSL) \ + $(pypiwin32) \ + $(requests) \ + $(setuptools) \ + $(six) \ + $(urllib3) + +$(asn1crypto) := asn1crypto==0.22.0 +$(certifi) := certifi==2017.7.27.1 +$(cffi) := cffi==1.10.0 +$(chardet) := chardet==3.0.4 +$(crytography) := cryptography==2.0.3 +$(enum34) := enum34==1.1.6 +$(future) := future==0.16.0 +$(idna) := idna==2.6 +$(ipaddress) := ipaddress==1.0.18 +$(pycparser) := pycparser==2.18 +$(PyInstaller) := PyInstaller==3.2.1 +$(pyOpenSSL) := pyOpenSSL==17.2.0 +$(pypiwin32) := pypiwin32==219 +$(requests) := requests==2.18.4 +$(setuptools) := setuptools==36.2.7 +$(six) := six==1.10.0 +$(urllib3) := urllib3==1.22 src/python-$(PYTHON_VERSION).msi: - cd src && wget https://www.python.org/ftp/python/$(PYTHON_VERSION)/python-$(PYTHON_VERSION… + mkdir -p src && \ + cd src && \ + curl -O https://www.python.org/ftp/python/$(PYTHON_VERSION)/python-$(PYTHON_VERSION… + +$(BUILD_DIR)/drive_c/python.exe: src/python-$(PYTHON_VERSION).msi + mkdir -p $(BUILD_DIR) && \ + export WINEPREFIX=$(BUILD_DIR) && \ + cd $(BUILD_DIR) && \ + cp $(CURDIR)/src/python-$(PYTHON_VERSION).msi . && \ + wine msiexec /qn /i python-$(PYTHON_VERSION).msi && \ + cd $(CURDIR) -$(PYTHON_PACKAGES): src/python-$(PYTHON_VERSION).msi +$(PYTHON_PACKAGES): $(BUILD_DIR)/drive_c/Python27/python.exe # Download needed python packages including depencencies. This has to be done # from within wine to obtain the correct win32 packages. # Note: We built this list to make the agent compilation reproducable. From time # to time we should update the packages here, but we don't want to fetch new versions # automatically. - mkdir $(BUILD_DIR) && \ + mkdir -p $(BUILD_DIR) && \ export WINEPREFIX=$(BUILD_DIR) && \ cd $(BUILD_DIR) && \ - cp $(CURDIR)/src/python-$(PYTHON_VERSION).msi . && \ - wine msiexec /qn /i python-$(PYTHON_VERSION).msi && \ - mkdir pip && \ + mkdir -p pip && \ cd pip && \ - wine c:\\Python27\\python.exe -m pip download --no-deps asn1crypto==0.22.0 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps certifi==2017.7.27.1 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps cffi==1.10.0 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps chardet==3.0.4 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps cryptography==2.0.3 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps enum34==1.1.6 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps future==0.16.0 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps idna==2.6 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps ipaddress==1.0.18 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps pycparser==2.18 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps PyInstaller==3.2.1 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps pyOpenSSL==17.2.0 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps pypiwin32==219 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps requests==2.18.4 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps setuptools==36.2.7 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps six==1.10.0 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps urllib3==1.22 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps $($@) && \ mkdir -p $(CURDIR)/src/pip && \ cp -r * $(CURDIR)/src/pip - rm -rf $(BUILD_DIR) -new_packages: src/python-$(PYTHON_VERSION).msi +new_packages: $(BUILD_DIR)/drive_c/Python27/python.exe # Use this target to obtain the newest versions of the needed packages. # You should update the explicit dependencies afterwars because the automatic # download of the latests packages might lead to an incosistent state, e.g. # if a package gets downloaded multiple times with different versions. - mkdir $(BUILD_DIR) && \ + mkdir -p $(BUILD_DIR) && \ export WINEPREFIX=$(BUILD_DIR) && \ cd $(BUILD_DIR) && \ - cp $(CURDIR)/src/python-$(PYTHON_VERSION).msi . && \ - wine msiexec /qn /i python-$(PYTHON_VERSION).msi && \ mkdir pip && \ cd pip && \ wine c:\\Python27\\python.exe -m pip download requests && \ @@ -81,11 +107,11 @@ new_packages: src/python-$(PYTHON_VERSION).msi wine c:\\Python27\\python.exe -m pip download pyOpenSSL && \ mkdir -p $(CURDIR)/src/pip && \ cp -r * $(CURDIR)/src/pip - rm -rf $(BUILD_DIR) src/vcredist_x86.exe: + mkdir -p src && \ cd src && \ - wget https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966… + curl -O https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966… setup: - sudo apt-get install scons upx-ucl wine + sudo apt-get install scons upx-ucl wine \ No newline at end of file diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 288080a..d586ec1 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -10,7 +10,8 @@ MIRROR=http://de.archive.ubuntu.com/ubuntu export HOSTNAME=cmk-windows-agent-chroot export LC_ALL=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 -BASE="$(realpath ../..)" +SCRIPT_DIR="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" +BASE="$(realpath $SCRIPT_DIR/../..)" if [ -z $CHROOT_PATH ]; then echo "ERROR: CHROOT_PATH not set" @@ -55,7 +56,9 @@ package_names=( autoconf automake build-essential + cabextract ca-certificates + curl gcc gettext language-pack-en @@ -152,10 +155,10 @@ fi sed -ri 's/^_apt:x:[0-9]+:/_apt:x:0:/g' $CHROOT_PATH/etc/passwd # We need to enable 32bit Wine -./do-chroot "dpkg --add-architecture i386 && apt-get update && apt-get -y install wine32" +$SCRIPT_DIR/do-chroot "dpkg --add-architecture i386 && apt-get update && apt-get -y install wine32" # Build Google Test and Google Mock -./do-chroot "$CHROOT_BUILD_DIR/agents/windows/test/build-googletest" +$SCRIPT_DIR/do-chroot "$CHROOT_BUILD_DIR/agents/windows/test/build-googletest" cp "$BASE/agents/windows/$VERSIONFILE" "$CHROOT_PATH/"

6 years, 10 months

Make the current stack-like nature of AndingFilter more explicit.

by Sven Panne

Module: check_mk Branch: master Commit: 6b43ee4731e7f8a6b7f1226e3ec3f6c339ee9692 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b43ee4731e7f8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 10 15:12:43 2017 +0100 Make the current stack-like nature of AndingFilter more explicit. Change-Id: I93da3f8bf96eca069f79371c437cfdcba5e524b7 --- livestatus/src/AndingFilter.cc | 11 ----------- livestatus/src/AndingFilter.h | 15 +++++++++++---- livestatus/src/Query.cc | 43 ++++++++++++++++++++++-------------------- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index b48b75a..aa657d1 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -23,9 +23,7 @@ // Boston, MA 02110-1301 USA. #include "AndingFilter.h" -#include <algorithm> #include <memory> -#include <vector> #include "Filter.h" #include "FilterVisitor.h" #include "OringFilter.h" @@ -88,12 +86,3 @@ const std::string *AndingFilter::findValueForIndexing( } return nullptr; } - -std::unique_ptr<Filter> AndingFilter::stealLastSubFilter() { - if (_subfilters.empty()) { - return nullptr; - } - std::unique_ptr<Filter> l = move(_subfilters.back()); - _subfilters.pop_back(); - return l; -} diff --git a/livestatus/src/AndingFilter.h b/livestatus/src/AndingFilter.h index 8e4133a..68b8c3a 100644 --- a/livestatus/src/AndingFilter.h +++ b/livestatus/src/AndingFilter.h @@ -26,15 +26,15 @@ #define AndingFilter_h #include "config.h" // IWYU pragma: keep +#include <algorithm> #include <chrono> -#include <cstddef> #include <cstdint> #include <memory> #include <string> #include <vector> +#include "Filter.h" #include "VariadicFilter.h" #include "contact_fwd.h" -class Filter; class FilterVisitor; class Row; @@ -51,8 +51,15 @@ public: std::unique_ptr<Filter> negate() const override; const std::string *findValueForIndexing( const std::string &column_name) const; - std::unique_ptr<Filter> stealLastSubFilter(); - size_t size() const { return _subfilters.size(); } + + // TODO(sp): stack-like interface, doesn't really belong here. + auto empty() const { return _subfilters.empty(); } + auto top() { return std::move(_subfilters.back()); } + void push(std::unique_ptr<Filter> f) { + _subfilters.push_back(std::move(f)); + } + void pop() { return _subfilters.pop_back(); } + auto begin() const { return _subfilters.begin(); } auto end() const { return _subfilters.end(); } }; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index c96997c..7bdbea7 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -225,20 +225,21 @@ void Query::parseAndOrLine(const std::string &header, char *line, return; } - auto num_filters = filter.size(); - if (number > static_cast<int>(num_filters)) { - invalidHeader("error combining filters for table " + _table->name() + - " with '" + header + "': expected " + - std::to_string(number) + " filters, but only " + - std::to_string(num_filters) + " " + - (num_filters == 1 ? "is" : "are") + " on stack"); - return; - } - for (auto i = 0; i < number; ++i) { - variadic->addSubfilter(filter.stealLastSubFilter()); + if (filter.empty()) { + invalidHeader("error combining filters for table " + + _table->name() + " with '" + header + "': expected " + + std::to_string(number) + " filters, but only " + + std::to_string(i) + " " + (i == 1 ? "is" : "are") + + " on stack"); + return; + } + + auto top = filter.top(); + filter.pop(); + variadic->addSubfilter(std::move(top)); } - filter.addSubfilter(std::move(variadic)); + filter.push(std::move(variadic)); } void Query::parseNegateLine(const std::string &header, char *line, @@ -248,13 +249,16 @@ void Query::parseNegateLine(const std::string &header, char *line, return; } - auto to_negate = filter.stealLastSubFilter(); - if (!to_negate) { - invalidHeader(header + " nothing to negate"); + if (filter.empty()) { + invalidHeader("error combining filters for table " + _table->name() + + " with '" + header + + "': expected 1 filters, but only 0 are on stack"); return; } - filter.addSubfilter(to_negate->negate()); + auto top = filter.top(); + filter.pop(); + filter.push(top->negate()); } void Query::parseStatsAndOrLine(const std::string &header, char *line, @@ -429,7 +433,7 @@ void Query::parseFilterLine(char *line, AndingFilter &filter) { } if (auto sub_filter = createFilter(*column, relOp, value)) { - filter.addSubfilter(std::move(sub_filter)); + filter.push(std::move(sub_filter)); _all_columns.insert(column); } } @@ -828,14 +832,13 @@ const std::vector<std::unique_ptr<Aggregator>> &Query::getAggregatorsFor( void Query::doWait() { // If no wait condition and no trigger is set, // we do not wait at all. - auto num_filters = _wait_condition.size(); - if (num_filters == 0 && _wait_trigger == nullptr) { + if (_wait_condition.empty() && _wait_trigger == nullptr) { return; } // If a condition is set, we check the condition. If it // is already true, we do not need to way - if (num_filters > 0 && + if (!_wait_condition.empty() && _wait_condition.accepts(_wait_object, _auth_user, timezoneOffset())) { Debug(_logger) << "Wait condition true, no waiting neccessary"; return;

6 years, 10 months

IWYU fix.

by Sven Panne

Module: check_mk Branch: master Commit: 2356761c0a6d1622ee61e33a26b2ce56ef259e79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2356761c0a6d16… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 10 15:54:55 2017 +0100 IWYU fix. Change-Id: I5349768052ec60ce6c05087317dc12889aec3ff8 --- livestatus/src/OringFilter.h | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/OringFilter.h b/livestatus/src/OringFilter.h index 55214e6..61ab35d 100644 --- a/livestatus/src/OringFilter.h +++ b/livestatus/src/OringFilter.h @@ -30,6 +30,7 @@ #include <cstdint> #include <memory> #include <string> +#include <vector> #include "VariadicFilter.h" #include "contact_fwd.h" class Filter;

6 years, 10 months

← Newer
1
...
21
22
23
24
25
26
27
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017