Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4418 FIX check_form_submit: Use Content-Type sent by server to decode the content

by Lars Michelsen

Module: check_mk Branch: master Commit: 89939a84fcaf46bc582ad9a8271641b47823e421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89939a84fcaf46… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 28 15:56:00 2017 +0100 4418 FIX check_form_submit: Use Content-Type sent by server to decode the content Change-Id: I5e95a006bea3f29bd6760e38cf3be2acf51eed8d --- .werks/4418 | 11 +++++++++++ active_checks/check_form_submit | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/.werks/4418 b/.werks/4418 new file mode 100644 index 0000000..ad8dd34 --- /dev/null +++ b/.werks/4418 @@ -0,0 +1,11 @@ +Title: check_form_submit: Use Content-Type sent by server to decode the content +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488293718 + + diff --git a/active_checks/check_form_submit b/active_checks/check_form_submit index ced4049..5ccf732 100755 --- a/active_checks/check_form_submit +++ b/active_checks/check_form_submit @@ -208,6 +208,10 @@ def open_url(url, method = 'GET', data = None): code = fd.getcode() content = fd.read() + encoding = fd.headers.getparam('charset') + if encoding: + content = content.decode(encoding) + debug('CODE: %s RESPONSE:' % code) debug('\n'.join([ ' %02d %s' % (index + 1, line) for index, line in enumerate(content.split('\n')) ])) return code, real_url, content

7 years, 4 months

4420 FIX Cleaning up signatures of unused packages now

by Lars Michelsen

Module: check_mk Branch: master Commit: 029512b3a27c725ad3fb0211d69f9153727fa869 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=029512b3a27c72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 28 16:19:16 2017 +0100 4420 FIX Cleaning up signatures of unused packages now The signatures of old agents (packages that are not needed by any host) were not deleted from the var/check_mk/agents/*/_PACKAGES directories while the packages and config files were deleted. This had the effect that when you change a agent package relevant configuration, bake the agent, change the value back and bake the agent with the same config, the agent will already be signed without the need manually sign it again. This was possible when the former signed config is exactly the same as the new one. Change-Id: I6233f24fa95e157095a729b0eaa698db46f741df --- .werks/4420 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/4420 b/.werks/4420 new file mode 100644 index 0000000..63631b5 --- /dev/null +++ b/.werks/4420 @@ -0,0 +1,16 @@ +Title: Cleaning up signatures of unused packages now +Level: 1 +Component: metrics +Compatible: compat +Version: 1.4.0b4 +Edition: cee +Date: 1488294733 +Class: fix + +The signatures of old agents (packages that are not needed by any host) were not +deleted from the var/check_mk/agents/*/_PACKAGES directories while the packages +and config files were deleted. + +This had the effect that when you change a agent package relevant configuration, +bake the agent, change the value back and bake the agent with the same config, +the agent will already be signed without the need manually sign it again. This

7 years, 4 months

4416 FIX check_form_submit: added documented but missing --help argument

by Lars Michelsen

