Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

Windows agent: use RAII for event handles

by Jukka Aro

Module: check_mk Branch: master Commit: 3e8a9cad65353dead209395f0b357f6fe71cfafc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e8a9cad65353d… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Dec 6 10:38:36 2017 +0100 Windows agent: use RAII for event handles More precisely, use the Resource Release is Finalization principle as the handles cannot be always acquired in a uniform way in a constructor due to the various ways handles can be acquired/opened through WinAPI. Wrap handles related to eventlog handling in instances of classes responsible for releasing the resources (alias closing the handles in this case). Specialize based wrapper class through handle-specific traits classes for handle type, invalid value as well as closing the handle. Do not wrap wrapper classes further to unique_ptr's etc when. there is no need for heap allocation of the wrapper object. Also refactor the eventlog handling in order to get rid of unnecessary resetting. Add unit tests for handle wrappers. Change-Id: Iacd6e245d5e55b6276f3ce3509ea6679103e7e8b --- agents/windows/EventLog.cc | 92 ++++----- agents/windows/EventLog.h | 84 ++------ agents/windows/EventLogVista.cc | 184 +++++++++--------- agents/windows/EventLogVista.h | 76 ++------ agents/windows/IEventLog.h | 15 +- agents/windows/Makefile.am | 3 + agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 1 - agents/windows/test/EnvironmentTest.cc | 3 - agents/windows/test/EventLogVistaTest.cc | 107 +++++++++++ agents/windows/test/MockWbem.h | 2 +- agents/windows/test/typesTest.cc | 295 +++++++++++++++++++++++++++++ agents/windows/test/wmiHelperTest.cc | 12 +- agents/windows/types.h | 122 ++++++++++-- 14 files changed, 691 insertions(+), 307 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3e8a9cad65…

6 years, 6 months

5453 FIX HW/SW inventory: Changed output format of raw inventory tree

by Simon Betz

Module: check_mk Branch: master Commit: b64330b1ecc0317d82a0261a5ec16fc01beb9f0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b64330b1ecc031… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 12 10:26:49 2017 +0100 5453 FIX HW/SW inventory: Changed output format of raw inventory tree Change-Id: I53e66693369e4a404f67ae4588c890e632d4eeee --- .werks/5453 | 13 +++++++++++++ cmk_base/inventory.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5453 b/.werks/5453 new file mode 100644 index 0000000..55f7321 --- /dev/null +++ b/.werks/5453 @@ -0,0 +1,13 @@ +Title: HW/SW inventory: Changed output format of raw inventory tree +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1513069962 + +The output format of raw inventory trees is now generated with +simple pythons's repr command, instead of the CPU consuming +pretty-print. diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index c17caea..7931cfb 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -56,7 +56,7 @@ import cmk_base.data_sources as data_sources inventory_output_dir = cmk.paths.var_dir + "/inventory" inventory_archive_dir = cmk.paths.var_dir + "/inventory_archive" # TODO: This is not configurable. Drop the flag? -inventory_pprint_output = True +inventory_pprint_output = False _inv_hw_changes = 0 _inv_sw_changes = 0

6 years, 6 months

Export IWYU_TOOL to sub-makes.

by Sven Panne

Module: check_mk Branch: master Commit: 12c451432510ead1c3f6604935920f7110b89139 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12c451432510ea… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 12 09:52:35 2017 +0100 Export IWYU_TOOL to sub-makes. Change-Id: I5a29573d5bc73620c861dbb8dcd558ea69d426c7 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 629e71e..06dae8a 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ export RUN_CLANG_TIDY := run-clang-tidy-$(CLANG_VERSION).py SCAN_BUILD := scan-build-$(CLANG_VERSION) CPPCHECK := cppcheck DOXYGEN := doxygen -IWYU_TOOL := iwyu_tool +export IWYU_TOOL := iwyu_tool # The Bear versions have a slightly tragic history: Due to the clang bug # https://llvm.org/bugs/show_bug.cgi?id=24710 we need absolute paths in our

