Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

WATO host search can now handle regex matches for host names

by Lars Michelsen

Module: check_mk Branch: master Commit: 6bed42093c71e1bcbe14e6a061bf7e3dc56903c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bed42093c71e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 29 16:44:53 2016 +0200 WATO host search can now handle regex matches for host names --- web/htdocs/watolib.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 54b3647..a505020 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1926,7 +1926,7 @@ class SearchFolder(BaseFolder): found = {} for host_name, host in in_folder.hosts().items(): - if self._criteria[".name"] and self._criteria[".name"].lower() not in host_name.lower(): + if self._criteria[".name"] and not host_attribute_matches(self._criteria[".name"], host_name): continue # Compute inheritance @@ -2474,12 +2474,18 @@ class TextAttribute(Attribute): if value == None: # Host does not have this attribute value = "" - if crit[0] == "~": - # insensitive infix regex match - return re.search(crit[1:], value, re.IGNORECASE) != None - else: - # insensitive infix search - return crit.lower() in value.lower() + return host_attribute_matches(crit, value) + + + +def host_attribute_matches(crit, value): + if crit[0] == "~": + # insensitive infix regex match + return re.search(crit[1:], value, re.IGNORECASE) != None + else: + # insensitive infix search + return crit.lower() in value.lower() + # A simple text attribute that is not editable by the user. # It can be used to store context information from other

8 years, 1 month

Web tests: Disable warning message when making "insecure" SSL tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ceaa3ccd47a40ded125ea9d0eeabe9bc1c9450a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ceaa3ccd47a40… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 29 10:29:56 2016 +0200 Web tests: Disable warning message when making "insecure" SSL tests --- tests/testlib/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d8fc4ba..ce2bdee 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -15,6 +15,10 @@ import subprocess from urlparse import urlparse from BeautifulSoup import BeautifulSoup +# Disable insecure requests warning message during SSL testing +from requests.packages.urllib3.exceptions import InsecureRequestWarning +requests.packages.urllib3.disable_warnings(InsecureRequestWarning) + try: import simplejson as json except ImportError:

8 years, 1 month

No format string for logging anymore...

by Sven Panne

