Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 076435aa71da308d63fa07f35aeaef8adf30d28a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=076435aa71da30… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 30 15:03:03 2016 +0200 Improve typing of log levels. --- livestatus/src/Logger.cc | 20 ++++++++++---------- livestatus/src/Logger.h | 43 +++++++++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/livestatus/src/Logger.cc b/livestatus/src/Logger.cc index 7d41390..fb9c489 100644 --- a/livestatus/src/Logger.cc +++ b/livestatus/src/Logger.cc @@ -26,7 +26,6 @@ #define _XOPEN_SOURCE 500 #include "Logger.h" -#include <syslog.h> #include <cerrno> #include <cstdio> #include <cstring> @@ -41,7 +40,7 @@ FILE *fl_logfile = nullptr; void open_logfile(const string &path) { fl_logfile = fopen(path.c_str(), "a"); if (fl_logfile == nullptr) { - logger(LOG_WARNING, + logger(LogLevel::warning, "Cannot open logfile " + path + ": " + strerror(errno)); } } @@ -64,7 +63,7 @@ using std::mutex; namespace { std::mutex fl_logfile_mutex; -int fl_log_level = 5; +LogLevel fl_log_level = LogLevel::notice; bool fl_log_microtime = false; } // namespace @@ -74,20 +73,21 @@ void reopen_logfile(const string &path) { if (fl_logfile != nullptr) { close_logfile(); open_logfile(path); - logger(LOG_NOTICE, "Reopened logfile."); + logger(LogLevel::notice, "Reopened logfile."); } } -void set_log_config(int log_level, bool log_microtime) { +void set_log_config(LogLevel log_level, bool log_microtime) { fl_log_level = log_level; fl_log_microtime = log_microtime; } -bool should_log(int priority) { return priority <= fl_log_level; } +bool should_log(LogLevel log_level) { return log_level <= fl_log_level; } FILE *get_logfile() { return fl_logfile != nullptr ? fl_logfile : stdout; } -void logger(int priority, const string &message) { - if (!should_log(priority)) { + +void logger(LogLevel log_level, const string &message) { + if (!should_log(log_level)) { return; // msg not important enough } @@ -107,7 +107,7 @@ void logger(int priority, const string &message) { if (fl_log_microtime) { fprintf(logfile, "%03ld.%03ld ", tv.tv_usec / 1000, tv.tv_usec % 1000); } - fprintf(logfile, "[%d] ", priority); + fprintf(logfile, "[%d] ", log_level); fputs(message.c_str(), logfile); fputc('\n', logfile); fflush(logfile); @@ -117,7 +117,7 @@ void logger(int priority, const string &message) { #include <ctime> -void logger(int /*priority*/, const string &message) { +void logger(LogLevel /*log_level*/, const string &message) { extern bool runningInLivestatusMainThread(); extern void writeToAllLogs(const string &message); // Only the main process may use the Nagios log methods diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index c0e1d5e..8106bbf 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -26,30 +26,41 @@ #define Logger_h #include "config.h" // IWYU pragma: keep -#include <syslog.h> #ifdef CMC #include <cstdio> #endif #include <sstream> #include <string> +// values must be in sync with config +enum class LogLevel { + emergency = 0, + alert = 1, + critical = 2, + error = 3, + warning = 4, + notice = 5, + informational = 6, + debug = 7 +}; + void open_logfile(const std::string &path); void close_logfile(); -void logger(int priority, const std::string &message); +void logger(LogLevel log_level, const std::string &message); #ifdef CMC -void set_log_config(int log_level, bool log_microtime); +void set_log_config(LogLevel log_level, bool log_microtime); void reopen_logfile(const std::string &path); -bool should_log(int priority); +bool should_log(LogLevel log_level); FILE *get_logfile(); #endif class Logger { public: - explicit Logger(int priority) : _priority(priority) {} - virtual ~Logger() { logger(_priority, _os.str()); } + explicit Logger(LogLevel log_level) : _log_level(log_level) {} + virtual ~Logger() { logger(_log_level, _os.str()); } #ifdef CMC - bool isEnabled() const { return should_log(_priority); } + bool isEnabled() const { return should_log(_log_level); } #endif template <typename T> @@ -58,40 +69,40 @@ public: } private: - int _priority; + LogLevel _log_level; std::ostringstream _os; }; struct Emergency : public Logger { - Emergency() : Logger(LOG_EMERG) {} + Emergency() : Logger(LogLevel::emergency) {} }; struct Alert : public Logger { - Alert() : Logger(LOG_ALERT) {} + Alert() : Logger(LogLevel::alert) {} }; struct Critical : public Logger { - Critical() : Logger(LOG_CRIT) {} + Critical() : Logger(LogLevel::critical) {} }; struct Error : public Logger { - Error() : Logger(LOG_ERR) {} + Error() : Logger(LogLevel::error) {} }; struct Warning : public Logger { - Warning() : Logger(LOG_WARNING) {} + Warning() : Logger(LogLevel::warning) {} }; struct Notice : public Logger { - Notice() : Logger(LOG_NOTICE) {} + Notice() : Logger(LogLevel::notice) {} }; struct Informational : public Logger { - Informational() : Logger(LOG_INFO) {} + Informational() : Logger(LogLevel::informational) {} }; struct Debug : public Logger { - Debug() : Logger(LOG_DEBUG) {} + Debug() : Logger(LogLevel::debug) {} }; #endif // Logger_h

