Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

5455 solaris_services: New check which monitors single services of Solaris systems

by Simon Betz

Module: check_mk Branch: master Commit: b6ad407108276d72fc89d4a41990ba202347bd77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6ad407108276d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 18 11:48:44 2017 +0100 5455 solaris_services: New check which monitors single services of Solaris systems Change-Id: Id78bda93b6b641df3c9f04ee000dadf8a2532795 --- .werks/5455 | 10 ++ checkman/solaris_services | 18 ++++ checkman/solaris_services.summary | 3 +- checks/solaris_services | 198 +++++++++++++++++++++++++++-------- web/plugins/wato/check_parameters.py | 93 +++++++++++++++- 5 files changed, 278 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b6ad407108…

6 years, 4 months

Patch for RE2: Use fallthrough attribute when available.

by Sven Panne

Module: check_mk Branch: master Commit: a975378ed57a8d3f829b0f626319b7cc77b0eefe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a975378ed57a8d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 9 15:23:24 2018 +0100 Patch for RE2: Use fallthrough attribute when available. We should probably upstream this... Change-Id: I9b98d74b9c13638b93d1c62ce4f4bc84c1c97599 --- omd/packages/re2/Makefile | 12 ++++++-- ...-Use-fallthrough-attribute-when-available.patch | 33 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index 2a7c9a0..832fe82 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -7,10 +7,9 @@ NAME = re2 VERSION = 2018-02-01 DIR = $(NAME)-$(VERSION) -.PHONY: build install skel clean +.PHONY: build unpacks install skel clean -build: - tar xzf $(DIR).tar.gz +build: unpack # basically what part of AC_PROC_CXX does @CXX="" ; \ 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 \ @@ -32,6 +31,13 @@ build: # The RE2 Makefile offers no mechanism to strip the libraries. :-/ strip $(PACKAGE_RE2_DESTDIR)/lib/*.a $(PACKAGE_RE2_DESTDIR)/lib/*.so +unpack: + tar xzf $(DIR).tar.gz + for p in patches/*.patch; do \ + echo "applying $$p..." ; \ + patch -p1 -b -d $(DIR) < $$p ; \ + done + install: mkdir -p $(DESTDIR)$(OMD_ROOT) cp -a $(PACKAGE_RE2_DESTDIR)/include $(PACKAGE_RE2_DESTDIR)/lib $(DESTDIR)$(OMD_ROOT) diff --git a/omd/packages/re2/patches/0001-Use-fallthrough-attribute-when-available.patch b/omd/packages/re2/patches/0001-Use-fallthrough-attribute-when-available.patch new file mode 100644 index 0000000..8fa9726 --- /dev/null +++ b/omd/packages/re2/patches/0001-Use-fallthrough-attribute-when-available.patch @@ -0,0 +1,33 @@ +From ef0b0e0bde7bb50b6b5d6144a53869bfc2416597 Mon Sep 17 00:00:00 2001 +From: Sven Panne <sp(a)mathias-kettner.de> +Date: Fri, 9 Feb 2018 15:12:37 +0100 +Subject: [PATCH] Use fallthrough attribute when available. + +--- + util/util.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/util/util.h b/util/util.h +index a69d842..9f8216b 100644 +--- a/util/util.h ++++ b/util/util.h +@@ -11,6 +11,16 @@ using std::string; + + #define arraysize(array) (int)(sizeof(array)/sizeof((array)[0])) + ++#if !defined(FALLTHROUGH_INTENDED) && defined(__has_cpp_attribute) ++#if __has_cpp_attribute(fallthrough) ++#define FALLTHROUGH_INTENDED [[fallthrough]] ++#elif __has_cpp_attribute(gnu::fallthrough) ++#define FALLTHROUGH_INTENDED [[gnu::fallthrough]] ++#elif __has_cpp_attribute(clang::fallthrough) ++#define FALLTHROUGH_INTENDED [[clang::fallthrough]] ++#endif ++#endif ++ + #ifndef FALLTHROUGH_INTENDED + #define FALLTHROUGH_INTENDED do { } while (0) + #endif +-- +2.14.1 +

6 years, 4 months

Improve RE2 installation.

by Sven Panne

