Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

by Jukka Aro

Module: check_mk Branch: master Commit: a558ef098251894e735de335c1325550b25d8310 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a558ef09825189… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 14 09:20:40 2018 +0100 Windows agent: run clang-format --- agents/windows/Configuration.cc | 3 +-- agents/windows/WinApi.cc | 2 +- agents/windows/sections/SectionCheckMK.cc | 1 - agents/windows/sections/SectionEventlog.cc | 6 +++--- agents/windows/sections/SectionOHM.cc | 8 +++----- agents/windows/sections/SectionUptime.h | 2 +- agents/windows/sections/SectionWMI.h | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 4e030df..44472a2 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -133,8 +133,7 @@ void Configuration::readConfigFile(const std::string &filename) { rtrim(value); // handle host restriction - if (variable == "host") - is_active = checkHostRestriction(value); + if (variable == "host") is_active = checkHostRestriction(value); // skip all other variables for non-relevant hosts else if (!is_active) diff --git a/agents/windows/WinApi.cc b/agents/windows/WinApi.cc index 7683ead..72e9139 100644 --- a/agents/windows/WinApi.cc +++ b/agents/windows/WinApi.cc @@ -194,7 +194,7 @@ LONG WinApi::CompareFileTime(const FILETIME *lpFileTime1, } WINBOOL WinApi::CopyFile(LPCSTR lpExistingFileName, LPCSTR lpNewFileName, - WINBOOL bFailIfExists) const { + WINBOOL bFailIfExists) const { return ::CopyFileA(lpExistingFileName, lpNewFileName, bFailIfExists); } diff --git a/agents/windows/sections/SectionCheckMK.cc b/agents/windows/sections/SectionCheckMK.cc index be0c7c0..7d4bca9 100644 --- a/agents/windows/sections/SectionCheckMK.cc +++ b/agents/windows/sections/SectionCheckMK.cc @@ -31,7 +31,6 @@ #include "Logger.h" #include "stringutil.h" - struct script_statistics_t { int pl_count; int pl_errors; diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index ab6b44f..1ea33ed 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -57,8 +57,8 @@ std::pair<char, int> getEventState(const IEventLogRecord &event, int level) { } } - const char *level_name(int level_id) { - switch (level_id) { +const char *level_name(int level_id) { + switch (level_id) { case -1: return "off"; case 0: @@ -69,8 +69,8 @@ std::pair<char, int> getEventState(const IEventLogRecord &event, int level) { return "crit"; default: return "invalid"; - } } +} // The int return value is there just for convenience, actually we are not // interested in the state int value at this point any more. diff --git a/agents/windows/sections/SectionOHM.cc b/agents/windows/sections/SectionOHM.cc index 703f447..b09a9dd 100644 --- a/agents/windows/sections/SectionOHM.cc +++ b/agents/windows/sections/SectionOHM.cc @@ -22,12 +22,12 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +#include "SectionOHM.h" +#include "Configuration.h" #include "Environment.h" #include "Logger.h" #include "OHMMonitor.h" #include "SectionWMI.h" -#include "Configuration.h" -#include "SectionOHM.h" SectionOHM::SectionOHM(Configuration &config, Logger *logger, const WinApiAdaptor &winapi) @@ -38,9 +38,7 @@ SectionOHM::SectionOHM(Configuration &config, Logger *logger, withObject(L"Sensor"); } -void SectionOHM::startIfAsync() { - _ohm_monitor.startProcess(); -} +void SectionOHM::startIfAsync() { _ohm_monitor.startProcess(); } bool SectionOHM::produceOutputInner(std::ostream &out) { Debug(_logger) << "SectionOHM::produceOutputInner"; diff --git a/agents/windows/sections/SectionUptime.h b/agents/windows/sections/SectionUptime.h index f5a2d1c..0d7609d 100644 --- a/agents/windows/sections/SectionUptime.h +++ b/agents/windows/sections/SectionUptime.h @@ -29,8 +29,8 @@ #include <memory> #include <string> #include <vector> -#include "wmiHelper.h" #include "Section.h" +#include "wmiHelper.h" class Environment; diff --git a/agents/windows/sections/SectionWMI.h b/agents/windows/sections/SectionWMI.h index 825b879..2a5b4da 100644 --- a/agents/windows/sections/SectionWMI.h +++ b/agents/windows/sections/SectionWMI.h @@ -28,8 +28,8 @@ #include <memory> #include <string> #include <vector> -#include "wmiHelper.h" #include "Section.h" +#include "wmiHelper.h" class SectionWMI : public Section { public:

6 years, 4 months

Windows: new tests for section plugin group

by Jukka Aro

Module: check_mk Branch: master Commit: 929cec24c712d42d00c56002f89227af0b99430e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=929cec24c712d4… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 13 15:29:04 2018 +0100 Windows: new tests for section plugin group * Test the config option execute = <list of file extensions>. * Use a dummy exe plugin for testing default plugin extensions. * Test the execution of PowerShell plugin with interpreter. --- agents/windows/Makefile.am | 4 +- agents/windows/build_version | 2 +- agents/windows/it/MontyPython.cc | 8 +++ agents/windows/it/test_agent_start_parameters.py | 2 +- agents/windows/it/test_section_plugin_group.py | 88 +++++++++++++++++++----- 5 files changed, 81 insertions(+), 23 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 363f61f..8d6605b 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = check_mk_agent check_PROGRAMS = WindowsAgentTest wmitest noinst_LIBRARIES = libcheck_mk_agent.a -noinst_PROGRAMS = DummyPlugin +noinst_PROGRAMS = MontyPython AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -O2 -Wformat=2 -Werror -Wall -fno-rtti -std=c++17 -gdwarf-2 \ @@ -98,7 +98,7 @@ libcheck_mk_agent_a_SOURCES = \ check_mk_agent_SOURCES = check_mk_agent.cc -DummyPlugin_SOURCES = it/DummyPlugin.cc +MontyPython_SOURCES = it/MontyPython.cc WindowsAgentTest_SOURCES = \ test/EnvironmentTest.cc \ diff --git a/agents/windows/build_version b/agents/windows/build_version index 2b7c0b1..ab63d70 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3102 +3104 diff --git a/agents/windows/it/MontyPython.cc b/agents/windows/it/MontyPython.cc new file mode 100644 index 0000000..4800b9a --- /dev/null +++ b/agents/windows/it/MontyPython.cc @@ -0,0 +1,8 @@ +// A dummy plugin for testing the execution of binary plugins. +#include <iostream> + +int main(int, char **) { + std::cout << "<<<monty_python>>>" << std::endl; + std::cout << "Monty Python's Flying Circus" << std::endl; + return 0; +} diff --git a/agents/windows/it/test_agent_start_parameters.py b/agents/windows/it/test_agent_start_parameters.py index b1d26bb..89a6d5c 100644 --- a/agents/windows/it/test_agent_start_parameters.py +++ b/agents/windows/it/test_agent_start_parameters.py @@ -23,7 +23,7 @@ class Globals(object): remote_capfile = os.path.join(remotedir, capfile) plugintype = 'plugins' pluginnames = ['netstat_an.bat', 'wmic_if.bat'] - binaryplugin = 'DummyPlugin.exe' + binaryplugin = 'MontyPython.exe' sections = ['check_mk', 'fileinfo', 'logfiles', 'logwatch', plugintype] testfiles = ('basedir', 'monty', [('python', 'flying'), ('circus', "It's")]) diff --git a/agents/windows/it/test_section_plugin_group.py b/agents/windows/it/test_section_plugin_group.py index 783021b..c2745f1 100644 --- a/agents/windows/it/test_section_plugin_group.py +++ b/agents/windows/it/test_section_plugin_group.py @@ -4,6 +4,7 @@ import platform import pytest import re import sys +import time from remote import (actual_output, assert_subprocess, config, remote_ip, remotedir, remotetest, remoteuser, sshopts, wait_agent, write_config) @@ -13,6 +14,9 @@ class Globals(object): executionmode = None pluginname = None plugintype = None + suffixes = None + builddir = 'build64' + binaryplugin = 'MontyPython.exe' @pytest.fixture @@ -20,22 +24,32 @@ def testfile(): return os.path.basename(__file__) +(a)pytest.fixture( + params=["default", "bat ps1"], ids=["default_suffixes", "bat_ps1"]) +def testconfig_suffixes(request, config): + Globals.suffixes = request.param + if request.param != "default": + config.set("global", "execute", request.param) + return config + + @pytest.fixture(params=['sync', 'async', 'async+cached']) -def testconfig(request, config): +def testconfig(request, testconfig_suffixes): Globals.executionmode = request.param - config.set("global", "sections", Globals.plugintype) - config.set("global", "crash_debug", "yes") + testconfig_suffixes.set("global", "sections", Globals.plugintype) + testconfig_suffixes.set("global", "crash_debug", "yes") if request.param != 'sync': - config.add_section(Globals.plugintype) - config.set(Globals.plugintype, 'execution %s' % Globals.pluginname, - 'async') - config.set(Globals.plugintype, 'timeout %s' % Globals.pluginname, '10') + testconfig_suffixes.add_section(Globals.plugintype) + testconfig_suffixes.set(Globals.plugintype, + 'execution %s' % Globals.pluginname, 'async') + testconfig_suffixes.set(Globals.plugintype, + 'timeout %s' % Globals.pluginname, '10') if request.param == 'async+cached': - config.set(Globals.plugintype, 'cache_age %s' % Globals.pluginname, - '300') - config.set(Globals.plugintype, 'retry_count %s' % Globals.pluginname, - '3') - return config + testconfig_suffixes.set(Globals.plugintype, + 'cache_age %s' % Globals.pluginname, '300') + testconfig_suffixes.set(Globals.plugintype, + 'retry_count %s' % Globals.pluginname, '3') + return testconfig_suffixes @pytest.fixture() @@ -44,8 +58,15 @@ def expected_output(): re.escape(r'<<<%s>>>' % (Globals.plugintype if Globals.plugintype == 'local' else '')) ] - if Globals.pluginname == 'netstat_an.bat': + if Globals.suffixes == 'default': plugin_fixed = [ + re.escape(r'<<<') + r'monty_python' + re.escape(r'>>>'), + r"Monty Python's Flying Circus" + ] + else: + plugin_fixed = [] + if Globals.pluginname == 'netstat_an.bat': + plugin_fixed += [ re.escape(r'<<<') + r'win_netstat%s' % (r':cached$\d+,\d+$' if Globals.executionmode == 'async+cached' else r'') + @@ -67,8 +88,8 @@ def expected_output(): if Globals.plugintype == 'plugins': netstat_pattern += r'|%s' % re.escape(r'<<<>>>') plugin_variadic = repeat(netstat_pattern) - else: - plugin_fixed = [ + elif Globals.pluginname == 'wmic_if.bat': + plugin_fixed += [ re.escape(r'<<<') + r'winperf_if:sep$44$%s' % (r':cached$\d+,\d+$' if Globals.executionmode == 'async+cached' else r'') + @@ -80,6 +101,19 @@ def expected_output(): r'|^$' r'%s' % (r'|%s' % re.escape(r'<<<>>>') if Globals.plugintype == 'plugins' else '')) + elif Globals.pluginname == 'windows_if.ps1': + plugin_fixed += [ + re.escape(r'<<<') + r'winperf_if:sep$9$%s' % + (r':cached$\d+,\d+$' + if Globals.executionmode == 'async+cached' else r'') + + re.escape(r'>>>'), + (r'Node\s+MACAddress\s+Name\s+NetConnectionID\s+NetConnectionStatus' + r'\s+Speed\s+GUID'), + (r'[^\t]+\s+([0-9A-Fa-f]{2}(:[0-9A-Fa-f]{2}){5})?\s+[^\t]+\s+[^\t]*' + r'\s+\d*\s+\d*\s+\{[0-9A-F]+(\-[0-9A-F]+)+\}') + ] + plugin_variadic = [] + return chain(main_label, plugin_fixed, plugin_variadic) @@ -92,11 +126,15 @@ def plugindir(request): return sourcedir, targetdir -(a)pytest.fixture(params=['netstat_an.bat', 'wmic_if.bat'], autouse=True) +(a)pytest.fixture( + params=['netstat_an.bat', 'wmic_if.bat', 'windows_if.ps1'], autouse=True) def manage_plugins(request, plugindir): Globals.pluginname = request.param targetdir = plugindir[1].replace('/', '\\') if platform.system() != 'Windows': + fullbuilddir = os.path.join( + os.path.dirname(os.path.dirname(os.path.abspath(__file__))), + Globals.builddir) cmds = [[ 'ssh', sshopts, '%s@%s' % (remoteuser, remote_ip), @@ -105,16 +143,28 @@ def manage_plugins(request, plugindir): 'scp', sshopts, os.path.join(plugindir[0], request.param), '%s@%s:%s' % (remoteuser, remote_ip, plugindir[1]) + ], [ + 'scp', sshopts, + os.path.join(fullbuilddir, Globals.binaryplugin), + '%s@%s:%s' % (remoteuser, remote_ip, plugindir[1]) ]] for cmd in cmds: assert_subprocess(cmd) yield if platform.system() == 'Windows': - os.unlink(os.path.join(targetdir, request.param)) + for plugin in [request.param, Globals.binaryplugin]: + for i in range(0, 5): + try: + os.unlink(os.path.join(targetdir, plugin)) + break + except WindowsError as e: + # For some reason, the exe plugin remains locked for a short + # while every now and then. Just sleep 1 s and retry. + sys.stderr.write("%s\n" % str(e)) + time.sleep(1) def test_section_plugin_group(request, testconfig, expected_output, actual_output, testfile): # request.node.name gives test name - remotetest(expected_output, actual_output, testfile, - request.node.name) + remotetest(expected_output, actual_output, testfile, request.node.name)

6 years, 4 months

5271 FIX Better handling of erroneous deployment information in Agent Bakery

by Andreas Umbreit

Module: check_mk Branch: master Commit: a8ed1d1c3fc8fade005f4e0a412479e4db8a7806 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8ed1d1c3fc8fa… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Feb 13 14:18:36 2018 +0100 5271 FIX Better handling of erroneous deployment information in Agent Bakery Depending of the state of the agent deployment information file for a host, the pages "Automatic agent updates" and "Agent update status" would crash and show only partial information. This is now mitigated by handling corrupt agent deployment files per-host and displaying an error message in a convenient format and location on the affected pages. Change-Id: Id6ad62d2eafad6f17a1123c1871e75aa353effc5 --- .werks/5271 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5271 b/.werks/5271 new file mode 100644 index 0000000..0660bc6 --- /dev/null +++ b/.werks/5271 @@ -0,0 +1,12 @@ +Title: Better handling of erroneous deployment information in Agent Bakery +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1518527285 +Class: fix + +Depending of the state of the agent deployment information file for a host, the pages "Automatic agent updates" and "Agent update status" would crash and show only partial information. + +This is now mitigated by handling corrupt agent deployment files per-host and displaying an error message in a convenient format and location on the affected pages.

6 years, 4 months

Windows agent: remove unused function declaration

by Jukka Aro

Module: check_mk Branch: master Commit: 00f2967f9b70f804cfc60209f744183eb004575e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00f2967f9b70f8… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 13 13:02:02 2018 +0100 Windows agent: remove unused function declaration --- agents/windows/build_version | 2 +- agents/windows/stringutil.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index d9d811c..2b7c0b1 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3100 +3102 diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index 77e4cd3..59e997b 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -116,8 +116,6 @@ inline std::vector<std::basic_string<CharT>> tokenizePossiblyQuoted( return tokenizeBase(input, possiblyQuotedRegex<CharT>(), 1); } -unsigned long long string_to_llu(const char *s); - int parse_boolean(const char *value); inline std::string to_utf8(const std::wstring &input) {

6 years, 4 months

Removed outdated comment.

by Sven Panne

Module: check_mk Branch: master Commit: e332eaafb24c5324c12e86552115a1b854bbf011 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e332eaafb24c53… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 13 10:35:27 2018 +0100 Removed outdated comment. Change-Id: Id5c96f15467e7de6882306f33c0fc8fdf34924bb --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 4f46999..8111191 100644 --- a/Makefile +++ b/Makefile @@ -503,9 +503,6 @@ analyze: config.h $(MAKE) -C livestatus clean cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++17" -# TODO: Repeating the include paths in the cppcheck targets below is ugly and -# fragile. - # GCC-like output on stderr intended for human consumption. cppcheck: config.h $(MAKE) -C livestatus/src cppcheck

6 years, 4 months

cppcheck should be silent about RE2 stuff.

by Sven Panne

Module: check_mk Branch: master Commit: d165b673a09198b7bfd2e5efa257eb2b2f132126 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d165b673a09198… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 13 10:42:44 2018 +0100 cppcheck should be silent about RE2 stuff. Change-Id: I5f7442274aa7035bf2930cac483f31bb739e606f --- livestatus/src/cppcheck-suppressions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index eeb1a50..2c22770 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -7,3 +7,5 @@ constStatement unmatchedSuppression // cppcheck is simply too dumb about macros... *:*/include/boost/config.hpp +// cppcheck doesn't like some RE2 stuff, silly and not our business... +noExplicitConstructor:*/include/re2/*.h

6 years, 4 months

Really use RE2 if available.

by Sven Panne

Module: check_mk Branch: master Commit: 5bad2b1ce9cb410f584fb12e4fd55572c9b26a91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bad2b1ce9cb41… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 13 10:04:33 2018 +0100 Really use RE2 if available. Change-Id: I973f340069529aec740c02fe2c158592c841e514 --- livestatus/src/RegExp.cc | 65 ++++++++++++++++++++++++++++++++---------------- livestatus/src/RegExp.h | 8 +++--- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/livestatus/src/RegExp.cc b/livestatus/src/RegExp.cc index 02cf401..bac70a7 100644 --- a/livestatus/src/RegExp.cc +++ b/livestatus/src/RegExp.cc @@ -24,19 +24,52 @@ #include "RegExp.h" -// Currently just for testing purposes, the real stuff will follow soon... #ifdef HAVE_RE2 +// ----------------------------------------------------------------------------- +// RE2 implementation +// ----------------------------------------------------------------------------- #include <re2/re2.h> -#endif +#include "re2/stringpiece.h" +#include <stdexcept> -#include <regex> +class RegExp::Impl { +public: + Impl(const std::string &str, Case c) : _regex(str, opts(c)) { + if (!_regex.ok()) { + throw std::runtime_error(_regex.error()); + } + } + + std::string replace(std::string str, const std::string &replacement) { + RE2::GlobalReplace(&str, _regex, replacement); + return str; + } + bool search(const std::string &str) const { + return RE2::PartialMatch(str, _regex); + } + +private: + RE2 _regex; + + static RE2::Options opts(Case c) { + RE2::Options options{RE2::Quiet}; + options.set_case_sensitive(c == Case::respect); + return options; + } +}; + +#else +// ----------------------------------------------------------------------------- +// standard <regex> implementation +// ----------------------------------------------------------------------------- +#include <regex> class RegExp::Impl { public: Impl(const std::string &str, Case c) - : _regex(str, c == Case::ignore - ? std::regex::extended | std::regex::icase - : std::regex::extended) {} + : _regex(str, c == Case::respect + ? std::regex::extended + : std::regex::extended | std::regex::icase) {} std::string replace(const std::string &str, const std::string &replacement) { @@ -51,29 +84,19 @@ public: private: std::regex _regex; }; +#endif + +// ----------------------------------------------------------------------------- +// boilerplate pimpl code +// ----------------------------------------------------------------------------- RegExp::RegExp(const std::string &str, Case c) : _impl(std::make_unique<Impl>(str, c)) {} RegExp::~RegExp() = default; -RegExp::RegExp(const RegExp &rhs) noexcept - : _impl(std::make_unique<Impl>(*rhs._impl)) {} - -RegExp &RegExp::operator=(const RegExp &rhs) noexcept { - *_impl = *rhs._impl; - return *this; -} - -RegExp::RegExp(RegExp &&rhs) noexcept = default; - -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); } diff --git a/livestatus/src/RegExp.h b/livestatus/src/RegExp.h index d9d2aa0..216e642 100644 --- a/livestatus/src/RegExp.h +++ b/livestatus/src/RegExp.h @@ -38,10 +38,10 @@ public: // the implementation file." RegExp(const std::string &str, Case c); ~RegExp(); - RegExp(const RegExp &rhs) noexcept; - RegExp &operator=(const RegExp &rhs) noexcept; - RegExp(RegExp &&rhs) noexcept; - RegExp &operator=(RegExp &&rhs) noexcept; + RegExp(const RegExp &rhs) = delete; + RegExp &operator=(const RegExp &rhs) = delete; + RegExp(RegExp &&rhs) = delete; + RegExp &operator=(RegExp &&rhs) = delete; std::string replace(const std::string &str, const std::string &replacement) const;

6 years, 4 months

Adapt suppressions for local Boost.

by Sven Panne

Module: check_mk Branch: master Commit: b11f954da3e4ca81695db160cda56c7dfef5b790 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b11f954da3e4ca… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 13 10:34:29 2018 +0100 Adapt suppressions for local Boost. Change-Id: Iea5edea1b7305ac4a5aa963e49d369ce58fd7a2e --- livestatus/src/cppcheck-suppressions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/cppcheck-suppressions.txt b/livestatus/src/cppcheck-suppressions.txt index 987a260..eeb1a50 100644 --- a/livestatus/src/cppcheck-suppressions.txt +++ b/livestatus/src/cppcheck-suppressions.txt @@ -6,4 +6,4 @@ constStatement // This is nonsense, but otherwise cppcheck complains even if it shouldn't. unmatchedSuppression // cppcheck is simply too dumb about macros... -*:/usr/include/boost/config.hpp +*:*/include/boost/config.hpp

6 years, 4 months

Windows agent: remove unused code in stringutil.*

by Jukka Aro

Module: check_mk Branch: master Commit: 6503810d95eddff68cd9c7faabe8d64c15c5cc02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6503810d95eddf… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 13 12:05:06 2018 +0100 Windows agent: remove unused code in stringutil.* --- agents/windows/build_version | 2 +- agents/windows/sections/SectionMRPE.cc | 8 ++-- agents/windows/stringutil.cc | 86 ---------------------------------- agents/windows/stringutil.h | 10 ---- 4 files changed, 5 insertions(+), 101 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 4fb7d0e..d9d811c 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3098 +3100 diff --git a/agents/windows/sections/SectionMRPE.cc b/agents/windows/sections/SectionMRPE.cc index e528eb9..d6d756a 100644 --- a/agents/windows/sections/SectionMRPE.cc +++ b/agents/windows/sections/SectionMRPE.cc @@ -115,10 +115,10 @@ bool SectionMRPE::produceOutputInner(std::ostream &out) { } command.readStdout(pos, buffer.size() - (pos - buf_start), false); - char *output_end = rstrip(&buffer[0]); - char *plugin_output = lstrip(&buffer[0]); + rtrim(buffer); + ltrim(buffer); // replace newlines - std::transform(plugin_output, output_end, plugin_output, + std::transform(buffer.cbegin(), buffer.cend(), buffer.begin(), [](char ch) { if (ch == '\n') return '\1'; if (ch == '\r') @@ -127,7 +127,7 @@ bool SectionMRPE::produceOutputInner(std::ostream &out) { return ch; }); int nagios_code = command.exitCode(); - out << nagios_code << " " << plugin_output << "\n"; + out << nagios_code << " " << buffer << "\n"; Debug(_logger) << "Script finished"; } catch (const std::exception &e) { Error(_logger) << "mrpe failed: " << e.what(); diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index 3b06e5e..85d76af 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -12,73 +12,6 @@ using std::string; using std::wstring; -char *lstrip(char *s) { - while (isspace(*s)) s++; - return s; -} - -const char *lstrip(const char *s) { - while (isspace(*s)) s++; - return s; -} - -char *rstrip(char *s) { - char *end = s + strlen(s); // point one beyond last character - while (end > s && isspace(*(end - 1))) { - end--; - } - *end = 0; - return end; -} - -char *strip(char *s) { - rstrip(s); - return lstrip(s); -} - -std::vector<const char *> split_line(char *pos, int (*split_pred)(int)) { - std::vector<const char *> result; - - char *current_word = pos; - while (*pos != '\0') { - if (split_pred(*pos)) { - *pos = '\0'; - const char *trimmed = strip(current_word); - if (*trimmed != '\0') { - result.push_back(trimmed); - } - current_word = pos + 1; - } - ++pos; - } - const char *trimmed = strip(current_word); - if (*trimmed != '\0') { - result.push_back(trimmed); - } - return result; -} - -char *next_word(char **line) { - if (*line == 0) // allow subsequent calls without checking - return 0; - - char *end = *line + strlen(*line); - char *value = *line; - while (value < end) { - value = lstrip(value); - char *s = value; - while (*s && !isspace(*s)) s++; - *s = 0; - *line = s + 1; - rstrip(value); - if (strlen(value) > 0) - return value; - else - return 0; - } - return 0; -} - template <> std::regex possiblyQuotedRegex<char>() { return std::regex{"(\"([^\"]+)\"|'([^']+)'|[^\" \\t]+)"}; @@ -89,25 +22,6 @@ std::wregex possiblyQuotedRegex<wchar_t>() { return std::wregex{L"(\"([^\"]+)\"|'([^']+)'|[^\" \\t]+)"}; } -unsigned long long string_to_llu(const char *s) { - unsigned long long value = 0; - unsigned long long mult = 1; - const char *e = s + strlen(s); - while (e > s) { - --e; - value += mult * (*e - '0'); - mult *= 10; - } - return value; -} - -void lowercase(char *s) { - while (*s) { - *s = tolower(*s); - s++; - } -} - int parse_boolean(const char *value) { if (!strcmp(value, "yes")) return 1; diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index 15901db..77e4cd3 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -41,11 +41,6 @@ using std::sregex_token_iterator; class WinApiAdaptor; -char *lstrip(char *s); -const char *lstrip(const char *s); -char *rstrip(char *s); -char *strip(char *s); - inline void ltrim(std::string &s) { s.erase(s.begin(), std::find_if(s.cbegin(), s.cend(), [](int ch) { return !std::isspace(ch); })); @@ -58,9 +53,6 @@ inline void rtrim(std::string &s) { s.end()); } -std::vector<const char *> split_line(char *pos, int (*split_pred)(int)); -char *next_word(char **line); - template <typename CharT> inline std::vector<std::basic_string<CharT>> tokenizeBase( const std::basic_string<CharT> &input, const std::basic_regex<CharT> &re, @@ -126,8 +118,6 @@ inline std::vector<std::basic_string<CharT>> tokenizePossiblyQuoted( unsigned long long string_to_llu(const char *s); -void lowercase(char *s); - int parse_boolean(const char *value); inline std::string to_utf8(const std::wstring &input) {

6 years, 4 months

Windows agent: use RAII while reading ini file

by Jukka Aro

Module: check_mk Branch: master Commit: 215f7290c7f14b09ce946257e8eda7deac8100fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=215f7290c7f14b… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 13 11:39:09 2018 +0100 Windows agent: use RAII while reading ini file --- agents/windows/Configuration.cc | 90 ++++++++++++++++++----------------------- agents/windows/Configuration.h | 2 +- agents/windows/build_version | 2 +- 3 files changed, 42 insertions(+), 52 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 73679d0..4e030df 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -24,9 +24,11 @@ #include "Configuration.h" #include <inttypes.h> +#include <algorithm> #include <cassert> #include <cstdio> #include <cstdlib> +#include <fstream> #include <regex> #include "Configurable.h" #include "Environment.h" @@ -58,15 +60,13 @@ std::string Configuration::configFileName(bool local, const Environment &env) { (local ? "_local" : "") + ".ini"; } -bool Configuration::checkHostRestriction(char *patterns) { - char *word; +bool Configuration::checkHostRestriction(const std::string &input) { std::string hostname = _environment.hostname(); - while ((word = next_word(&patterns))) { - if (globmatch(word, hostname.c_str())) { - return true; - } - } - return false; + const auto patterns = tokenize(input, "\\s+"); + return std::any_of(patterns.cbegin(), patterns.cend(), + [&hostname](const auto &p) { + return globmatch(p.c_str(), hostname.c_str()); + }); } void Configuration::outputConfigurables(std::ostream &out) { @@ -96,51 +96,44 @@ void Configuration::outputConfigurables(std::ostream &out) { } void Configuration::readConfigFile(const std::string &filename) { - FILE *file = fopen(filename.c_str(), "r"); - if (!file) { + std::ifstream ifs(filename); + if (!ifs) { return; } - char line[512]; - int lineno = 0; - + std::string line; bool is_active = true; // false in sections with host restrictions - std::string section; - while (!feof(file)) { - if (!fgets(line, sizeof(line), file)) { - fclose(file); - return; - } - lineno++; - char *l = strip(line); - if (l[0] == 0 || l[0] == '#' || l[0] == ';') + + for (unsigned lineno = 1; std::getline(ifs, line); ++lineno) { + ltrim(line); + rtrim(line); + if (line.empty() || line.front() == '#' || line.front() == ';') continue; // skip empty lines and comments - int len = strlen(l); - if (l[0] == '[' && l[len - 1] == ']') { + + if (line.front() == '[' && line.back() == ']') { // found section header - l[len - 1] = 0; - section = l + 1; + section = std::move(line.substr(1, line.size() - 2)); // forget host-restrictions if new section begins is_active = true; } else { // split up line at = sign - char *s = l; - while (*s && *s != '=') s++; - if (*s != '=') { - fprintf(stderr, "Invalid line %d in %s.\r\n", lineno, - filename.c_str()); + const auto tokens = tokenize(line, "="); + if (tokens.size() != 2) { + std::cerr << "Invalid line " << lineno << " in " << filename + << "." << std::endl; exit(1); } - *s = 0; - char *value = s + 1; - char *variable = l; - rstrip(variable); - lowercase(variable); - value = strip(value); + std::string variable{tokens[0]}; + rtrim(variable); + std::transform(variable.cbegin(), variable.cend(), variable.begin(), + tolower); + std::string value{tokens[1]}; + ltrim(value); + rtrim(value); // handle host restriction - if (!strcmp(variable, "host")) + if (variable == "host") is_active = checkHostRestriction(value); // skip all other variables for non-relevant hosts @@ -148,35 +141,32 @@ void Configuration::readConfigFile(const std::string &filename) { continue; // Useful for debugging host restrictions - else if (!strcmp(variable, "print")) - fprintf(stderr, "%s\r\n", value); + else if (variable == "print") + std::cerr << value << std::endl; else { bool found = false; - size_t key_len = strcspn(variable, " \n"); - + size_t key_len = strcspn(variable.c_str(), " \n"); auto map_iter = _configurables.find( - config_key(section, std::string(variable, key_len))); + config_key(section, std::string(variable, 0, key_len))); if (map_iter != _configurables.end()) { for (auto &cfg : map_iter->second) { try { cfg->feed(variable, value); found = true; } catch (const std::exception &e) { - fprintf(stderr, "Failed to interpret %s: %s\n", - line, e.what()); + std::cerr << "Failed to interpret " << line << ": " + << e.what() << std::endl; } } } if (!found) { - fprintf(stderr, "Invalid entry (%s:%s) in %s line %d.\r\n", - section.c_str(), variable, filename.c_str(), - lineno); + std::cerr << "Invalid entry (" << section << ":" << variable + << ") in " << filename << " line " << lineno + << std::endl; exit(1); } } } } - - fclose(file); } diff --git a/agents/windows/Configuration.h b/agents/windows/Configuration.h index da9e3c7..34f2a9e 100644 --- a/agents/windows/Configuration.h +++ b/agents/windows/Configuration.h @@ -86,7 +86,7 @@ public: private: void readConfigFile(const std::string &filename); - bool checkHostRestriction(char *patterns); + bool checkHostRestriction(const std::string &input); private: ConfigurableMap _configurables; diff --git a/agents/windows/build_version b/agents/windows/build_version index 0511e1b..4fb7d0e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3096 +3098

6 years, 4 months

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