7 years, 10 months

Graph controls / label can now be enabled or disabled through painter options

by Lars Michelsen

Module: check_mk Branch: master Commit: 956e12fb5a3c30625cfa95e299c23a5707b5d182 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=956e12fb5a3c30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 30 15:12:55 2016 +0200 Graph controls / label can now be enabled or disabled through painter options --- web/htdocs/views.py | 27 +++++++++++++++++++++------ web/plugins/views/painters.py | 14 +++++++++----- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7a107b8..67f1652 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -880,10 +880,10 @@ def show_painter_options(painter_options): html.write('<div class="view_form" id="painteroptions" style="display: none">') html.begin_form("painteroptions") forms.header(_("Display Options")) - for on in painter_options: - vs = multisite_painter_options[on]['valuespec'] + for name in painter_options: + vs = get_painter_option_valuespec(multisite_painter_options[name]) forms.section(vs.title()) - vs.render_input('po_' + on, get_painter_option(on)) + vs.render_input('po_' + name, get_painter_option(name)) forms.end() html.button("painter_options", _("Submit"), "submit") @@ -1396,10 +1396,14 @@ def view_options(viewname): if html.has_var_prefix(var_prefix): # Get new value for the option from the value spec - vs = opt['valuespec'] + vs = get_painter_option_valuespec(opt) value = vs.from_html_vars(var_prefix) v[option_name] = value + # TODO: This is nasty. The multisite_painter_options should really not + # be modified during user requests! They should be handled as static + # configured data structures and the user specific things should be + # kept separated. opt['value'] = value # make globally present for painters if not have_old_value or v[option_name] != old_value: @@ -2474,14 +2478,25 @@ def create_dict_key(value): else: return value + def get_painter_option(name): opt = multisite_painter_options[name] if "forced_value" in opt: return opt["forced_value"] + elif not config.may("general.painter_options"): - return opt['valuespec'].default_value() + return get_painter_option_valuespec(opt).default_value() + else: - return opt.get("value", opt['valuespec'].default_value()) + return opt.get("value", get_painter_option_valuespec(opt).default_value()) + + +def get_painter_option_valuespec(opt): + if type(lambda: None) == type(opt["valuespec"]): + return opt["valuespec"]() + else: + return opt["valuespec"] + def get_host_tags(row): if type(row.get("host_custom_variables")) == dict: diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 5d94de3..459c931 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -959,7 +959,7 @@ def paint_time_graph_cmk(row, show_timeranges=False): "service_description" : row.get("service_description", "_HOST_"), }) graph_data_range = { "time_range" : get_graph_timerange_from_painter_options() } - graph_render_options = {} + graph_render_options = get_graph_render_options_from_painter_options() if html.is_mobile(): graph_render_options.update({ @@ -987,10 +987,14 @@ def paint_time_graph_cmk(row, show_timeranges=False): show_timeranges) +def get_graph_render_options_from_painter_options(): + return get_painter_option("graph_render_options") + + def get_graph_timerange_from_painter_options(): - timerange_spec = get_painter_option("pnp_timerange") - vs = multisite_painter_options["pnp_timerange"]['valuespec'] - return map(int, vs.compute_range(timerange_spec)[0]) + value = get_painter_option("pnp_timerange") + vs = get_painter_option_valuespec(multisite_painter_options["pnp_timerange"]) + return map(int, vs.compute_range(value)[0]) def paint_time_graph_pnp(row): @@ -1025,7 +1029,7 @@ def paint_time_graph_pnp(row): multisite_painters["svc_pnpgraph" ] = { "title" : _("Service Graphs"), "columns" : [ "host_name", "service_description", "service_perf_data", "service_metrics", "service_check_command" ], - "options" : [ 'pnp_timerange' ], + "options" : [ "pnp_timerange", "graph_render_options", ], "paint" : paint_time_graph, "printable" : "time_graph", }