Module: check_mk Branch: master Commit: f1cdd5c845137622698d316c98213bd7f3b9c367 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1cdd5c8451376… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 9 15:00:07 2018 +0100 Improve RE2 installation. Change-Id: I0c17bbaa8d80c7f3a6fc633f8d985e61528cc4af --- omd/packages/re2/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index aee377c..2a7c9a0 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -24,10 +24,17 @@ build: echo "no"; IFS=$$SAVED_IFS ; \ done ; \ test -z "$$CXX" && { echo "error: no C++ compiler found" >&2 ; exit 1; } ; \ - $(MAKE) -C $(DIR) CXX="$$CXX" prefix=$(OMD_ROOT) && \ - $(MAKE) -C $(DIR) CXX="$$CXX" DESTDIR=$(PACKAGE_RE2_DESTDIR) prefix="" install + $(MAKE) -C $(DIR) CXX="$$CXX" CPPFLAGS="-DRE2_ON_VALGRIND" DESTDIR=$(PACKAGE_RE2_DESTDIR) prefix=$(OMD_ROOT) install +# TODO(sp): What should we do about RE2_ON_VALGRIND? +# Massage paths a bit by moving things around. + mv $(PACKAGE_RE2_DESTDIR)/$(OMD_ROOT)/include $(PACKAGE_RE2_DESTDIR)/$(OMD_ROOT)/lib $(PACKAGE_RE2_DESTDIR) + rm -rf $(PACKAGE_RE2_DESTDIR)/$(OMD_BASE) +# The RE2 Makefile offers no mechanism to strip the libraries. :-/ + strip $(PACKAGE_RE2_DESTDIR)/lib/*.a $(PACKAGE_RE2_DESTDIR)/lib/*.so install: + mkdir -p $(DESTDIR)$(OMD_ROOT) + cp -a $(PACKAGE_RE2_DESTDIR)/include $(PACKAGE_RE2_DESTDIR)/lib $(DESTDIR)$(OMD_ROOT) skel:

6 years, 4 months

Test usage of RE2 (if available).

by Sven Panne

Module: check_mk Branch: master Commit: 6ff7961f6b11d302d900acdeb8270eebc86955ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ff7961f6b11d3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 9 13:49:16 2018 +0100 Test usage of RE2 (if available). Change-Id: I1844f3719725f8eac12d74fb1d951c2f9d02588a --- livestatus/src/.clang_complete | 1 + livestatus/src/Makefile.am | 6 +++--- livestatus/src/RegExp.cc | 9 +++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/livestatus/src/.clang_complete b/livestatus/src/.clang_complete index ec64bce..eadb606 100644 --- a/livestatus/src/.clang_complete +++ b/livestatus/src/.clang_complete @@ -1,6 +1,7 @@ -I. -I../.. -I.. +-I../../omd/packages/re2/destdir/include -DHAVE_CONFIG_H -std=c++17 -Wall diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 8e8ca3d..6a854b2 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -160,15 +160,15 @@ liblivestatus_a_SOURCES = \ .PHONY: tidy iwyu cppcheck cppcheck-xml documentation -liblivestatus_a_CPPFLAGS = -I.. @BOOST_CPPFLAGS@ +liblivestatus_a_CPPFLAGS = -I.. @BOOST_CPPFLAGS@ @RE2_CPPFLAGS@ liblivestatus_a_CXXFLAGS = -fPIC livestatus.o: $(liblivestatus_a_OBJECTS) # Note: libstdc++fs is only available as a static library, so we are lucky - $(CXXLINK) -shared $^ -lstdc++fs -lpthread -static-libstdc++ @BOOST_LDFLAGS@ @BOOST_ASIO_LIB@ + $(CXXLINK) -shared $^ -lstdc++fs -lpthread -static-libstdc++ @BOOST_LDFLAGS@ @BOOST_ASIO_LIB@ @RE2_LDFLAGS@ @RE2_LIBS@ # To make sure we can dlopen() our NEB later $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) -c NagiosMockup.cc -o NagiosMockup.o - $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.o $@ -o NagiosMockup + $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.o $@ -o NagiosMockup @RE2_LDFLAGS@ @RE2_LIBS@ $(RM) NagiosMockup compile_commands.json: Makefile $(wildcard *.cc *.h) diff --git a/livestatus/src/RegExp.cc b/livestatus/src/RegExp.cc index 6d05276..02cf401 100644 --- a/livestatus/src/RegExp.cc +++ b/livestatus/src/RegExp.cc @@ -23,6 +23,12 @@ // Boston, MA 02110-1301 USA. #include "RegExp.h" + +// Currently just for testing purposes, the real stuff will follow soon... +#ifdef HAVE_RE2 +#include <re2/re2.h> +#endif + #include <regex> class RegExp::Impl { @@ -65,6 +71,9 @@ RegExp &RegExp::operator=(RegExp &&rhs) noexcept = default; std::string RegExp::replace(const std::string &str, const std::string &replacement) const { +#ifdef HAVE_RE2 + RE2 dummyRegExpJustForTesting{".*"}; +#endif return _impl->replace(str, replacement); }

