Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

Fixed other build issues in screen sessions

by Lars Michelsen

Module: check_mk Branch: master Commit: fb6d07591ddc2d80b2966baf4935070a5e8554ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb6d07591ddc2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 20:06:32 2018 +0200 Fixed other build issues in screen sessions Change-Id: Ibf07c37220f9f4ab055202047fed93696fd847b6 --- agents/windows/do-chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/windows/do-chroot b/agents/windows/do-chroot index 5d7134c..400e18f 100755 --- a/agents/windows/do-chroot +++ b/agents/windows/do-chroot @@ -6,6 +6,7 @@ CMD="$1" export HOSTNAME=cmk-windows-agent-chroot unset LANG +export TERM=linux SCRIPT_DIR="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" BASE="$(realpath $SCRIPT_DIR/../..)"

6 years, 2 months

pnp4nagios: Fixed PHP 7.2 runtime dependency

by Lars Michelsen

Module: check_mk Branch: master Commit: 9fd893a8fa669cbde56732d29720f82e66579567 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fd893a8fa669c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 07:48:30 2018 +0200 pnp4nagios: Fixed PHP 7.2 runtime dependency Change-Id: I6da18e707a01df918b80087dcfeda66e43539fc2 --- .../patches/0103-fix-sizeof-issue-with-php72.diff | 362 +++++++++++++++++++++ 1 file changed, 362 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9fd893a8fa…

6 years, 2 months

Fixed Ubuntu 18.04 runtime dependencies

by Lars Michelsen

Module: check_mk Branch: master Commit: 74ec96ac3c7329330f24b60994cfdd1149527fc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74ec96ac3c7329… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 07:47:54 2018 +0200 Fixed Ubuntu 18.04 runtime dependencies Change-Id: I3b983cc8f55002de22f31d162c709aaa362a9c09 --- omd/distros/UBUNTU_18.04.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/distros/UBUNTU_18.04.mk b/omd/distros/UBUNTU_18.04.mk index cc5049c..8e18c79 100644 --- a/omd/distros/UBUNTU_18.04.mk +++ b/omd/distros/UBUNTU_18.04.mk @@ -70,7 +70,6 @@ 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 @@ -91,6 +90,7 @@ 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 += libfl2 # needed by heirloom-pkgtools OS_PACKAGES += poppler-utils # needed for preview of PDF in reporting OS_PACKAGES += libffi6 # needed for pyOpenSSL and dependant USERADD_OPTIONS =

6 years, 2 months

6030 FIX NagVis: Updated to 1.9.8

by Lars Michelsen

Module: check_mk Branch: master Commit: 28cc34fa9f1469e1fdfd3e36036133a53a2f1643 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28cc34fa9f1469… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 08:18:49 2018 +0200 6030 FIX NagVis: Updated to 1.9.8 Change-Id: I7927a7de36b952f433be3435412963855b6ecaee --- .werks/6030 | 10 ++++++++++ omd/packages/nagvis/Makefile | 2 +- omd/packages/nagvis/nagvis-1.9.7.tar.gz | Bin 1790286 -> 0 bytes omd/packages/nagvis/nagvis-1.9.8.tar.gz | Bin 0 -> 1791560 bytes 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6030 b/.werks/6030 new file mode 100644 index 0000000..9a77074 --- /dev/null +++ b/.werks/6030 @@ -0,0 +1,10 @@ +Title: NagVis: Updated to 1.9.8 +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524550715 +Class: fix + + diff --git a/omd/packages/nagvis/Makefile b/omd/packages/nagvis/Makefile index bcaea4e..b68961a 100644 --- a/omd/packages/nagvis/Makefile +++ b/omd/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.9.7 +VERSION = 1.9.8 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/omd/packages/nagvis/nagvis-1.9.7.tar.gz b/omd/packages/nagvis/nagvis-1.9.7.tar.gz deleted file mode 100644 index df48bdf..0000000 Binary files a/omd/packages/nagvis/nagvis-1.9.7.tar.gz and /dev/null differ diff --git a/omd/packages/nagvis/nagvis-1.9.8.tar.gz b/omd/packages/nagvis/nagvis-1.9.8.tar.gz new file mode 100644 index 0000000..19fe32d Binary files /dev/null and b/omd/packages/nagvis/nagvis-1.9.8.tar.gz differ

6 years, 2 months

Fix broken windows agent unit tests when being executed in screen

by Lars Michelsen

Module: check_mk Branch: master Commit: ff27df42dc561cff49f4c1932e5ee43b19439ef5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff27df42dc561c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 19:54:53 2018 +0200 Fix broken windows agent unit tests when being executed in screen Change-Id: I5ebc5d06f168ae80c53e58f62a498be7d4f06961 --- 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 8a7d663..a85b4b7 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -168,7 +168,7 @@ check_mk_agent.res: check_mk_agent.rc $(VPATH)/check_mk_agent.ico # to /dev/null as the test output will go to stdout (and/or xml file) anyway. # DISPLAY="$$DISPLAY xterm" GTEST_OUTPUT=xml:result.xml wine $< 2>/dev/null unittest: WindowsAgentTest$(EXEEXT) - DISPLAY="$$DISPLAY xterm" GTEST_OUTPUT=xml:result.xml wine $< + TERM=linux DISPLAY="$$DISPLAY xterm" GTEST_OUTPUT=xml:result.xml wine $< integrationtest: install-strip cd $(bindir)/it ; \