7 years, 10 months

Management board: Fixed fetching SNMP data from board when using inline SNMP

by Lars Michelsen

Module: check_mk Branch: master Commit: a24caf8de3b68cbc80ea05847817ac8f0a9da7db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a24caf8de3b68c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 30 11:19:14 2016 +0200 Management board: Fixed fetching SNMP data from board when using inline SNMP --- modules/check_mk_base.py | 7 +++++-- modules/discovery.py | 4 ++++ modules/snmp.py | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 8beb09a..704e71b 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -429,6 +429,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, table = None else: table = get_snmp_table(hostname, ipaddress, check_type, oid_info, use_snmpwalk_cache) + store_cached_checkinfo(hostname, check_type, table) # only write cache file in non interactive mode. Otherwise it would # prevent the regular checking from getting status updates during @@ -1520,9 +1521,11 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag for checkname, item, params, description, aggrname in check_table: if is_snmp_check(checkname) and is_management_snmp: - res = execute_check(checkname, item, params, description, aggrname, management_addr) + address = management_address else: - res = execute_check(checkname, item, params, description, aggrname, ipaddress) + address = ipaddress + + res = execute_check(checkname, item, params, description, aggrname, address) if res: num_success += 1 diff --git a/modules/discovery.py b/modules/discovery.py index 68c8b9e..add7672 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -575,10 +575,12 @@ def get_info_for_discovery(hostname, ipaddress, section_name, use_caches): max_cachefile_age = use_caches and inventory_max_cachefile_age or 0 rh_info = get_realhost_info(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval=True, use_snmpwalk_cache=False) + if rh_info != None: info = apply_parse_function(add_nodeinfo(rh_info, section_name), section_name) else: info = None + if info != None and section_name in check_info and check_info[section_name]["extra_sections"]: info = [ info ] for es in check_info[section_name]["extra_sections"]: @@ -596,6 +598,7 @@ def get_info_for_discovery(hostname, ipaddress, section_name, use_caches): if opt_debug: raise info.append(None) + return info def is_ipaddress(address): @@ -835,6 +838,7 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches, on_error, u if use_snmp is None: use_snmp = is_snmp_host(hostname) + # Skip SNMP checks on non-SNMP hosts if check_uses_snmp(check_type) and not use_snmp: return [] diff --git a/modules/snmp.py b/modules/snmp.py index 7c49ede..f67124e 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -243,7 +243,8 @@ def perform_snmpwalk(hostname, ip, check_type, base_oid, fetchoid): for context_name in snmp_contexts: if is_inline_snmp_host(hostname): rows = inline_snmpwalk_on_suboid(hostname, check_type, fetchoid, base_oid, - context_name=context_name) + context_name=context_name, + ipaddress=ip) else: rows = snmpwalk_on_suboid(hostname, ip, fetchoid, context_name=context_name)

7 years, 10 months

added missing werk files

by Andreas Boesl

Module: check_mk Branch: master Commit: c065a9d69a616fe1a94fdca8f3de4722f1b173ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c065a9d69a616f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 30 14:43:57 2016 +0200 added missing werk files --- modules/check_mk.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 8dff140..8f16357 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2507,10 +2507,51 @@ def pack_config(): out.write("#!/usr/bin/python\n" "# encoding: utf-8\n" "# Created by Check_MK. Dump of the currently active configuration\n\n") + + + + + # These functions purpose is to filter out hosts which are monitored on different sites + active_hosts = all_active_hosts() + active_clusters = all_active_clusters() + def filter_all_hosts(all_hosts): + all_hosts_red = [] + for host_entry in all_hosts: + hostname = host_entry.split("|", 1)[0] + if hostname in active_hosts: + all_hosts_red.append(host_entry) + return all_hosts_red + + def filter_clusters(clusters): + clusters_red = {} + for cluster_entry, cluster_nodes in clusters.items(): + clustername = cluster_entry.split("|", 1)[0] + if clustername in active_clusters: + clusters_red[cluster_entry] = cluster_nodes + return clusters_red + + def filter_hostname_in_dict(values): + values_red = {} + for hostname, attributes in values.items(): + if hostname in active_hosts: + values_red[hostname] = attributes + return values_red + + filter_var_functions = { + "all_hosts" : filter_all_hosts, + "clusters" : filter_clusters, + "host_attributes" : filter_hostname_in_dict, + "ipaddresses" : filter_hostname_in_dict, + "explicit_snmp_communities": filter_hostname_in_dict, + "hosttags" : filter_hostname_in_dict + } + for varname in list(config_variable_names) + derived_config_variable_names: if varname not in skipped_config_variable_names: val = globals()[varname] if packable(varname, val): + if varname in filter_var_functions: + val = filter_var_functions[varname](val) out.write("\n%s = %r\n" % (varname, val)) for varname, factory_setting in factory_settings.items():