6 years, 4 months

5496 FIX lnx_if: fix an issue that could lead to a crash of the agent if no interface address is returned

by Tom Baerwinkel

Module: check_mk Branch: master Commit: eef09f0f0621ac146622f22cefd287cb7c826951 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eef09f0f0621ac… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Jan 30 14:27:42 2018 +0100 5496 FIX lnx_if: fix an issue that could lead to a crash of the agent if no interface address is returned Change-Id: Iaabbb663209860c523bc969bf1ab30b890cbe603 --- .werks/5496 | 10 ++++++++++ agents/check_mk_agent.linux | 6 +++--- agents/check_mk_agent.openwrt | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/5496 b/.werks/5496 new file mode 100644 index 0000000..5404be8 --- /dev/null +++ b/.werks/5496 @@ -0,0 +1,10 @@ +Title: lnx_if: fix an issue that could lead to a crash of the agent if no interface address is returned +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517490540 +Class: fix + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 0a94bdc..074c224 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -389,11 +389,11 @@ echo '<<<lnx_if:sep(58)>>>' sed 1,2d /proc/net/dev if type ethtool > /dev/null then - for eth in $(sed -e 1,2d < /proc/net/dev | cut -d':' -f1 | sort) + for eth in $(sed -e 1,2d /proc/net/dev | cut -d':' -f1 | sort) do echo "[$eth]" - ethtool $eth | egrep '(Speed|Duplex|Link detected|Auto-negotiation):' - echo -en "\tAddress: " ; cat /sys/class/net/$eth/address ; echo + ethtool "$eth" | grep -E '(Speed|Duplex|Link detected|Auto-negotiation):' + echo -e "\tAddress: $(cat "/sys/class/net/$eth/address")\n" done fi diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 86c2ea0..0e3bc75 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -336,11 +336,11 @@ echo '<<<lnx_if:sep(58)>>>' sed 1,2d /proc/net/dev if type ethtool > /dev/null then - for eth in $(sed -e 1,2d < /proc/net/dev | cut -d':' -f1 | sort) + for eth in $(sed -e 1,2d /proc/net/dev | cut -d':' -f1 | sort) do echo "[$eth]" - ethtool $eth | egrep '(Speed|Duplex|Link detected|Auto-negotiation):' - echo -en "\tAddress: " ; cat /sys/class/net/$eth/address ; echo + ethtool "$eth" | grep -E '(Speed|Duplex|Link detected|Auto-negotiation):' + echo -e "\tAddress: $(cat "/sys/class/net/$eth/address")\n" done fi

6 years, 4 months

Remove RegExp::assign.

by Sven Panne

Module: check_mk Branch: master Commit: 2d4930804c40c7ff1896fff539873f281ccc26e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d4930804c40c7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 9 10:58:57 2018 +0100 Remove RegExp::assign. RE2 doesn't offer such a functionality and it's cleaner without it, anyway. Change-Id: I57a5a1b2d087f2e45a32ed66c21b43cf3eb48778 --- livestatus/src/CustomVarsDictFilter.cc | 29 ++++------------------------ livestatus/src/CustomVarsDictFilter.h | 4 ++-- livestatus/src/ListFilter.cc | 32 +++++++------------------------ livestatus/src/ListFilter.h | 4 ++-- livestatus/src/RegExp.cc | 35 +++++++++++++++++++++------------- livestatus/src/RegExp.h | 5 ++--- livestatus/src/StringFilter.cc | 32 +++++++------------------------ livestatus/src/StringFilter.h | 4 ++-- livestatus/src/opids.cc | 26 +++++++++++++++++++++++++ livestatus/src/opids.h | 4 ++++ 10 files changed, 78 insertions(+), 97 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2d4930804c…

6 years, 4 months

Added comment

by Simon Betz

