Checkmk git commits August 2018

checkmk-commits@lists.checkmk.com

10 participants
351 discussions

6521 FIX akcp_exp_temp: Fixed reference to invalid default levels variable

by Lars Michelsen

Module: check_mk Branch: master Commit: e80bf0eba10437010fe09b2379f255f10c76f300 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e80bf0eba10437… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 10:15:22 2018 +0200 6521 FIX akcp_exp_temp: Fixed reference to invalid default levels variable FEED-933 Change-Id: I4861b3c562fe135c68b2d9e7ea94377eb2dd3f61 --- .werks/6521 | 11 +++++++++++ checks/akcp_exp_temp | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6521 b/.werks/6521 new file mode 100644 index 0000000..252870e --- /dev/null +++ b/.werks/6521 @@ -0,0 +1,11 @@ +Title: akcp_exp_temp: Fixed reference to invalid default levels variable +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535703303 + + diff --git a/checks/akcp_exp_temp b/checks/akcp_exp_temp index 8892033..8955065 100644 --- a/checks/akcp_exp_temp +++ b/checks/akcp_exp_temp @@ -35,7 +35,7 @@ check_info["akcp_exp_temp"] = { "inventory_function" : inventory_akcp_sensor_temp, "service_description" : "Temperature %s", "has_perfdata" : True, - "default_levels_variable" : "akcp_temperature_default_levels", + "default_levels_variable" : "akcp_temp_default_levels", "snmp_scan_function" : snmp_scan_akcp_exp, "snmp_info" : ( ".1.3.6.1.4.1.3854.2.3.2.1", [ 2, # SPAGENT-MIB::sensorTemperatureDescription

5 years, 10 months

6519 FIX Fixed unselecting items from dual list choice via double click

by Lars Michelsen

Module: check_mk Branch: master Commit: fb78f3944a9a43f7b52a32e2931bf1e284c8c041 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb78f3944a9a43… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 09:56:58 2018 +0200 6519 FIX Fixed unselecting items from dual list choice via double click It was possible to select items in dual list choices elements (like like network interface types), but not possible to unselect them in the same way. Change-Id: I0f63f5661babf5c05b9d1133ed3582ff2dedae83 --- .werks/6519 | 12 ++++++++++++ cmk/gui/valuespec.py | 37 +++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.werks/6519 b/.werks/6519 new file mode 100644 index 0000000..a571a28 --- /dev/null +++ b/.werks/6519 @@ -0,0 +1,12 @@ +Title: Fixed unselecting items from dual list choice via double click +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535702157 + +It was possible to select items in dual list choices elements (like like network interface types), +but not possible to unselect them in the same way. diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 858c463..349aa32 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -2235,7 +2235,7 @@ class DualListChoice(ListChoice): unselected.append(e) select_func = 'vs_duallist_switch(\'unselected\', \'%s\', %d);' % (varprefix, 1 if self._custom_order else 0) - unselect_func = 'vs_duallist_switch(\'selected\', \'%s\', 1);' % varprefix + unselect_func = 'vs_duallist_switch(\'selected\', \'%s\', %d);' % (varprefix, 1 if self._custom_order else 0) html.open_table(class_=["vs_duallist"], style = "width: %dpx;" % (self._size * 6.4) if self._size else None) @@ -2253,28 +2253,25 @@ class DualListChoice(ListChoice): html.close_td() html.close_tr() - onchange_unselected = select_func if self._instant_add else '' - onchange_selected = unselect_func if self._instant_add else '' - if self._enlarge_active: - onchange_selected = 'vs_duallist_enlarge(\'selected\', \'%s\');' % varprefix - onchange_unselected = 'vs_duallist_enlarge(\'unselected\', \'%s\');' % varprefix + html.open_tr() + for suffix, choices, select_func in [ + ("unselected", unselected, select_func), + ("selected", selected, unselect_func), ]: - attrs = { - 'multiple' : 'multiple', - 'style' : 'height:auto' if self._autoheight else "height: %dpx" % (self._rows * 16), - 'ondblclick' : select_func if not self._instant_add else '', - } + onchange_func = select_func if self._instant_add else '' + if self._enlarge_active: + onchange_func = 'vs_duallist_enlarge(\'%s\', \'%s\');' % (suffix, varprefix) - html.open_tr() - html.open_td() - attrs["onchange"] = onchange_unselected - html.multi_select(varprefix + '_unselected', unselected, deflt='', sorted=self._custom_order, **attrs) - html.close_td() + attrs = { + 'multiple' : 'multiple', + 'style' : 'height:auto' if self._autoheight else "height: %dpx" % (self._rows * 16), + 'ondblclick' : select_func if not self._instant_add else '', + } - html.open_td() - attrs["onchange"] = onchange_selected - html.multi_select(varprefix + '_selected', selected, deflt='', sorted=self._custom_order, **attrs) - html.close_td() + html.open_td() + attrs["onchange"] = onchange_func + html.multi_select("%s_%s" % (varprefix, suffix), choices, deflt='', sorted=self._custom_order, **attrs) + html.close_td() html.close_tr() html.close_table()

5 years, 10 months

systemd_units: refactor file content.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 320a42d8727945e04007fcbb075efae967e602a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=320a42d8727945… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Aug 31 07:37:38 2018 +0200 systemd_units: refactor file content. Change-Id: I4df7711a0a9bf432b9c675e44144fb444a2e0e47 --- checks/systemd_units | 119 +++++++++++++++++++++++++++++++++- checks/systemd_units.services | 144 ------------------------------------------ 2 files changed, 118 insertions(+), 145 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=320a42d872…

5 years, 10 months

Various LogCache-related cleanups.

by Sven Panne

Module: check_mk Branch: master Commit: c4b2eb014b4ed2b09b6b60409e704f3966cf4770 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b2eb014b4ed2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 31 08:57:32 2018 +0200 Various LogCache-related cleanups. * Made methods private if possible. * Just expose an iterator interface, not a whole internal field. * Inlined an internal method, making the actual intent clearer. * Improved naming. Change-Id: I9f7fd73ea1bbe4f7de10bee4aae05caf2aaffddf --- livestatus/src/LogCache.cc | 22 ++++++++++------------ livestatus/src/LogCache.h | 10 +++++----- livestatus/src/Logfile.cc | 2 +- livestatus/src/TableLog.cc | 13 ++++++------- livestatus/src/TableStateHistory.cc | 11 +++++------ 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 2506863..f14380a 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -57,27 +57,20 @@ void LogCache::setMaxCachedMessages(unsigned long m) { } #endif -bool LogCache::logCachePreChecks() { +bool LogCache::update() { if (_logfiles.empty() || _mc->last_logfile_rotation() > _last_index_update) { - forgetLogfiles(); updateLogfileIndex(); } - if (_logfiles.empty()) { - Notice(logger()) << "no log file found, not even " - << _mc->historyFilePath(); - } return !_logfiles.empty(); } -void LogCache::forgetLogfiles() { - Notice(logger()) << "flushing log file index"; +void LogCache::updateLogfileIndex() { + Informational(logger()) << "updating log file index"; + _logfiles.clear(); num_cached_log_messages = 0; -} -void LogCache::updateLogfileIndex() { - Informational(logger()) << "updating log file index"; _last_index_update = std::chrono::system_clock::now(); // We need to find all relevant logfiles. This includes directory, the // current nagios.log and all files in the archive. @@ -91,6 +84,11 @@ void LogCache::updateLogfileIndex() { } catch (const fs::filesystem_error &e) { Warning(logger()) << "updating log file index: " << e.what(); } + + if (_logfiles.empty()) { + Notice(logger()) << "no log file found, not even " + << _mc->historyFilePath(); + } } void LogCache::addToIndex(std::unique_ptr<Logfile> logfile) { @@ -117,7 +115,7 @@ void LogCache::addToIndex(std::unique_ptr<Logfile> logfile) { The parameters to this method reflect the current query, not the messages that just has been loaded. */ -void LogCache::handleNewMessage(Logfile *logfile, unsigned logclasses) { +void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { if (static_cast<unsigned long>(++num_cached_log_messages) <= _max_cached_messages) { return; // current message count still allowed, everything ok diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 84e9ceb..0eea98c 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -45,11 +45,10 @@ public: #ifdef CMC void setMaxCachedMessages(unsigned long m); #endif - void handleNewMessage(Logfile *logfile, unsigned logclasses); - logfiles_t *logfiles() { return &_logfiles; }; - void forgetLogfiles(); - void updateLogfileIndex(); - bool logCachePreChecks(); + void logLineHasBeenAdded(Logfile *logfile, unsigned logclasses); + bool update(); // returns true if at least one log file has been found + auto begin() { return _logfiles.begin(); } + auto end() { return _logfiles.end(); } private: MonitoringCore *const _mc; @@ -58,6 +57,7 @@ private: logfiles_t _logfiles; std::chrono::system_clock::time_point _last_index_update; + void updateLogfileIndex(); void addToIndex(std::unique_ptr<Logfile> logfile); Logger *logger() const; }; diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index dc162ec..64c7288 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -156,7 +156,7 @@ void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, } } if (processLogLine(_lineno, &linebuffer[0], missing_types)) { - logcache->handleNewMessage(this, logclasses); + logcache->logLineHasBeenAdded(this, logclasses); } } } diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index cee4b56..bb23e12 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -126,7 +126,7 @@ std::string TableLog::namePrefix() const { return "log_"; } void TableLog::answerQuery(Query *query) { std::lock_guard<std::mutex> lg(_log_cache->_lock); - if (!_log_cache->logCachePreChecks()) { + if (!_log_cache->update()) { return; } @@ -151,16 +151,15 @@ void TableLog::answerQuery(Query *query) { the Limit: header produces more reasonable results. */ /* NEW CODE - NEWEST FIRST */ - logfiles_t::iterator it; - it = _log_cache->logfiles()->end(); // it now points beyond last log file + auto it = _log_cache->end(); // it now points beyond last log file --it; // switch to last logfile (we have at least one) // Now find newest log where 'until' is contained. The problem // here: For each logfile we only know the time of the *first* entry, // not that of the last. - while (it != _log_cache->logfiles()->begin() && - it->first > until) { // while logfiles are too new... - --it; // go back in history + while (it != _log_cache->begin() && it->first > until) { + // while logfiles are too new go back in history + --it; } if (it->first > until) { return; // all logfiles are too new @@ -171,7 +170,7 @@ void TableLog::answerQuery(Query *query) { classmask)) { break; // end of time range found } - if (it == _log_cache->logfiles()->begin()) { + if (it == _log_cache->begin()) { break; // this was the oldest one } --it; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index e0d6162..86b98ff 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -208,7 +208,7 @@ std::string TableStateHistory::namePrefix() const { return "statehist_"; } void TableStateHistory::getPreviousLogentry() { while (_it_entries == _entries->begin()) { // open previous logfile - if (_it_logs == _log_cache->logfiles()->begin()) { + if (_it_logs == _log_cache->begin()) { return; } --_it_logs; @@ -226,7 +226,7 @@ LogEntry *TableStateHistory::getNextLogentry() { while (_it_entries == _entries->end()) { auto it_logs_cpy = _it_logs; - if (++it_logs_cpy == _log_cache->logfiles()->end()) { + if (++it_logs_cpy == _log_cache->end()) { return nullptr; } ++_it_logs; @@ -278,7 +278,7 @@ std::unique_ptr<Filter> TableStateHistory::createPartialFilter( void TableStateHistory::answerQuery(Query *query) { auto object_filter = createPartialFilter(*query); std::lock_guard<std::mutex> lg(_log_cache->_lock); - if (!_log_cache->logCachePreChecks()) { + if (!_log_cache->update()) { return; } @@ -313,13 +313,12 @@ void TableStateHistory::answerQuery(Query *query) { } // Switch to last logfile (we have at least one) - _it_logs = _log_cache->logfiles()->end(); + _it_logs = _log_cache->end(); --_it_logs; auto newest_log = _it_logs; // Now find the log where 'since' starts. - while (_it_logs != _log_cache->logfiles()->begin() && - _it_logs->first >= _since) { + while (_it_logs != _log_cache->begin() && _it_logs->first >= _since) { --_it_logs; // go back in history }

5 years, 10 months

Removed dead code. Made fields/methods as private as possible.

by Sven Panne

Module: check_mk Branch: master Commit: 41ec9d1dc20a9800b2bfeb161a9ab2e67c2c60fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41ec9d1dc20a98… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 31 10:27:11 2018 +0200 Removed dead code. Made fields/methods as private as possible. Change-Id: I32eda6798a57a4688e2e4870bd66f937b2ae1b49 --- livestatus/src/Logfile.cc | 17 ----------------- livestatus/src/Logfile.h | 42 +++++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 38 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 64c7288..be24cec 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -211,23 +211,6 @@ logfile_entries_t *Logfile::getEntriesFromQuery(const Query * /*unused*/, return &_entries; } -bool Logfile::answerQuery(Query *query, LogCache *logcache, time_t since, - time_t until, unsigned logclasses) { - // Make sure existing references to objects point to correct world - updateReferences(); - // make sure all messages are present - load(logcache, logclasses); - uint64_t sincekey = makeKey(since, 0); - for (auto it = _entries.lower_bound(sincekey); it != _entries.end(); ++it) { - // end found or limit exceeded? - if (it->second->_time >= until || - !query->processDataset(Row(it->second.get()))) { - return false; - } - } - return true; -} - bool Logfile::answerQueryReverse(Query *query, LogCache *logcache, time_t since, time_t until, unsigned logclasses) { // Make sure existing references to objects point to correct world diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 05db416..08e4dd7 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -48,51 +48,51 @@ class World; using logfile_entries_t = std::map<uint64_t, std::unique_ptr<LogEntry>>; class Logfile { -private: - MonitoringCore *_mc; - fs::path _path; - time_t _since; // time of first entry - bool _watch; // true only for current logfile - fpos_t _read_pos; // read until this position - size_t _lineno; // read until this line - - logfile_entries_t _entries; -#ifdef CMC - World *_world; // CMC: world our references point into -#endif - public: Logfile(MonitoringCore *mc, fs::path path, bool watch); std::string path() { return _path; } #ifdef CMC // Note: The buffer is 2 bytes larger then the file, containing a zero - // character at both ends. + // character at both ends. For StateHistoryThread::processLogfile. std::unique_ptr<std::vector<char>> readIntoBuffer(); #endif - void load(LogCache *logcache, unsigned logclasses); + + // for tricky protocol between LogCache::logLineHasBeenAdded and this class void flush(); time_t since() { return _since; } unsigned classesRead() { return _logclasses_read; } size_t size() { return _entries.size(); } + long freeMessages(unsigned logclasses); + + // for TableStateHistory logfile_entries_t *getEntriesFromQuery(const Query *query, LogCache *logcache, unsigned logclasses); - bool answerQuery(Query *query, LogCache *logcache, time_t since, - time_t until, unsigned logclasses); + + // for TableLog::answerQuery bool answerQueryReverse(Query *query, LogCache *logcache, time_t since, time_t until, unsigned logclasses); - long freeMessages(unsigned logclasses); - void updateReferences(); - +private: + MonitoringCore *_mc; + fs::path _path; + time_t _since; // time of first entry + bool _watch; // true only for current logfile + fpos_t _read_pos; // read until this position + size_t _lineno; // read until this line + logfile_entries_t _entries; +#ifdef CMC + World *_world; // CMC: world our references point into +#endif unsigned _logclasses_read; // only these types have been read -private: + void load(LogCache *logcache, unsigned logclasses); void loadRange(FILE *file, unsigned missing_types, LogCache *logcache, unsigned logclasses); bool processLogLine(size_t lineno, std::string line, unsigned logclasses); uint64_t makeKey(time_t t, size_t lineno); + void updateReferences(); Logger *logger() const; };

5 years, 10 months

6406 FIX df: fix a crash of the check if the inode count is '-'

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c3c3e96a86ab09c340a5efad95f05b8cf2f99e67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3c3e96a86ab09… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Aug 28 17:26:05 2018 +0200 6406 FIX df: fix a crash of the check if the inode count is '-' Change-Id: Ib9cb3c21368ea961ba82dd7e058985c3c22a43fe --- .werks/6406 | 10 ++++++++++ checks/df | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/6406 b/.werks/6406 new file mode 100644 index 0000000..745b46b --- /dev/null +++ b/.werks/6406 @@ -0,0 +1,10 @@ +Title: df: fix a crash of the check if the inode count is '-' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535697589 +Class: fix + + diff --git a/checks/df b/checks/df index 9143903..a157f45 100644 --- a/checks/df +++ b/checks/df @@ -164,8 +164,13 @@ def parse_df(info): pass else: line = [ line[0], None ] + line[1:] - inodes_total = int(line[2]) - inodes_avail = int(line[4]) + + try: + inodes_total = int(line[2]) + inodes_avail = int(line[4]) + except ValueError: + continue + mountpoint = line[-1] df_inodes.append((mountpoint, inodes_total, inodes_avail)) return df_inodes

5 years, 10 months

df: add test for inode section where the inode count is '-'

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 878771c91a63ba4a0889a06cc253abc4371fd295 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=878771c91a63ba… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Aug 31 08:34:31 2018 +0200 df: add test for inode section where the inode count is '-' Change-Id: Ie44e27cf1e5e8212ad59ecc192b0dfaab3ef88f5 --- tests/unit/checks/test_df_check.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/unit/checks/test_df_check.py b/tests/unit/checks/test_df_check.py index 4d25bdc..76e1842 100644 --- a/tests/unit/checks/test_df_check.py +++ b/tests/unit/checks/test_df_check.py @@ -212,6 +212,12 @@ info_solaris_zfs = [ [u'zfs', u'is', u'hashed', u'(/usr/sbin/zfs)'], ] +info_empty_inodes = [ + [u'[df_inodes_start]'], + [u'/dev/mapper/vgdns-lvbindauthlog', u'-', u'-', u'-', u'-', u'-', u'/dns/bindauth/log'], + [u'[df_inodes_end]'], +] + #. # .--Test functions------------------------------------------------------. # | _____ _ __ _ _ | @@ -245,6 +251,7 @@ info_solaris_zfs = [ (info_df_btrfs, [(u'/dev/sda1 btrfs /dev/sda1', {})], { "include_volume_name" : True }), # btrfs w/ volume name option (info_solaris_zfs, [], {}), # ignore filensystems without size + (info_empty_inodes, [], {}) ]) def test_df_discovery_with_parse(check_manager, info, expected_result, inventory_df_rules):

5 years, 10 months

6517 FIX Nagios: Improved init script when tmpfs is not prepared

by Lars Michelsen

Module: check_mk Branch: master Commit: 5acc758e26624b9fdec7444333b07e259eade2ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5acc758e26624b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 07:48:48 2018 +0200 6517 FIX Nagios: Improved init script when tmpfs is not prepared When using Nagios as core and executing "cmk -R" or "cmk -O" on a totally stopped site ("omd stop" + "omd umount") without previously executing "omd start" errors like this occured: etc/init.d/nagios: line 72: /omd/sites/heute/tmp/nagios/nagios.cfg: No such file or directory Nagios configuration file /omd/sites/heute/tmp/nagios/nagios.cfg not found. Terminating... This has been replaced by a more helpful error message: Change-Id: If442e8cdf01c752535daeaebc55a83e1438864df ERROR: tmp directory is not ready. Use "omd start" to prepare it --- .werks/6517 | 20 ++++++++++++++++++++ omd/packages/nagios/skel/etc/init.d/nagios | 8 ++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.werks/6517 b/.werks/6517 new file mode 100644 index 0000000..50caf5a --- /dev/null +++ b/.werks/6517 @@ -0,0 +1,20 @@ +Title: Nagios: Improved init script when tmpfs is not prepared +Level: 1 +Component: packages +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535694318 + +When using Nagios as core and executing "cmk -R" or "cmk -O" +on a totally stopped site ("omd stop" + "omd umount") without +previously executing "omd start" errors like this occured: + +etc/init.d/nagios: line 72: /omd/sites/heute/tmp/nagios/nagios.cfg: No such file or directory +Nagios configuration file /omd/sites/heute/tmp/nagios/nagios.cfg not found. Terminating... + +This has been replaced by a more helpful error message: + +ERROR: tmp directory is not ready. Use "omd start" to prepare it diff --git a/omd/packages/nagios/skel/etc/init.d/nagios b/omd/packages/nagios/skel/etc/init.d/nagios index 758f3ed..94574aa 100755 --- a/omd/packages/nagios/skel/etc/init.d/nagios +++ b/omd/packages/nagios/skel/etc/init.d/nagios @@ -41,11 +41,10 @@ cd ###ROOT### [ "$CONFIG_CORE" = "nagios" ] || exit 5 BIN=###ROOT###/bin/nagios +TMP_DIR=###ROOT###/tmp/nagios CFG_FILE=###ROOT###/tmp/nagios/nagios.cfg -STATUS_FILE=###ROOT###/tmp/nagios/status.dat CMD_FILE=###ROOT###/tmp/run/nagios.cmd PID_FILE=###ROOT###/tmp/lock/nagios.lock -STATUS_DAT=###ROOT###/tmp/nagios/status.dat CHECKRESULTS_DIR=###ROOT###/tmp/nagios/checkresults USR=###SITE### GRP=###SITE### @@ -68,6 +67,11 @@ export CONFIG_MKEVENTD # OMD: create configuration file out of fragments case "$1" in start|restart|reload|checkconfig|check) + if [ ! -d "$TMP_DIR" ]; then + echo "ERROR: tmp directory is not ready. Use \"omd start\" to prepare it" + exit 1 + fi + merge-nagios-config \ ###ROOT###/etc/nagios/nagios.d/*.cfg \ ###ROOT###/etc/nagios/nagios.cfg \

5 years, 10 months

Nuked log_file global variable.

by Sven Panne

Module: check_mk Branch: master Commit: dd66975113da054d40a1fd2cb5262a780f9d3e79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd66975113da05… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 30 16:43:13 2018 +0200 Nuked log_file global variable. Note that for the NEB we still use Nagios' own log_file global variable, because there is no other API for it. Change-Id: I0662768be68feee005fcc6846381e7ecae486111 --- livestatus/src/LogCache.cc | 8 +++----- livestatus/src/MonitoringCore.h | 1 + livestatus/src/module.cc | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 8a0ce98..ec0358a 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -36,9 +36,6 @@ namespace { constexpr unsigned long check_mem_cycle = 1000; } // namespace -// watch nagios' logfile rotation -extern char *log_file; - int num_cached_log_messages = 0; LogCache::LogCache(MonitoringCore *mc, unsigned long max_cached_messages) @@ -66,7 +63,8 @@ bool LogCache::logCachePreChecks() { updateLogfileIndex(); } if (_logfiles.empty()) { - Notice(logger()) << "no log file found, not even " << log_file; + Notice(logger()) << "no log file found, not even " + << _mc->historyFilePath(); } return !_logfiles.empty(); } @@ -82,7 +80,7 @@ void LogCache::updateLogfileIndex() { _last_index_update = std::chrono::system_clock::now(); // We need to find all relevant logfiles. This includes directory, the // current nagios.log and all files in the archive. - scanLogfile(log_file, true); + scanLogfile(_mc->historyFilePath(), true); fs::path dirpath = _mc->logArchivePath(); try { diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 8ed4e80..2656884 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -100,6 +100,7 @@ public: virtual std::string mkInventoryPath() = 0; virtual std::string structuredStatusPath() = 0; virtual std::string pnpPath() = 0; + virtual std::string historyFilePath() = 0; virtual std::string logArchivePath() = 0; virtual Encoding dataEncoding() = 0; virtual size_t maxResponseSize() = 0; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index afe5e8c..ef72d05 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -652,6 +652,7 @@ public: return fl_structured_status_path; } std::string pnpPath() override { return fl_pnp_path; } + std::string historyFilePath() override { return log_file; } std::string logArchivePath() override { extern char *log_archive_path; return log_archive_path;

5 years, 10 months

Cleaned up LogCache header.

by Sven Panne

Module: check_mk Branch: master Commit: 376b988be181506bf97d91e77f23feb8b8ea864a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=376b988be18150… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 30 16:00:26 2018 +0200 Cleaned up LogCache header. Removed dead code. Reordered fields/methods. Change-Id: I67ee8788cd9a10901a4768f4b3133768ed7e7dfa --- livestatus/src/LogCache.h | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 546a132..5044512 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -32,7 +32,6 @@ #include <memory> #include <mutex> #include "FileSystem.h" -class Column; class Logfile; class Logger; class MonitoringCore; @@ -40,11 +39,6 @@ class MonitoringCore; using logfiles_t = std::map<time_t, std::unique_ptr<Logfile>>; class LogCache { - MonitoringCore *_mc; - unsigned long _max_cached_messages; - unsigned long _num_at_last_check; - logfiles_t _logfiles; - public: std::mutex _lock; @@ -52,23 +46,21 @@ public: #ifdef CMC void setMaxCachedMessages(unsigned long m); #endif - std::chrono::system_clock::time_point _last_index_update; - - const char *name() { return "log"; } - const char *namePrefix() { return "logs"; } void handleNewMessage(Logfile *logfile, time_t since, time_t until, unsigned logclasses); - Column *column( - const char *colname); // override in order to handle current_ logfiles_t *logfiles() { return &_logfiles; }; void forgetLogfiles(); void updateLogfileIndex(); - bool logCachePreChecks(); private: + MonitoringCore *const _mc; + unsigned long _max_cached_messages; + unsigned long _num_at_last_check; + logfiles_t _logfiles; + std::chrono::system_clock::time_point _last_index_update; + void scanLogfile(const fs::path &path, bool watch); - logfiles_t::iterator findLogfileStartingBefore(time_t); Logger *logger() const; };

5 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2018