7 years, 10 months

Centralize write_to_all_logs. Various tiny cleanups.

by Sven Panne

Module: check_mk Branch: master Commit: 93a35a26791d1917e4c37c018a5729bed4560301 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93a35a26791d19… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 30 14:43:52 2016 +0200 Centralize write_to_all_logs. Various tiny cleanups. --- livestatus/src/Logger.cc | 38 +++++++++++++++--------------------- livestatus/src/TimeperiodsCache.cc | 12 ++++++------ livestatus/src/module.cc | 27 ++++++++++++------------- 3 files changed, 34 insertions(+), 43 deletions(-) diff --git a/livestatus/src/Logger.cc b/livestatus/src/Logger.cc index aaed892..7d41390 100644 --- a/livestatus/src/Logger.cc +++ b/livestatus/src/Logger.cc @@ -36,8 +36,6 @@ using std::string; namespace { FILE *fl_logfile = nullptr; -int fl_log_level = 5; -bool fl_log_microtime = false; } // namespace void open_logfile(const string &path) { @@ -56,6 +54,20 @@ void close_logfile() { } #ifdef CMC + +#include <sys/time.h> +#include <ctime> +#include <mutex> + +using std::lock_guard; +using std::mutex; + +namespace { +std::mutex fl_logfile_mutex; +int fl_log_level = 5; +bool fl_log_microtime = false; +} // namespace + // Called during a logfile rotation, triggered by an external command. // This should only do somehting in case the logfile is really open. void reopen_logfile(const string &path) { @@ -74,21 +86,6 @@ void set_log_config(int log_level, bool log_microtime) { bool should_log(int priority) { return priority <= fl_log_level; } FILE *get_logfile() { return fl_logfile != nullptr ? fl_logfile : stdout; } -#endif - -#ifdef CMC - -#include <sys/time.h> -#include <ctime> -#include <mutex> - -using std::lock_guard; -using std::mutex; - -namespace { -std::mutex fl_logfile_mutex; -} // namespace - void logger(int priority, const string &message) { if (!should_log(priority)) { return; // msg not important enough @@ -119,16 +116,13 @@ void logger(int priority, const string &message) { #else #include <ctime> -#include "nagios.h" void logger(int /*priority*/, const string &message) { extern bool runningInLivestatusMainThread(); + extern void writeToAllLogs(const string &message); // Only the main process may use the Nagios log methods if (fl_logfile == nullptr || runningInLivestatusMainThread()) { - // 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); + writeToAllLogs("livestatus: " + message); } else if (fl_logfile != nullptr) { char timestring[64]; time_t now_t = time(nullptr); diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index eb56023..070b5d2 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -23,16 +23,17 @@ // Boston, MA 02110-1301 USA. #include "TimeperiodsCache.h" -#include <syslog.h> -#include <cstdio> #include <cstring> #include <ctime> #include <ostream> +#include <string> #include <utility> #include "Logger.h" using std::lock_guard; using std::mutex; +using std::string; +using std::to_string; extern timeperiod *timeperiod_list; @@ -129,8 +130,7 @@ bool TimeperiodsCache::inTimeperiod(timeperiod *tp) { } void TimeperiodsCache::logTransition(char *name, int from, int to) { - char buffer[256]; - snprintf(buffer, sizeof(buffer), "TIMEPERIOD TRANSITION: %s;%d;%d", name, - from, to); - write_to_all_logs(buffer, LOG_INFO); + extern void writeToAllLogs(const string &message); + writeToAllLogs(string("TIMEPERIOD TRANSITION: ") + name + ";" + + to_string(from) + ";" + to_string(to)); } diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 54e462d..8e63566 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -38,7 +38,6 @@ #include <cerrno> #include <cstddef> #include <cstdint> -#include <cstdio> #include <cstdlib> #include <cstring> #include <ctime> @@ -143,6 +142,11 @@ void count_services() { } } +void writeToAllLogs(const string &message) { + // TODO(sp) The Nagios headers are (once again) not const-correct... + write_to_all_logs(const_cast<char *>(message.c_str()), NSLOG_INFO_MESSAGE); +} + host *getHostByDesignation(const char *designation) { auto it = fl_hosts_by_designation.find(unsafe_tolower(designation)); return it == fl_hosts_by_designation.end() ? nullptr : it->second; @@ -486,22 +490,17 @@ void livestatus_log_initial_states() { // Log DOWNTIME hosts for (host *h = host_list; h != nullptr; h = h->next) { if (h->scheduled_downtime_depth > 0) { - char buffer[8192]; - snprintf(buffer, sizeof(buffer), - "HOST DOWNTIME ALERT: %s;STARTED;%s", h->name, - get_downtime_comment(h->name, nullptr)); - write_to_all_logs(buffer, NSLOG_INFO_MESSAGE); + writeToAllLogs(string("HOST DOWNTIME ALERT: ") + h->name + + ";STARTED;" + + get_downtime_comment(h->name, nullptr)); } } // Log DOWNTIME services for (service *s = service_list; s != nullptr; s = s->next) { if (s->scheduled_downtime_depth > 0) { - char buffer[8192]; - snprintf(buffer, sizeof(buffer), - "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, NSLOG_INFO_MESSAGE); + writeToAllLogs(string("SERVICE DOWNTIME ALERT: ") + s->host_name + + ";" + s->description + ";STARTED;" + + get_downtime_comment(s->host_name, s->description)); } } // Log TIMERPERIODS @@ -517,9 +516,7 @@ int broker_event(int event_type __attribute__((__unused__)), void *data) { livestatus_log_initial_states(); } else if (log_initial_states == 1) { // 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"), - NSLOG_INFO_MESSAGE); + writeToAllLogs("logging initial states"); } } g_timeperiods_cache->update(ts->timestamp.tv_sec);