6 years, 6 months

5252 FIX Agent Updater Check: increased robustness in handling incomplete agent data

by Andreas Boesl

Module: check_mk Branch: master Commit: 1804d5f6966eaa929cac02c32bbe6037a7d2bd2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1804d5f6966eaa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 12 09:49:41 2017 +0100 5252 FIX Agent Updater Check: increased robustness in handling incomplete agent data Change-Id: I7f51b3a33e0e88032c6890f2bce49177fb7d64a3 --- .werks/5252 | 10 ++++++++++ checks/check_mk | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/5252 b/.werks/5252 new file mode 100644 index 0000000..2c4a922 --- /dev/null +++ b/.werks/5252 @@ -0,0 +1,10 @@ +Title: Agent Updater Check: increased robustness in handling incomplete agent data +Level: 1 +Component: checks +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1513068500 +Class: fix + + diff --git a/checks/check_mk b/checks/check_mk index ed7d90b..efcbabe 100644 --- a/checks/check_mk +++ b/checks/check_mk @@ -148,9 +148,12 @@ def check_cmk_agent_update(_no_item, _no_params, info): if parsed["error"] != "None": yield 1, "error: %s" % parsed["error"] + if len(parsed.keys()) == 1: + return else: yield 0, "no errors" + try: last_check = float(parsed["last_check"]) age = now - last_check @@ -168,10 +171,10 @@ def check_cmk_agent_update(_no_item, _no_params, info): except: yield 1, "no successful connect to server yet" - if parsed["last_update"]: + if "last_update" in parsed: yield 0, "last agent update: %s" % get_timestamp_human_readable(parsed["last_update"]) - if parsed["aghash"]: + if "aghash" in parsed: yield 0, "agent configuration: %s" % parsed["aghash"][:8] return

6 years, 6 months

Use local compilation database for IWYU.

by Sven Panne

Module: check_mk Branch: master Commit: e0bb15ed3659784d008b1fbf423c817d48d39276 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0bb15ed365978… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 12 09:39:21 2017 +0100 Use local compilation database for IWYU. Change-Id: Id53535a6217d3c8e2f51ebce25e60fa683142d55 --- Makefile | 8 +++++--- livestatus/src/Makefile.am | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a653da8..629e71e 100644 --- a/Makefile +++ b/Makefile @@ -490,9 +490,11 @@ ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise/core/src tidy endif -# Not really perfect rules, but better than nothing -iwyu: compile_commands.json - @$(IWYU_TOOL) --output-format=clang -p . -- --mapping_file=$(realpath tests/iwyu-mappings/check_mk.imp) +iwyu: config.h + $(MAKE) -C livestatus/src iwyu +ifeq ($(ENTERPRISE),yes) + $(MAKE) -C enterprise/core/src iwyu +endif # Not really perfect rules, but better than nothing analyze: config.h diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 9639f3d..84ead24 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -24,6 +24,7 @@ CLANG_VERSION ?= 5.0 RUN_CLANG_TIDY ?= run-clang-tidy-$(CLANG_VERSION).py +IWYU_TOOL ?= iwyu_tool BEAR ?= bear bin_PROGRAMS = unixcat @@ -173,6 +174,9 @@ compile_commands.json: Makefile $(wildcard *.cc *.h) tidy: compile_commands.json $(RUN_CLANG_TIDY) -quiet -j6 +iwyu: compile_commands.json + $(IWYU_TOOL) --output-format=clang -p . -- --mapping_file=$(abs_top_srcdir)/tests/iwyu-mappings/check_mk.imp + all-local: livestatus.o install-data-local:

6 years, 6 months

The number of RRD write threads is an integer, not an age.

by Sven Panne

