Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Fixed broken version update in cmk python module

by Lars Michelsen

Module: check_mk Branch: master Commit: 47883789871947282e4fa33d1ce70b80d95b2944 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47883789871947… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 6 16:31:25 2018 +0100 Fixed broken version update in cmk python module Change-Id: I38ff24d390e7a19649f7a49e34bf75796aa6de7d --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dddd782..a93b3fd 100644 --- a/Makefile +++ b/Makefile @@ -234,7 +234,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI tar cf $(DISTNAME)/bin.tar $(TAROPTS) -C bin $$(cd bin ; ls) tar rf $(DISTNAME)/bin.tar $(TAROPTS) -C agents/windows/msibuild msi-update gzip $(DISTNAME)/bin.tar - python -m compileall lib ; \ + python -m compileall cmk ; \ tar czf $(DISTNAME)/lib.tar.gz $(TAROPTS) \ cmk/* ; \ rm cmk/*.pyc @@ -333,7 +333,7 @@ setversion: sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkbackup ; \ - sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' lib/__init__.py bin/mkbench bin/livedump; \ + sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' cmk/__init__.py bin/mkbench bin/livedump; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion $(MAKE) -C omd NEW_VERSION=$(NEW_VERSION) setversion

6 years, 4 months

5721 FIX Saving backup jobs: Fixed AttributeError() occuring while handling an exception

by Lars Michelsen

Module: check_mk Branch: master Commit: e60438931d53556c53158f5637ac95a14c9d377d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e60438931d5355… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 6 13:36:13 2018 +0100 5721 FIX Saving backup jobs: Fixed AttributeError() occuring while handling an exception Change-Id: Ieb58946306aba5eaafdc8a947571df766a193a92 --- .werks/5721 | 11 +++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5721 b/.werks/5721 new file mode 100644 index 0000000..6220560 --- /dev/null +++ b/.werks/5721 @@ -0,0 +1,11 @@ +Title: Saving backup jobs: Fixed AttributeError() occuring while handling an exception +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1517920517 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 59734a6..cf63004 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5842,7 +5842,7 @@ class SiteBackupJobs(backup.Jobs): close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=open(os.devnull)) if p.wait() != 0: - raise MKGeneralException(_("Failed to apply the cronjob config: %s") % p.stderr.read()) + raise MKGeneralException(_("Failed to apply the cronjob config: %s") % p.stdout.read())

6 years, 4 months

5779 FIX mk_logwatch.exe: fixed broken python frozen binary

by Andreas Boesl

Module: check_mk Branch: master Commit: 081145e6cbea88098684189fe80236b238c5aef2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=081145e6cbea88… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 6 16:59:41 2018 +0100 5779 FIX mk_logwatch.exe: fixed broken python frozen binary Change-Id: Id495768efac0aa018d3bb513bf6c1c7467fd57e7 --- .werks/5779 | 10 ++++++++++ agents/windows/plugins/mk_logwatch.exe | Bin 4563981 -> 4554210 bytes 2 files changed, 10 insertions(+) diff --git a/.werks/5779 b/.werks/5779 new file mode 100644 index 0000000..f252964 --- /dev/null +++ b/.werks/5779 @@ -0,0 +1,10 @@ +Title: mk_logwatch.exe: fixed broken python frozen binary +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517932755 +Class: fix + + diff --git a/agents/windows/plugins/mk_logwatch.exe b/agents/windows/plugins/mk_logwatch.exe index 3acbda1..2d93ccb 100755 Binary files a/agents/windows/plugins/mk_logwatch.exe and b/agents/windows/plugins/mk_logwatch.exe differ

6 years, 4 months

Fixed handling of another numeration format

by Simon Betz

Module: check_mk Branch: master Commit: 48a20ff4676976e5f2166b2aac3df7d54b81f94b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48a20ff4676976… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 6 16:53:06 2018 +0100 Fixed handling of another numeration format Change-Id: Id8d05793ada41f6b6781bbab405080a008a604f9 --- cmk/structured_data.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index af36fa2..52caf71 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -194,10 +194,15 @@ class StructuredDataTree(object): # In the second case we have to deal with nested numerations # We take a look at children which may be real numerations # or sub trees. - if self._is_numeration(v): + # May also be a flat list, thus we convert to expected + # numeration format: [{KEY: VAL,..},..] + entries_type = self._get_entries_type(v) + if isinstance(entries_type, Numeration): sub_raw_tree.setdefault(k, v) - else: + elif isinstance(entries_type, Container): sub_raw_tree.setdefault(k, dict(enumerate(v))) + else: + sub_raw_tree.setdefault(k, [{"name": e} for e in v]) else: # Here we collect all other values meaning simple # attributes of this node. @@ -205,12 +210,15 @@ class StructuredDataTree(object): return sub_raw_tree, leaf_data - def _is_numeration(self, entries): + def _get_entries_type(self, entries): + #TODO test for entry in entries: + if not isinstance(entry, dict): + return for k, v in entry.iteritems(): if isinstance(v, list): - return False - return True + return Container() + return Numeration() # ---delegators-----------------------------------------------------------

6 years, 4 months

Use bionic (Ubuntu 18.04) for Windows agent chroot

by Jukka Aro

Module: check_mk Branch: master Commit: 05c1bb5ee71c26d32d4f7d13ce44d9ce7306431c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05c1bb5ee71c26… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Feb 2 13:46:36 2018 +0100 Use bionic (Ubuntu 18.04) for Windows agent chroot bionic provides mingw-w64 5.0.3-1 that is based on gcc 7.2.0 which supports C++17 --- agents/windows/chroot_version | 2 +- agents/windows/make-chroot | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index 45a4fb7..ec63514 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -8 +9 diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 1214319..e7a5d15 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -4,7 +4,7 @@ set -e -DISTRO=artful +DISTRO=bionic MIRROR=http://de.archive.ubuntu.com/ubuntu export HOSTNAME=cmk-windows-agent-chroot @@ -112,7 +112,10 @@ package_names=( python2.7 ssh-askpass uuid-dev - wine-stable +# TODO: Need to install wine separately in order to use --force-overwrite, see +# https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/1725928/ +# Cannot pass --force-overwrite through debootstrap. +# wine-stable ) packages=$(IFS=,; echo "${package_names[*]}") @@ -122,6 +125,12 @@ debootstrap \ --include="$packages" \ --arch amd64 $DISTRO $CHROOT_PATH $MIRROR +# Cope with the known bug with libsane1 that wine depends on. +# https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/1725928/ +# Need to use --force-overwrite with apt-get. This option cannot be passed +# through debootstrap. +$SCRIPT_DIR/do-chroot 'apt-get -y -o Dpkg::Options::="--force-overwrite" install wine-stable' + # Need to be installed for installation. cat <<EOF > $CHROOT_PATH/etc/fstab # created by make-chroot @@ -161,7 +170,7 @@ fi sed -ri 's/^_apt:x:[0-9]+:/_apt:x:0:/g' $CHROOT_PATH/etc/passwd # We need to enable 32bit Wine -$SCRIPT_DIR/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 -o Dpkg::Options::="--force-overwrite" -y install wine32' # Build Google Test and Google Mock $SCRIPT_DIR/do-chroot "$CHROOT_BUILD_DIR/agents/windows/test/build-googletest"

6 years, 4 months

Re-enable parallel build for Googletest

by Jukka Aro

Module: check_mk Branch: master Commit: d35050f7ec1024be2953ee027d1a14d0dd836263 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d35050f7ec1024… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 6 16:15:49 2018 +0100 Re-enable parallel build for Googletest This should reduce chroot setup time at least a bit. The output of single build steps will be separated from each other, so the build output should remain readable even if run in parallel - in the rare case someone would still like to read it. --- agents/windows/test/build-googletest | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/agents/windows/test/build-googletest b/agents/windows/test/build-googletest index caa90d7..fba94c3 100755 --- a/agents/windows/test/build-googletest +++ b/agents/windows/test/build-googletest @@ -23,9 +23,17 @@ for project in test mock ; do # we only need the libs... targets=lib/libg${project}.la autoreconf --install + # Build 32 and 64 bit in parallel, wait for child processes to terminate. + children=() for arch in 32 64 ; do - build $arch + build $arch & + children+=($!) done + for pid in "${children[@]}" ; do + # If any subprocess fails, wait for the rest to exit in a controlled way. + wait $pid || { wait; exit 1; } + done + # make install is not supported by Google -> copy headers and libs cp -r include/g${project} /usr/share/mingw-w64/include/ for arch in 32 64 ; do

6 years, 4 months

Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 63c366dfb0edd773118c3bc053e0f5b8c1538775 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63c366dfb0edd7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 6 16:45:11 2018 +0100 Reserved 50 Werk IDS Change-Id: I906bb594b3765206cd2f3ec3c2d530a7812e7dc4 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c95247f..07e12df 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5778 +5828

6 years, 4 months

Windows agent: compile with -std=c++17

by Jukka Aro

Module: check_mk Branch: master Commit: 23bf8da15c1154804899965f1cc352b425c5ab8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23bf8da15c1154… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Feb 2 14:06:19 2018 +0100 Windows agent: compile with -std=c++17 --- agents/windows/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 1b2a4b9..23b1ea3 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -4,7 +4,7 @@ noinst_LIBRARIES = libcheck_mk_agent.a noinst_PROGRAMS = DummyPlugin AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -O2 -Wformat=2 -Werror -Wall -fno-rtti -std=c++14 -gdwarf-2 \ +AM_CPPFLAGS = -O2 -Wformat=2 -Werror -Wall -fno-rtti -std=c++17 -gdwarf-2 \ -DCHECK_MK_VERSION='"$(VERSION)"' -D__USE_MINGW_ANSI_STDIO AM_LDFLAGS = -static -static-libgcc -static-libstdc++ LD_COMMON = -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -lntdll

6 years, 4 months

cisco_hsrp: Convert to new check_info format

by Konstantin Büttner

Module: check_mk Branch: master Commit: b8fb89b542ce5fcb7dfbeb3ed181a2c9fe41f7ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8fb89b542ce5f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 6 16:40:43 2018 +0100 cisco_hsrp: Convert to new check_info format Change-Id: I8528f75676e84ff180fa784234cf10a66876c919 --- checks/cisco_hsrp | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/checks/cisco_hsrp b/checks/cisco_hsrp index 3df1965..f0c7a74 100644 --- a/checks/cisco_hsrp +++ b/checks/cisco_hsrp @@ -128,21 +128,17 @@ def check_cisco_hsrp(item, params, info): return 3, "HSRP Group not found in Agent output" - -# FIXME: Outdated format. Fix after discussing WATO options. -check_info["cisco_hsrp"] = (check_cisco_hsrp, "HSRP Group %s", 0, inventory_cisco_hsrp) - -snmp_info["cisco_hsrp"] = \ - ( ".1.3.6.1.4.1.9.9.106.1.2.1.1", [ - OID_END, - "11", # cHsrpGrpVirtualIpAddr - "13", # cHsrpGrpActiveRouter - "14", # cHsrpGrpStandbyRouter - "15", # cHsrpGrpStandbyState - "16", # cHsrpGrpVirtualMacAddr - ]) - -# We can't scan for the HSRP table since the entries are indexed -# based on information we dont have without fetching all of it -# Instead we use the HSRP timeout -snmp_scan_functions["cisco_hsrp"] = lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and oid(".1.3.6.1.4.1.9.9.106.1.1.1.0") +check_info["cisco_hsrp"] = { + "inventory_function" : inventory_cisco_hsrp, + "check_function" : check_cisco_hsrp, + "service_description" : "HSRP Group %s", + "snmp_info" : ( ".1.3.6.1.4.1.9.9.106.1.2.1.1", [ + OID_END, + "11", # cHsrpGrpVirtualIpAddr + "13", # cHsrpGrpActiveRouter + "14", # cHsrpGrpStandbyRouter + "15", # cHsrpGrpStandbyState + "16", # cHsrpGrpVirtualMacAddr + ]), + "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and oid(".1.3.6.1.4.1.9.9.106.1.1.1.0"), +}

6 years, 4 months

Windows: fix typo in chroot setup progress info

by Jukka Aro

Module: check_mk Branch: master Commit: 91a5cc39a69011b1c206957c2b509ba8ce30d083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91a5cc39a69011… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 6 16:10:19 2018 +0100 Windows: fix typo in chroot setup progress info --- agents/windows/make-agent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 5b28a31..f2f077d 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -53,7 +53,7 @@ echo "CHROOT_PATH is $CHROOT_PATH" # created, multiple jobs may be executed in the chroot simultaneously, # but the setup must be performed only by a single job. ( - echo "[MAKE-CHROOT LOCK] aquire" + echo "[MAKE-CHROOT LOCK] acquire" flock -x -w 1800 200 || (echo "[MAKE-CHROOT LOCK] ERROR: Failed to get lock within 1800 seconds" ; exit 1) echo "[MAKE-CHROOT LOCK] got it"

6 years, 4 months

← Newer
1
...
25
26
27
28
29
30
31
32
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018