Module: check_mk Branch: master Commit: b1e0219335cab5bbefb8ab64bba28f6e52da6ad0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1e0219335cab5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 9 13:26:14 2018 +0100 Added comment Change-Id: Id7b6c662d5703fce00d1758c8730795b6def2a31 --- cmk/structured_data.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index af36fa2..ec069d7 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -207,6 +207,10 @@ class StructuredDataTree(object): def _is_numeration(self, entries): for entry in entries: + #TODO Skipping invalid entries such as + # esx_vsphere_clusters: {u'hostsystems': [LIST OF STRINGS], ...} + #if not isinstance(entry, dict): + # continue for k, v in entry.iteritems(): if isinstance(v, list): return False

6 years, 4 months

Fixed inventory_plugin esx_vsphere_clusters again which return wrong numeration format

by Simon Betz

Module: check_mk Branch: master Commit: a52ca8c261349a575ced7f04ae6de74e4d56d2a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a52ca8c261349a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 9 13:20:43 2018 +0100 Fixed inventory_plugin esx_vsphere_clusters again which return wrong numeration format Change-Id: I24463fba82fdca62af31eef11af48e3d243edabb --- inventory/esx_vsphere_clusters | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/inventory/esx_vsphere_clusters b/inventory/esx_vsphere_clusters index 8597803..fd8a9e0 100644 --- a/inventory/esx_vsphere_clusters +++ b/inventory/esx_vsphere_clusters @@ -32,7 +32,6 @@ def inv_esx_vsphere_clusters(info): node = inv_tree_list("software.applications.vmwareesx:") - datacenters = {} for line in info: datacenter, what, cluster = line[0:3] @@ -41,12 +40,12 @@ def inv_esx_vsphere_clusters(info): datacenters.setdefault(datacenter, {}) datacenters[datacenter].setdefault(cluster, {}) datacenters[datacenter][cluster]["name"] = cluster - datacenters[datacenter][cluster][what] = [{"name": e} for e in entries] + datacenters[datacenter][cluster][what] = ", ".join(entries) for dc_name, clusters in datacenters.items(): data = { "name": dc_name, "clusters": [] } - for cluster, values in clusters.items(): - data["clusters"].append(dict([("name", cluster)] + values.items())) + for cluster_name, values in clusters.items(): + data["clusters"].append(dict([("name", cluster_name)] + values.items())) node.append(data)

6 years, 4 months

5780 FIX fileinfo.groups: Fixed check parameters display bug in service discovery page

by Andreas Boesl

Module: check_mk Branch: master Commit: 72421bee41354053dbacd3d51acba7c739f3314d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72421bee413540… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 9 13:06:27 2018 +0100 5780 FIX fileinfo.groups: Fixed check parameters display bug in service discovery page Change-Id: I2958572ed2efb9e90eb72f1237907d96c6bc1a43 --- .werks/5780 | 11 +++++++++++ web/plugins/wato/check_parameters.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5780 b/.werks/5780 new file mode 100644 index 0000000..3aa9504 --- /dev/null +++ b/.werks/5780 @@ -0,0 +1,11 @@ +Title: fileinfo.groups: Fixed check parameters display bug in service discovery page +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1518177945 + + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 3d024e8..179d4e3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6303,7 +6303,8 @@ register_check_parameters( help = _("Outside these ranges the check will always be OK"), count = 3, )), - ] + ], + ignored_keys = ["precompiled_patterns"] ), TextAscii( title = _("File Group Name"),

6 years, 4 months

Fixed inventory_plugin esx_vsphere_clusters which return wrong numeration format

by Simon Betz

Module: check_mk Branch: master Commit: 48fcf48a1f1095c84c2bce608b20dca9bc12dcbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48fcf48a1f1095… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 9 12:54:03 2018 +0100 Fixed inventory_plugin esx_vsphere_clusters which return wrong numeration format Change-Id: I7723d260e511c178870a0e3bfe288f6575d481c5 --- inventory/esx_vsphere_clusters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/esx_vsphere_clusters b/inventory/esx_vsphere_clusters index 93b836c..8597803 100644 --- a/inventory/esx_vsphere_clusters +++ b/inventory/esx_vsphere_clusters @@ -41,7 +41,7 @@ def inv_esx_vsphere_clusters(info): datacenters.setdefault(datacenter, {}) datacenters[datacenter].setdefault(cluster, {}) datacenters[datacenter][cluster]["name"] = cluster - datacenters[datacenter][cluster][what] = entries + datacenters[datacenter][cluster][what] = [{"name": e} for e in entries] for dc_name, clusters in datacenters.items(): data = { "name": dc_name, "clusters": [] }

6 years, 4 months

← Newer
1
...
21
22
23
24
25
26
27
...
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