Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Include enterprise and managed makefiles only, if they are needed

by Alex Zurhake

Module: check_mk Branch: master Commit: 47f7f5b7d0b4b7456ec41afae9e5ba8e64f3070a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47f7f5b7d0b4b7… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 21 14:26:41 2018 +0100 Include enterprise and managed makefiles only, if they are needed Change-Id: I3fbdfca7e319005a0735a2a5c38f4cacda80b455 --- omd/packages/packages.make | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/omd/packages/packages.make b/omd/packages/packages.make index 78d8444..6f02c8b 100644 --- a/omd/packages/packages.make +++ b/omd/packages/packages.make @@ -103,5 +103,14 @@ include packages/apache-omd/apache-omd.make \ packages/rrdtool/rrdtool.make \ packages/snap7/snap7.make \ packages/Webinject/Webinject.make \ - $(REPO_PATH)/enterprise/enterprise.make \ + + +ifeq ($(EDITION),enterprise) +include $(REPO_PATH)/enterprise/enterprise.make +endif +ifeq ($(EDITION),managed) +include $(REPO_PATH)/enterprise/enterprise.make \ $(REPO_PATH)/managed/managed.make +endif + +

5 years, 10 months

CMK-1134: Build managed and enterprise the same way as all the other packages.

by Alex Zurhake

Module: check_mk Branch: master Commit: d504dfec743b87aabb7562a6ce56e55ededef177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d504dfec743b87… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 21 13:39:47 2018 +0100 CMK-1134: Build managed and enterprise the same way as all the other packages. Change-Id: Ia534200bd971959c448bd395fe14f8a86500ca5d --- omd/Makefile | 15 +++++++-------- omd/packages/packages.make | 4 +++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index 35be6b5..09cd3b3 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -54,6 +54,13 @@ PACKAGES := \ snap7 \ heirloom-pkgtools +ifeq ($(EDITION),enterprise) +PACKAGES += enterprise +endif +ifeq ($(EDITION),managed) +PACKAGES += enterprise +PACKAGES += managed +endif default: build @@ -83,14 +90,6 @@ check-edition: fi build: check-edition $(PACKAGES) -# TODO: Clean up build for enterprise and managed. Those 2 package Makefiles are Symlinked to the top level Makefile. -ifeq ($(EDITION),enterprise) - $(MAKE) -C $(PACKAGE_DIR)/check_mk_enterprise build -endif -ifeq ($(EDITION),managed) - $(MAKE) -C $(PACKAGE_DIR)/check_mk_enterprise - $(MAKE) -C $(PACKAGE_DIR)/check_mk_managed -endif pack: skel diff --git a/omd/packages/packages.make b/omd/packages/packages.make index f1143fe..78d8444 100644 --- a/omd/packages/packages.make +++ b/omd/packages/packages.make @@ -102,4 +102,6 @@ include packages/apache-omd/apache-omd.make \ packages/re2/re2.make \ packages/rrdtool/rrdtool.make \ packages/snap7/snap7.make \ - packages/Webinject/Webinject.make + packages/Webinject/Webinject.make \ + $(REPO_PATH)/enterprise/enterprise.make \ + $(REPO_PATH)/managed/managed.make

5 years, 10 months

Fix monitoring plugins MONITORING_PLUGINS_CONFIGUREOPTS

by Alex Zurhake

Module: check_mk Branch: master Commit: 6a3e3690f96e0a5acafccabb3fa20bb7c087a5c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a3e3690f96e0a… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 21 13:38:06 2018 +0100 Fix monitoring plugins MONITORING_PLUGINS_CONFIGUREOPTS Change-Id: Id40844a68b95e64db65e05d19a285486542493a4 --- omd/packages/monitoring-plugins/monitoring-plugins.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/monitoring-plugins/monitoring-plugins.make b/omd/packages/monitoring-plugins/monitoring-plugins.make index cee15e5..7282e48 100644 --- a/omd/packages/monitoring-plugins/monitoring-plugins.make +++ b/omd/packages/monitoring-plugins/monitoring-plugins.make @@ -17,7 +17,7 @@ MONITORING_PLUGINS_CONFIGUREOPTS := \ --libexecdir=$(OMD_ROOT)/lib/nagios/plugins $(MONITORING_PLUGINS_BUILD): $(MONITORING_PLUGINS_PATCHING) - cd $(MONITORING_PLUGINS_DIR) ; ./configure $(CONFIGUREOPTS) + cd $(MONITORING_PLUGINS_DIR) ; ./configure $(MONITORING_PLUGINS_CONFIGUREOPTS) $(MAKE) -C $(MONITORING_PLUGINS_DIR) all $(TOUCH) $@