6 years, 2 months

windows agent unittest target: temporarily enable stderr

by Lars Michelsen

Module: check_mk Branch: master Commit: 59d0a22745181bc4dc849d43191be30cbf88b7c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59d0a22745181b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 17:29:34 2018 +0200 windows agent unittest target: temporarily enable stderr Enable this trying to track down random build issues like this: (...) mv -f test/.deps/WindowsAgentTest-MockWinApi.Tpo test/.deps/WindowsAgentTest-MockWinApi.Po x86_64-w64-mingw32-g++-posix -g -O2 -static -static-libgcc -static-libstdc++ -o WindowsAgentTest.exe test/WindowsAgentTest-ConfigurationTest.o test/WindowsAgentTest-EnvironmentTest.o test/WindowsAgentTest-EventLogVistaTest.o test/WindowsAgentTest-MockEnvironment.o test/WindowsAgentTest-MockLogger.o test/WindowsAgentTest-MockWinApi.o test/WindowsAgentTest-RotatingFileHandlerTest.o test/WindowsAgentTest-WritableFileTest.o test/WindowsAgentTest-gtest_main.o test/WindowsAgentTest-stringutilTest.o test/WindowsAgentTest-typesTest.o test/WindowsAgentTest-wmiHelperTest.o test/sections/WindowsAgentTest-SectionEventlogTest.o test/sections/WindowsAgentTest-SectionHeaderTest.o test/sections/WindowsAgentTest-SectionLogwatchTest.o test/sections/WindowsAgentTest-SectionMRPETest.o libcheck_mk_agent.a -lgtest -lgmock -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -lstdc++fs DISPLAY="$DISPLAY xterm" wine WindowsAgentTest.exe 2>/dev/null Makefile:1381: recipe for target 'unittest' failed make: *** [unittest] Error 1 Change-Id: I579c4a11d0952682364b468e6af2d65a51b77c93 --- agents/windows/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index c7ede10..8a7d663 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -166,8 +166,9 @@ check_mk_agent.res: check_mk_agent.rc $(VPATH)/check_mk_agent.ico # Wine depends on X Server and may produce a number of warnings at startup. # Using Xvfb does not work properly, either. Simply send those stderr warnings # to /dev/null as the test output will go to stdout (and/or xml file) anyway. +# DISPLAY="$$DISPLAY xterm" GTEST_OUTPUT=xml:result.xml wine $< 2>/dev/null unittest: WindowsAgentTest$(EXEEXT) - DISPLAY="$$DISPLAY xterm" GTEST_OUTPUT=xml:result.xml wine $< 2>/dev/null + DISPLAY="$$DISPLAY xterm" GTEST_OUTPUT=xml:result.xml wine $< integrationtest: install-strip cd $(bindir)/it ; \

6 years, 2 months

heirloom-pkgtools: Fix compilation with OpenSSL 1.1.0

by Lars Michelsen

Module: check_mk Branch: master Commit: efa49d588b80ddd867c56b995fca7d9ac673744c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efa49d588b80dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 17:15:59 2018 +0200 heirloom-pkgtools: Fix compilation with OpenSSL 1.1.0 Change-Id: Ib4c235362c1cc7a16fa64d1cb5d1d4ace557d5e7 --- .../0008-fix-comilation-with-openssl-1.1.0.dif | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/omd/packages/heirloom-pkgtools/patches/0008-fix-comilation-with-openssl-1.1.0.dif b/omd/packages/heirloom-pkgtools/patches/0008-fix-comilation-with-openssl-1.1.0.dif new file mode 100644 index 0000000..2e1972e --- /dev/null +++ b/omd/packages/heirloom-pkgtools/patches/0008-fix-comilation-with-openssl-1.1.0.dif @@ -0,0 +1,33 @@ +diff -Nur heirloom-pkgtools-070227.orig/libpkg/keystore.c heirloom-pkgtools-070227/libpkg/keystore.c +--- heirloom-pkgtools-070227.orig/libpkg/keystore.c 2007-02-25 19:39:51.000000000 +0100 ++++ heirloom-pkgtools-070227/libpkg/keystore.c 2018-04-23 17:14:05.450917523 +0200 +@@ -56,7 +56,6 @@ + #include <openssl/err.h> + #include <openssl/safestack.h> + #include <openssl/stack.h> +-#include "p12lib.h" + #include "pkgerr.h" + #include "keystore.h" + #include "pkglib.h" +diff -Nur heirloom-pkgtools-070227.orig/libpkg/pkgweb.c heirloom-pkgtools-070227/libpkg/pkgweb.c +--- heirloom-pkgtools-070227.orig/libpkg/pkgweb.c 2007-02-26 01:31:09.000000000 +0100 ++++ heirloom-pkgtools-070227/libpkg/pkgweb.c 2018-04-23 17:14:18.068000845 +0200 +@@ -72,7 +72,6 @@ + #include "keystore.h" + #include "pkgweb.h" + #include "pkgerr.h" +-#include "p12lib.h" + #include "libadm.h" + + #ifdef __sun +diff -Nur heirloom-pkgtools-070227.orig/libpkg/security.c heirloom-pkgtools-070227/libpkg/security.c +--- heirloom-pkgtools-070227.orig/libpkg/security.c 2007-02-25 15:47:15.000000000 +0100 ++++ heirloom-pkgtools-070227/libpkg/security.c 2018-04-23 17:14:19.728144963 +0200 +@@ -63,7 +63,6 @@ + #include "pkglib.h" + #include "pkglibmsgs.h" + #include "pkglocale.h" +-#include "p12lib.h" + + /* length of allowable passwords */ + #define MAX_PASSLEN 128

