Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

by Simon Betz

Module: check_mk Branch: master Commit: f9d8d4804cc4856428b42b2d96d74dfa3e1baa08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9d8d4804cc485… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 21 15:42:55 2017 +0200 Updated werk 5112 Change-Id: Ia906c56a288551220df1f8cd3313d0c7fad5ce0b --- checks/if.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/if.include b/checks/if.include index 321013e..a5d012c 100644 --- a/checks/if.include +++ b/checks/if.include @@ -432,7 +432,7 @@ def inventory_if_common(info, has_nodeinfo = False): if ifSpeed != "" and if_inventory_monitor_speed: params["speed"] = int(ifSpeed) - local_seen.add(ifIndex) + local_seen.add(item) pre_inventory.append( (item, "%r" % params, int(ifIndex)) ) global_seen = global_seen.union(local_seen)

6 years, 10 months

5114 FIX ps, ps.perf: Allow "/" in process name in manual checks

by Simon Betz

Module: check_mk Branch: master Commit: 11713f304e3ab842e397ac8b44b0d38b1b424c8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11713f304e3ab8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 21 14:38:38 2017 +0200 5114 FIX ps, ps.perf: Allow "/" in process name in manual checks Change-Id: I0c8aa3a816aa6c4bc1cf3a9f46661589d0bd55ac --- .werks/5114 | 11 +++++++++++ web/plugins/wato/check_parameters.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5114 b/.werks/5114 new file mode 100644 index 0000000..555c1a3 --- /dev/null +++ b/.werks/5114 @@ -0,0 +1,11 @@ +Title: ps, ps.perf: Allow "/" in process name in manual checks +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1503318885 + + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 5225215..e82ec6a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3671,7 +3671,7 @@ register_check_parameters( title = _("Process Name"), help = _("This name will be used in the description of the service"), allow_empty = False, - regex = "^[a-zA-Z_0-9 _.-]*$", + regex = "^[a-zA-Z_0-9 _.-/]*$", regex_error = _("Please use only a-z, A-Z, 0-9, space, underscore, " "dot and hyphon for your service description"), ),

6 years, 10 months

refactored all 3par check plugins

by Marcel Arentz

