Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Use std::filesystem a bit more, simplifying things.

by Sven Panne

Module: check_mk Branch: master Commit: 068974e1c09dc73595aef5643f6c9441f573343a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=068974e1c09dc7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 15:45:43 2019 +0200 Use std::filesystem a bit more, simplifying things. Change-Id: I2a96a3564783bfa9e5c0f3504371149e23e95a3a --- livestatus/src/LogwatchListColumn.cc | 6 +++--- livestatus/src/LogwatchListColumn.h | 3 ++- livestatus/src/mk_logwatch.cc | 9 +++++---- livestatus/src/mk_logwatch.h | 3 ++- livestatus/src/module.cc | 12 ------------ 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index b3ab6b3..11710d4 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -62,12 +62,12 @@ std::vector<std::string> LogwatchListColumn::getValue( return {}; } -std::string LogwatchListColumn::getDirectory(Row row) const { +fs::path LogwatchListColumn::getDirectory(Row row) const { auto logwatch_path = _mc->mkLogwatchPath(); auto host_name = getHostName(row); return logwatch_path.empty() || host_name.empty() - ? "" - : logwatch_path + pnp_cleanup(host_name); + ? fs::path() + : fs::path(logwatch_path) / pnp_cleanup(host_name); } std::string LogwatchListColumn::getHostName(Row row) const { diff --git a/livestatus/src/LogwatchListColumn.h b/livestatus/src/LogwatchListColumn.h index e090d04..b640c93 100644 --- a/livestatus/src/LogwatchListColumn.h +++ b/livestatus/src/LogwatchListColumn.h @@ -29,6 +29,7 @@ #include <chrono> #include <string> #include <vector> +#include "FileSystem.h" #include "ListColumn.h" #include "contact_fwd.h" class MonitoringCore; @@ -50,7 +51,7 @@ public: private: MonitoringCore *_mc; - std::string getDirectory(Row row) const; + fs::path getDirectory(Row row) const; std::string getHostName(Row row) const; }; diff --git a/livestatus/src/mk_logwatch.cc b/livestatus/src/mk_logwatch.cc index dc23876..ba315c3 100644 --- a/livestatus/src/mk_logwatch.cc +++ b/livestatus/src/mk_logwatch.cc @@ -23,12 +23,12 @@ // Boston, MA 02110-1301 USA. #include "mk_logwatch.h" -#include <unistd.h> #include <ostream> +#include <system_error> #include "Logger.h" #include "pnp4nagios.h" -void mk_logwatch_acknowledge(Logger *logger, const std::string &logwatch_path, +void mk_logwatch_acknowledge(Logger *logger, const fs::path &logwatch_path, const std::string &host_name, const std::string &file_name) { if (file_name.find('/') != std::string::npos) { @@ -39,8 +39,9 @@ void mk_logwatch_acknowledge(Logger *logger, const std::string &logwatch_path, if (logwatch_path.empty()) { return; } - std::string path = logwatch_path + pnp_cleanup(host_name) + "/" + file_name; - if (unlink(path.c_str()) != 0) { + auto path = fs::path(logwatch_path) / pnp_cleanup(host_name) / file_name; + std::error_code ec; + if (!fs::remove(path, ec)) { generic_error ge("Cannot acknowledge mk_logfile file '" + file_name + "' of host '" + host_name + "'"); Warning(logger) << ge; diff --git a/livestatus/src/mk_logwatch.h b/livestatus/src/mk_logwatch.h index b373911..164643e 100644 --- a/livestatus/src/mk_logwatch.h +++ b/livestatus/src/mk_logwatch.h @@ -27,9 +27,10 @@ #include "config.h" // IWYU pragma: keep #include <string> +#include "FileSystem.h" class Logger; -void mk_logwatch_acknowledge(Logger *logger, const std::string &logwatch_path, +void mk_logwatch_acknowledge(Logger *logger, const fs::path &logwatch_path, const std::string &host_name, const std::string &file_name); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 6fb25fe..b8d53b2 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -1121,29 +1121,17 @@ void livestatus_parse_arguments(const char *args_orig) { } } else if (strcmp(left, "pnp_path") == 0) { fl_paths._pnp_path = right; - if (right[strlen(right) - 1] != '/') { - fl_paths._pnp_path += "/"; - } check_path("PNP perfdata directory", fl_paths._pnp_path); } else if (strcmp(left, "mk_inventory_path") == 0) { fl_paths._mk_inventory_path = right; - if (right[strlen(right) - 1] != '/') { - fl_paths._mk_inventory_path += "/"; - } check_path("Check_MK Inventory directory", fl_paths._mk_inventory_path); } else if (strcmp(left, "structured_status_path") == 0) { fl_paths._structured_status_path = right; - if (right[strlen(right) - 1] != '/') { - fl_paths._structured_status_path += "/"; - } check_path("Check_MK structured status directory", fl_paths._structured_status_path); } else if (strcmp(left, "mk_logwatch_path") == 0) { fl_paths._mk_logwatch_path = right; - if (right[strlen(right) - 1] != '/') { - fl_paths._mk_logwatch_path += "/"; - } check_path("Check_MK logwatch directory", fl_paths._mk_logwatch_path); } else if (strcmp(left, "data_encoding") == 0) {

5 years, 6 months

alcatel_*_aos7: Add info about supported devices and operating systems

by Florian Kromer

Module: check_mk Branch: master Commit: 34e79bdbd3d18b9dbcfc92462f80f6a7a1ad5bcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34e79bdbd3d18b… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Apr 8 15:58:50 2019 +0200 alcatel_*_aos7: Add info about supported devices and operating systems Change-Id: I9e24eea6fc85cd5be46218d3776490cfdcf93d9c --- checkman/alcatel_cpu_aos7 | 15 ++++++++++++--- checkman/alcatel_fans_aos7 | 15 ++++++++++++--- checkman/alcatel_power_aos7 | 26 ++++++++++++++++++-------- checkman/alcatel_temp_aos7 | 12 +++++++++++- 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/checkman/alcatel_cpu_aos7 b/checkman/alcatel_cpu_aos7 index e79d8cf..8a1c5aa 100644 --- a/checkman/alcatel_cpu_aos7 +++ b/checkman/alcatel_cpu_aos7 @@ -5,9 +5,18 @@ license: GPL distribution: check_mk description: - This Check Monitors the CPU utilization on new Alcatel switches running at least AOS7 supporting - the ALCATEL-IND1-HEALTH-MIB (version for >=AOS7). The value is a average in percent over the - last hour. This average is calculated by the device. + This check monitors the CPU utilization of the following Alcatel switches + running the specified operating system release versions: + + - OmniSwitch 6860E-P48: AOS 8.2.1.351.R01 Service Release + + - OmniSwitch 6900-X20: AOS 7.3.4.310.R02 Service Release + + - OmniSwitch 6900-T40: AOS 8.4.1.233.R02 Service Release + + - OmniSwitch 10K: AOS 8.3.1.377.R01 Service Release + + The value is a average in percent over the last hour. This average is calculated by the device. inventory: One check is created diff --git a/checkman/alcatel_fans_aos7 b/checkman/alcatel_fans_aos7 index e9ee994..ccf0d52 100644 --- a/checkman/alcatel_fans_aos7 +++ b/checkman/alcatel_fans_aos7 @@ -5,9 +5,18 @@ license: GPL distribution: check_mk description: - This Check Monitors all Fans on new Alcatel switches running at least AOS7 supporting - the ALCATEL-IND1-CHASSIS-MIB (version for >=AOS7). The status is automaticly reported - by the device, so no configuration is needed. + This check monitors all fans of the following Alcatel switches + running the specified operating system release versions: + + - OmniSwitch 6860E-P48: AOS 8.2.1.351.R01 Service Release + + - OmniSwitch 6900-X20: AOS 7.3.4.310.R02 Service Release + + - OmniSwitch 6900-T40: AOS 8.4.1.233.R02 Service Release + + - OmniSwitch 10K: AOS 8.3.1.377.R01 Service Release + + The status is automaticly reported by the device, so no configuration is needed. inventory: One check is created diff --git a/checkman/alcatel_power_aos7 b/checkman/alcatel_power_aos7 index 4d67a47..4220b35 100644 --- a/checkman/alcatel_power_aos7 +++ b/checkman/alcatel_power_aos7 @@ -4,20 +4,30 @@ catalog: hw/network/alcatel license: GPL distribution: check_mk description: - This check monitors the status of power supplies in Alcatel switches running - operating system AOS7 or higher. Please consider that this check does not - behave like {alcatel_power} for Alcatel switches running operating system - AOS6 or lower. + This check monitors the status of power supplies in the following Alcatel + switches running the specified operating system release versions: + + - OmniSwitch 6860E-P48: AOS 8.2.1.351.R01 Service Release + + - OmniSwitch 6900-X20: AOS 7.3.4.310.R02 Service Release + + - OmniSwitch 6900-T40: AOS 8.4.1.233.R02 Service Release + + - OmniSwitch 10K: AOS 8.3.1.377.R01 Service Release Check status: + - {OK} in case the monitored value is one of: - up, master + {up}, {master} + - {WARN} in case the monitored value is one of: - testing, secondary, idle, pwrsave + {testing}, {secondary}, {idle}, {pwrsave} + - {CRIT} in case the monitored value is one of: - down, unpowered + {down}, {unpowered} + - {UNKNOWN} in case the monitored value is one of: - unknown + {unknown} item: The ID of the power supply as output from the SNMP agent. diff --git a/checkman/alcatel_temp_aos7 b/checkman/alcatel_temp_aos7 index 5f1240f..90f80e7 100644 --- a/checkman/alcatel_temp_aos7 +++ b/checkman/alcatel_temp_aos7 @@ -4,7 +4,17 @@ catalog: hw/network/alcatel license: GPL distribution: check_mk description: - This check monitors board temperatures on Alcatel switches running + This check monitors board temperatures of the following Alcatel switches + running the specified operating system release versions: + + - OmniSwitch 6860E-P48: AOS 8.2.1.351.R01 Service Release + + - OmniSwitch 6900-X20: AOS 7.3.4.310.R02 Service Release + + - OmniSwitch 6900-T40: AOS 8.4.1.233.R02 Service Release + + - OmniSwitch 10K: AOS 8.3.1.377.R01 Service Release + operating system AOS7 or higher and supporting the ALCATEL-IND1-CHASSIS-MIB (version for >=AOS7). Considered board temperatures are control module boards (CPMA and CPMB), fabric boards (CFMA, CFMB, CFMC and CMFD), fantrays 1 und 2

5 years, 6 months

Replace plain C strings with C++ strings in a few places.

by Sven Panne

Module: check_mk Branch: master Commit: 03ac8272180d3becc138a4c05b7f356b68bb06a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03ac8272180d3b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 15:25:25 2019 +0200 Replace plain C strings with C++ strings in a few places. Actually these are paths, but this is a step into the right direction... Change-Id: Id85caa9e18339cc6b30d41e7d1eb51e38dc2a5dd --- livestatus/src/module.cc | 62 ++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 41 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index f1f1e65..6fb25fe 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -98,10 +98,10 @@ int g_max_fd_ever = 0; struct NagiosPaths { std::string _socket_path; - char _pnp_path[4096]; - char _mk_inventory_path[4096]; - char _structured_status_path[4096]; - char _mk_logwatch_path[4096]; + std::string _pnp_path; + std::string _mk_inventory_path; + std::string _structured_status_path; + std::string _mk_logwatch_path; std::string _logfile_path; std::string _mkeventd_socket_path; }; @@ -984,18 +984,17 @@ void deregister_callbacks() { neb_deregister_callback(NEBCALLBACK_TIMED_EVENT_DATA, broker_event); } -void check_path(const char *name, char *path) { +void check_path(const std::string &name, std::string &path) { struct stat st; - if (0 == stat(path, &st)) { - if (0 != access(path, R_OK)) { - Error(fl_logger_nagios) - << name << " '" << path - << "' not readable, please fix permissions."; - path[0] = 0; // disable - } - } else { + if (stat(path.c_str(), &st) != 0) { Error(fl_logger_nagios) << name << " '" << path << "' not existing!"; - path[0] = 0; // disable + path.clear(); // disable + return; + } + if (access(path.c_str(), R_OK) != 0) { + Error(fl_logger_nagios) << name << " '" << path + << "' not readable, please fix permissions."; + path.clear(); // disable } } @@ -1011,9 +1010,6 @@ void livestatus_parse_arguments(const char *args_orig) { fl_paths._mkeventd_socket_path = ""; - /* there is no default PNP path */ - fl_paths._pnp_path[0] = 0; - if (args_orig == nullptr) { return; // no arguments, use default options } @@ -1124,45 +1120,29 @@ void livestatus_parse_arguments(const char *args_orig) { "allowed are strict and loose"; } } else if (strcmp(left, "pnp_path") == 0) { - strncpy(fl_paths._pnp_path, right, - sizeof(fl_paths._pnp_path) - 1); - // make sure, that trailing slash is always there + fl_paths._pnp_path = right; if (right[strlen(right) - 1] != '/') { - strncat(fl_paths._pnp_path, "/", - sizeof(fl_paths._pnp_path) - - strlen(fl_paths._pnp_path) - 1); + fl_paths._pnp_path += "/"; } check_path("PNP perfdata directory", fl_paths._pnp_path); } else if (strcmp(left, "mk_inventory_path") == 0) { - strncpy(fl_paths._mk_inventory_path, right, - sizeof(fl_paths._mk_inventory_path) - 1); + fl_paths._mk_inventory_path = right; if (right[strlen(right) - 1] != '/') { - strncat(fl_paths._mk_inventory_path, "/", - sizeof(fl_paths._mk_inventory_path) - - strlen(fl_paths._mk_inventory_path) - - 1); // make sure, that trailing slash is there + fl_paths._mk_inventory_path += "/"; } check_path("Check_MK Inventory directory", fl_paths._mk_inventory_path); } else if (strcmp(left, "structured_status_path") == 0) { - strncpy(fl_paths._structured_status_path, right, - sizeof(fl_paths._structured_status_path) - 1); + fl_paths._structured_status_path = right; if (right[strlen(right) - 1] != '/') { - strncat(fl_paths._structured_status_path, "/", - sizeof(fl_paths._structured_status_path) - - strlen(fl_paths._structured_status_path) - - 1); // make sure, that trailing slash is there + fl_paths._structured_status_path += "/"; } check_path("Check_MK structured status directory", fl_paths._structured_status_path); } else if (strcmp(left, "mk_logwatch_path") == 0) { - strncpy(fl_paths._mk_logwatch_path, right, - sizeof(fl_paths._mk_logwatch_path) - 1); + fl_paths._mk_logwatch_path = right; if (right[strlen(right) - 1] != '/') { - strncat(fl_paths._mk_logwatch_path, "/", - sizeof(fl_paths._mk_logwatch_path) - - strlen(fl_paths._mk_logwatch_path) - - 1); // make sure, that trailing slash is there + fl_paths._mk_logwatch_path += "/"; } check_path("Check_MK logwatch directory", fl_paths._mk_logwatch_path);

5 years, 6 months

Tiny simplifications.

by Sven Panne

Module: check_mk Branch: master Commit: 3af5bc9c5246cf43ac671b96e0affedfe1e0013b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3af5bc9c5246cf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 15:03:37 2019 +0200 Tiny simplifications. Change-Id: I43bf4a808e808b03c54f77af8f6bd141c03c0ff4 --- livestatus/src/module.cc | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 6f3fa07..f1f1e65 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -118,15 +118,11 @@ static std::vector<ThreadInfo> fl_thread_info; static thread_local ThreadInfo *tl_info; struct NagiosLimits { - size_t _max_cached_messages; - size_t _max_lines_per_logfile; - size_t _max_response_size; -}; -static NagiosLimits fl_limits{ - ._max_cached_messages = 500000, - ._max_lines_per_logfile = 1000000, - ._max_response_size = 100 * 1024 * 1024, + size_t _max_cached_messages{500000}; + size_t _max_lines_per_logfile{1000000}; + size_t _max_response_size{100 * 1024 * 1024}; }; +static NagiosLimits fl_limits; int g_thread_running = 0; @@ -479,6 +475,7 @@ void livestatus_cleanup_after_fork() { void *main_thread(void *data) { tl_info = static_cast<ThreadInfo *>(data); + auto logger = fl_core->loggerLivestatus(); while (!fl_should_terminate) { do_statistics(); @@ -494,14 +491,14 @@ void *main_thread(void *data) { #endif if (cc == -1) { generic_error ge("cannot accept client connection"); - Warning(fl_core->loggerLivestatus()) << ge; + Warning(logger) << ge; continue; } #if !HAVE_ACCEPT4 if (fcntl(cc, F_SETFD, FD_CLOEXEC) == -1) { generic_error ge( "cannot set close-on-exec bit on client socket"); - Alert(fl_core->loggerLivestatus()) << ge; + Alert(logger) << ge; break; } #endif @@ -513,33 +510,30 @@ void *main_thread(void *data) { counterIncrement(Counter::connections); } } - Notice(fl_core->loggerLivestatus()) << "socket thread has terminated"; + Notice(logger) << "socket thread has terminated"; return voidp; } void *client_thread(void *data) { tl_info = static_cast<ThreadInfo *>(data); + auto logger = fl_core->loggerLivestatus(); while (!fl_should_terminate) { int cc = fl_client_queue->popConnection(); g_num_queued_connections--; g_livestatus_active_connections++; if (cc >= 0) { - Debug(fl_core->loggerLivestatus()) - << "accepted client connection on fd " << cc; - InputBuffer input_buffer(cc, fl_should_terminate, - fl_core->loggerLivestatus(), + Debug(logger) << "accepted client connection on fd " << cc; + InputBuffer input_buffer(cc, fl_should_terminate, logger, fl_query_timeout, fl_idle_timeout); bool keepalive = true; unsigned requestnr = 0; while (keepalive && !fl_should_terminate) { if (++requestnr > 1) { - Debug(fl_core->loggerLivestatus()) - << "handling request " << requestnr - << " on same connection"; + Debug(logger) << "handling request " << requestnr + << " on same connection"; } counterIncrement(Counter::requests); - OutputBuffer output_buffer(cc, fl_should_terminate, - fl_core->loggerLivestatus()); + OutputBuffer output_buffer(cc, fl_should_terminate, logger); keepalive = fl_core->answerRequest(input_buffer, output_buffer); } close(cc); @@ -592,10 +586,11 @@ void start_threads() { count_services(); if (g_thread_running == 0) { - fl_core->loggerLivestatus()->setLevel(fl_livestatus_log_level); - fl_core->loggerLivestatus()->setUseParentHandlers(false); + auto logger = fl_core->loggerLivestatus(); + logger->setLevel(fl_livestatus_log_level); + logger->setUseParentHandlers(false); try { - fl_core->loggerLivestatus()->setHandler( + logger->setHandler( std::make_unique<LivestatusHandler>(fl_paths._logfile_path)); } catch (const generic_error &ex) { Warning(fl_logger_nagios) << ex;

5 years, 6 months

Moved data encoding into NagiosCore where it belongs.

by Sven Panne

Module: check_mk Branch: master Commit: 05637478960096cab8f49f5c0c1bc977e879c6c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05637478960096… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 15:01:34 2019 +0200 Moved data encoding into NagiosCore where it belongs. Change-Id: Ic11775edd3929cc34131333d2613ac561f0b2ef5 --- livestatus/src/module.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 12b614e..6f3fa07 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -136,7 +136,7 @@ struct NagiosAuthorization { }; static NagiosAuthorization fl_authorization; -Encoding fl_data_encoding = Encoding::utf8; +Encoding fl_data_encoding{Encoding::utf8}; static Logger *fl_logger_nagios = nullptr; static LogLevel fl_livestatus_log_level = LogLevel::notice; @@ -156,11 +156,12 @@ constexpr const char *default_socket_path = "/usr/local/nagios/var/rw/live"; class NagiosCore : public MonitoringCore { public: NagiosCore(const NagiosPaths &paths, const NagiosLimits &limits, - const NagiosAuthorization &authorization) + const NagiosAuthorization &authorization, Encoding data_encoding) : _logger_livestatus(Logger::getLogger("cmk.livestatus")) , _paths(paths) , _limits(limits) , _authorization(authorization) + , _data_encoding(data_encoding) , _store(this) { for (host *hst = host_list; hst != nullptr; hst = hst->next) { if (const char *address = hst->address) { @@ -284,7 +285,7 @@ public: return log_archive_path; } - Encoding dataEncoding() override { return fl_data_encoding; } + Encoding dataEncoding() override { return _data_encoding; } size_t maxResponseSize() override { return _limits._max_response_size; } size_t maxCachedMessages() override { return _limits._max_cached_messages; } @@ -356,6 +357,7 @@ private: const NagiosPaths &_paths; const NagiosLimits &_limits; const NagiosAuthorization &_authorization; + Encoding _data_encoding; Store _store; std::unordered_map<std::string, host *> _hosts_by_designation; Triggers _triggers; @@ -861,7 +863,8 @@ int broker_process(int event_type __attribute__((__unused__)), void *data) { auto ps = static_cast<struct nebstruct_process_struct *>(data); switch (ps->type) { case NEBTYPE_PROCESS_START: - fl_core = new NagiosCore(fl_paths, fl_limits, fl_authorization); + fl_core = new NagiosCore(fl_paths, fl_limits, fl_authorization, + fl_data_encoding); fl_client_queue = new ClientQueue(); g_timeperiods_cache = new TimeperiodsCache(fl_logger_nagios); break;

5 years, 6 months

Moved authorization settings into NagiosCore where they belong.

by Sven Panne

Module: check_mk Branch: master Commit: 57205e0b26e7b23516cdd91a0236aff472009c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57205e0b26e7b2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 14:57:29 2019 +0200 Moved authorization settings into NagiosCore where they belong. Change-Id: I80a1ed071b4f4a66d442ed33e3ba3150d2ae7e62 --- livestatus/src/module.cc | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index ea7d3a4..12b614e 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -129,8 +129,13 @@ static NagiosLimits fl_limits{ }; int g_thread_running = 0; -static AuthorizationKind fl_service_authorization = AuthorizationKind::loose; -static AuthorizationKind fl_group_authorization = AuthorizationKind::strict; + +struct NagiosAuthorization { + AuthorizationKind _service{AuthorizationKind::loose}; + AuthorizationKind _group{AuthorizationKind::strict}; +}; +static NagiosAuthorization fl_authorization; + Encoding fl_data_encoding = Encoding::utf8; static Logger *fl_logger_nagios = nullptr; @@ -150,10 +155,12 @@ constexpr const char *default_socket_path = "/usr/local/nagios/var/rw/live"; class NagiosCore : public MonitoringCore { public: - NagiosCore(const NagiosPaths &paths, const NagiosLimits &limits) + NagiosCore(const NagiosPaths &paths, const NagiosLimits &limits, + const NagiosAuthorization &authorization) : _logger_livestatus(Logger::getLogger("cmk.livestatus")) , _paths(paths) , _limits(limits) + , _authorization(authorization) , _store(this) { for (host *hst = host_list; hst != nullptr; hst = hst->next) { if (const char *address = hst->address) { @@ -287,11 +294,11 @@ public: } AuthorizationKind serviceAuthorization() const override { - return fl_service_authorization; + return _authorization._service; } AuthorizationKind groupAuthorization() const override { - return fl_group_authorization; + return _authorization._group; } Logger *loggerLivestatus() override { return _logger_livestatus; } @@ -348,6 +355,7 @@ private: Logger *_logger_livestatus; const NagiosPaths &_paths; const NagiosLimits &_limits; + const NagiosAuthorization &_authorization; Store _store; std::unordered_map<std::string, host *> _hosts_by_designation; Triggers _triggers; @@ -853,7 +861,7 @@ int broker_process(int event_type __attribute__((__unused__)), void *data) { auto ps = static_cast<struct nebstruct_process_struct *>(data); switch (ps->type) { case NEBTYPE_PROCESS_START: - fl_core = new NagiosCore(fl_paths, fl_limits); + fl_core = new NagiosCore(fl_paths, fl_limits, fl_authorization); fl_client_queue = new ClientQueue(); g_timeperiods_cache = new TimeperiodsCache(fl_logger_nagios); break; @@ -1099,9 +1107,9 @@ void livestatus_parse_arguments(const char *args_orig) { } } else if (strcmp(left, "service_authorization") == 0) { if (strcmp(right, "strict") == 0) { - fl_service_authorization = AuthorizationKind::strict; + fl_authorization._service = AuthorizationKind::strict; } else if (strcmp(right, "loose") == 0) { - fl_service_authorization = AuthorizationKind::loose; + fl_authorization._service = AuthorizationKind::loose; } else { Warning(fl_logger_nagios) << "invalid service authorization mode, " @@ -1109,9 +1117,9 @@ void livestatus_parse_arguments(const char *args_orig) { } } else if (strcmp(left, "group_authorization") == 0) { if (strcmp(right, "strict") == 0) { - fl_group_authorization = AuthorizationKind::strict; + fl_authorization._group = AuthorizationKind::strict; } else if (strcmp(right, "loose") == 0) { - fl_group_authorization = AuthorizationKind::loose; + fl_authorization._group = AuthorizationKind::loose; } else { Warning(fl_logger_nagios) << "invalid group authorization mode, "

5 years, 6 months

Moved Livestatus logger into NagiosCore where it belongs.

by Sven Panne

Module: check_mk Branch: master Commit: bdc4961ffd82d98756cdb62377a1fc66aa0cc2e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdc4961ffd82d9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 14:47:58 2019 +0200 Moved Livestatus logger into NagiosCore where it belongs. Change-Id: Ia4c012857eb5629ef51fd2afca00b1ec59bb9b70 --- livestatus/src/module.cc | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index ac13be2..ea7d3a4 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -134,7 +134,6 @@ static AuthorizationKind fl_group_authorization = AuthorizationKind::strict; Encoding fl_data_encoding = Encoding::utf8; static Logger *fl_logger_nagios = nullptr; -static Logger *fl_logger_livestatus = nullptr; static LogLevel fl_livestatus_log_level = LogLevel::notice; static ClientQueue *fl_client_queue = nullptr; TimeperiodsCache *g_timeperiods_cache = nullptr; @@ -152,7 +151,10 @@ constexpr const char *default_socket_path = "/usr/local/nagios/var/rw/live"; class NagiosCore : public MonitoringCore { public: NagiosCore(const NagiosPaths &paths, const NagiosLimits &limits) - : _paths(paths), _limits(limits), _store(this) { + : _logger_livestatus(Logger::getLogger("cmk.livestatus")) + , _paths(paths) + , _limits(limits) + , _store(this) { for (host *hst = host_list; hst != nullptr; hst = hst->next) { if (const char *address = hst->address) { _hosts_by_designation[mk::unsafe_tolower(address)] = hst; @@ -292,7 +294,7 @@ public: return fl_group_authorization; } - Logger *loggerLivestatus() override { return fl_logger_livestatus; } + Logger *loggerLivestatus() override { return _logger_livestatus; } Triggers &triggers() override { return _triggers; } @@ -343,6 +345,7 @@ public: } private: + Logger *_logger_livestatus; const NagiosPaths &_paths; const NagiosLimits &_limits; Store _store; @@ -481,14 +484,14 @@ void *main_thread(void *data) { #endif if (cc == -1) { generic_error ge("cannot accept client connection"); - Warning(fl_logger_livestatus) << ge; + Warning(fl_core->loggerLivestatus()) << ge; continue; } #if !HAVE_ACCEPT4 if (fcntl(cc, F_SETFD, FD_CLOEXEC) == -1) { generic_error ge( "cannot set close-on-exec bit on client socket"); - Alert(fl_logger_livestatus) << ge; + Alert(fl_core->loggerLivestatus()) << ge; break; } #endif @@ -500,7 +503,7 @@ void *main_thread(void *data) { counterIncrement(Counter::connections); } } - Notice(fl_logger_livestatus) << "socket thread has terminated"; + Notice(fl_core->loggerLivestatus()) << "socket thread has terminated"; return voidp; } @@ -511,22 +514,22 @@ void *client_thread(void *data) { g_num_queued_connections--; g_livestatus_active_connections++; if (cc >= 0) { - Debug(fl_logger_livestatus) + Debug(fl_core->loggerLivestatus()) << "accepted client connection on fd " << cc; InputBuffer input_buffer(cc, fl_should_terminate, - fl_logger_livestatus, fl_query_timeout, - fl_idle_timeout); + fl_core->loggerLivestatus(), + fl_query_timeout, fl_idle_timeout); bool keepalive = true; unsigned requestnr = 0; while (keepalive && !fl_should_terminate) { if (++requestnr > 1) { - Debug(fl_logger_livestatus) + Debug(fl_core->loggerLivestatus()) << "handling request " << requestnr << " on same connection"; } counterIncrement(Counter::requests); OutputBuffer output_buffer(cc, fl_should_terminate, - fl_logger_livestatus); + fl_core->loggerLivestatus()); keepalive = fl_core->answerRequest(input_buffer, output_buffer); } close(cc); @@ -579,10 +582,10 @@ void start_threads() { count_services(); if (g_thread_running == 0) { - fl_logger_livestatus->setLevel(fl_livestatus_log_level); - fl_logger_livestatus->setUseParentHandlers(false); + fl_core->loggerLivestatus()->setLevel(fl_livestatus_log_level); + fl_core->loggerLivestatus()->setUseParentHandlers(false); try { - fl_logger_livestatus->setHandler( + fl_core->loggerLivestatus()->setHandler( std::make_unique<LivestatusHandler>(fl_paths._logfile_path)); } catch (const generic_error &ex) { Warning(fl_logger_nagios) << ex; @@ -1221,8 +1224,6 @@ extern "C" int nebmodule_init(int flags __attribute__((__unused__)), char *args, fl_logger_nagios->setHandler(std::make_unique<NagiosHandler>()); fl_logger_nagios->setUseParentHandlers(false); - fl_logger_livestatus = Logger::getLogger("cmk.livestatus"); - g_nagios_handle = handle; livestatus_parse_arguments(args); omd_advertize();

5 years, 6 months

Moved triggers into NagiosCore where they belong.

by Sven Panne

Module: check_mk Branch: master Commit: d102fe1c9b8168b483c9eaffdf3196e8e6c97f53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d102fe1c9b8168… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 14:36:45 2019 +0200 Moved triggers into NagiosCore where they belong. Change-Id: I2de6f6ccf2d95d30fcd1559a25d149c04ae6a6ff --- livestatus/src/module.cc | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 7d03e64..ac13be2 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -132,7 +132,6 @@ int g_thread_running = 0; static AuthorizationKind fl_service_authorization = AuthorizationKind::loose; static AuthorizationKind fl_group_authorization = AuthorizationKind::strict; Encoding fl_data_encoding = Encoding::utf8; -Triggers fl_triggers; static Logger *fl_logger_nagios = nullptr; static Logger *fl_logger_livestatus = nullptr; @@ -295,7 +294,7 @@ public: Logger *loggerLivestatus() override { return fl_logger_livestatus; } - Triggers &triggers() override { return fl_triggers; } + Triggers &triggers() override { return _triggers; } size_t numQueuedNotifications() override { return 0; } size_t numQueuedAlerts() override { return 0; } @@ -348,6 +347,7 @@ private: const NagiosLimits &_limits; Store _store; std::unordered_map<std::string, host *> _hosts_by_designation; + Triggers _triggers; void *implInternal() const override { return const_cast<Store *>(&_store); } @@ -748,7 +748,7 @@ int broker_check(int event_type, void *data) { counterIncrement(Counter::host_checks); } } - fl_triggers.notify_all(Triggers::Kind::check); + fl_core->triggers().notify_all(Triggers::Kind::check); return result; } @@ -756,7 +756,7 @@ int broker_comment(int event_type __attribute__((__unused__)), void *data) { auto co = static_cast<nebstruct_comment_data *>(data); fl_core->registerComment(co); counterIncrement(Counter::neb_callbacks); - fl_triggers.notify_all(Triggers::Kind::comment); + fl_core->triggers().notify_all(Triggers::Kind::comment); return 0; } @@ -764,7 +764,7 @@ int broker_downtime(int event_type __attribute__((__unused__)), void *data) { auto dt = static_cast<nebstruct_downtime_data *>(data); fl_core->registerDowntime(dt); counterIncrement(Counter::neb_callbacks); - fl_triggers.notify_all(Triggers::Kind::downtime); + fl_core->triggers().notify_all(Triggers::Kind::downtime); return 0; } @@ -772,7 +772,10 @@ int broker_log(int event_type __attribute__((__unused__)), void *data __attribute__((__unused__))) { counterIncrement(Counter::neb_callbacks); counterIncrement(Counter::log_messages); - fl_triggers.notify_all(Triggers::Kind::log); + // NOTE: We use logging very early, even before the core is instantiated! + if (fl_core != nullptr) { + fl_core->triggers().notify_all(Triggers::Kind::log); + } return 0; } @@ -785,25 +788,25 @@ int broker_command(int event_type __attribute__((__unused__)), void *data) { strcmp(sc->command_string, "_LOG") == 0) { write_to_all_logs(sc->command_args, -1); counterIncrement(Counter::log_messages); - fl_triggers.notify_all(Triggers::Kind::log); + fl_core->triggers().notify_all(Triggers::Kind::log); } } counterIncrement(Counter::neb_callbacks); - fl_triggers.notify_all(Triggers::Kind::command); + fl_core->triggers().notify_all(Triggers::Kind::command); return 0; } int broker_state(int event_type __attribute__((__unused__)), void *data __attribute__((__unused__))) { counterIncrement(Counter::neb_callbacks); - fl_triggers.notify_all(Triggers::Kind::state); + fl_core->triggers().notify_all(Triggers::Kind::state); return 0; } int broker_program(int event_type __attribute__((__unused__)), void *data __attribute__((__unused__))) { counterIncrement(Counter::neb_callbacks); - fl_triggers.notify_all(Triggers::Kind::program); + fl_core->triggers().notify_all(Triggers::Kind::program); return 0; }

5 years, 6 months

Moved host designation map into NagiosCore where it belongs.

by Sven Panne

Module: check_mk Branch: master Commit: 58265af4a5b4798e2355e153baad148d22277326 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58265af4a5b479… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 14:24:42 2019 +0200 Moved host designation map into NagiosCore where it belongs. Change-Id: Ib9edcfce1bd2557e38718d8b717b14abdc13133d --- livestatus/src/module.cc | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 10ceaa9..7d03e64 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -134,9 +134,6 @@ static AuthorizationKind fl_group_authorization = AuthorizationKind::strict; Encoding fl_data_encoding = Encoding::utf8; Triggers fl_triggers; -// Map to speed up access via name/alias/address -std::unordered_map<std::string, host *> fl_hosts_by_designation; - static Logger *fl_logger_nagios = nullptr; static Logger *fl_logger_livestatus = nullptr; static LogLevel fl_livestatus_log_level = LogLevel::notice; @@ -156,7 +153,17 @@ constexpr const char *default_socket_path = "/usr/local/nagios/var/rw/live"; class NagiosCore : public MonitoringCore { public: NagiosCore(const NagiosPaths &paths, const NagiosLimits &limits) - : _paths(paths), _limits(limits), _store(this) {} + : _paths(paths), _limits(limits), _store(this) { + for (host *hst = host_list; hst != nullptr; hst = hst->next) { + if (const char *address = hst->address) { + _hosts_by_designation[mk::unsafe_tolower(address)] = hst; + } + if (const char *alias = hst->alias) { + _hosts_by_designation[mk::unsafe_tolower(alias)] = hst; + } + _hosts_by_designation[mk::unsafe_tolower(hst->name)] = hst; + } + } Host *find_host(const std::string &name) override { // Older Nagios headers are not const-correct... :-P @@ -164,9 +171,9 @@ public: } Host *getHostByDesignation(const std::string &designation) override { - auto it = fl_hosts_by_designation.find(mk::unsafe_tolower(designation)); - return it == fl_hosts_by_designation.end() ? nullptr - : fromImpl(it->second); + auto it = _hosts_by_designation.find(mk::unsafe_tolower(designation)); + return it == _hosts_by_designation.end() ? nullptr + : fromImpl(it->second); } Service *find_service(const std::string &host_name, @@ -340,6 +347,7 @@ private: const NagiosPaths &_paths; const NagiosLimits &_limits; Store _store; + std::unordered_map<std::string, host *> _hosts_by_designation; void *implInternal() const override { return const_cast<Store *>(&_store); } @@ -839,15 +847,6 @@ int broker_process(int event_type __attribute__((__unused__)), void *data) { auto ps = static_cast<struct nebstruct_process_struct *>(data); switch (ps->type) { case NEBTYPE_PROCESS_START: - for (host *hst = host_list; hst != nullptr; hst = hst->next) { - if (const char *address = hst->address) { - fl_hosts_by_designation[mk::unsafe_tolower(address)] = hst; - } - if (const char *alias = hst->alias) { - fl_hosts_by_designation[mk::unsafe_tolower(alias)] = hst; - } - fl_hosts_by_designation[mk::unsafe_tolower(hst->name)] = hst; - } fl_core = new NagiosCore(fl_paths, fl_limits); fl_client_queue = new ClientQueue(); g_timeperiods_cache = new TimeperiodsCache(fl_logger_nagios);

5 years, 6 months

Moved Store into NagiosCore where it belongs.

by Sven Panne

Module: check_mk Branch: master Commit: a9e4057cd7eb7fa85ed3ef8d6a547e85390467df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9e4057cd7eb7f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 14:13:47 2019 +0200 Moved Store into NagiosCore where it belongs. Change-Id: I0436e1222a35cb5f6ba0a4cc68d4af72f55e22c6 --- livestatus/src/module.cc | 514 ++++++++++++++++++++++++----------------------- 1 file changed, 261 insertions(+), 253 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a9e4057cd7…

5 years, 6 months

← Newer
1
...
36
37
38
39
40
41
42
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019