6 years, 2 months

6028 FIX chrony: Fixed incompatibility with RedHat 7.5

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e56d264c8d85278c37a3bbb6bc334475141b13e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e56d264c8d852… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 15:47:51 2018 +0200 6028 FIX chrony: Fixed incompatibility with RedHat 7.5 The SELinux rules shipped with RedHat 7.5 deny execution of chronyc like our agent did before. We have changed the agent code to be able to also work with RedHat 7.5 out of the box. Change-Id: I4cee0004c4baef0eb8d882de7d9dfab866ac8f10 --- .werks/6028 | 13 +++++++++++++ agents/check_mk_agent.linux | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/6028 b/.werks/6028 new file mode 100644 index 0000000..8a5ee3b --- /dev/null +++ b/.werks/6028 @@ -0,0 +1,13 @@ +Title: chrony: Fixed incompatibility with RedHat 7.5 +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524491173 + +The SELinux rules shipped with RedHat 7.5 deny execution of chronyc like +our agent did before. We have changed the agent code to be able to also +work with RedHat 7.5 out of the box. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4f1738b..4f912dc 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -648,7 +648,11 @@ fi # Time synchronization with Chrony if type chronyc > /dev/null 2>&1 ; then # Force successful exit code. Otherwise section will be missing if daemon not running - run_cached -s chrony 30 "waitmax 5 chronyc -n tracking || true" + # + # The "| cat" has been added for some kind of regression in RedHat 7.5. The + # SELinux rules shipped with that release were denying the chronyc call + # without cat. + run_cached -s chrony 30 "waitmax 5 chronyc -n tracking | cat || true" fi if type nvidia-settings >/dev/null && [ -S /tmp/.X11-unix/X0 ]

6 years, 2 months

Fixed multiple inheritance

by Simon Betz

Module: check_mk Branch: master Commit: 40afcabd705cde7c40957e2bec151060ee2525da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40afcabd705cde… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 23 14:54:35 2018 +0200 Fixed multiple inheritance Change-Id: I0523a4aa7b154157a6eae67c1cf071521b4512ae --- cmk_base/data_sources/snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index 31e453d..ba7307b 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -266,7 +266,7 @@ class SNMPDataSource(DataSource): # 1. TCP host + SNMP MGMT Board: standard SNMP beibehalten # 2. snmpv3 context -class SNMPManagementBoardDataSource(SNMPDataSource, ManagementBoardDataSource): +class SNMPManagementBoardDataSource(ManagementBoardDataSource, SNMPDataSource): def id(self): return "mgmt_snmp"

6 years, 2 months

6027 FIX Fixed availability CSV export when summary is disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 67e712e914317a20353218683b24e6269ea01677 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67e712e914317a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 14:30:12 2018 +0200 6027 FIX Fixed availability CSV export when summary is disabled Change-Id: Id932de0947c717db8e51f3862c92e694f3364443 --- .werks/6027 | 11 +++++++++++ web/plugins/views/availability.py | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6027 b/.werks/6027 new file mode 100644 index 0000000..7a6000b --- /dev/null +++ b/.werks/6027 @@ -0,0 +1,11 @@ +Title: Fixed availability CSV export when summary is disabled +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524486596 + + diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index f4425b0..c11d92f 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -919,7 +919,9 @@ def output_availability_csv(what, av_data, avoptions): # presumably all rows have the same width pad = len(row["object"]) - 1 table.row() - cells_from_row(group_titles, group_cells, + + if "summary" in av_table: + cells_from_row(group_titles, group_cells, av_table["object_titles"], av_table["cell_titles"], [(_("Summary"), "")] + [("", "")] * pad, av_table["summary"]) table.end()

6 years, 2 months

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018