Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 53a2782396daaa4ce40abd16f763512280dd7bc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53a2782396daaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 09:28:54 2017 +0200 Updated bug entries #2498, #2555 Change-Id: I4fc823c5d5e133906b48ff13f3addacd155e0190 --- .bugs/2498 | 7 +++++-- .bugs/2555 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/2498 b/.bugs/2498 index e8a5e1f..1f0e2c5 100644 --- a/.bugs/2498 +++ b/.bugs/2498 @@ -1,9 +1,9 @@ Title: WATO-Snapshots should warn if data in local/ is too much Component: wato -State: open +Class: bug +State: done Date: 2016-07-06 11:43:10 Targetversion: 1.5.0 -Class: bug We had the case that a user pu approx 4GB of tmp data below local/. During "Activate Changes" WATO creates a snapshot of this. This @@ -17,3 +17,6 @@ limit? Or positively check all directories? Solution: We are planning to create some "todo / config and performance hints" page that shows a list of things to tune to have a good setup. This page could make such a local/ directory size check. + +2017-10-27 08:51:48: changed state open -> done +This will be part of the upcoming best practices tests. diff --git a/.bugs/2555 b/.bugs/2555 index f3c39e5..f00bb1f 100644 --- a/.bugs/2555 +++ b/.bugs/2555 @@ -1,11 +1,14 @@ Title: Match for contact groups when core = Nagios does not work Component: notification -State: open +Class: bug +State: works4me Date: 2017-06-08 08:10:56 Targetversion: 1.4.0 -Class: bug When doing notification rules with matching on contact groups we need the list of contactgroups from the core. These doe not seem to be present when the core is Nagios so we need to fetch them via Livestatus. This is not yet implemented. + +2017-10-27 08:42:37: changed state open -> works4me +Seems this has been implemented in the meantime. It works as intended.

6 years, 10 months

Fixed possible exception related to "tmp_path" vari able in case of locking issues during saving

by Lars Michelsen

Module: check_mk Branch: master Commit: 06fb9b763a57c1aaf40948fb46988263a92467b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06fb9b763a57c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 10:42:26 2017 +0200 Fixed possible exception related to "tmp_path" vari able in case of locking issues during saving Change-Id: Ib9f61097dd04176ed77a1836a2cb917529a70012 --- lib/store.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/store.py b/lib/store.py index f88545d..5efbc45 100644 --- a/lib/store.py +++ b/lib/store.py @@ -154,13 +154,14 @@ def save_data_to_file(path, data, pretty=True): # Then the new file is written to a temporary file and moved to the target path def save_file(path, content, mode=0660): try: + tmp_path = None + # Normally the file is already locked (when data has been loaded before with lock=True), # but lock it just to be sure we have the lock on the file. # # Please note that this already creates the file with 0 bytes (in case it is missing). aquire_lock(path) - tmp_path = None with tempfile.NamedTemporaryFile("w", dir=os.path.dirname(path), prefix=".%s.new" % os.path.basename(path), delete=False) as tmp:

6 years, 10 months

5423 FIX Fixed exception on "Catalog of check plugins page"

by Lars Michelsen

Module: check_mk Branch: master Commit: 191b66fa87472688820ccdcbfc055e37eae1813a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=191b66fa874726… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 09:51:34 2017 +0200 5423 FIX Fixed exception on "Catalog of check plugins page" The exception was caused by man pages having an empty "catalog:" header declaration. Change-Id: I1e1dab5fc64c66030abd0c15a2bfd04aa01c32d4 --- .werks/5423 | 10 ++++++++++ lib/man_pages.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5423 b/.werks/5423 new file mode 100644 index 0000000..6fca388 --- /dev/null +++ b/.werks/5423 @@ -0,0 +1,10 @@ +Title: Fixed exception on "Catalog of check plugins page" +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509090617 +Class: fix + +The exception was caused by man pages having an empty "catalog:" header declaration. diff --git a/lib/man_pages.py b/lib/man_pages.py index 8da4488..99779dc 100644 --- a/lib/man_pages.py +++ b/lib/man_pages.py @@ -291,7 +291,7 @@ def load_man_page_catalog(): raise parsed = _create_fallback_man_page(name, path, e) - if "catalog" in parsed: + if parsed.get("catalog"): cat = parsed["catalog"] else: cat = [ "unsorted" ]

6 years, 10 months