5 years, 10 months

Fix snap7 dependency

by Alex Zurhake

Module: check_mk Branch: master Commit: a00a6453a31b9131828064f5f54e7a7a3a418095 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a00a6453a31b91… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 21 13:37:38 2018 +0100 Fix snap7 dependency Change-Id: I3afba5a99f0f7e443a920bbad8e808d004861f22 --- omd/packages/snap7/snap7.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/snap7/snap7.make b/omd/packages/snap7/snap7.make index c968a9f..da43a44 100644 --- a/omd/packages/snap7/snap7.make +++ b/omd/packages/snap7/snap7.make @@ -19,7 +19,7 @@ ifeq ($(ARCH),i686) ARCH=i386 endif -$(SNAP7_BUILD): $(SNAP7_UNPACK) python +$(SNAP7_BUILD): $(SNAP7_UNPACK) $(PYTHON_BUILD) $(MAKE) -C $(SNAP7_DIR)/build/unix -f $(ARCH)_linux.mk $(SNAP7_INSTALL): $(SNAP7_BUILD)

5 years, 10 months

Add re2 as boost dependency

by Alex Zurhake

Module: check_mk Branch: master Commit: 0d57cff85bdacb4994b67e23fce319ab5d0cc369 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d57cff85bdacb… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 21 13:38:54 2018 +0100 Add re2 as boost dependency Change-Id: I691c8e922411281d680ac36abc97eaa04589057a --- omd/packages/boost/boost.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/boost/boost.make b/omd/packages/boost/boost.make index 32a5a3d..95cd275 100644 --- a/omd/packages/boost/boost.make +++ b/omd/packages/boost/boost.make @@ -26,7 +26,7 @@ $(BOOST)-isntall: $(BOOST_INSTALL) B2_LINK_OPTION := "link=static" -$(BOOST_BUILD): $(PYTHON_BUILD) $(BOOST_UNPACK) +$(BOOST_BUILD): $(PYTHON_BUILD) $(RE2_BUILD) $(BOOST_UNPACK) # basically what part of AC_PROC_CXX does @CXX="" ; \ for PROG in g++-8 clang++-7 g++-7 clang++-6.0 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 \

5 years, 10 months

added WK6690

by Andreas Boesl

Module: check_mk Branch: master Commit: 41cc76879bb8a7af06d86414d4f2dfb93b012020 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41cc76879bb8a7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 21 13:41:07 2018 +0100 added WK6690 Change-Id: Ib6cdf8667a5bfab63ea5def48036abab42b8133f --- .werks/6690 | 11 +++++++++++ cmk/gui/userdb.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/6690 b/.werks/6690 new file mode 100644 index 0000000..0042a41 --- /dev/null +++ b/.werks/6690 @@ -0,0 +1,11 @@ +Title: Fixed timeout during user logins when user synchronisation background job was running +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542803194 + + diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 3484223..692f07f 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -208,10 +208,10 @@ def new_user_template(connection_id): def create_non_existing_user(connection_id, username): - users = load_users(lock=True) - if username in users: + if user_exists(username): return # User exists. Nothing to do... + users = load_users(lock=True) users[username] = new_user_template(connection_id) save_users(users)

5 years, 10 months

6814 FIX hp_msa_if: Do not crash if no speed information is available

by Simon Betz

Module: check_mk Branch: master Commit: 6273cabe089c62c09ec1cdb5e2300ba83e0a7cc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6273cabe089c62… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Nov 16 14:05:44 2018 +0100 6814 FIX hp_msa_if: Do not crash if no speed information is available Change-Id: Ifd54f51489deb65da55934aedaf28156d8ce0961 --- .werks/6814 | 10 ++++++++++ checks/hp_msa_if | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/6814 b/.werks/6814 new file mode 100644 index 0000000..62c3715 --- /dev/null +++ b/.werks/6814 @@ -0,0 +1,10 @@ +Title: hp_msa_if: Do not crash if no speed information is available +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542373485 +Class: fix + + diff --git a/checks/hp_msa_if b/checks/hp_msa_if index 4be6c06..da8a4af 100644 --- a/checks/hp_msa_if +++ b/checks/hp_msa_if @@ -124,10 +124,10 @@ def parse_hp_msa_if(info): parsed = [] for idx, (_key, values) in enumerate(sorted(parse_hp_msa(info).iteritems())): - if values['actual-speed'] == '': - speed = values['actual-speed'] = 0 - else: + try: speed = int(values['actual-speed'].replace('Gb', '')) * 10**9 + except ValueError: + speed = 0 if values['status'] == 'Up': status = '1'