Module: check_mk Branch: master Commit: 6b72e7d6a4fecc2ae0bfc7a47a84af759c9e13ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b72e7d6a4fecc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 29 15:51:21 2016 +0200 No format string for logging anymore... --- livestatus/src/Logger.h | 2 +- livestatus/src/logger.cc | 25 ++++++++----------------- livestatus/src/logger.h | 5 ++--- livestatus/src/module.cc | 1 + 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index 859bedc..890c6de 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -32,7 +32,7 @@ class Logger { public: explicit Logger(int priority) : _priority(priority) {} - virtual ~Logger() { logger(_priority, "%s", _os.str().c_str()); } + virtual ~Logger() { logger(_priority, _os.str()); } template <typename T> std::ostream &operator<<(const T &t) { diff --git a/livestatus/src/logger.cc b/livestatus/src/logger.cc index 5ec97df..cdd8882 100644 --- a/livestatus/src/logger.cc +++ b/livestatus/src/logger.cc @@ -28,7 +28,6 @@ #include "logger.h" #include <pthread.h> #include <cerrno> -#include <cstdarg> #include <cstdio> #include <cstring> #include <ctime> @@ -45,8 +44,8 @@ void open_logfile(const string &path) { fl_logfile = fopen(path.c_str(), "a"); if (fl_logfile == nullptr) { - logger(LOG_WARNING, "Cannot open logfile %s: %s", path.c_str(), - strerror(errno)); + logger(LOG_WARNING, + "Cannot open logfile " + path + ": " + strerror(errno)); } } @@ -57,28 +56,20 @@ void close_logfile() { } } -void logger(int /*priority*/, const char *loginfo, ...) { - va_list ap; - va_start(ap, loginfo); - +void logger(int /*priority*/, const string &message) { // Only the main process may use the Nagios log methods if (fl_logfile == nullptr || g_mainthread_id == pthread_self()) { - char buffer[8192]; - snprintf(buffer, 20, "livestatus: "); - vsnprintf(buffer + strlen(buffer), sizeof(buffer) - strlen(buffer), - loginfo, ap); - write_to_all_logs(buffer, NSLOG_INFO_MESSAGE); + // TODO(sp) The Nagios headers are (once again) not const-correct... + write_to_all_logs( + const_cast<char *>(("livestatus: " + message).c_str()), + NSLOG_INFO_MESSAGE); } else if (fl_logfile != nullptr) { char timestring[64]; time_t now_t = time(nullptr); struct tm now; localtime_r(&now_t, &now); strftime(timestring, 64, "%F %T ", &now); - fputs(timestring, fl_logfile); - - vfprintf(fl_logfile, loginfo, ap); - fputc('\n', fl_logfile); + fputs((timestring + message + "\n").c_str(), fl_logfile); fflush(fl_logfile); } - va_end(ap); } diff --git a/livestatus/src/logger.h b/livestatus/src/logger.h index f0bf6a5..d297c3c 100644 --- a/livestatus/src/logger.h +++ b/livestatus/src/logger.h @@ -26,11 +26,10 @@ #define logger_h #include "config.h" // IWYU pragma: keep -#include <syslog.h> +#include <syslog.h> // IWYU pragma: keep #include <string> -void logger(int priority, const char *loginfo, ...) - __attribute__((format(printf, 2, 3))); +void logger(int priority, const std::string &message); void open_logfile(const std::string &path); void close_logfile(); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 1e5f692..6b8b761 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -57,6 +57,7 @@ #include "data_encoding.h" #include "global_counters.h" #include "livestatus.h" +#include "logger.h" #include "nagios.h" #include "strutil.h" #include "waittriggers.h"

8 years, 1 month

Make the logfile structure non-global.

by Sven Panne

Module: check_mk Branch: master Commit: f604e8e04f54b5e6a142d493abf3a276fe16b599 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f604e8e04f54b5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 29 15:27:59 2016 +0200 Make the logfile structure non-global. --- livestatus/src/logger.cc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/livestatus/src/logger.cc b/livestatus/src/logger.cc index 2fc12f4..5ec97df 100644 --- a/livestatus/src/logger.cc +++ b/livestatus/src/logger.cc @@ -37,22 +37,23 @@ using std::string; pthread_t g_mainthread_id; -FILE *g_logfile = nullptr; +static FILE *fl_logfile = nullptr; void open_logfile(const string &path) { - g_logfile = fopen(path.c_str(), "a"); // needed to determine main thread later g_mainthread_id = pthread_self(); - if (g_logfile == nullptr) { + + fl_logfile = fopen(path.c_str(), "a"); + if (fl_logfile == nullptr) { logger(LOG_WARNING, "Cannot open logfile %s: %s", path.c_str(), strerror(errno)); } } void close_logfile() { - if (g_logfile != nullptr) { - fclose(g_logfile); - g_logfile = nullptr; + if (fl_logfile != nullptr) { + fclose(fl_logfile); + fl_logfile = nullptr; } } @@ -61,23 +62,23 @@ void logger(int /*priority*/, const char *loginfo, ...) { va_start(ap, loginfo); // Only the main process may use the Nagios log methods - if (g_logfile == nullptr || g_mainthread_id == pthread_self()) { + if (fl_logfile == nullptr || g_mainthread_id == pthread_self()) { char buffer[8192]; snprintf(buffer, 20, "livestatus: "); vsnprintf(buffer + strlen(buffer), sizeof(buffer) - strlen(buffer), loginfo, ap); write_to_all_logs(buffer, NSLOG_INFO_MESSAGE); - } else if (g_logfile != nullptr) { + } else if (fl_logfile != nullptr) { char timestring[64]; time_t now_t = time(nullptr); struct tm now; localtime_r(&now_t, &now); strftime(timestring, 64, "%F %T ", &now); - fputs(timestring, g_logfile); + fputs(timestring, fl_logfile); - vfprintf(g_logfile, loginfo, ap); - fputc('\n', g_logfile); - fflush(g_logfile); + vfprintf(fl_logfile, loginfo, ap); + fputc('\n', fl_logfile); + fflush(fl_logfile); } va_end(ap); }

8 years, 1 month

3796 agent_vsphere: new option allows monitoring of ESX hostsystem and windows agent

by Andreas Boesl

Module: check_mk Branch: master Commit: a2de544a2a5c553ef7db9bdae9dee4a7c54bebf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2de544a2a5c55… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 29 15:49:39 2016 +0200 3796 agent_vsphere: new option allows monitoring of ESX hostsystem and windows agent --- .werks/3796 | 9 +++++++++ ChangeLog | 1 + checks/agent_vsphere | 8 +++++++- web/plugins/wato/datasource_programs.py | 7 ++++--- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/3796 b/.werks/3796 new file mode 100644 index 0000000..3258211 --- /dev/null +++ b/.werks/3796 @@ -0,0 +1,9 @@ +Title: agent_vsphere: new option allows monitoring of ESX hostsystem and windows agent +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472478527 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 912a8fa..36eccc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -146,6 +146,7 @@ * 3794 f5_bigip_snat: now able to configure levels * 3795 cisco_cpu_multiitem: monitors the cpu utilization of each cpu * 3834 hitachi_hus_dku, hitachi_hus_dkc: now recognises Hitachi G800/HM800 devices + * 3796 agent_vsphere: new option allows monitoring of ESX hostsystem and windows agent * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/agent_vsphere b/checks/agent_vsphere index 8ac5141..094de2d 100644 --- a/checks/agent_vsphere +++ b/checks/agent_vsphere @@ -40,10 +40,16 @@ def agent_vsphere_arguments(params, hostname, ipaddress): args += " -s " + quote_shell_string(params["secret"]) args += " -i " + ",".join(params["infos"]) + # Available options. Don't ask... + # True, _("Queried host is a host system" ) ), + # "hostsystem_agent", _("Queried host is a host system with Check_MK Agent installed") ), + # False, _("Queried host is the vCenter") ), + # "agent", _("Queried host is the vCenter with Check_MK Agent installed") ), direct = params.get("direct", False) - if direct == "agent": args += ' --agent' + elif direct == "hostsystem_agent": + args += ' --agent --direct --hostname ' + quote_shell_string(hostname) elif direct: args += ' --direct --hostname ' + quote_shell_string(hostname) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index cd6c249..3aa4932 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -156,9 +156,10 @@ register_rule(group, DropdownChoice( title = _("Type of query"), choices = [ - ( True, _("Queried host is a host system" ) ), - ( False, _("Queried host is the vCenter") ), - ( "agent", _("Queried host is the vCenter with Check_MK Agent installed") ), + ( True, _("Queried host is a host system" ) ), + ( "hostsystem_agent", _("Queried host is a host system with Check_MK Agent installed") ), + ( False, _("Queried host is the vCenter") ), + ( "agent", _("Queried host is the vCenter with Check_MK Agent installed") ), ], default = True, )

8 years, 1 month

Removed unused #defines.

by Sven Panne

Module: check_mk Branch: master Commit: 71f7030030ed7ba4bfda7a23f24873aa845ebdde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71f7030030ed7b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 29 14:57:20 2016 +0200 Removed unused #defines. --- livestatus/src/logger.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/livestatus/src/logger.h b/livestatus/src/logger.h index fef8222..678f67a 100644 --- a/livestatus/src/logger.h +++ b/livestatus/src/logger.h @@ -28,23 +28,6 @@ #include "config.h" // IWYU pragma: keep #include <syslog.h> -#ifdef CMC -#define LG_DEBUG LOG_INFO -#define LG_INFO LOG_NOTICE -#define LG_WARN LOG_WARNING -#define LG_ERR LOG_ERR -#define LG_CRIT LOG_CRIT -#define LG_ALERT LOG_ALERT -#else -// TODO: Really use log levels -#define LG_INFO 262144 -#define LG_WARN LOG_INFO -#define LG_ERR LOG_INFO -#define LG_CRIT LOG_INFO -#define LG_DEBUG LOG_INFO -#define LG_ALERT LOG_INFO -#endif - void logger(int priority, const char *loginfo, ...) __attribute__((format(printf, 2, 3))); void open_logfile();

8 years, 1 month

Make the logfile path non-global.

by Sven Panne

Module: check_mk Branch: master Commit: bc93301565474eace56864d9c6299a0aea289bfb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc93301565474e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 29 15:03:41 2016 +0200 Make the logfile path non-global. --- livestatus/src/logger.cc | 9 +++++---- livestatus/src/logger.h | 3 ++- livestatus/src/module.cc | 16 ++++++++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/livestatus/src/logger.cc b/livestatus/src/logger.cc index 26ead67..2fc12f4 100644 --- a/livestatus/src/logger.cc +++ b/livestatus/src/logger.cc @@ -34,16 +34,17 @@ #include <ctime> #include "nagios.h" -extern char g_logfile_path[]; +using std::string; + pthread_t g_mainthread_id; FILE *g_logfile = nullptr; -void open_logfile() { - g_logfile = fopen(g_logfile_path, "a"); +void open_logfile(const string &path) { + g_logfile = fopen(path.c_str(), "a"); // needed to determine main thread later g_mainthread_id = pthread_self(); if (g_logfile == nullptr) { - logger(LOG_WARNING, "Cannot open logfile %s: %s", g_logfile_path, + logger(LOG_WARNING, "Cannot open logfile %s: %s", path.c_str(), strerror(errno)); } } diff --git a/livestatus/src/logger.h b/livestatus/src/logger.h index 678f67a..f0bf6a5 100644 --- a/livestatus/src/logger.h +++ b/livestatus/src/logger.h @@ -27,10 +27,11 @@ #include "config.h" // IWYU pragma: keep #include <syslog.h> +#include <string> void logger(int priority, const char *loginfo, ...) __attribute__((format(printf, 2, 3))); -void open_logfile(); +void open_logfile(const std::string &path); void close_logfile(); #endif // logger_h diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 05e3723..1e5f692 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -97,7 +97,7 @@ char pnp_path_storage[4096]; char *g_pnp_path = pnp_path_storage; char g_mk_inventory_path[4096]; // base path of Check_MK inventory files char g_mk_logwatch_path[4096]; // base path of Check_MK logwatch files -char g_logfile_path[4096]; +static char fl_logfile_path[4096]; char g_mkeventd_socket_path[4096]; int g_debug_level = 0; int g_should_terminate = false; @@ -670,11 +670,11 @@ void livestatus_parse_arguments(const char *args_orig) { strncpy(g_socket_path, DEFAULT_SOCKET_PATH, sizeof(g_socket_path)); /* set default path to our logfile to be in the same path as nagios.log */ - strncpy(g_logfile_path, log_file, - sizeof(g_logfile_path) - 16 /* len of "livestatus.log" */); - char *slash = strrchr(g_logfile_path, '/'); + strncpy(fl_logfile_path, log_file, + sizeof(fl_logfile_path) - 16 /* len of "livestatus.log" */); + char *slash = strrchr(fl_logfile_path, '/'); if (slash == nullptr) { - strncpy(g_logfile_path, "/tmp/livestatus.log", 20); + strncpy(fl_logfile_path, "/tmp/livestatus.log", 20); } else { strncpy(slash + 1, "livestatus.log", 15); } @@ -701,7 +701,7 @@ void livestatus_parse_arguments(const char *args_orig) { g_debug_level = atoi(right); Informational() << "Setting debug level to " << g_debug_level; } else if (strcmp(left, "log_file") == 0) { - strncpy(g_logfile_path, right, sizeof(g_logfile_path)); + strncpy(fl_logfile_path, right, sizeof(fl_logfile_path)); } else if (strcmp(left, "mkeventd_socket_path") == 0) { strncpy(g_mkeventd_socket_path, right, sizeof(g_mkeventd_socket_path)); @@ -866,7 +866,7 @@ extern "C" int nebmodule_init(int flags __attribute__((__unused__)), char *args, void *handle) { g_nagios_handle = handle; livestatus_parse_arguments(args); - open_logfile(); + open_logfile(fl_logfile_path); Informational() << "Livestatus " << VERSION << " by Mathias Kettner. Socket: '" << g_socket_path << "'"; @@ -903,7 +903,7 @@ extern "C" int nebmodule_init(int flags __attribute__((__unused__)), char *args, that happens, we haven't got any data anyway... */ Informational() << "Finished initialization. Further log messages go to " - << g_logfile_path; + << fl_logfile_path; return 0; }

8 years, 1 month

3834 hitachi_hus_dku, hitachi_hus_dkc: now recognises Hitachi G800/ HM800 devices

by Marcel Arentz

Module: check_mk Branch: master Commit: 527462f5108e680e8774148792a8c4793107e1f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=527462f5108e68… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Aug 29 14:54:32 2016 +0200 3834 hitachi_hus_dku, hitachi_hus_dkc: now recognises Hitachi G800/HM800 devices --- .werks/3834 | 9 +++++++++ ChangeLog | 1 + checks/hitachi_hus_dkc | 4 +++- checks/hitachi_hus_dku | 4 +++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/3834 b/.werks/3834 new file mode 100644 index 0000000..b7daefc --- /dev/null +++ b/.werks/3834 @@ -0,0 +1,9 @@ +Title: hitachi_hus_dku, hitachi_hus_dkc: now recognises Hitachi G800/HM800 devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472475250 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 572aae1..912a8fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ * 3793 f5_bigip_vserver: traffic and packet levels are now configurable * 3794 f5_bigip_snat: now able to configure levels * 3795 cisco_cpu_multiitem: monitors the cpu utilization of each cpu + * 3834 hitachi_hus_dku, hitachi_hus_dkc: now recognises Hitachi G800/HM800 devices * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/hitachi_hus_dkc b/checks/hitachi_hus_dkc index e2582de..0e704a4 100644 --- a/checks/hitachi_hus_dkc +++ b/checks/hitachi_hus_dkc @@ -81,5 +81,7 @@ check_info["hitachi_hus_dkc"] = { 8, # dkcHWFan 9, # dkcHWEnvironment ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116.3.11"), + "snmp_scan_function" : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116.3.11") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8072.3.2.10"), } diff --git a/checks/hitachi_hus_dku b/checks/hitachi_hus_dku index fc146dd..e8c95ee 100644 --- a/checks/hitachi_hus_dku +++ b/checks/hitachi_hus_dku @@ -74,5 +74,7 @@ check_info["hitachi_hus_dku"] = { 4, # dkuHWEnvironment 5, # dkuHWDrive ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116.3.11"), + "snmp_scan_function" : lambda oid: \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.116.3.11") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8072.3.2.10"), }

8 years, 1 month

More logging level deobfuscation.

by Sven Panne

Module: check_mk Branch: master Commit: 1c928e65fd2d5ec3f17877c4b0fdefa751626eca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c928e65fd2d5e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 29 13:56:08 2016 +0200 More logging level deobfuscation. --- livestatus/src/logger.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/logger.cc b/livestatus/src/logger.cc index 5e4f5be..26ead67 100644 --- a/livestatus/src/logger.cc +++ b/livestatus/src/logger.cc @@ -43,7 +43,7 @@ void open_logfile() { // needed to determine main thread later g_mainthread_id = pthread_self(); if (g_logfile == nullptr) { - logger(LG_WARN, "Cannot open logfile %s: %s", g_logfile_path, + logger(LOG_WARNING, "Cannot open logfile %s: %s", g_logfile_path, strerror(errno)); } } @@ -55,17 +55,17 @@ void close_logfile() { } } -void logger(int priority, const char *loginfo, ...) { +void logger(int /*priority*/, const char *loginfo, ...) { va_list ap; va_start(ap, loginfo); // Only the main process may use the Nagios log methods - if ((g_logfile == nullptr) || g_mainthread_id == pthread_self()) { + if (g_logfile == nullptr || g_mainthread_id == pthread_self()) { char buffer[8192]; snprintf(buffer, 20, "livestatus: "); vsnprintf(buffer + strlen(buffer), sizeof(buffer) - strlen(buffer), loginfo, ap); - write_to_all_logs(buffer, priority); + write_to_all_logs(buffer, NSLOG_INFO_MESSAGE); } else if (g_logfile != nullptr) { char timestring[64]; time_t now_t = time(nullptr);

8 years, 1 month

Cleaned up logging level confusion.

by Sven Panne

Module: check_mk Branch: master Commit: 18a9dd054e2773a6b9261ac0ebe8544b317a9148 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18a9dd054e2773… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 29 13:49:42 2016 +0200 Cleaned up logging level confusion. --- livestatus/src/module.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index c0b67e9..05e3723 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -57,7 +57,6 @@ #include "data_encoding.h" #include "global_counters.h" #include "livestatus.h" -#include "logger.h" #include "nagios.h" #include "strutil.h" #include "waittriggers.h" @@ -486,7 +485,7 @@ void livestatus_log_initial_states() { snprintf(buffer, sizeof(buffer), "HOST DOWNTIME ALERT: %s;STARTED;%s", h->name, get_downtime_comment(h->name, nullptr)); - write_to_all_logs(buffer, LG_INFO); + write_to_all_logs(buffer, NSLOG_INFO_MESSAGE); } } // Log DOWNTIME services @@ -497,7 +496,7 @@ void livestatus_log_initial_states() { "SERVICE DOWNTIME ALERT: %s;%s;STARTED;%s", s->host_name, s->description, get_downtime_comment(s->host_name, s->description)); - write_to_all_logs(buffer, LG_INFO); + write_to_all_logs(buffer, NSLOG_INFO_MESSAGE); } } // Log TIMERPERIODS @@ -515,7 +514,7 @@ int broker_event(int event_type __attribute__((__unused__)), void *data) { // initial info during startup // TODO(sp) The Nagios headers are (once again) not const-correct... write_to_all_logs(const_cast<char *>("logging initial states"), - LG_INFO); + NSLOG_INFO_MESSAGE); } } g_timeperiods_cache->update(ts->timestamp.tv_sec);

8 years, 1 month

← Newer
1
2
3
4
5
6
7
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016