5424 FIX Fixed possible exception during logout when having cookies with invalid format for other sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 0887b015d69746f5a53b281304af9b376eecfc41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0887b015d69746… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 10:05:55 2017 +0200 5424 FIX Fixed possible exception during logout when having cookies with invalid format for other sites Change-Id: I7c62cda64e387989be842373bb4a318c8dccc6a8 --- .werks/5424 | 11 +++++++++++ web/htdocs/login.py | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/5424 b/.werks/5424 new file mode 100644 index 0000000..61e09e4 --- /dev/null +++ b/.werks/5424 @@ -0,0 +1,11 @@ +Title: Fixed possible exception during logout when having cookies with invalid format for other sites +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509091524 + + diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 4350cee..5095d87 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -253,6 +253,9 @@ def auth_cookie_is_valid(cookie_name): return True except MKAuthException: return False + except Exception: + log_exception() + return False def check_auth(mod_python_req):

6 years, 10 months

5422 Add build support for Ubuntu 17.10 (artful)

by Lars Michelsen

Module: check_mk Branch: master Commit: 148ef062d18b62180ac84f3631d41fd3ad34477b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=148ef062d18b62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 09:47:57 2017 +0200 5422 Add build support for Ubuntu 17.10 (artful) Change-Id: Ib74bacc4dec7456c9438c2c0e901420c6ed0be60 --- .werks/5422 | 10 ++++ omd/distros/UBUNTU_17.10.mk | 112 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/.werks/5422 b/.werks/5422 new file mode 100644 index 0000000..1a506a7 --- /dev/null +++ b/.werks/5422 @@ -0,0 +1,10 @@ +Title: Add build support for Ubuntu 17.10 (artful) +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509090452 +Class: feature + + diff --git a/omd/distros/UBUNTU_17.10.mk b/omd/distros/UBUNTU_17.10.mk new file mode 100644 index 0000000..438f8c0 --- /dev/null +++ b/omd/distros/UBUNTU_17.10.mk @@ -0,0 +1,112 @@ +DISTRO_CODE = artful +BUILD_PACKAGES = +BUILD_PACKAGES += build-essential +BUILD_PACKAGES += devscripts +BUILD_PACKAGES += dpatch +BUILD_PACKAGES += dnsutils +BUILD_PACKAGES += fping +BUILD_PACKAGES += smbclient # otherwise missing path in util.pm +BUILD_PACKAGES += rpcbind # otherwise missing path in util.pm +BUILD_PACKAGES += git-buildpackage +BUILD_PACKAGES += libboost-all-dev +BUILD_PACKAGES += libcloog-ppl1 +BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk +BUILD_PACKAGES += libevent-dev +BUILD_PACKAGES += libgd-dev +BUILD_PACKAGES += libglib2.0-dev +BUILD_PACKAGES += libgnutls28-dev +BUILD_PACKAGES += libldap2-dev +BUILD_PACKAGES += libltdl-dev +BUILD_PACKAGES += libmcrypt-dev +BUILD_PACKAGES += libmysqlclient-dev +BUILD_PACKAGES += libpq-dev +BUILD_PACKAGES += libpango1.0-dev +BUILD_PACKAGES += libperl-dev +BUILD_PACKAGES += libreadline-dev +BUILD_PACKAGES += libssl-dev +BUILD_PACKAGES += libxml2-dev +BUILD_PACKAGES += libsqlite3-dev # needed by Python (for sqlite3 module) +BUILD_PACKAGES += patch +BUILD_PACKAGES += rsync +BUILD_PACKAGES += uuid-dev +BUILD_PACKAGES += snmp +BUILD_PACKAGES += apache2-dev # compiling mod_python +BUILD_PACKAGES += apache2 # compiling mod_python +BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman +BUILD_PACKAGES += libpcap-dev # needed for CMC +BUILD_PACKAGES += gettext # needed for german l10n +BUILD_PACKAGES += libfreeradius-dev +# +# Check_MK build specific packages below +# +BUILD_PACKAGES += libgsf-1-dev # needed for msitools +BUILD_PACKAGES += librrd-dev # needed for CMC +BUILD_PACKAGES += libffi-dev # needed for pyOpenSSL (and dependant) compilations +BUILD_PACKAGES += libkrb5-dev # needed for python kerberos support +BUILD_PACKAGES += flex # needed for heirloom-pkgtools +BUILD_PACKAGES += openssh-client # needed for check_by_ssh +OS_PACKAGES = +OS_PACKAGES += time # needed for mk-job +OS_PACKAGES += traceroute # needed for Check_MK parent scan +OS_PACKAGES += curl +OS_PACKAGES += dialog +OS_PACKAGES += dnsutils +OS_PACKAGES += fping +OS_PACKAGES += graphviz +OS_PACKAGES += apache2 +OS_PACKAGES += apache2-utils # contains htpasswd2 +OS_PACKAGES += libdbi1 +OS_PACKAGES += libevent-1.4-2 +OS_PACKAGES += libltdl7 +OS_PACKAGES += libnet-snmp-perl +OS_PACKAGES += libpango1.0-0 +OS_PACKAGES += libperl5.26 +OS_PACKAGES += libreadline5 +OS_PACKAGES += libsnmp-perl +OS_PACKAGES += libuuid1 +OS_PACKAGES += libxml2 +OS_PACKAGES += patch +OS_PACKAGES += php-cli +OS_PACKAGES += php-cgi +OS_PACKAGES += php-gd +OS_PACKAGES += php-mcrypt +OS_PACKAGES += php-sqlite3 +OS_PACKAGES += php-json +OS_PACKAGES += php-pear +OS_PACKAGES += pyro +OS_PACKAGES += rsync +OS_PACKAGES += smbclient +OS_PACKAGES += rpcbind # otherwise missing path in util.pm +OS_PACKAGES += snmp +OS_PACKAGES += unzip +OS_PACKAGES += xinetd +OS_PACKAGES += freeradius-utils +# +# Check_MK build specific packages below +# +OS_PACKAGES += libpcap0.8 # needed for cmc +OS_PACKAGES += rpm # needed by msitools/Agent Bakery +OS_PACKAGES += binutils # needed by msitools/Agent Bakery +OS_PACKAGES += lcab # needed for creating MSI packages +OS_PACKAGES += libgsf-1-114 # needed by msitools/Agent Bakery +OS_PACKAGES += libglib2.0-0 # needed by msitools/Agent Bakery +OS_PACKAGES += poppler-utils # needed for preview of PDF in reporting +OS_PACKAGES += libffi6 # needed for pyOpenSSL and dependant +USERADD_OPTIONS = +ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s +PACKAGE_INSTALL = aptitude -y update ; aptitude -y install +ACTIVATE_INITSCRIPT = update-rc.d %s defaults +APACHE_CONF_DIR = /etc/apache2/conf.d +APACHE_INIT_NAME = apache2 +APACHE_USER = www-data +APACHE_GROUP = www-data +APACHE_BIN = /usr/sbin/apache2 +APACHE_CTL = /usr/sbin/apache2ctl +APACHE_MODULE_DIR = /usr/lib/apache2/modules +APACHE_MODULE_DIR_64 = /usr/lib/apache2/modules +APACHE_ENMOD = a2enmod %s +PHP_FCGI_BIN = /usr/bin/php-cgi +BECOME_ROOT = sudo su -c +ARCH = $(shell dpkg --print-architecture) +MOUNT_OPTIONS = +INIT_CMD = /etc/init.d/%(name)s %(action)s