7 years, 10 months

3797 Check_MK Check helpers: Decreased memory consumption in distributed setups

by Andreas Boesl

Module: check_mk Branch: master Commit: a1f6f2ecf0a6808c39190e12c43b46c8e5ca0915 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1f6f2ecf0a680… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 30 13:34:59 2016 +0200 3797 Check_MK Check helpers: Decreased memory consumption in distributed setups Hosts which are not monitored in a specific site are no longer put into the respective Check_MK Helpers configuration, thus reducing their size. --- .werks/3797 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3797 b/.werks/3797 new file mode 100644 index 0000000..1554412 --- /dev/null +++ b/.werks/3797 @@ -0,0 +1,10 @@ +Title: Check_MK Check helpers: Decreased memory consumption in distributed setups +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472556738 +Class: feature + +Hosts which are not monitored in a specific site are no longer put into +the respective Check_MK Helpers configuration, thus reducing their size. diff --git a/ChangeLog b/ChangeLog index 36eccc7..55efa0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,6 +147,7 @@ * 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 + * 3797 Check_MK Check helpers: Decreased memory consumption in distributed setups... * 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

7 years, 10 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 9cf790828bf5ac74ef42412c1406145c2deeeda3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cf790828bf5ac… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 30 13:23:41 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/Logger.cc | 94 ++++++++++++++++++---------------------------- livestatus/src/module.cc | 7 +++- 2 files changed, 42 insertions(+), 59 deletions(-) diff --git a/livestatus/src/Logger.cc b/livestatus/src/Logger.cc index 27df544..aaed892 100644 --- a/livestatus/src/Logger.cc +++ b/livestatus/src/Logger.cc @@ -26,60 +26,68 @@ #define _XOPEN_SOURCE 500 #include "Logger.h" - -#ifdef CMC - -#include <sys/time.h> #include <syslog.h> #include <cerrno> #include <cstdio> #include <cstring> -#include <ctime> -#include <mutex> #include <string> -using std::lock_guard; -using std::mutex; using std::string; namespace { -FILE *g_logfile = nullptr; -std::mutex g_logfile_mutex; -int g_log_level = 5; -bool g_log_microtime = false; +FILE *fl_logfile = nullptr; +int fl_log_level = 5; +bool fl_log_microtime = false; } // namespace -void set_log_config(int log_level, bool log_microtime) { - g_log_level = log_level; - g_log_microtime = log_microtime; -} - void open_logfile(const string &path) { - g_logfile = fopen(path.c_str(), "a"); - if (g_logfile == nullptr) { + fl_logfile = fopen(path.c_str(), "a"); + if (fl_logfile == nullptr) { logger(LOG_WARNING, "Cannot open logfile " + path + ": " + 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; } } +#ifdef CMC // Called during a logfile rotation, triggered by an external command. // This should only do somehting in case the logfile is really open. void reopen_logfile(const string &path) { - if (g_logfile != nullptr) { + if (fl_logfile != nullptr) { close_logfile(); open_logfile(path); logger(LOG_NOTICE, "Reopened logfile."); } } -bool should_log(int priority) { return priority <= g_log_level; } +void set_log_config(int log_level, bool log_microtime) { + fl_log_level = log_level; + fl_log_microtime = log_microtime; +} + +bool should_log(int priority) { return priority <= fl_log_level; } + +FILE *get_logfile() { return fl_logfile != nullptr ? fl_logfile : stdout; } +#endif + +#ifdef CMC + +#include <sys/time.h> +#include <ctime> +#include <mutex> + +using std::lock_guard; +using std::mutex; + +namespace { +std::mutex fl_logfile_mutex; +} // namespace void logger(int priority, const string &message) { if (!should_log(priority)) { @@ -90,7 +98,7 @@ void logger(int priority, const string &message) { // Make sure that loglines are not garbled up, Livestatus threads also // log... - lock_guard<mutex> lg(g_logfile_mutex); + lock_guard<mutex> lg(fl_logfile_mutex); struct timeval tv; gettimeofday(&tv, nullptr); time_t t = tv.tv_sec; @@ -99,7 +107,7 @@ void logger(int priority, const string &message) { char datestring[32]; strftime(datestring, sizeof(datestring), "%Y-%m-%d %H:%M:%S ", &lt); fputs(datestring, logfile); - if (g_log_microtime) { + if (fl_log_microtime) { fprintf(logfile, "%03ld.%03ld ", tv.tv_usec / 1000, tv.tv_usec % 1000); } fprintf(logfile, "[%d] ", priority); @@ -108,45 +116,15 @@ void logger(int priority, const string &message) { fflush(logfile); } -FILE *get_logfile() { return g_logfile != nullptr ? g_logfile : stdout; } - #else -#include <pthread.h> -#include <cstdio> -#include <syslog.h> -#include <cerrno> -#include <cstring> #include <ctime> -#include <string> #include "nagios.h" -using std::string; - -pthread_t g_mainthread_id; -static FILE *fl_logfile = nullptr; - -void open_logfile(const string &path) { - // needed to determine main thread later - g_mainthread_id = pthread_self(); - - fl_logfile = fopen(path.c_str(), "a"); - if (fl_logfile == nullptr) { - logger(LOG_WARNING, - "Cannot open logfile " + path + ": " + strerror(errno)); - } -} - -void close_logfile() { - if (fl_logfile != nullptr) { - fclose(fl_logfile); - fl_logfile = nullptr; - } -} - void logger(int /*priority*/, const string &message) { + extern bool runningInLivestatusMainThread(); // Only the main process may use the Nagios log methods - if (fl_logfile == nullptr || g_mainthread_id == pthread_self()) { + if (fl_logfile == nullptr || runningInLivestatusMainThread()) { // TODO(sp) The Nagios headers are (once again) not const-correct... write_to_all_logs( const_cast<char *>(("livestatus: " + message).c_str()), diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 1e5f692..54e462d 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -101,7 +101,7 @@ static char fl_logfile_path[4096]; char g_mkeventd_socket_path[4096]; int g_debug_level = 0; int g_should_terminate = false; -extern pthread_t g_mainthread_id; +pthread_t g_mainthread_id; pthread_t *g_clientthread_id; unsigned long g_max_cached_messages = 500000; unsigned long g_max_lines_per_logfile = @@ -179,7 +179,12 @@ void livestatus_cleanup_after_fork() { } } +bool runningInLivestatusMainThread() { + return g_mainthread_id == pthread_self(); +} + void *main_thread(void *data __attribute__((__unused__))) { + g_mainthread_id = pthread_self(); g_thread_pid = getpid(); while (g_should_terminate == 0) { do_statistics();

