Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Sven Panne

Module: check_mk Branch: master Commit: f20849cca52359e61396ddc98b886250c85b267b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f20849cca52359… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 30 20:45:04 2018 +0100 NagVis has no hooks anymore. Change-Id: I61e7bcdf7277237a364a50482398ce4c816ae771 --- omd/packages/nagvis/.f12 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/omd/packages/nagvis/.f12 b/omd/packages/nagvis/.f12 deleted file mode 100755 index 721619b..0000000 --- a/omd/packages/nagvis/.f12 +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e - -SITE=${SITE:-$(cat ../../../.site 2>/dev/null || true)} -SITE=${SITE:-$(omd sites --bare | head -n 1)} -ROOT=/omd/sites/$SITE - -for hook in *.hook; do - sudo cp -v $hook /omd/versions/default/lib/omd/hooks/${hook%*.hook} - sudo chmod +x /omd/versions/default/lib/omd/hooks/${hook%*.hook} -done

5 years, 6 months

Unbreak OMD hook installation.

by Sven Panne

Module: check_mk Branch: master Commit: 177a7a0dcc8731a63dd58dc02f639d31c912006e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=177a7a0dcc8731… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 30 20:44:14 2018 +0100 Unbreak OMD hook installation. Change-Id: I0d0f71e3f0ecc31157871c8f77d156b057f5569b --- omd/packages/omd/.f12 | 9 +++++---- omd/packages/omd/{ => hooks}/ADMIN_MAIL | 0 omd/packages/omd/{ => hooks}/APACHE_MODE | 0 omd/packages/omd/{ => hooks}/AUTOSTART | 0 omd/packages/omd/{ => hooks}/CORE | 0 omd/packages/omd/{ => hooks}/TMPFS | 0 omd/packages/omd/omd.make | 6 +----- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/omd/packages/omd/.f12 b/omd/packages/omd/.f12 index 771d63f..e24c1a5 100755 --- a/omd/packages/omd/.f12 +++ b/omd/packages/omd/.f12 @@ -11,10 +11,11 @@ sudo cp -v logout.php $ROOT/share/omd/htdocs/logout.php 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 -for hook in *.hook; do - sudo cp -v $hook $ROOT/lib/omd/hooks/${hook%*.hook} - sudo chmod +x $ROOT/lib/omd/hooks/${hook%*.hook} -done +( cd hooks; \ + for hook in *; do \ + sudo cp -v $hook $ROOT/lib/omd/hooks/$hook ; \ + sudo chmod +x $ROOT/lib/omd/hooks/$hook ; \ + done ) sudo mkdir -p $ROOT/lib/omd/scripts/post-create sudo cp -v omd.service $ROOT/share/omd sudo cp -v omd.bin $ROOT/bin/omd diff --git a/omd/packages/omd/ADMIN_MAIL b/omd/packages/omd/hooks/ADMIN_MAIL similarity index 100% rename from omd/packages/omd/ADMIN_MAIL rename to omd/packages/omd/hooks/ADMIN_MAIL diff --git a/omd/packages/omd/APACHE_MODE b/omd/packages/omd/hooks/APACHE_MODE similarity index 100% rename from omd/packages/omd/APACHE_MODE rename to omd/packages/omd/hooks/APACHE_MODE diff --git a/omd/packages/omd/AUTOSTART b/omd/packages/omd/hooks/AUTOSTART similarity index 100% rename from omd/packages/omd/AUTOSTART rename to omd/packages/omd/hooks/AUTOSTART diff --git a/omd/packages/omd/CORE b/omd/packages/omd/hooks/CORE similarity index 100% rename from omd/packages/omd/CORE rename to omd/packages/omd/hooks/CORE diff --git a/omd/packages/omd/TMPFS b/omd/packages/omd/hooks/TMPFS similarity index 100% rename from omd/packages/omd/TMPFS rename to omd/packages/omd/hooks/TMPFS diff --git a/omd/packages/omd/omd.make b/omd/packages/omd/omd.make index 2be3abb..a0de0d2 100644 --- a/omd/packages/omd/omd.make +++ b/omd/packages/omd/omd.make @@ -36,11 +36,7 @@ $(OMD_INSTALL): install -m 755 $(PACKAGE_DIR)/$(OMD)/port_is_used $(DESTDIR)$(OMD_ROOT)/lib/omd/ install -m 644 $(PACKAGE_DIR)/$(OMD)/bash_completion $(DESTDIR)$(OMD_ROOT)/lib/omd/ $(MKDIR) $(DESTDIR)$(OMD_ROOT)/lib/omd/scripts/post-create - install -m 755 $(PACKAGE_DIR)/$(OMD)/ADMIN_MAIL $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - install -m 755 $(PACKAGE_DIR)/$(OMD)/APACHE_MODE $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - install -m 755 $(PACKAGE_DIR)/$(OMD)/AUTOSTART $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - install -m 755 $(PACKAGE_DIR)/$(OMD)/CORE $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - install -m 755 $(PACKAGE_DIR)/$(OMD)/TMPFS $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ + install -m 755 $(PACKAGE_DIR)/$(OMD)/hooks/* $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ $(TOUCH) $@

5 years, 6 months

Build mk-livestatus with RE2, hopefully...

by Sven Panne

Module: check_mk Branch: master Commit: c3cda061c84c8be9c423bb2126d275250f06917b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3cda061c84c8b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 30 17:24:54 2018 +0100 Build mk-livestatus with RE2, hopefully... Change-Id: I8649cae38d943625dd6d33b276d0858311c70798 --- omd/packages/mk-livestatus/mk-livestatus.make | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/omd/packages/mk-livestatus/mk-livestatus.make b/omd/packages/mk-livestatus/mk-livestatus.make index a2a8d93..07eb10f 100644 --- a/omd/packages/mk-livestatus/mk-livestatus.make +++ b/omd/packages/mk-livestatus/mk-livestatus.make @@ -1,8 +1,6 @@ MK_LIVESTATUS := mk-livestatus MK_LIVESTATUS_DIR := $(MK_LIVESTATUS)-$(CMK_VERSION) -CXX_FLAGS := -g -O3 -Wall -Wextra -BOOST_OPT := --with-boost=$(PACKAGE_BOOST_DESTDIR) # Attention: copy-n-paste from check_mk/Makefile below... MK_LIVESTATUS_BUILD := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS)-build MK_LIVESTATUS_INSTALL := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS)-install @@ -16,11 +14,10 @@ $(MK_LIVESTATUS)-install: $(MK_LIVESTATUS_INSTALL) $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz: $(MAKE) -C $(REPO_PATH) $(MK_LIVESTATUS_DIR).tar.gz -$(MK_LIVESTATUS_BUILD): $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz $(BOOST_BUILD) +$(MK_LIVESTATUS_BUILD): $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz $(BOOST_BUILD) $(RE2_BUILD) $(TAR_GZ) $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz cd $(MK_LIVESTATUS_DIR) ; \ - $(ECHO) ./configure CXXFLAGS="$(CXX_FLAGS)" $(BOOST_OPT) --prefix=$(OMD_ROOT) ; \ - ./configure CXXFLAGS="$(CXX_FLAGS)" $(BOOST_OPT) --prefix=$(OMD_ROOT) + ./configure CXXFLAGS="-g -O3 -Wall -Wextra" --with-boost=$(PACKAGE_BOOST_DESTDIR) --with-re2=$(PACKAGE_RE2_DESTDIR) --prefix=$(OMD_ROOT) $(MAKE) -C $(MK_LIVESTATUS_DIR) all $(TOUCH) $@

5 years, 6 months

refactor mkdir command

by Alex Zurhake

Module: check_mk Branch: master Commit: 21e4dbb6fb8b99066df66f5c1836e25f9fffe036 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21e4dbb6fb8b99… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Nov 30 09:54:32 2018 +0100 refactor mkdir command Change-Id: I586d898f78ede8d4c819b56efec181581725ea22 --- omd/Makefile | 6 +++++- omd/packages/Python/Python.make | 4 ++-- omd/packages/Webinject/Webinject.make | 1 - omd/packages/apache-omd/apache-omd.make | 2 -- omd/packages/boost/boost.make | 1 - omd/packages/check_mk/check_mk.make | 4 ---- omd/packages/check_multi/check_multi.make | 5 +---- .../check_mysql_health/check_mysql_health.make | 1 - .../check_oracle_health/check_oracle_health.make | 1 - omd/packages/cma/cma.make | 4 ++-- omd/packages/dokuwiki/dokuwiki.make | 1 - omd/packages/heirloom-mailx/heirloom-mailx.make | 2 -- omd/packages/heirloom-pkgtools/heirloom-pkgtools.make | 2 -- omd/packages/jmx4perl/jmx4perl.make | 11 ++++------- omd/packages/libgsf/libgsf.make | 2 +- omd/packages/maintenance/maintenance.make | 4 ---- omd/packages/msitools/msitools.make | 2 -- omd/packages/nagios/nagios.make | 5 +---- omd/packages/navicli/navicli.make | 5 ++--- omd/packages/omd/omd.make | 15 +++++++-------- .../openhardwaremonitor/openhardwaremonitor.make | 2 +- omd/packages/pnp4nagios/pnp4nagios.make | 19 +++++++++---------- omd/packages/python-modules/python-modules.make | 4 ++-- omd/packages/snap7/snap7.make | 1 - 24 files changed, 37 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=21e4dbb6fb…

5 years, 6 months

fix build targets

by Alex Zurhake

Module: check_mk Branch: master Commit: 631612e05bc5a9bb474f24f8fa4285ff95345651 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=631612e05bc5a9… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Nov 30 15:09:40 2018 +0100 fix build targets Change-Id: I192214171573c10e9751d889337249bfc0711209 --- omd/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index 9cba363..1f9f0b6 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -110,24 +110,20 @@ PRE_SKEL := $(BUILD_HELPER_DIR)/pre-skel INSTALL := $(BUILD_HELPER_DIR)/install INSTALL_GLOBAL := $(BUILD_HELPER_DIR)/install-global -BUILD_TARGETS := $(shell echo $(PACKAGES) | tr 'a-z' 'A-Z' | tr '-' '_' ) -INSTALL_TARGETS := $(foreach package,$(addsuffix _INSTALL,$(BUILD_TARGETS)),$($(package))) -SKEL_TARGETS := $(foreach package,$(addsuffix _SKEL,$(BUILD_TARGETS)),$($(package))) +BUILD_TARGET_VARS := $(shell echo $(PACKAGES) | tr 'a-z' 'A-Z' | tr '-' '_' ) +BUILD_TARGETS := $(foreach package,$(addsuffix _BUILD,$(BUILD_TARGET_VARS)),$($(package))) +INSTALL_TARGETS := $(foreach package,$(addsuffix _INSTALL,$(BUILD_TARGET_VARS)),$($(package))) +SKEL_TARGETS := $(foreach package,$(addsuffix _SKEL,$(BUILD_TARGET_VARS)),$($(package))) .PHONY: install-global build install pack skel -debug: - echo $(BUILD_TARGETS) - echo $(INSTALL_TARGETS) - echo $(SKEL_TARGETS) - build: $(BUILD_TARGETS) install: $(INSTALL) install-global: $(INSTALL_GLOBAL) -pack: $(BIN_TGZ) +pack: $(BIN_TGZ) skel: $(DESTDIR)$(OMD_ROOT)/share/omd/skel.permissions $(FIX_SKEL)

5 years, 6 months

use buildhelper files for dependencies instead of .PHONY targts. .PHONY targets lead to unwanted rebuilding of the target

by Alex Zurhake

Module: check_mk Branch: master Commit: abf86ae34a562ea501511bb8db854b3cc3e3ad3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abf86ae34a562e… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Nov 29 09:53:09 2018 +0100 use buildhelper files for dependencies instead of .PHONY targts. .PHONY targets lead to unwanted rebuilding of the target Install Hooks inside of package isntall targets to make installation of Hooks more explicit remove outdated CMA target. These files do not need to be edited Change-Id: I466a50a2f4ab127bb4f637e33d6760bd29f13fe7 --- omd/Makefile | 161 ++++++++++----------- .../{APACHE_TCP_ADDR.hook => APACHE_TCP_ADDR} | 0 .../{APACHE_TCP_PORT.hook => APACHE_TCP_PORT} | 0 omd/packages/apache-omd/apache-omd.make | 18 +-- omd/packages/check_mk/{MKEVENTD.hook => MKEVENTD} | 0 .../{MKEVENTD_SNMPTRAP.hook => MKEVENTD_SNMPTRAP} | 0 .../{MKEVENTD_SYSLOG.hook => MKEVENTD_SYSLOG} | 0 ...KEVENTD_SYSLOG_TCP.hook => MKEVENTD_SYSLOG_TCP} | 0 ..._AUTHORISATION.hook => MULTISITE_AUTHORISATION} | 0 ...SITE_COOKIE_AUTH.hook => MULTISITE_COOKIE_AUTH} | 0 omd/packages/check_mk/check_mk.make | 8 + omd/packages/check_multi/check_multi.make | 6 +- .../check_mysql_health/check_mysql_health.make | 1 - .../check_oracle_health/check_oracle_health.make | 1 - omd/packages/cma/Makefile | 16 -- omd/packages/cma/cma.make | 7 + .../dokuwiki/{DOKUWIKI_AUTH.hook => DOKUWIKI_AUTH} | 0 omd/packages/dokuwiki/dokuwiki.make | 1 + .../{LIVESTATUS_TCP.hook => LIVESTATUS_TCP} | 0 ...TCP_ONLY_FROM.hook => LIVESTATUS_TCP_ONLY_FROM} | 0 ...IVESTATUS_TCP_PORT.hook => LIVESTATUS_TCP_PORT} | 0 omd/packages/mk-livestatus/mk-livestatus.make | 3 + omd/packages/mod_wsgi/mod_wsgi.make | 5 +- .../nagios/{NAGIOS_THEME.hook => NAGIOS_THEME} | 0 omd/packages/nagios/nagios.make | 1 + omd/packages/nsca/{NSCA.hook => NSCA} | 0 .../nsca/{NSCA_TCP_PORT.hook => NSCA_TCP_PORT} | 0 omd/packages/nsca/nsca.make | 2 + omd/packages/omd/{ADMIN_MAIL.hook => ADMIN_MAIL} | 0 omd/packages/omd/{APACHE_MODE.hook => APACHE_MODE} | 0 omd/packages/omd/{AUTOSTART.hook => AUTOSTART} | 0 omd/packages/omd/{CORE.hook => CORE} | 0 omd/packages/omd/{TMPFS.hook => TMPFS} | 0 omd/packages/omd/omd.make | 6 + .../openhardwaremonitor/openhardwaremonitor.make | 1 + omd/packages/packages.make | 2 +- .../pnp4nagios/{PNP4NAGIOS.hook => PNP4NAGIOS} | 0 omd/packages/pnp4nagios/pnp4nagios.make | 3 + 38 files changed, 118 insertions(+), 124 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=abf86ae34a…

5 years, 6 months

Make yapf happy again

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9afbe5639172fa249a3ef2180d09a830b2d69d0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9afbe5639172fa… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 30 14:57:26 2018 +0100 Make yapf happy again Change-Id: Icc80a2c124aa6c23f523590d2f182833057bf893 --- inventory/dell_idrac_info | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inventory/dell_idrac_info b/inventory/dell_idrac_info index 3031189..b36c8fc 100644 --- a/inventory/dell_idrac_info +++ b/inventory/dell_idrac_info @@ -47,15 +47,15 @@ def inv_dell_idrac_info(info): # been observed in the wild. More accurate appears to be # mm/dd/yyyy or 0mm/dd/yyyy or mm/0dd/yyyy. The 0 represents a # random 0 thrown in for good measure :/ - if bios_date[2] == "/" and bios_date[5] == "/": # mm/dd/yyyy + if bios_date[2] == "/" and bios_date[5] == "/": # mm/dd/yyyy node['date'] = time.mktime(time.strptime(bios_date, "%m/%d/%Y")) - elif bios_date[3] == "/" and bios_date[6] == "/": # 0mm/dd/yyyy + elif bios_date[3] == "/" and bios_date[6] == "/": # 0mm/dd/yyyy node['date'] = time.mktime(time.strptime(bios_date, "0%m/%d/%Y")) - elif bios_date[2] == "/" and bios_date[6] == "/": # mm/0dd/yyyy + elif bios_date[2] == "/" and bios_date[6] == "/": # mm/0dd/yyyy node['date'] = time.mktime(time.strptime(bios_date, "%m/0%d/%Y")) - elif "/" not in bios_date[:8]: # In case of Dell devices following the MIB + elif "/" not in bios_date[:8]: # In case of Dell devices following the MIB node['date'] = time.mktime(time.strptime(bios_date[:8], "%Y%m%d")) - else: # We deliberately ignore any other broken formats that might exist. + else: # We deliberately ignore any other broken formats that might exist. pass node = inv_tree("hardware.storage.controller.")

5 years, 6 months

6981 FIX dell_idrac_info: Fix inventory for certain aberrant date formats

by Konstantin Büttner

Module: check_mk Branch: master Commit: e789e8da40b2b7ebfcdadfb7ab9fcd9021a95da2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e789e8da40b2b7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 30 14:33:02 2018 +0100 6981 FIX dell_idrac_info: Fix inventory for certain aberrant date formats Change-Id: Icfe8a3639d830eb5563f870d6118cce47100b973 --- .werks/6981 | 11 +++++++++++ inventory/dell_idrac_info | 17 ++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.werks/6981 b/.werks/6981 new file mode 100644 index 0000000..dc552de --- /dev/null +++ b/.werks/6981 @@ -0,0 +1,11 @@ +Title: dell_idrac_info: Fix inventory for certain aberrant date formats +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1543584742 + + diff --git a/inventory/dell_idrac_info b/inventory/dell_idrac_info index 8812dd6..3031189 100644 --- a/inventory/dell_idrac_info +++ b/inventory/dell_idrac_info @@ -41,7 +41,22 @@ def inv_dell_idrac_info(info): node = inv_tree("hardware.bios.") node['version'] = bios_version node['vendor'] = bios_vendor - node['date'] = time.mktime(time.strptime(bios_date, "%m/%d/%Y")) + + # Beware: Dell's actual definition of the format supposed + # to be here is yyyymmddHHMMSS.uuuuuu+ooo. This has *never* + # been observed in the wild. More accurate appears to be + # mm/dd/yyyy or 0mm/dd/yyyy or mm/0dd/yyyy. The 0 represents a + # random 0 thrown in for good measure :/ + if bios_date[2] == "/" and bios_date[5] == "/": # mm/dd/yyyy + node['date'] = time.mktime(time.strptime(bios_date, "%m/%d/%Y")) + elif bios_date[3] == "/" and bios_date[6] == "/": # 0mm/dd/yyyy + node['date'] = time.mktime(time.strptime(bios_date, "0%m/%d/%Y")) + elif bios_date[2] == "/" and bios_date[6] == "/": # mm/0dd/yyyy + node['date'] = time.mktime(time.strptime(bios_date, "%m/0%d/%Y")) + elif "/" not in bios_date[:8]: # In case of Dell devices following the MIB + node['date'] = time.mktime(time.strptime(bios_date[:8], "%Y%m%d")) + else: # We deliberately ignore any other broken formats that might exist. + pass node = inv_tree("hardware.storage.controller.") node['version'] = raid_version

5 years, 6 months

Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: f41ff4abe982e55b6f80fa7ab3630368b76a4b1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f41ff4abe982e5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 30 14:32:03 2018 +0100 Reserved 10 Werk IDS Change-Id: I949533bfad6725ace29984ed0e0932b04779bbfe --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 97286e0..c521a1f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6981 +6991

5 years, 6 months

6693 FIX Background Jobs no longer slow down when there is a large amount of log output

by Andreas Boesl

Module: check_mk Branch: master Commit: e4ef03ffa27c1eec0708485141a0c91f96254fa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4ef03ffa27c1e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 30 12:17:03 2018 +0100 6693 FIX Background Jobs no longer slow down when there is a large amount of log output CMK-1359 Change-Id: I158b660853d57f0cf96e2ef3810d9d689781bd66 --- .werks/6693 | 8 +++ cmk/gui/background_job.py | 160 ++++++++++++++++++------------------------ cmk/gui/gui_background_job.py | 21 +++--- 3 files changed, 86 insertions(+), 103 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e4ef03ffa2…

5 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018