6 years, 10 months

Global settings: Fixed exception related to new Livestatus TCP setting ( LIVESTATUS_TCP_ONLY_FROM)

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ea14d9a7e557ce88472b1e7a82fd512853b4c82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ea14d9a7e557c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 09:44:06 2017 +0200 Global settings: Fixed exception related to new Livestatus TCP setting (LIVESTATUS_TCP_ONLY_FROM) Change-Id: I1baafd323351a40978afa565251d015630d83d18 --- web/htdocs/watolib.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 145bbed..3d76893 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -661,6 +661,9 @@ class ConfigDomainOMD(ConfigDomain): } del settings["LIVESTATUS_TCP_PORT"] + # Be compatible to older sites that don't have the key in their config yet + settings.setdefault("LIVESTATUS_TCP_ONLY_FROM", "0.0.0.0") + if settings["LIVESTATUS_TCP_ONLY_FROM"] != "0.0.0.0": settings["LIVESTATUS_TCP"]["only_from"] = settings["LIVESTATUS_TCP_ONLY_FROM"].split()

6 years, 10 months

5426 FIX df perfometer: Fixed exception when maximum value is not available

by Lars Michelsen

Module: check_mk Branch: master Commit: d1cd00bf71386da5698b01444eca8e46dd5fa7f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1cd00bf71386d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 10:31:07 2017 +0200 5426 FIX df perfometer: Fixed exception when maximum value is not available Change-Id: I85b5658daa097956a39e04f1a2c0f97f0758229c --- .werks/5426 | 11 +++++++++++ web/plugins/perfometer/check_mk.py | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/5426 b/.werks/5426 new file mode 100644 index 0000000..1e77b27 --- /dev/null +++ b/.werks/5426 @@ -0,0 +1,11 @@ +Title: df perfometer: Fixed exception when maximum value is not available +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509092934 + + diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 0dce660..85ebe7d 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1145,6 +1145,9 @@ def perfometer_check_mk_df(row, check_command, perf_data): hours_left = float(data[1]) break + if not maxx: + return "", "" + perc_used = 100 * (float(value) / float(maxx)) perc_free = 100 - float(perc_used)