7 years, 10 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 06a22a211d569f8054d5e0ba7cd89df35da5d984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a22a211d569f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 30 11:40:07 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/{logger.cc => Logger.cc} | 90 ++++++++++++++++++++++++++++++- livestatus/src/Logger.h | 2 + livestatus/src/Makefile.am | 2 +- 3 files changed, 92 insertions(+), 2 deletions(-) diff --git a/livestatus/src/logger.cc b/livestatus/src/Logger.cc similarity index 57% rename from livestatus/src/logger.cc rename to livestatus/src/Logger.cc index 9302840..27df544 100644 --- a/livestatus/src/logger.cc +++ b/livestatus/src/Logger.cc @@ -25,6 +25,93 @@ // Needed for localtime_r #define _XOPEN_SOURCE 500 +#include "Logger.h" + +#ifdef CMC + +#include <sys/time.h> +#include <syslog.h> +#include <cerrno> +#include <cstdio> +#include <cstring> +#include <ctime> +#include <mutex> +#include <string> + +using std::lock_guard; +using std::mutex; +using std::string; + +namespace { +FILE *g_logfile = nullptr; +std::mutex g_logfile_mutex; +int g_log_level = 5; +bool g_log_microtime = false; +} // namespace + +void set_log_config(int log_level, bool log_microtime) { + g_log_level = log_level; + g_log_microtime = log_microtime; +} + +void open_logfile(const string &path) { + g_logfile = fopen(path.c_str(), "a"); + if (g_logfile == nullptr) { + logger(LOG_WARNING, + "Cannot open logfile " + path + ": " + strerror(errno)); + } +} + +void close_logfile() { + if (g_logfile != nullptr) { + fclose(g_logfile); + g_logfile = nullptr; + } +} + +// Called during a logfile rotation, triggered by an external command. +// This should only do somehting in case the logfile is really open. +void reopen_logfile(const string &path) { + if (g_logfile != nullptr) { + close_logfile(); + open_logfile(path); + logger(LOG_NOTICE, "Reopened logfile."); + } +} + +bool should_log(int priority) { return priority <= g_log_level; } + +void logger(int priority, const string &message) { + if (!should_log(priority)) { + return; // msg not important enough + } + + FILE *logfile = get_logfile(); + + // Make sure that loglines are not garbled up, Livestatus threads also + // log... + lock_guard<mutex> lg(g_logfile_mutex); + struct timeval tv; + gettimeofday(&tv, nullptr); + time_t t = tv.tv_sec; + struct tm lt; + localtime_r(&t, &lt); + char datestring[32]; + strftime(datestring, sizeof(datestring), "%Y-%m-%d %H:%M:%S ", &lt); + fputs(datestring, logfile); + if (g_log_microtime) { + fprintf(logfile, "%03ld.%03ld ", tv.tv_usec / 1000, tv.tv_usec % 1000); + } + fprintf(logfile, "[%d] ", priority); + fputs(message.c_str(), logfile); + fputc('\n', logfile); + fflush(logfile); +} + +FILE *get_logfile() { return g_logfile != nullptr ? g_logfile : stdout; } + +#else + #include <pthread.h> #include <cstdio> #include <syslog.h> @@ -32,7 +119,6 @@ #include <cstring> #include <ctime> #include <string> -#include "Logger.h" // IWYU pragma: keep #include "nagios.h" using std::string; @@ -75,3 +161,5 @@ void logger(int /*priority*/, const string &message) { fflush(fl_logfile); } } + +#endif diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index 8fd7479..c0e1d5e 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -27,7 +27,9 @@ #include "config.h" // IWYU pragma: keep #include <syslog.h> +#ifdef CMC #include <cstdio> +#endif #include <sstream> #include <string> diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 1fbbccf..090a1fa 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -81,6 +81,7 @@ livestatus_so_SOURCES = \ LogCache.cc \ LogEntry.cc \ Logfile.cc \ + Logger.cc \ LogwatchListColumn.cc \ MetricsColumn.cc \ NullColumn.cc \ @@ -146,7 +147,6 @@ livestatus_so_SOURCES = \ WorldNagios.cc \ auth.cc \ global_counters.cc \ - logger.cc \ mk_inventory.cc \ mk_logwatch.cc \ module.cc \