Module: check_mk Branch: master Commit: da67731c2f2343f1a4020867155e482431143355 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da67731c2f2343… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Aug 17 16:03:42 2017 +0200 refactored all 3par check plugins Change-Id: Ibe38dad1d99ed200927a33e9e0402485ea35df12 --- checks/3par_cpgs | 15 ++++++--------- checks/3par_hosts | 13 +++++-------- checks/3par_ports | 6 +++--- checks/3par_remotecopy | 6 +++--- checks/3par_system | 10 +++++----- checks/3par_volumes | 11 +++-------- 6 files changed, 25 insertions(+), 36 deletions(-) diff --git a/checks/3par_cpgs b/checks/3par_cpgs index 7bc9fde..aa74a1a 100644 --- a/checks/3par_cpgs +++ b/checks/3par_cpgs @@ -28,7 +28,7 @@ def count_3par_vvs(line): return line['numFPVVs'] + line['numTDVVs'] + line['numTPVVs'] def inventory_3par_cpgs(parsed): - for entry in parsed['members']: + for entry in parsed.get('members', {}): if "name" in entry and count_3par_vvs(entry) > 0: yield (entry['name'], {}) @@ -40,11 +40,8 @@ def check_3par_cpgs(item, params, parsed): 3: (2, "Failed"), } - for entry in parsed['members']: - if not "name" in entry: - continue - - if entry['name'] == item: + for entry in parsed.get('members', {}): + if entry.get('name') == item: state, state_readable = states[entry['state']] yield state, "%s, %s VVs" % (state_readable, count_3par_vvs(entry)) @@ -60,15 +57,15 @@ check_info['3par_cpgs'] = { def inventory_3par_cpgs_usage(parsed): - for entry in parsed['members']: + for entry in parsed.get('members', {}): if count_3par_vvs(entry) > 0: for fs in ["SAUsage", "SDUsage", "UsrUsage"]: yield ("%s %s" % (entry['name'], fs), {}) def check_3par_cpgs_usage(item, params, parsed): - for entry in parsed['members']: + for entry in parsed.get('members', {}): for fs in ["SAUsage", "SDUsage", "UsrUsage"]: - if "%s %s" % (entry['name'], fs) == item: + if "%s %s" % (entry.get('name'), fs) == item: total = entry[fs]['totalMiB'] free = entry[fs]['totalMiB']-entry[fs]['usedMiB'] yield df_check_filesystem_list(item, params, [ (item, total, free, 0) ]) diff --git a/checks/3par_hosts b/checks/3par_hosts index c851674..9ab4e8f 100644 --- a/checks/3par_hosts +++ b/checks/3par_hosts @@ -26,23 +26,20 @@ def inventory_3par_hosts(parsed): - for entry in parsed['members']: + for entry in parsed.get('members', {}): if "name" in entry: yield (entry['name'], None) def check_3par_hosts(item, _no_params, parsed): - for entry in parsed['members']: - if not "name" in entry: - continue - - if item == entry['name']: + for entry in parsed.get('members', {}): + if item == entry.get('name'): yield 0, "ID: %s" % entry['id'] if "descriptors" in entry: yield 0, "OS: %s" % entry['descriptors']['os'] - if len(entry['FCPaths']) > 0: + if len(entry.get('FCPaths', 0)) > 0: yield 0, "FC Paths: %s" % len(entry['FCPaths']) - elif len(entry['iSCSIPaths']) > 0: + elif len(entry.get('iSCSIPaths', 0)) > 0: yield 0, "iSCSI Paths: %s" % len(entry['iSCSIPaths']) diff --git a/checks/3par_ports b/checks/3par_ports index e24e8a0..2eedf79 100644 --- a/checks/3par_ports +++ b/checks/3par_ports @@ -62,9 +62,9 @@ def translate_protocol_3par_ports(number): return protocols[number] def inventory_3par_ports(parsed): - for entry in parsed['members']: + for entry in parsed.get('members', {}): # Only create an item if not "FREE" (type = 3) - if not entry['type'] == 3: + if not entry.get('type', 3) == 3: item = "%s Node %s Slot %s Port %s" % \ (translate_protocol_3par_ports(entry['protocol']), \ entry['portPos']['node'], @@ -108,7 +108,7 @@ def check_3par_ports(item, params, parsed): 4 : "PEER", } - for entry in parsed['members']: + for entry in parsed.get('members', {}): if item == "%s Node %s Slot %s Port %s" % (translate_protocol_3par_ports(entry['protocol']), \ entry['portPos']['node'], entry['portPos']['slot'], diff --git a/checks/3par_remotecopy b/checks/3par_remotecopy index 2e5aaaf..2d68e5f 100644 --- a/checks/3par_remotecopy +++ b/checks/3par_remotecopy @@ -39,7 +39,7 @@ factory_settings['threepar_remotecopy_default_levels'] = { } def inventory_3par_remotecopy(parsed): - if parsed["mode"] > 1: + if parsed.get("mode", 0) > 1: return [ (None, {}) ] @@ -50,7 +50,7 @@ def check_3par_remotecopy(_no_item, params, parsed): 3 : (2, "STOPPED"), } - state, state_readable = mode_translate[parsed['mode']] + state, state_readable = mode_translate[parsed.get('mode', 1)] yield state, "Mode: %s" % state_readable status_translate = { @@ -64,7 +64,7 @@ def check_3par_remotecopy(_no_item, params, parsed): 8 : "UPGRADE", } - status = parsed['status'] + status = parsed.get('status', 6) state_readable = status_translate[status] yield params[status], "Status: %s" % state_readable diff --git a/checks/3par_system b/checks/3par_system index 848b088..6559378 100644 --- a/checks/3par_system +++ b/checks/3par_system @@ -33,11 +33,11 @@ def inventory_3par_system(parsed): def check_3par_system(item, _no_params, parsed): state = 0 - serial = parsed['serialNumber'] - model = parsed['model'] - sys_version = parsed['systemVersion'] - cluster_nodes = parsed['clusterNodes'] - online_nodes = parsed['onlineNodes'] + serial = parsed.get('serialNumber', "N/A") + model = parsed.get('model', "N/A") + sys_version = parsed.get('systemVersion', "N/A") + cluster_nodes = parsed.get('clusterNodes', 0) + online_nodes = parsed.get('onlineNodes', 0) yield state, 'Model: %s, Version: %s, Serial number: %s, Online nodes: %s/%s' % \ (model, sys_version, serial, len(online_nodes), len(cluster_nodes)) diff --git a/checks/3par_volumes b/checks/3par_volumes index 04a941f..e8405f5 100644 --- a/checks/3par_volumes +++ b/checks/3par_volumes @@ -26,7 +26,7 @@ def inventory_3par_volumes(parsed): - for entry in parsed['members']: + for entry in parsed.get('members', {}): if not entry['policies']['system'] == True and \ "name" in entry: yield ( entry['name'], {} ) @@ -48,13 +48,8 @@ def check_3par_volumes(item, params, parsed): 6 : "TDVV", } - for entry in parsed['members']: - # Avoid crashing of complete check if a LUN does - # not exist anymore or is not available at the moment - if not "name" in entry: - continue - - if entry['name'] == item: + for entry in parsed.get('members', {}): + if entry.get('name') == item: total = entry['sizeMiB'] usr_free = total - entry['userSpace']['usedMiB'] yield df_check_filesystem_list(item, params, [ (item, total, usr_free, 0) ])

6 years, 10 months

5112 FIX if.include: Fixed wrong handling of duplicate interfaces if ' use alias' or 'use desccription' is configured

by Simon Betz

Module: check_mk Branch: master Commit: 3254092ff6feefbd511c50c87d0dd3f0b6613651 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3254092ff6feef… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 17 15:06:26 2017 +0200 5112 FIX if.include: Fixed wrong handling of duplicate interfaces if 'use alias' or 'use desccription' is configured Change-Id: I5c713ba0ec0eec9e87c15f771e52ddd0ad2e09d0 --- .werks/5112 | 19 +++++++++++++++++++ checks/if.include | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/5112 b/.werks/5112 new file mode 100644 index 0000000..4c20abf --- /dev/null +++ b/.werks/5112 @@ -0,0 +1,19 @@ +Title: if.include: Fixed wrong handling of duplicate interfaces if "use alias" or "use desccription" is configured +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1502973584 + +Within the rule {{Network Interface and Switch Port Discovery}} +you are able to configure the service description to use the +interface alias or description. Per default the index is used. +If there are duplicate interfaces with same name, the interface +index should be added. + + +Unfortunately, the afore-mentioned mechanism was broken. This +has been fixed. diff --git a/checks/if.include b/checks/if.include index 3d0a3ed..321013e 100644 --- a/checks/if.include +++ b/checks/if.include @@ -417,7 +417,7 @@ def inventory_if_common(info, has_nodeinfo = False): # Prepare single interfaces if not is_only_in_group: - if ifIndex in global_seen: + if item in global_seen: continue if item in seen_items: # duplicate

6 years, 10 months

added bug report regarding php5 and nagvis in debian9

by Marcel Arentz

Module: check_mk Branch: master Commit: 706362a551ccdbf4765148a4089e7deb11b5ac9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=706362a551ccdb… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Aug 17 14:48:23 2017 +0200 added bug report regarding php5 and nagvis in debian9 Change-Id: I07dcfb0efa763ce0dd152195004e6779179825f0 --- .bugs/2513 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2513 b/.bugs/2513 new file mode 100644 index 0000000..13a06dc --- /dev/null +++ b/.bugs/2513 @@ -0,0 +1,8 @@ +Title: faulty reference to php5 in debian 9 and nagvis +Component: multisite +State: open +Date: 2017-08-17 14:45:04 +Targetversion: 1.2.8 +Class: bug + +php5-cgi reference is not available in Debian 9. It's just php-cgi or php7-cgi.

6 years, 10 months

Reduced displayed contact groups to 20 in host properties > permissions

by Simon Betz

Module: check_mk Branch: master Commit: 06b911de410c4314df34a5f779cadbb1f4dc5b50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06b911de410c43… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 17 12:05:42 2017 +0200 Reduced displayed contact groups to 20 in host properties > permissions Change-Id: I5f22212374981c4b26ef9787d0de02f3b7d7ead9 --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 13e2e2e..d53d229 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3210,7 +3210,7 @@ class ContactGroupsAttribute(Attribute): cg_choices = sorted([(cg_id, cg_attrs.get("alias", cg_id)) for cg_id, cg_attrs in self._contactgroups.items()], key=lambda x: x[1]) - return DualListChoice(choices=cg_choices, rows=40, size=100) + return DualListChoice(choices=cg_choices, rows=20, size=100) def initialize_host_attribute_structures():

6 years, 10 months

5026 FIX Fixed possible core dumps during config reload

by Sven Panne

Module: check_mk Branch: master Commit: 4e970cf84f1b390f177bcb956e49168a0b6c06d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e970cf84f1b39… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 17 12:01:22 2017 +0200 5026 FIX Fixed possible core dumps during config reload Some race conditions during a config reload could lead to various erratic behavior of the Check_MK Micro Core, including core dumps. This has been fixed. Change-Id: Id1e4b0d9661a169901396dd684991a01ce36330b --- .werks/5026 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5026 b/.werks/5026 new file mode 100644 index 0000000..77efc27 --- /dev/null +++ b/.werks/5026 @@ -0,0 +1,12 @@ +Title: Fixed possible core dumps during config reload +Level: 1 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1502963971 +Class: fix + +Some race conditions during a config reload could lead to various erratic +behavior of the Check_MK Micro Core, including core dumps. This has been +fixed.

6 years, 10 months

Improved naming and added comments.

by Sven Panne

Module: check_mk Branch: master Commit: 08e511dfa4b0943e7c99f9b9b8c0684de8f30ae6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08e511dfa4b094… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 17 10:16:24 2017 +0200 Improved naming and added comments. Change-Id: I7c0aeebb517f4d00f182bf4a7b703c5d833d878f --- livestatus/src/ClientQueue.h | 6 ++++-- livestatus/src/Logger.h | 3 +++ livestatus/src/Store.h | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/livestatus/src/ClientQueue.h b/livestatus/src/ClientQueue.h index 455f474..063dc8c 100644 --- a/livestatus/src/ClientQueue.h +++ b/livestatus/src/ClientQueue.h @@ -39,10 +39,12 @@ public: void terminate(); private: - std::deque<int> _queue; + // The mutext protects _queue and _should_terminate, and it works together + // with the condition variable. std::mutex _mutex; - std::condition_variable _cond; + std::deque<int> _queue; bool _should_terminate; + std::condition_variable _cond; }; #endif // ClientQueue_h diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index f5fbf6b..270fec2 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -121,6 +121,7 @@ public: SharedStreamHandler(std::mutex &mutex, std::ostream &os); private: + // The mutex protects the _os. std::mutex &_mutex; std::ostream &_os; @@ -132,6 +133,7 @@ public: explicit StreamHandler(std::ostream &os); private: + // The mutex protects the output stream, see SharedStreamHandler. std::mutex _mutex; }; @@ -249,6 +251,7 @@ public: private: static LogManager _global_log_manager; + // The mutex protects _known_loggers. std::mutex _mutex; std::unordered_map<std::string, std::unique_ptr<Logger>> _known_loggers; diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index d6cc658..1365ff5 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -136,6 +136,8 @@ private: std::map<std::string, Table *> _tables; #ifndef CMC + // Nagios is not thread-safe, so this mutex protects calls to + // process_external_command1 / submit_external_command. std::mutex _command_mutex; #endif

6 years, 10 months

Make TimeperiodsCache implementation less surprising.

by Sven Panne

Module: check_mk Branch: master Commit: f4bcc803f1eb9911c802d415dad5a23dfe9d5974 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4bcc803f1eb99… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 17 09:19:32 2017 +0200 Make TimeperiodsCache implementation less surprising. Using time_t for *minutes* instead of the intended seconds is highly confusing. Furhtermore, modern C++ uses std::chrono facilities for stuff in this area. Various minor cleanups on the way. Change-Id: I4bf5082828ea64d392b563b8792b62708f73b398 --- livestatus/src/ChronoUtils.h | 6 +++ livestatus/src/TimeperiodsCache.cc | 76 +++++++++++++++----------------------- livestatus/src/TimeperiodsCache.h | 14 +++---- livestatus/src/module.cc | 5 +-- 4 files changed, 45 insertions(+), 56 deletions(-) diff --git a/livestatus/src/ChronoUtils.h b/livestatus/src/ChronoUtils.h index f1de078..1073138 100644 --- a/livestatus/src/ChronoUtils.h +++ b/livestatus/src/ChronoUtils.h @@ -64,6 +64,12 @@ inline timeval to_timeval(std::chrono::duration<Rep, Period> dur) { return tv; } +inline std::chrono::system_clock::time_point from_timeval(const timeval &tv) { + return std::chrono::system_clock::time_point( + std::chrono::seconds(tv.tv_sec) + + std::chrono::microseconds(tv.tv_usec)); +} + inline std::chrono::system_clock::time_point parse_time_t( const std::string &str) { return std::chrono::system_clock::from_time_t(atoi(str.c_str())); diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index 3921431..6742ee2 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -23,8 +23,8 @@ // Boston, MA 02110-1301 USA. #include "TimeperiodsCache.h" -#include <cstring> #include <ostream> +#include <ratio> #include <string> #include <utility> #include "Logger.h" @@ -32,24 +32,22 @@ using std::lock_guard; using std::mutex; using std::string; +using std::chrono::system_clock; +using std::chrono::minutes; extern timeperiod *timeperiod_list; -TimeperiodsCache::TimeperiodsCache(Logger *logger) - : _logger(logger), _cache_time(0) {} - -TimeperiodsCache::~TimeperiodsCache() = default; +TimeperiodsCache::TimeperiodsCache(Logger *logger) : _logger(logger) {} void TimeperiodsCache::logCurrentTimeperiods() { lock_guard<mutex> lg(_mutex); - time_t now = time(nullptr); - // Loop over all timeperiods and compute if we are - // currently in. Detect the case where no time periods - // are known (yet!). This might be the case when a timed - // event broker message arrives *before* the start of the - // event loop. + // Loop over all timeperiods and compute if we are currently in. Detect the + // case where no time periods are known (yet!). This might be the case when + // a timed event broker message arrives *before* the start of the event + // loop. + auto now = system_clock::to_time_t(system_clock::now()); for (timeperiod *tp = timeperiod_list; tp != nullptr; tp = tp->next) { - bool is_in = 0 == check_time_against_period(now, tp); + bool is_in = check_time_against_period(now, tp) == 0; // check previous state and log transition if state has changed auto it = _cache.find(tp); if (it == _cache.end()) { // first entry @@ -60,26 +58,22 @@ void TimeperiodsCache::logCurrentTimeperiods() { } } -void TimeperiodsCache::update(time_t now) { +void TimeperiodsCache::update(system_clock::time_point now) { lock_guard<mutex> lg(_mutex); - - // update cache only once a minute. The timeperiod - // definitions have 1 minute as granularity, so a - // 1sec resultion is not needed. - int minutes = now / 60; - if (minutes == _cache_time) { + // Update cache only once a minute. The timeperiod definitions have a + // 1-minute granularity, so a 1-second resultion is not needed. + if (now < _last_update + minutes(1)) { return; } + _last_update = now; - // Loop over all timeperiods and compute if we are - // currently in. Detect the case where no time periods - // are known (yet!). This might be the case when a timed - // event broker message arrives *before* the start of the - // event loop. - int num_periods = 0; + // Loop over all timeperiods and compute if we are currently in. Detect the + // case where no time periods are known (yet!). This might be the case when + // a timed event broker message arrives *before* the start of the event + // loop. for (timeperiod *tp = timeperiod_list; tp != nullptr; tp = tp->next) { - bool is_in = 0 == check_time_against_period(now, tp); - + bool is_in = + check_time_against_period(system_clock::to_time_t(now), tp) == 0; // check previous state and log transition if state has changed auto it = _cache.find(tp); if (it == _cache.end()) { // first entry @@ -89,43 +83,33 @@ void TimeperiodsCache::update(time_t now) { logTransition(tp->name, it->second ? 1 : 0, is_in ? 1 : 0); it->second = is_in; } - - num_periods++; } - if (num_periods > 0) { - _cache_time = minutes; - } else { + if (timeperiod_list != nullptr) { Informational(_logger) << "Timeperiod cache not updated, there are no timeperiods (yet)"; } } -bool TimeperiodsCache::inTimeperiod(const char *tpname) const { +bool TimeperiodsCache::inTimeperiod(const string &tpname) const { for (timeperiod *tp = timeperiod_list; tp != nullptr; tp = tp->next) { - if (strcmp(tpname, tp->name) == 0) { + if (tpname == tp->name) { return inTimeperiod(tp); } } return true; // unknown timeperiod is assumed to be 7X24 } -bool TimeperiodsCache::inTimeperiod(timeperiod *tp) const { +bool TimeperiodsCache::inTimeperiod(const timeperiod *tp) const { lock_guard<mutex> lg(_mutex); auto it = _cache.find(tp); - bool is_in; - if (it != _cache.end()) { - is_in = it->second; - } else { + if (it == _cache.end()) { + // Problem: check_time_against_period is not thread safe, so we can't + // use it here. Informational(_logger) << "No timeperiod information available for " << tp->name << ". Assuming out of period."; - is_in = false; - // Problem: The method check_time_against_period is to a high - // degree not thread safe. In the current situation Icinga is - // very probable to hang up forever. - // time_t now = time(0); - // is_in = 0 == check_time_against_period(now, tp); + return false; } - return is_in; + return it->second; } void TimeperiodsCache::logTransition(char *name, int from, int to) const { diff --git a/livestatus/src/TimeperiodsCache.h b/livestatus/src/TimeperiodsCache.h index 01c7440..b227169 100644 --- a/livestatus/src/TimeperiodsCache.h +++ b/livestatus/src/TimeperiodsCache.h @@ -26,27 +26,27 @@ #define TimeperiodsCache_h #include "config.h" // IWYU pragma: keep -#include <ctime> +#include <chrono> #include <map> #include <mutex> +#include <string> #include "nagios.h" class Logger; class TimeperiodsCache { public: explicit TimeperiodsCache(Logger *logger); - ~TimeperiodsCache(); - void update(time_t now); - bool inTimeperiod(timeperiod *tp) const; - bool inTimeperiod(const char *tpname) const; + void update(std::chrono::system_clock::time_point now); + bool inTimeperiod(const timeperiod *tp) const; + bool inTimeperiod(const std::string &tpname) const; void logCurrentTimeperiods(); private: Logger *const _logger; - // The mutex protects _cache_time and _cache. + // The mutex protects _last_update and _cache. mutable std::mutex _mutex; - time_t _cache_time; + std::chrono::system_clock::time_point _last_update; std::map<const timeperiod *, bool> _cache; void logTransition(char *name, int from, int to) const; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 1f8bbab..5040d89 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -32,7 +32,6 @@ #include <pthread.h> #include <sys/socket.h> #include <sys/stat.h> -#include <sys/time.h> #include <sys/un.h> #include <unistd.h> #include <chrono> @@ -575,7 +574,7 @@ int broker_event(int event_type __attribute__((__unused__)), void *data) { Informational(fl_logger_nagios) << "logging initial states"; } } - g_timeperiods_cache->update(ts->timestamp.tv_sec); + g_timeperiods_cache->update(from_timeval(ts->timestamp)); return 0; } @@ -758,7 +757,7 @@ int broker_process(int event_type __attribute__((__unused__)), void *data) { g_timeperiods_cache = new TimeperiodsCache(fl_logger_nagios); break; case NEBTYPE_PROCESS_EVENTLOOPSTART: - g_timeperiods_cache->update(time(nullptr)); + g_timeperiods_cache->update(from_timeval(ps->timestamp)); start_threads(); break; default:

6 years, 10 months

Improved naming and added a comment.

by Sven Panne

Module: check_mk Branch: master Commit: 55fa66b01e551e338a7b10eb0078d7e292362d2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55fa66b01e551e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 17 09:00:01 2017 +0200 Improved naming and added a comment. Change-Id: I44e7bb7db00f38eb4e16af7a660232dd1e4b7033 --- livestatus/src/TimeperiodsCache.cc | 6 +++--- livestatus/src/TimeperiodsCache.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index cc894ec..3921431 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -41,7 +41,7 @@ TimeperiodsCache::TimeperiodsCache(Logger *logger) TimeperiodsCache::~TimeperiodsCache() = default; void TimeperiodsCache::logCurrentTimeperiods() { - lock_guard<mutex> lg(_cache_lock); + lock_guard<mutex> lg(_mutex); time_t now = time(nullptr); // Loop over all timeperiods and compute if we are // currently in. Detect the case where no time periods @@ -61,7 +61,7 @@ void TimeperiodsCache::logCurrentTimeperiods() { } void TimeperiodsCache::update(time_t now) { - lock_guard<mutex> lg(_cache_lock); + lock_guard<mutex> lg(_mutex); // update cache only once a minute. The timeperiod // definitions have 1 minute as granularity, so a @@ -110,7 +110,7 @@ bool TimeperiodsCache::inTimeperiod(const char *tpname) const { } bool TimeperiodsCache::inTimeperiod(timeperiod *tp) const { - lock_guard<mutex> lg(_cache_lock); + lock_guard<mutex> lg(_mutex); auto it = _cache.find(tp); bool is_in; if (it != _cache.end()) { diff --git a/livestatus/src/TimeperiodsCache.h b/livestatus/src/TimeperiodsCache.h index 6c4ac6a..01c7440 100644 --- a/livestatus/src/TimeperiodsCache.h +++ b/livestatus/src/TimeperiodsCache.h @@ -43,9 +43,11 @@ public: private: Logger *const _logger; + + // The mutex protects _cache_time and _cache. + mutable std::mutex _mutex; time_t _cache_time; std::map<const timeperiod *, bool> _cache; - mutable std::mutex _cache_lock; void logTransition(char *name, int from, int to) const; };

6 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017