6 years, 10 months

Disable web.log logging: Too much noise caused by single users

by Lars Michelsen

Module: check_mk Branch: master Commit: 4347736f68ad721457ca777203c4cf16b6241bf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4347736f68ad72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 10:07:00 2017 +0200 Disable web.log logging: Too much noise caused by single users Change-Id: I3746058b6a6a72bf69c08e7ef7e81c3c9dc8cb20 --- web/htdocs/login.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 5095d87..6e895ca 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -254,7 +254,6 @@ def auth_cookie_is_valid(cookie_name): except MKAuthException: return False except Exception: - log_exception() return False

6 years, 10 months

Detect more recent C/C++ compilers.

by Sven Panne

Module: check_mk Branch: master Commit: 14d3b148681981bf0ec4cb93ec3863aae79fb92f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14d3b148681981… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 10:48:23 2017 +0200 Detect more recent C/C++ compilers. Change-Id: Ib342beb08e3197e4b189e0a87395c2fb5b844538 --- configure.ac | 4 ++-- omd/packages/boost/Makefile | 2 +- omd/packages/python/Makefile | 4 ++-- standalone.make | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 44ef454..11d4498 100644 --- a/configure.ac +++ b/configure.ac @@ -49,12 +49,12 @@ AS_IF([test "x$enable_rrd_is_thread_safe" != "xno"], [RRDLIB_TO_CHECK=rrd], [RRDLIB_TO_CHECK=rrd_th]) # Checks for programs. -AC_PROG_CC([gcc-6 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang]) +AC_PROG_CC([gcc-7 clang-5.0 gcc-6 clang-4.0 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang]) AC_PROG_CC_C99([], []) if test "x$ac_cv_prog_cc_c99" = xno; then AC_MSG_ERROR([Need a C99-compliant C compiler]) fi -AC_PROG_CXX([g++-6 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++]) +AC_PROG_CXX([g++-7 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++]) AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) AC_PROG_RANLIB # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it. :-P diff --git a/omd/packages/boost/Makefile b/omd/packages/boost/Makefile index 733d3f7..42cf8c4 100644 --- a/omd/packages/boost/Makefile +++ b/omd/packages/boost/Makefile @@ -24,7 +24,7 @@ build: check-python tar xzf $(NAME)_$(VERSION).tar.gz # basically what part of AC_PROC_CXX does @CXX="" ; \ - for PROG in g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ + for PROG in g++-7 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \ for DIR in $$PATH; do \ IFS=$$SAVED_IFS ; \ diff --git a/omd/packages/python/Makefile b/omd/packages/python/Makefile index cf0bcba..fa8b1c6 100644 --- a/omd/packages/python/Makefile +++ b/omd/packages/python/Makefile @@ -38,7 +38,7 @@ build: bin/gcc bin/g++ # The compiler detection code below is basically what part of AC_PROC_CXX does. bin/gcc: @CC="" ; \ - for PROG in gcc-6 clang-4.0 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang; do \ + for PROG in gcc-7 clang-5.0 gcc-6 clang-4.0 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang; do \ echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \ for DIR in $$PATH; do \ IFS=$$SAVED_IFS ; \ @@ -55,7 +55,7 @@ bin/gcc: bin/g++: @CXX="" ; \ - for PROG in g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ + for PROG in g++-7 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \ for DIR in $$PATH; do \ IFS=$$SAVED_IFS ; \ diff --git a/standalone.make b/standalone.make index 188f996..a90bd61 100644 --- a/standalone.make +++ b/standalone.make @@ -23,7 +23,9 @@ # Boston, MA 02110-1301 USA. # TODO(sp) We should really use autotools here... -ifneq ($(shell which g++-6 2>/dev/null),) +ifneq ($(shell which g++-7 2>/dev/null),) + CXX := g++-7 -std=c++14 +else ifneq ($(shell which g++-6 2>/dev/null),) CXX := g++-6 -std=c++14 else CXX := g++-5 -std=c++14

6 years, 10 months

IWYU fix.

by Sven Panne

Module: check_mk Branch: master Commit: bb3ec4513f17fca2fb504abddfcd84084b4d7882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb3ec4513f17fc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 10:17:22 2017 +0200 IWYU fix. Change-Id: I370548ddbfd08ff42f3572e6a26f777d5b2d89f2 --- livestatus/src/TableEventConsole.h | 1 - 1 file changed, 1 deletion(-) diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index 5afdcdb..ff356fa 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -38,7 +38,6 @@ #include "IntColumn.h" #include "ListColumn.h" #include "MonitoringCore.h" -#include "Renderer.h" #include "Row.h" #include "StringColumn.h" #include "StringUtils.h"

6 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017