7 years, 10 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 2b898490c5f1f6138029420c218240babbb03011 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b898490c5f1f6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 30 09:47:01 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/Logger.h | 18 +++++++++++++++++- livestatus/src/logger.cc | 6 ++++-- livestatus/src/logger.h | 36 ------------------------------------ livestatus/src/module.cc | 1 - 4 files changed, 21 insertions(+), 40 deletions(-) diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index 890c6de..8fd7479 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -26,13 +26,29 @@ #define Logger_h #include "config.h" // IWYU pragma: keep +#include <syslog.h> +#include <cstdio> #include <sstream> -#include "logger.h" +#include <string> + +void open_logfile(const std::string &path); +void close_logfile(); +void logger(int priority, const std::string &message); + +#ifdef CMC +void set_log_config(int log_level, bool log_microtime); +void reopen_logfile(const std::string &path); +bool should_log(int priority); +FILE *get_logfile(); +#endif class Logger { public: explicit Logger(int priority) : _priority(priority) {} virtual ~Logger() { logger(_priority, _os.str()); } +#ifdef CMC + bool isEnabled() const { return should_log(_priority); } +#endif template <typename T> std::ostream &operator<<(const T &t) { diff --git a/livestatus/src/logger.cc b/livestatus/src/logger.cc index cdd8882..9302840 100644 --- a/livestatus/src/logger.cc +++ b/livestatus/src/logger.cc @@ -25,12 +25,14 @@ // Needed for localtime_r #define _XOPEN_SOURCE 500 -#include "logger.h" #include <pthread.h> -#include <cerrno> #include <cstdio> +#include <syslog.h> +#include <cerrno> #include <cstring> #include <ctime> +#include <string> +#include "Logger.h" // IWYU pragma: keep #include "nagios.h" using std::string; diff --git a/livestatus/src/logger.h b/livestatus/src/logger.h deleted file mode 100644 index d297c3c..0000000 --- a/livestatus/src/logger.h +++ /dev/null @@ -1,36 +0,0 @@ -// +------------------------------------------------------------------+ -// | ____ _ _ __ __ _ __ | -// | / ___| |__ ___ ___| | __ | \/ | |/ / | -// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -// | | |___| | | | __/ (__| < | | | | . \ | -// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | | -// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | -// +------------------------------------------------------------------+ -// -// This file is part of Check_MK. -// The official homepage is at http://mathias-kettner.de/check_mk. -// -// check_mk is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation in version 2. check_mk is distributed -// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -// PARTICULAR PURPOSE. See the GNU General Public License for more de- -// tails. You should have received a copy of the GNU General Public -// License along with GNU Make; see the file COPYING. If not, write -// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -// Boston, MA 02110-1301 USA. - -#ifndef logger_h -#define logger_h - -#include "config.h" // IWYU pragma: keep -#include <syslog.h> // IWYU pragma: keep -#include <string> - -void logger(int priority, const std::string &message); -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 6b8b761..1e5f692 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"