Module: check_mk Branch: master Commit: 9702d6169071e6a9c8a4d85361dcc72b666da923 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9702d6169071e6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 12 08:38:53 2017 +0100 The number of RRD write threads is an integer, not an age. Change-Id: I5f21ba78cd195057aa4e48fd3579748f21e2e878 --- web/plugins/wato/omd_configuration.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/omd_configuration.py b/web/plugins/wato/omd_configuration.py index 45556f5..6933ad5 100644 --- a/web/plugins/wato/omd_configuration.py +++ b/web/plugins/wato/omd_configuration.py @@ -531,12 +531,13 @@ register_configvar(group, "acceptable in most cases."), minvalue = 0, )), - ("WRITE_THREADS", Age( + ("WRITE_THREADS", Integer( title = _("Number of threads used for writing RRD files"), help = _("Increasing this number will allow rrdcached to have more simultaneous " "I/O requests into the kernel. This may allow the kernel to re-order " "disk writes, resulting in better disk throughput."), minvalue = 1, + maxvalue = 100 )), ], optional_keys = [],

6 years, 6 months

Made counter for active Livestatus connections atomic.

by Sven Panne

Module: check_mk Branch: master Commit: f253e7bd86f45e787b72164289ad2ea5055e4d67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f253e7bd86f45e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 11 12:02:10 2017 +0100 Made counter for active Livestatus connections atomic. We have seen Livestatus usage >100% out in the wild, which is total nonsense. This commit is trying to fix this, but there could be other problems: We really, really have to introduce memory barriers and locks in Livestatus, the current code is simply wrong in this respect. Change-Id: Ie063ef2b4ff0dc78d1a05159d320d452d9e7e9bc --- livestatus/src/AtomicInt32PointerColumn.h | 48 +++++++++++++++++++++++++++++++ livestatus/src/TableStatus.cc | 6 ++-- livestatus/src/module.cc | 3 +- 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/livestatus/src/AtomicInt32PointerColumn.h b/livestatus/src/AtomicInt32PointerColumn.h new file mode 100644 index 0000000..42fd34c --- /dev/null +++ b/livestatus/src/AtomicInt32PointerColumn.h @@ -0,0 +1,48 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// tails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#ifndef AtomicInt32PointerColumn_h +#define AtomicInt32PointerColumn_h + +#include "config.h" // IWYU pragma: keep +#include <atomic> +#include "IntColumn.h" + +class AtomicInt32PointerColumn : public IntColumn { +public: + AtomicInt32PointerColumn(const std::string& name, + const std::string& description, + const std::atomic_int32_t* number) + : IntColumn(name, description, -1, -1, -1, 0), _number(number) {} + + int32_t getValue(Row /* row */, + const contact* /* auth_user */) const override { + return _number->load(); + } + +private: + const std::atomic_int32_t* const _number; +}; + +#endif // AtomicInt32PointerColumn_h diff --git a/livestatus/src/TableStatus.cc b/livestatus/src/TableStatus.cc index acf5604..b09aebc 100644 --- a/livestatus/src/TableStatus.cc +++ b/livestatus/src/TableStatus.cc @@ -23,8 +23,10 @@ // Boston, MA 02110-1301 USA. #include "TableStatus.h" +#include <atomic> #include <ctime> #include <memory> +#include "AtomicInt32PointerColumn.h" #include "Column.h" #include "DoublePointerColumn.h" #include "IntPointerColumn.h" @@ -61,7 +63,7 @@ extern int g_num_hosts; extern int g_num_services; extern int g_livestatus_threads; extern int g_num_queued_connections; -extern int g_livestatus_active_connections; +extern std::atomic_int32_t g_livestatus_active_connections; #ifndef NAGIOS4 extern circular_buffer external_command_buffer; @@ -217,7 +219,7 @@ TableStatus::TableStatus(MonitoringCore *mc) : Table(mc) { addColumn(std::make_unique<StringPointerColumn>( "livestatus_version", "The version of the MK Livestatus module", VERSION)); - addColumn(std::make_unique<IntPointerColumn>( + addColumn(std::make_unique<AtomicInt32PointerColumn>( "livestatus_active_connections", "The current number of active connections to MK Livestatus", &g_livestatus_active_connections)); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 6875cfa..90b6a8a 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -34,6 +34,7 @@ #include <sys/stat.h> #include <sys/un.h> #include <unistd.h> +#include <atomic> #include <chrono> #include <cstddef> #include <cstdint> @@ -98,7 +99,7 @@ size_t g_livestatus_threads = 10; // current number of queued connections (for statistics) int g_num_queued_connections = 0; // current number of active connections (for statistics) -int g_livestatus_active_connections = 0; +std::atomic_int32_t g_livestatus_active_connections{0}; size_t g_thread_stack_size = 1024 * 1024; /* stack size of threads */ static int fl_disable_statehist_filtering;

6 years, 6 months

5470 Make the number of rrdcached write threads configurable.

by Sven Panne

Module: check_mk Branch: master Commit: cf3711b5a3ed89f71ddca65d7347d2e476a55439 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf3711b5a3ed89… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 11 10:53:22 2017 +0100 5470 Make the number of rrdcached write threads configurable. Thanks to Matthias Hähnel for this patch! Change-Id: I94b5cc7c8a7575930e09b7125d974b6e6a549e54 --- .werks/5470 | 11 +++++++++++ bin/mkbench | 1 + omd/packages/rrdtool/skel/etc/init.d/rrdcached | 4 ++-- omd/packages/rrdtool/skel/etc/rrdcached.conf | 5 +++++ web/plugins/wato/omd_configuration.py | 8 ++++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.werks/5470 b/.werks/5470 new file mode 100644 index 0000000..f897121 --- /dev/null +++ b/.werks/5470 @@ -0,0 +1,11 @@ +Title: Make the number of rrdcached write threads configurable. +Level: 1 +Component: wato +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1512985932 +Class: feature + + +Thanks to Matthias Hähnel for this patch! \ No newline at end of file diff --git a/bin/mkbench b/bin/mkbench index ed19acf..e7f0d6d 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -582,6 +582,7 @@ class TestRunner(threading.Thread): "TIMEOUT=300\n" "RANDOM_DELAY=10\n" "FLUSH_TIMEOUT=7200\n" + "WRITE_THREADS=4\n" ) p = subprocess.Popen(["omd", "restart", "rrdcached"], diff --git a/omd/packages/rrdtool/skel/etc/init.d/rrdcached b/omd/packages/rrdtool/skel/etc/init.d/rrdcached index 174316b..9ebd4a0 100644 --- a/omd/packages/rrdtool/skel/etc/init.d/rrdcached +++ b/omd/packages/rrdtool/skel/etc/init.d/rrdcached @@ -22,7 +22,7 @@ fi TIMEOUT=3600 RANDOM_DELAY=1800 FLUSH_TIMEOUT=7200 - +WRITE_THREADS=4 # Read in tuning configuration of admin CONFFILE=$OMD_ROOT/etc/rrdcached.conf @@ -47,7 +47,7 @@ SOCKET="###ROOT###/tmp/run/rrdcached.sock" PIDFILE="###ROOT###/tmp/rrdcached.pid" USER="###SITE###" GROUP="###SITE###" -OPTS="-w $TIMEOUT -z $RANDOM_DELAY -f $FLUSH_TIMEOUT -s $GROUP -m 660 -l unix:$SOCKET -p $PIDFILE -j $JOURNAL_DIR" +OPTS="-t $WRITE_THREADS -w $TIMEOUT -z $RANDOM_DELAY -f $FLUSH_TIMEOUT -s $GROUP -m 660 -l unix:$SOCKET -p $PIDFILE -j $JOURNAL_DIR" DAEMON="###ROOT###/bin/rrdcached" case "$1" in diff --git a/omd/packages/rrdtool/skel/etc/rrdcached.conf b/omd/packages/rrdtool/skel/etc/rrdcached.conf index f17938a..7c216e9 100644 --- a/omd/packages/rrdtool/skel/etc/rrdcached.conf +++ b/omd/packages/rrdtool/skel/etc/rrdcached.conf @@ -18,3 +18,8 @@ RANDOM_DELAY=1800 # 3600 seconds, is acceptable in most cases. FLUSH_TIMEOUT=7200 +# Specifies the number of threads used for writing RRD files. Increasing this +# number will allow rrdcached to have more simultaneous I/O requests into the +# kernel. This may allow the kernel to re-order disk writes, resulting in better +# disk throughput. +WRITE_THREADS=4 diff --git a/web/plugins/wato/omd_configuration.py b/web/plugins/wato/omd_configuration.py index 67629fb..45556f5 100644 --- a/web/plugins/wato/omd_configuration.py +++ b/web/plugins/wato/omd_configuration.py @@ -479,6 +479,7 @@ class ConfigDomainRRDCached(watolib.ConfigDomain): "TIMEOUT" : self._get_value_from_config("TIMEOUT", int, 3600), "RANDOM_DELAY" : self._get_value_from_config("RANDOM_DELAY", int, 1800), "FLUSH_TIMEOUT" : self._get_value_from_config("FLUSH_TIMEOUT", int, 7200), + "WRITE_THREADS" : self._get_value_from_config("WRITE_THREADS", int, 4), } } @@ -530,6 +531,13 @@ register_configvar(group, "acceptable in most cases."), minvalue = 0, )), + ("WRITE_THREADS", Age( + title = _("Number of threads used for writing RRD files"), + help = _("Increasing this number will allow rrdcached to have more simultaneous " + "I/O requests into the kernel. This may allow the kernel to re-order " + "disk writes, resulting in better disk throughput."), + minvalue = 1, + )), ], optional_keys = [], ),

6 years, 6 months

IWYU fixes required after recent clang-tidy fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 0861411f3337181e345646eb8bdd099ff5e40050 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0861411f333718… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 8 16:12:34 2017 +0100 IWYU fixes required after recent clang-tidy fixes. Change-Id: Iebae408c9f2353f4358db1d057130b50e2eaf513 --- livestatus/src/Logger.cc | 1 - livestatus/src/TableEventConsole.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/livestatus/src/Logger.cc b/livestatus/src/Logger.cc index 58019cb..1ed597f 100644 --- a/livestatus/src/Logger.cc +++ b/livestatus/src/Logger.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "Logger.h" -#include <algorithm> #include <cstddef> #include <iostream> #include <utility> diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index afec50b..9ecabf1 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "TableEventConsole.h" -#include <algorithm> #include <ctime> #include <iosfwd> #include <iostream>

6 years, 7 months

Automatic clang-tidy fix for modernize-pass-by-value.

by Sven Panne

Module: check_mk Branch: master Commit: 7f66cb29f976b6669aa3882c8288df4c95ddd25b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f66cb29f976b6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 8 14:58:17 2017 +0100 Automatic clang-tidy fix for modernize-pass-by-value. Change-Id: I23449c446f394da561b9c52f8738b710f95bc7d3 --- .clang-tidy | 3 +-- livestatus/src/ChronoUtils.h | 11 ++++++----- livestatus/src/CustomTimeperiodColumn.h | 5 +++-- livestatus/src/HostListColumn.h | 7 +++++-- livestatus/src/Logger.h | 9 +++++---- livestatus/src/PerfdataAggregator.h | 3 ++- livestatus/src/RendererBrokenCSV.h | 18 ++++++++++-------- livestatus/src/ServiceGroupMembersColumn.h | 8 ++++---- livestatus/src/ServiceListColumn.h | 11 ++++++----- livestatus/src/Store.h | 9 ++++++--- livestatus/src/TableEventConsole.h | 7 +++++-- 11 files changed, 53 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7f66cb29f9…

6 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017