5 years, 10 months

Cleaned up mkeventd WATO module a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 84adabbad0513b0f2a1d5b73d01e40288beaf90f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84adabbad0513b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 21 09:30:58 2018 +0100 Cleaned up mkeventd WATO module a bit * Moved imports to module level * Configuration variables are now always registered, even when the Event Console is disabled by "omd config" Change-Id: Ia5cf1e968098671eb48bc9a517d4f8070f74d37b --- cmk/gui/wato/mkeventd.py | 1234 +++++++++++++++++++++++----------------------- 1 file changed, 614 insertions(+), 620 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=84adabbad0…

5 years, 10 months

Fixed creating pnp4nagios skel directories

by Lars Michelsen

Module: check_mk Branch: master Commit: 39e863cf6fc66ef22cc557c02a4a8acce9234bfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39e863cf6fc66e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 21 13:13:00 2018 +0100 Fixed creating pnp4nagios skel directories Change-Id: I68af40dc9c645476955f23dd8a5476bbfda85618 --- omd/packages/pnp4nagios/pnp4nagios.make | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/omd/packages/pnp4nagios/pnp4nagios.make b/omd/packages/pnp4nagios/pnp4nagios.make index 2cb40c4..762834f 100644 --- a/omd/packages/pnp4nagios/pnp4nagios.make +++ b/omd/packages/pnp4nagios/pnp4nagios.make @@ -57,12 +57,12 @@ $(PNP4NAGIOS_INSTALL): $(PNP4NAGIOS_BUILD) install -m 644 $(PACKAGE_DIR)/$(PNP4NAGIOS)/diskspace $(DESTDIR)$(OMD_ROOT)/share/diskspace/pnp4nagios # Move default config files to skel - mkdir -p skel/etc/pnp4nagios - mkdir -p skel/var/pnp4nagios/stats - mkdir -p skel/var/pnp4nagios/perfdata - mkdir -p skel/var/pnp4nagios/log - mkdir -p skel/var/pnp4nagios/spool - mkdir -p skel/tmp/pnp4nagios/run + mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/pnp4nagios + mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/pnp4nagios/stats + mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/pnp4nagios/perfdata + mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/pnp4nagios/log + mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/pnp4nagios/spool + mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/tmp/pnp4nagios/run # Install the facelift theme for pnp4nagios mkdir -p $(DESTDIR)$(OMD_ROOT)/share/pnp4nagios/htdocs/media/css/ui-facelift/images

5 years, 10 months

6418 FIX Fix a crash during notification cancelling

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 593273e05988f93b913523b90cfe264c11297969 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=593273e05988f9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Nov 21 12:05:21 2018 +0100 6418 FIX Fix a crash during notification cancelling When a notification was cancelled and the cancelling rule contained more contacts than the notification that was going to be cancelled the processing of notifications raised an exception. As a result no further notifications were processed. The exception was raised e.g. if a notification for the contact "ab" was cancelled for the users "ab" and "cd" using the option "The following users" in the contact selection. With this werk the issue is fixed. Change-Id: I725452b02e5db22977707044d0474a4ab4340725 --- .werks/6418 | 20 ++++++++++++++++++++ cmk_base/notify.py | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/6418 b/.werks/6418 new file mode 100644 index 0000000..9d6924b --- /dev/null +++ b/.werks/6418 @@ -0,0 +1,20 @@ +Title: Fix a crash during notification cancelling +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542797388 + +When a notification was cancelled and the cancelling rule contained +more contacts than the notification that was going to be cancelled +the processing of notifications raised an exception. As a result +no further notifications were processed. + +The exception was raised e.g. if a notification for the contact "ab" +was cancelled for the users "ab" and "cd" using the option "The +following users" in the contact selection. + +With this werk the issue is fixed. diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 68c8876..4be8c47 100755 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -474,7 +474,7 @@ def notify_rulebased(raw_context, analyse=False): remaining = notify_contacts.difference(contacts) if not remaining: - del notifications[key] + del notifications[notify_key] else: new_key = remaining, plugin notifications[new_key] = notifications.pop(notify_key)

5 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018