Module: check_mk Branch: master Commit: e05356cff58d3018cdc7a2b60c66b4d84a817c14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e05356cff58d30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 28 15:48:55 2017 +0100 4416 FIX check_form_submit: added documented but missing --help argument Change-Id: Id7f11547d639b2ff2f4ad8d33af4cedc1aec8f11 --- .werks/4416 | 11 +++++++++++ active_checks/check_form_submit | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4416 b/.werks/4416 new file mode 100644 index 0000000..5ef1f18 --- /dev/null +++ b/.werks/4416 @@ -0,0 +1,11 @@ +Title: check_form_submit: added documented but missing --help argument +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488293307 + + diff --git a/active_checks/check_form_submit b/active_checks/check_form_submit index 3b27a73..66280cf 100755 --- a/active_checks/check_form_submit +++ b/active_checks/check_form_submit @@ -78,9 +78,10 @@ OPTIONS: """) short_options = 'I:u:p:H:f:q:e:t:n:sd' +long_options = [ "help" ] try: - opts, args = getopt.getopt(sys.argv[1:], short_options) + opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) except getopt.GetoptError, err: sys.stderr.write("%s\n" % err) sys.exit(1) @@ -100,7 +101,7 @@ num_warn = None num_crit = None for o,a in opts: - if o == '-h': + if o in [ '-h', '--help' ]: usage() sys.exit(0) elif o == '-I':

7 years, 4 months

Make clang-tidy happy again.

by Sven Panne

Module: check_mk Branch: master Commit: 9d4df469f3b73fe1d5ae36e75999d26cfd104d52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d4df469f3b73f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 28 16:10:19 2017 +0100 Make clang-tidy happy again. Change-Id: I1672f03fc7ecd2861c6783024c79171a898eef84 --- livestatus/src/Logfile.cc | 4 ++-- livestatus/src/Logfile.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index c28af1a..2d96fde 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -53,9 +53,9 @@ using std::vector; extern unsigned long g_max_lines_per_logfile; Logfile::Logfile(Logger *logger, const CommandsHolder &commands_holder, - const fs::path &path, bool watch) + fs::path path, bool watch) : _commands_holder(commands_holder) - , _path(path) + , _path(std::move(path)) , _since(0) , _watch(watch) , _read_pos{} diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 9f168d0..d1761e7 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -64,7 +64,7 @@ private: public: Logfile(Logger *logger, const CommandsHolder &commands_holder, - const fs::path &path, bool watch); + fs::path path, bool watch); ~Logfile(); std::string path() { return _path; }

7 years, 4 months

4417 FIX check_form_submit: Fixed GET method "item is not defined" issue

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e169c1a769715d53d2ebb5edde706079a5b8d94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e169c1a769715… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 28 15:51:14 2017 +0100 4417 FIX check_form_submit: Fixed GET method "item is not defined" issue Change-Id: Iaddae1962bf8bbfefd087a329e12b20f88d54f35 --- .werks/4417 | 11 +++++++++++ active_checks/check_form_submit | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4417 b/.werks/4417 new file mode 100644 index 0000000..951cc7f --- /dev/null +++ b/.werks/4417 @@ -0,0 +1,11 @@ +Title: check_form_submit: Fixed GET method "item is not defined" issue +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488293456 + + diff --git a/active_checks/check_form_submit b/active_checks/check_form_submit index 66280cf..ced4049 100755 --- a/active_checks/check_form_submit +++ b/active_checks/check_form_submit @@ -186,7 +186,7 @@ def open_url(url, method = 'GET', data = None): if method == 'GET' and data is not None: # Add the query string to the url in this case start = '?' in url and '&' or '?' - url += start + '&'.join([ '='.join(item) for item in data.items() ]) + url += start + urllib.urlencode(data) data = None try:

7 years, 4 months

4419 FIX check_form_submit: Deal with forms that provide the method as lower case string

by Lars Michelsen

Module: check_mk Branch: master Commit: daee9c58a39f1c73bb27f05f8081cc062b7b5189 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daee9c58a39f1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 28 15:57:04 2017 +0100 4419 FIX check_form_submit: Deal with forms that provide the method as lower case string Change-Id: Iffb9b90ee36eb5c3871c3cfb1d0c9b1e9234be8c --- .werks/4419 | 10 ++++++++++ active_checks/check_form_submit | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4419 b/.werks/4419 new file mode 100644 index 0000000..a2c5659 --- /dev/null +++ b/.werks/4419 @@ -0,0 +1,10 @@ +Title: check_form_submit: Deal with forms that provide the method as lower case string +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488293801 +Class: fix + + diff --git a/active_checks/check_form_submit b/active_checks/check_form_submit index 5ccf732..51d61fa 100755 --- a/active_checks/check_form_submit +++ b/active_checks/check_form_submit @@ -302,7 +302,7 @@ try: # Issue a HTTP request with those parameters # Extract the form target and method - method = form['attrs'].get('method', 'GET') + method = form['attrs'].get('method', 'GET').upper() target = form['attrs'].get('action', real_url) if target[0] == '/': # target is given as absolute path, relative to hostname

7 years, 4 months

4451 FIX BI Aggregations: fixed redundant read of cached data,

by Andreas Boesl

slowing down GUI Message-ID: <58b5953b.NVSY3saAERmJVZjm%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: d3adfd9a1925da29f4e4d1b0c7554c27f6514e10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3adfd9a1925da… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 28 16:15:05 2017 +0100 4451 FIX BI Aggregations: fixed redundant read of cached data, slowing down GUI Change-Id: I63a17f6446c44f719f29940e013e16ac5fb31c26 --- .werks/4451 | 10 ++++++++++ web/htdocs/bi.py | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4451 b/.werks/4451 new file mode 100644 index 0000000..f9ed9b9 --- /dev/null +++ b/.werks/4451 @@ -0,0 +1,10 @@ +Title: BI Aggregations: fixed redundant read of cached data, slowing down GUI +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488294834 +Class: fix + + diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index f2d247b..6a69ef2 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -492,6 +492,8 @@ class BICacheFile(object): def __init__(self, **kwargs): self._filepath = kwargs.get("filepath") self._cached_data = None + + # Timestamp of the last/read write operation self._filetime = None try: @@ -505,7 +507,7 @@ class BICacheFile(object): def clear_cache(self): log("Clearing caches %s" % self._filepath) self._cached_data = None - self._filetime = None + def get_filepath(self): return self._filepath

7 years, 4 months

More std::filesystem goodness.

by Sven Panne

Module: check_mk Branch: master Commit: c9941ea6f2a8e40f5c5c2d22cfa2b4547be83222 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9941ea6f2a8e4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 28 16:06:22 2017 +0100 More std::filesystem goodness. Change-Id: I5dfc6a857e5b1eb7ff4e3559f1bf03ede172a6b8 --- livestatus/src/pnp4nagios.cc | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index c90d6c1..b0c77a8 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -22,12 +22,13 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// IWYU pragma: no_include <experimental/bits/fs_ops.h> +// IWYU pragma: no_include <experimental/fs_ops.h> #include "pnp4nagios.h" #include <cstddef> -#ifdef CMC -#include <sys/stat.h> -#else -#include <unistd.h> +#include <system_error> +#ifndef CMC +#include "FileSystem.h" #endif using std::string; @@ -54,34 +55,33 @@ string pnp_cleanup(const string& name) { } #ifndef CMC +// TODO(sp) Merge this with Perfdatabase::getPNPXMLPath int pnpgraph_present(const string& host, const string& service) { - string pnp_path(g_pnp_path); + fs::path pnp_path = g_pnp_path; if (pnp_path.empty()) { return -1; } - string path(pnp_path.append(pnp_cleanup(host)) - .append("/") - .append(pnp_cleanup(service)) - .append(".xml")); - return access(path.c_str(), R_OK) == 0 ? 1 : 0; + fs::path path = + pnp_path / pnp_cleanup(host) / (pnp_cleanup(service) + ".xml"); + std::error_code ec; + fs::status(path, ec); + return ec ? 0 : 1; } #endif #ifdef CMC +// TODO(sp) Merge this with Perfdatabase::getPNPRRDPath fs::path rrd_path(const string& host, const string& service, const string& varname) { - string pnp_path(g_pnp_path); + fs::path pnp_path = g_pnp_path; if (pnp_path.empty()) { return ""; } - string path(pnp_path.append("/") - .append(pnp_cleanup(host)) - .append("/") - .append(pnp_cleanup(service)) - .append("_") - .append(pnp_cleanup(varname)) - .append(".rrd")); - struct stat st; - return stat(path.c_str(), &st) == 0 ? path : ""; + fs::path path = + pnp_path / pnp_cleanup(host) / + (pnp_cleanup(service) + "_" + pnp_cleanup(varname) + ".rrd"); + std::error_code ec; + fs::status(path, ec); + return ec ? "" : path; } #endif

7 years, 4 months

4439 statgrab: added uptime into plugin

by Marcel Arentz

Module: check_mk Branch: master Commit: b06e6fda0b59e4c3d97a1f2c2681d9cafc6070f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b06e6fda0b59e4… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Feb 28 09:32:42 2017 +0100 4439 statgrab: added uptime into plugin Added uptime section to statgrab plugin so HP-UX Hosts are now reporting this section. You need to have the hpux_statgrab plugin installed to profit from this update. Change-Id: Id2544be3ab581b7392eed2022f0fc0501e6fd938 --- .werks/4439 | 12 ++++++++++++ agents/plugins/hpux_statgrab | 3 +++ 2 files changed, 15 insertions(+) diff --git a/.werks/4439 b/.werks/4439 new file mode 100644 index 0000000..9df0a3f --- /dev/null +++ b/.werks/4439 @@ -0,0 +1,12 @@ +Title: statgrab: added uptime into plugin +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488270599 +Class: feature + +Added uptime section to statgrab plugin so HP-UX Hosts are now reporting +this section. You need to have the hpux_statgrab plugin installed to profit +from this update. diff --git a/agents/plugins/hpux_statgrab b/agents/plugins/hpux_statgrab index 3f47a6f..c592ff1 100755 --- a/agents/plugins/hpux_statgrab +++ b/agents/plugins/hpux_statgrab @@ -41,6 +41,9 @@ if which statgrab > /dev/null ; then echo '<<<statgrab_mem>>>' cat /tmp/statgrab.$$ | egrep "^(swap|mem)\." | sed 's/ *= */ /' + echo '<<<uptime>>>' + cat /tmp/statgrab.$$ | egrep "^general\.uptime" | sed 's/.* //' + fi [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ fi

7 years, 4 months

Use fs::directory_iterator instead of home-grown code.

by Sven Panne

Module: check_mk Branch: master Commit: aa3df7b74c875eac0546f92accc46ed77ccef5c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa3df7b74c875e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 28 15:14:29 2017 +0100 Use fs::directory_iterator instead of home-grown code. Change-Id: I8b481064917fad09daca110fd4da270cfe4efd6a --- livestatus/src/LogCache.cc | 35 ++++++++--------------------------- livestatus/src/LogCache.h | 4 ++-- livestatus/src/Logfile.cc | 16 ++++++++-------- livestatus/src/Logfile.h | 5 +++-- livestatus/src/LogwatchListColumn.cc | 26 +++++++++++--------------- 5 files changed, 32 insertions(+), 54 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 7a22b5c..a59b6fb 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -23,9 +23,7 @@ // Boston, MA 02110-1301 USA. #include "LogCache.h" -#include <dirent.h> -#include <cerrno> -#include <ostream> +#include <sstream> #include <string> #include <utility> #include "Logfile.h" @@ -97,34 +95,17 @@ void LogCache::updateLogfileIndex() { scanLogfile(log_file, true); // TODO(sp) Avoid global variable - string dirpath = log_archive_path; - DIR *dir = opendir(dirpath.c_str()); - if (dir == nullptr) { - generic_error ge("cannot open log archive " + dirpath); - Informational(_logger) << ge; - return; - } - - while (true) { - errno = 0; - dirent *ent = readdir(dir); - if (ent == nullptr) { - if (errno != 0) { - generic_error ge("cannot read directory entry from " + dirpath); - Warning(_logger) << ge; - } - break; - } - string name = ent->d_name; - if (name != "." && name != "..") { - scanLogfile(dirpath + "/" + ent->d_name, false); + fs::path dirpath = log_archive_path; + try { + for (const auto &entry : fs::directory_iterator(dirpath)) { + scanLogfile(dirpath / entry.path(), false); } + } catch (const fs::filesystem_error &e) { + Warning(_logger) << "error while iterating directory: " << e.what(); } - - closedir(dir); } -void LogCache::scanLogfile(const string &path, bool watch) { +void LogCache::scanLogfile(const fs::path &path, bool watch) { auto logfile = new Logfile(_logger, _commands_holder, path, watch); time_t since = logfile->since(); if (since != 0) { diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index cdfcbcb..d96ffe9 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -30,7 +30,7 @@ #include <ctime> #include <map> #include <mutex> -#include <string> +#include "FileSystem.h" #include "nagios.h" // IWYU pragma: keep class Column; class CommandsHolder; @@ -71,7 +71,7 @@ public: bool logCachePreChecks(MonitoringCore *core); private: - void scanLogfile(const std::string &path, bool watch); + void scanLogfile(const fs::path &path, bool watch); _logfiles_t::iterator findLogfileStartingBefore(time_t); }; diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 9bedbf9..c28af1a 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -26,7 +26,7 @@ #include "Logfile.h" #include <fcntl.h> #include <cstdlib> -#include <fstream> +#include <sstream> #include <utility> #include "LogCache.h" #include "LogEntry.h" @@ -53,9 +53,9 @@ using std::vector; extern unsigned long g_max_lines_per_logfile; Logfile::Logfile(Logger *logger, const CommandsHolder &commands_holder, - string path, bool watch) + const fs::path &path, bool watch) : _commands_holder(commands_holder) - , _path(move(path)) + , _path(path) , _since(0) , _watch(watch) , _read_pos{} @@ -67,7 +67,7 @@ Logfile::Logfile(Logger *logger, const CommandsHolder &commands_holder, , _logclasses_read(0) { ifstream is(_path, ios::binary); if (!is) { - generic_error ge("cannot open logfile " + _path); + generic_error ge("cannot open logfile " + _path.string()); Informational(_logger) << ge; return; } @@ -144,7 +144,7 @@ void Logfile::load(LogCache *logcache, time_t since, time_t until, file = fopen(_path.c_str(), "r"); if (file == nullptr) { - generic_error ge("cannot open logfile " + _path); + generic_error ge("cannot open logfile " + _path.string()); Informational(_logger) << ge; return; } @@ -288,7 +288,7 @@ unique_ptr<vector<char>> Logfile::readIntoBuffer() { unique_ptr<vector<char>> result; ifstream is(_path, ios::binary | ios::ate); if (!is) { - generic_error ge("cannot open logfile " + _path); + generic_error ge("cannot open logfile " + _path.string()); Warning(_logger) << ge; return result; } @@ -296,7 +296,7 @@ unique_ptr<vector<char>> Logfile::readIntoBuffer() { auto end = is.tellg(); is.seekg(0, ios::beg); if (!is) { - generic_error ge("cannot determine size of " + _path); + generic_error ge("cannot determine size of " + _path.string()); Warning(_logger) << ge; return result; } @@ -314,7 +314,7 @@ unique_ptr<vector<char>> Logfile::readIntoBuffer() { is.read(&result->front() + 1, size); if (!is) { generic_error ge("cannot open read " + to_string(size) + - " byted from " + _path); + " byted from " + _path.string()); Warning(_logger) << ge; } diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index fc2aebb..9f168d0 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -31,6 +31,7 @@ #include <ctime> #include <map> #include <string> +#include "FileSystem.h" class CommandsHolder; class LogCache; class Query; @@ -49,7 +50,7 @@ typedef std::map<uint64_t, LogEntry *> class Logfile { private: const CommandsHolder &_commands_holder; - std::string _path; + 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 @@ -63,7 +64,7 @@ private: public: Logfile(Logger *logger, const CommandsHolder &commands_holder, - std::string path, bool watch); + const fs::path &path, bool watch); ~Logfile(); std::string path() { return _path; } diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index 90f51ac..fbf08b0 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -23,7 +23,9 @@ // Boston, MA 02110-1301 USA. #include "LogwatchListColumn.h" -#include <dirent.h> +#include <ostream> +#include "FileSystem.h" +#include "Logger.h" #include "Renderer.h" #include "pnp4nagios.h" @@ -50,21 +52,15 @@ void LogwatchListColumn::output(void *row, RowRenderer &r, #endif ListRenderer l(r); - if (_logwatch_path.empty()) { - return; - } - string path = _logwatch_path + pnp_cleanup(host_name); - if (DIR *dir = opendir(path.c_str())) { - while (true) { - if (dirent *ent = readdir(dir)) { - string name = ent->d_name; - if (name != "." && name != "..") { - l.output(name); - } - } else { - break; + if (!_logwatch_path.empty()) { + try { + for (const auto &entry : fs::directory_iterator( + _logwatch_path + pnp_cleanup(host_name))) { + l.output(entry.path().string()); } + } catch (const fs::filesystem_error &e) { + Warning(logger()) << "error while iterating directory: " + << e.what(); } - closedir(dir); } }

7 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017