7 years, 10 months

Not following redirects in case of expecting a redirect

by Lars Michelsen

Module: check_mk Branch: master Commit: ce4f4052662b6a6f84c61c5ef889e1af025b80b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce4f4052662b6a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 29 14:27:03 2016 +0200 Not following redirects in case of expecting a redirect --- tests/testlib/__init__.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index ce2bdee..183c30c 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -320,12 +320,16 @@ class WebSession(requests.Session): return self._request("post", *args, **kwargs) - def _request(self, method, path, proto="http", expected_code=200, expect_redirect=None, allow_errors=False, add_transid=False, **kwargs): + def _request(self, method, path, proto="http", expected_code=200, expect_redirect=None, + allow_errors=False, add_transid=False, **kwargs): url = self.url(proto, path) if add_transid: url = self._add_transid(url) + if expect_redirect: + kwargs["allow_redirects"] = False + if method == "post": response = super(WebSession, self).post(url, **kwargs) else: @@ -358,10 +362,12 @@ class WebSession(requests.Session): mime_type = self._get_mime_type(response) - if expect_redirect: expected_code, redirect_target = expect_redirect - assert response.headers["Location"] == redirect_target + assert response.headers["Location"] == redirect_target, \ + "Expected %d redirect to %s but got this location: %s" % \ + (expected_code, redirect_target, + response.headers.get('Location', "None")) assert response.status_code == expected_code, \ "Got invalid status code (%d != %d) for URL %s (Location: %s)" % \

7 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 2016