Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Win-agent: default-initialize event state offset

by Jukka Aro

Module: check_mk Branch: master Commit: cf385c519587d0fa5336427ec3caa7df34189f16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf385c519587d0… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 28 16:38:37 2018 +0100 Win-agent: default-initialize event state offset Until now, the sendall-feature of Windows eventlogs was working at most accidentally, relying on the compiler being friendly enough to zero struct fields even when not told to do so. --- agents/windows/sections/SectionEventlog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/sections/SectionEventlog.h b/agents/windows/sections/SectionEventlog.h index 44ae3f6..13d489b 100644 --- a/agents/windows/sections/SectionEventlog.h +++ b/agents/windows/sections/SectionEventlog.h @@ -60,7 +60,7 @@ std::ostream &operator<<(std::ostream &out, const config &val); struct state { state(const char *name) : name(name), newly_discovered(true) {} std::string name; - uint64_t record_no; + uint64_t record_no{0}; bool newly_discovered; };

6 years, 6 months

Win-agent: rely on implicit ~SectionEventlog

by Jukka Aro

Module: check_mk Branch: master Commit: 53736e92665a96a63c1161227682d4b811e21d19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53736e92665a96… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 28 16:28:05 2018 +0100 Win-agent: rely on implicit ~SectionEventlog The destructor will be implicitly declared by the compiler. --- agents/windows/sections/SectionEventlog.cc | 2 -- agents/windows/sections/SectionEventlog.h | 1 - 2 files changed, 3 deletions(-) diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index b7150a8..1cb3a5c 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -241,8 +241,6 @@ SectionEventlog::SectionEventlog(Configuration &config, Logger *logger, config.reg("logwatch", "logfile", &_config); } -SectionEventlog::~SectionEventlog() {} - void SectionEventlog::saveEventlogOffsets(const std::string &statefile) { std::ofstream ofs(statefile); diff --git a/agents/windows/sections/SectionEventlog.h b/agents/windows/sections/SectionEventlog.h index e8bc805..44ae3f6 100644 --- a/agents/windows/sections/SectionEventlog.h +++ b/agents/windows/sections/SectionEventlog.h @@ -97,7 +97,6 @@ class SectionEventlog : public Section { public: SectionEventlog(Configuration &config, Logger *logger, const WinApiAdaptor &winapi); - virtual ~SectionEventlog(); protected: virtual bool produceOutputInner(std::ostream &out) override;

6 years, 6 months

Win-agent: load eventlog offsets immediately

by Jukka Aro

Module: check_mk Branch: master Commit: d3e0eb5c74e8b6336987fad63b65cdef1a626a24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3e0eb5c74e8b6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 28 11:42:32 2018 +0100 Win-agent: load eventlog offsets immediately Reading eventlog offsets is not dependent on configuration, so it can be done immediately when initalizing SectionEventlog. There is no need to trigged it separately through emitConfigLoaded. --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 38 ++++++++++++++---------------- agents/windows/sections/SectionEventlog.h | 5 +--- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 4471739..46b6da4 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3136 +3138 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index be78919..2e5b6a7 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -123,6 +123,22 @@ inline bool hasPreviousState(eventlog_file_state &state) { return uint64limits::max() != state.record_no; } +eventlog_hints_t loadEventlogOffsets(const std::string &statefile, + Logger *logger) { + eventlog_hints_t hints; + std::ifstream ifs(statefile); + std::string line; + while (std::getline(ifs, line)) { + try { + hints.push_back(parseStateLine(line)); + } catch (const StateParseError &e) { + Error(logger) << e.what(); + } + } + + return hints; +} + } // namespace eventlog_hint_t parseStateLine(const std::string &line) { @@ -187,28 +203,14 @@ SectionEventlog::SectionEventlog(Configuration &config, Logger *logger, : Section("logwatch", "logwatch", config.getEnvironment(), logger, winapi) , _send_initial(config, "logwatch", "sendall", false, winapi) , _vista_api(config, "logwatch", "vista_api", false, winapi) - , _config(config, "logwatch", "logname", winapi) { + , _config(config, "logwatch", "logname", winapi) + , _hints(loadEventlogOffsets(_env.eventlogStatefile(), logger)) { // register a second key-name config.reg("logwatch", "logfile", &_config); } SectionEventlog::~SectionEventlog() {} -void SectionEventlog::loadEventlogOffsets(const std::string &statefile) { - if (!_records_loaded) { - std::ifstream ifs(statefile); - std::string line; - while (std::getline(ifs, line)) { - try { - _hints.push_back(parseStateLine(line)); - } catch (const StateParseError &e) { - Error(_logger) << e.what(); - } - } - _records_loaded = true; - } -} - void SectionEventlog::saveEventlogOffsets(const std::string &statefile) { std::ofstream ofs(statefile); @@ -332,10 +334,6 @@ bool SectionEventlog::find_eventlogs(std::ostream &out) { return success; } -void SectionEventlog::postprocessConfig() { - loadEventlogOffsets(_env.eventlogStatefile()); -} - void SectionEventlog::readHintOffsets() { // Special handling on startup (first_run) // The last processed record number of each eventlog is stored in the diff --git a/agents/windows/sections/SectionEventlog.h b/agents/windows/sections/SectionEventlog.h index 27cd255..e4d6415 100644 --- a/agents/windows/sections/SectionEventlog.h +++ b/agents/windows/sections/SectionEventlog.h @@ -129,8 +129,6 @@ public: const WinApiAdaptor &winapi); virtual ~SectionEventlog(); - virtual void postprocessConfig() override; - protected: virtual bool produceOutputInner(std::ostream &out) override; @@ -140,7 +138,6 @@ private: bool hideContext); void registerEventlog(const char *logname); bool find_eventlogs(std::ostream &out); - void loadEventlogOffsets(const std::string &statefile); void saveEventlogOffsets(const std::string &statefile); void readHintOffsets(); std::pair<EventlogLevel, bool> readConfig( @@ -152,7 +149,7 @@ private: Configurable<bool> _send_initial; Configurable<bool> _vista_api; EventlogConfigurable _config; - eventlog_hints_t _hints; + const eventlog_hints_t _hints; eventlog_state_t _state; bool _records_loaded = false; bool _first_run = true;

6 years, 6 months

Win-agent: use namespace for eventlog-specific types

by Jukka Aro

Module: check_mk Branch: master Commit: c9d4933098ee96439145ff15cc950eae58a7d29a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9d4933098ee96… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 28 13:56:21 2018 +0100 Win-agent: use namespace for eventlog-specific types --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 160 ++++++++++++--------- agents/windows/sections/SectionEventlog.h | 99 +++++-------- .../windows/test/sections/SectionEventlogTest.cc | 12 +- 4 files changed, 139 insertions(+), 134 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c9d4933098…

6 years, 6 months

Fixed misspelling.

by Sven Panne

Module: check_mk Branch: master Commit: 0a0fb9e9d2fa2f0559234b096d69fd730f653167 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a0fb9e9d2fa2f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 28 13:09:51 2018 +0100 Fixed misspelling. Change-Id: I5230d98685027fa97c248692a7f37f8e1f0652b8 --- web/plugins/views/mkeventd.py | 2 +- web/plugins/visuals/mkeventd.py | 2 +- web/plugins/wato/mkeventd.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 3c6175d..884aaaa 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -211,7 +211,7 @@ if mkeventd_enabled: } multisite_painters["event_first"] = { - "title" : _("Time of first occurrance of this serial"), + "title" : _("Time of first occurrence of this serial"), "short" : _("First"), "columns" : ["event_first"], "options" : [ "ts_format", "ts_date" ], diff --git a/web/plugins/visuals/mkeventd.py b/web/plugins/visuals/mkeventd.py index 2d35e1d..0e3a3a7 100644 --- a/web/plugins/visuals/mkeventd.py +++ b/web/plugins/visuals/mkeventd.py @@ -163,7 +163,7 @@ if mkeventd_enabled: declare_filter(209, EventFilterState("event", "event_priority", _("Syslog Priority"), mkeventd.syslog_priorities)) declare_filter(225, EventFilterState("history", "history_what", _("History action type"), [(k,k) for k in mkeventd.action_whats.keys()])) - declare_filter(220, FilterTime("event", "event_first", _("First occurrance of event"), "event_first", )) + declare_filter(220, FilterTime("event", "event_first", _("First occurrence of event"), "event_first", )) declare_filter(221, FilterTime("event", "event_last", _("Last occurrance of event"), "event_last", )) declare_filter(222, FilterTime("history", "history_time", _("Time of entry in event history"), "history_time",)) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 2f2e9de..f261f38 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -50,7 +50,7 @@ mkeventd_status_file = cmk.paths.omd_root + "/var/mkeventd/status" _help_list = [("$ID$", _("Event ID")), ("$COUNT$", _("Number of occurrances")), ("$TEXT$", _("Message text")), - ("$FIRST$", _("Time of the first occurrance (time stamp)")), + ("$FIRST$", _("Time of the first occurrence (time stamp)")), ("$LAST$", _("Time of the most recent occurrance")), ("$COMMENT$", _("Event comment")), ("$SL$", _("Service Level")),

6 years, 6 months

added mod_python patch 0010-fix-multithreading-module-cache.dif

by Andreas Boesl

Module: check_mk Branch: master Commit: 9132067053df5cc6ce236cc0e06d26d5e2685ab8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9132067053df5c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 28 11:48:03 2018 +0100 added mod_python patch 0010-fix-multithreading-module-cache.dif Change-Id: Iae5462e0752888e21e5290f8f7e8795fe0e22f6a --- .../patches/0010-fix-multithreading-module-cache.dif | 13 +++++++++++++ omd/packages/mod_python/patches/README | 3 +++ 2 files changed, 16 insertions(+) diff --git a/omd/packages/mod_python/patches/0010-fix-multithreading-module-cache.dif b/omd/packages/mod_python/patches/0010-fix-multithreading-module-cache.dif new file mode 100644 index 0000000..971d97b --- /dev/null +++ b/omd/packages/mod_python/patches/0010-fix-multithreading-module-cache.dif @@ -0,0 +1,13 @@ +--- mod_python-3.3.1/lib/python/mod_python/importer.py.orig 2018-02-28 11:14:06.489071095 +0100 ++++ mod_python-3.3.1/lib/python/mod_python/importer.py 2018-02-28 11:14:46.440575635 +0100 +@@ -490,6 +490,10 @@ + # Retrieve the per request modules cache entry. + + modules = _get_request_modules_cache() ++ if not modules: ++ _setup_request_modules_cache() ++ modules = _get_request_modules_cache() ++ + + # Calculate a unique label corresponding to the + # name of the file which is the module. This diff --git a/omd/packages/mod_python/patches/README b/omd/packages/mod_python/patches/README index 4419229..0774b89 100644 --- a/omd/packages/mod_python/patches/README +++ b/omd/packages/mod_python/patches/README @@ -32,6 +32,9 @@ 0009 Makes logging of mod_python work again with current apache versions. +0010 + Fixes broken "import module"-caches when using multiple threads + The other patches are taken with thanks from the FEDORA mod_python package and fix compile problems and RedHat 6.1 (and probably other distros as well).

6 years, 6 months

Do not heal spaces for Windows agent code

by Jukka Aro

Module: check_mk Branch: master Commit: 69c645a5093247d5ca662a605bc0fc885fffadd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69c645a5093247… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 28 10:30:51 2018 +0100 Do not heal spaces for Windows agent code The script breaks symlinks. C++ code should rather be formatted with clang-format. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index a4c3f17..76f63d0 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,6 @@ LIVESTATUS_SOURCES := Makefile.am api/c++/{Makefile,*.{h,cc}} api/perl/* \ # Files that are checked for trailing spaces HEAL_SPACES_IN := checkman/* cmk_base/* checks/* notifications/* inventory/* \ $$(find -name Makefile) livestatus/src/*.{cc,h} \ - agents/windows/*.cc \ web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ doc/helpers/* scripts/setup.sh scripts/autodetect.py \ $$(find pnp-templates -type f -name "*.php") \

6 years, 6 months

Win-agent: output eventlog state with stream operator

by Jukka Aro

Module: check_mk Branch: master Commit: 50946e1beb110a6b1c0baeaaa4f1d6cc074a0b9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50946e1beb110a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 27 15:09:35 2018 +0100 Win-agent: output eventlog state with stream operator --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 7a7d1ab..30aafae 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3128 +3130 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 4b3e688..aaee8c0 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -111,6 +111,11 @@ std::pair<uint64_t, EventlogLevel> processEventLog( return {lastRecordId, worstState}; } +inline std::ostream &operator<<(std::ostream &out, + const eventlog_file_state &state) { + return out << state.name << "|" << state.record_no; +} + } // namespace eventlog_hint_t parseStateLine(const std::string &line) { @@ -210,7 +215,7 @@ void SectionEventlog::saveEventlogOffsets(const std::string &statefile) { EventlogLevel level{EventlogLevel::Warn}; std::tie(level, std::ignore) = readConfig(state); if (level != EventlogLevel::Off) { - ofs << state.name << "|" << state.record_no << std::endl; + ofs << state << std::endl; } } }

6 years, 6 months

Win-agent: use safe enum for eventlog levels

by Jukka Aro

Module: check_mk Branch: master Commit: 96633be2270c8a55a30566d1ea0c8e84d25050e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96633be2270c8a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 27 15:01:55 2018 +0100 Win-agent: use safe enum for eventlog levels Declare the set of levels as 'enum class' instead of int. --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 103 ++++++++++++----------------- agents/windows/sections/SectionEventlog.h | 30 +++++++-- 3 files changed, 68 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=96633be227…

6 years, 6 months

Win-agent: split SectionEventlog::produceOutputInner

by Jukka Aro

Module: check_mk Branch: master Commit: 6af35316583ea916b0a9bace595fbe66e2ed208a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6af35316583ea9… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Feb 27 14:01:24 2018 +0100 Win-agent: split SectionEventlog::produceOutputInner Extract smaller subfunctions to improve readability. --- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 71 ++++++++++++++++-------------- agents/windows/sections/SectionEventlog.h | 4 +- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index b345efa..179b5d3 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3124 +3126 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 1ea33ed..dccbe5e 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -75,7 +75,7 @@ const char *level_name(int level_id) { // The int return value is there just for convenience, actually we are not // interested in the state int value at this point any more. int outputEventlogRecord(std::ostream &out, const IEventLogRecord &event, - int level, int hide_context) { + int level, bool hide_context) { char type_char; int this_state; std::tie(type_char, this_state) = getEventState(event, level); @@ -236,7 +236,7 @@ void SectionEventlog::saveEventlogOffsets(const std::string &statefile) { uint64_t SectionEventlog::outputEventlog(std::ostream &out, const char *logname, uint64_t previouslyReadId, int level, - int hideContext) { + bool hideContext) { Debug(_logger) << " - event log \"" << logname << "\":"; try { @@ -354,6 +354,36 @@ void SectionEventlog::postprocessConfig() { loadEventlogOffsets(_env.eventlogStatefile()); } +void SectionEventlog::readHintOffsets() { + // Special handling on startup (first_run) + // The last processed record number of each eventlog is stored in the + // file eventstate.txt + if (_first_run && !*_send_initial) { + for (auto &state : _state) { + auto it = std::find_if( + _hints.cbegin(), _hints.cend(), + [&state](const auto &hint) { return state.name == hint.name; }); + // If there is no entry for the given eventlog we start at the + // end + state.record_no = + it != _hints.cend() ? it->record_no : uint64limits::max(); + } + } +} + +std::pair<int, bool> SectionEventlog::readConfig( + const eventlog_file_state &state) const { + // Get the configuration of that log file (which messages to + // send) + auto it = std::find_if( + _config->cbegin(), _config->cend(), [&state](const auto &config) { + return config.name == "*" || ci_equal(config.name, state.name); + }); + return it != _config->cend() + ? std::make_pair(it->level, it->hide_context != 0) + : std::make_pair(1, false); +} + // The output of this section is compatible with // the logwatch agent for Linux and UNIX bool SectionEventlog::produceOutputInner(std::ostream &out) { @@ -365,47 +395,20 @@ bool SectionEventlog::produceOutputInner(std::ostream &out) { // not been processed. if (find_eventlogs(out)) { - // Special handling on startup (first_run) - // The last processed record number of each eventlog is stored in the - // file eventstate.txt - if (_first_run && !*_send_initial) { - for (auto &state : _state) { - bool found_hint = false; - for (const auto &hint : _hints) { - if (state.name == hint.name) { - state.record_no = hint.record_no; - found_hint = true; - break; - } - } - // If there is no entry for the given eventlog we start at the - // end - if (!found_hint) { - state.record_no = uint64limits::max(); - } - } - } + readHintOffsets(); for (auto &state : _state) { if (!state.newly_discovered) // not here any more! out << "[[[" << state.name << ":missing]]]\n"; else { - // Get the configuration of that log file (which messages to - // send) int level = 1; - int hide_context = 0; - for (const eventlog_config_entry &config : *_config) { - if ((config.name == "*") || - ci_equal(config.name, state.name)) { - level = config.level; - hide_context = config.hide_context; - break; - } - } + bool hideContext = false; + std::tie(level, hideContext) = readConfig(state); + if (level != -1) { state.record_no = outputEventlog(out, state.name.c_str(), state.record_no, - level, hide_context); + level, hideContext); } } } diff --git a/agents/windows/sections/SectionEventlog.h b/agents/windows/sections/SectionEventlog.h index f2ae38b..ce138b7 100644 --- a/agents/windows/sections/SectionEventlog.h +++ b/agents/windows/sections/SectionEventlog.h @@ -120,11 +120,13 @@ protected: private: uint64_t outputEventlog(std::ostream &out, const char *logname, uint64_t previouslyReadId, int level, - int hideContext); + bool hideContext); void registerEventlog(const char *logname); bool find_eventlogs(std::ostream &out); void loadEventlogOffsets(const std::string &statefile); void saveEventlogOffsets(const std::string &statefile); + void readHintOffsets(); + std::pair<int, bool> readConfig(const eventlog_file_state &state) const; Configurable<bool> _send_initial; Configurable<bool> _vista_api;

6 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018