Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

Updated mk_jolokia.exe to include Werk #4802

by Konstantin Büttner

Module: check_mk Branch: master Commit: 39050f5cf4a55e64524745816ea011b23026b564 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39050f5cf4a55e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 31 17:16:59 2017 +0200 Updated mk_jolokia.exe to include Werk #4802 Change-Id: I41a22e1cca7858e5ff1debaae0abff7b6158bb3a --- agents/windows/plugins/mk_jolokia.exe | Bin 10106761 -> 10088473 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index 2f88ebb..1eeac35 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ

6 years, 10 months

Nuke one more strdup().

by Sven Panne

Module: check_mk Branch: master Commit: a0e54bfcb2fcb3d646b89c864bd1399f3daaa899 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0e54bfcb2fcb3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 31 16:13:25 2017 +0200 Nuke one more strdup(). Change-Id: Iaaa094c31d8a52aa3f50b84d7ca01b432c691011 --- livestatus/src/LogEntry.cc | 28 +++++++++++----------------- livestatus/src/LogEntry.h | 10 +++++----- livestatus/src/TableLog.cc | 3 ++- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 940ca08..94cf6f0 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -60,24 +60,21 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) size_t msglen = strlen(line); while (msglen > 0 && _msg[msglen - 1] == '\n') { _msg[--msglen] = '\0'; - - // keep unsplitted copy of the message (needs lots of memory, - // maybe we could optimize that one day...) } - _complete = strdup(_msg); + + // keep unsplit copy of the message (needs lots of memory, maybe we could + // optimize that one day...) + _complete = _msg; // pointer to options (everything after ':') - _options = _complete; - while (*_options != 0 && *_options != ':') { - _options++; + size_t pos = _complete.find(':'); + if (pos != string::npos) { + pos = _complete.find_first_not_of(' ', pos + 1); } - if (*_options != 0) // line contains colon - { - _options++; // skip ':' - while (*_options == ' ') { - _options++; // skip space after ':' - } + if (pos == string::npos) { + pos = _complete.size(); } + _options = &_complete[pos]; // [1260722267] xxx - extract timestamp, validate message if (msglen < 13 || _msg[0] != '[' || _msg[11] != ']') { @@ -98,10 +95,7 @@ LogEntry::LogEntry(MonitoringCore *mc, unsigned lineno, const char *line) // rest is Class::INFO } -LogEntry::~LogEntry() { - free(_msg); - free(_complete); -} +LogEntry::~LogEntry() { free(_msg); } bool LogEntry::assign(Param par, char **scan) { switch (par) { diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index ee222f8..0e6f165 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -80,11 +80,11 @@ public: time_t _time; Class _logclass; LogEntryType _type; - char *_complete; // copy of complete unsplit message - char *_options; // points into _complete after ':' - char *_text; // points into msg - char *_host_name; // points into msg or is 0 - char *_svc_desc; // points into msg or is 0 + std::string _complete; // copy of complete unsplit message + const char *_options; // points into _complete after ':' + char *_text; // points into msg + char *_host_name; // points into msg or is 0 + char *_svc_desc; // points into msg or is 0 const char *_command_name; char *_contact_name; int _state; diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 12cfeee..8f003b1 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -33,6 +33,7 @@ #include "LogEntry.h" #include "Logfile.h" #include "OffsetIntColumn.h" +#include "OffsetSStringColumn.h" #include "OffsetStringColumn.h" #include "OffsetTimeColumn.h" #include "Query.h" @@ -67,7 +68,7 @@ TableLog::TableLog(MonitoringCore *mc, LogCache *log_cache) "class", "The class of the message as integer (0:info, 1:state, 2:program, 3:notification, 4:passive, 5:command)", DANGEROUS_OFFSETOF(LogEntry, _logclass), -1, -1, -1)); - addColumn(make_unique<OffsetStringColumn>( + addColumn(make_unique<OffsetSStringColumn>( "message", "The complete message line including the timestamp", DANGEROUS_OFFSETOF(LogEntry, _complete), -1, -1, -1)); addColumn(make_unique<OffsetStringColumn>(

6 years, 10 months

Fix typos

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5c6f99c783ab669547a0aed83ea07172d893f819 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c6f99c783ab66… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 31 15:49:34 2017 +0200 Fix typos Change-Id: I5527bd0da0c9592780f95f8dbf6fd6bcac695017 --- agents/plugins/mk_jolokia | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index dc0353f..6a2e23a 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -478,7 +478,7 @@ conffile = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/jolokia.cfg" if os.path.exists(conffile): execfile(conffile) -if server = "use fqdn": +if server == "use fqdn": server = socket.getfqdn() if instance == None: @@ -518,6 +518,6 @@ for inst in instances: inst["instance"] = inst["instance"].replace(" ", "_") if inst.get("server") == "use fqdn": - inst["server"] == socket.getfqdn() + inst["server"] = socket.getfqdn() query_instance(inst)

6 years, 10 months

4802 mk_jolokia: Can now be configured to use the local machine' s FQDN to access Jolokia

by Konstantin Büttner

Module: check_mk Branch: master Commit: bbf2e2be92048079b0d3e99c2efc3419dbf0b90f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbf2e2be920480… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 31 15:38:21 2017 +0200 4802 mk_jolokia: Can now be configured to use the local machine's FQDN to access Jolokia Previously, the Jolokia server could be configured via an IP address or an explicit FQDN. When using HTTPS on a large number of devices, configuring "localhost" or 127.0.0.1 would lead to certificate errors unless one configured the FQDN for each host individually. This is unreasonably tedious, and can be avoided using this feature. Change-Id: I786ba5170f4cd8e06cda8fa2191a0a49c26c289b --- .werks/4802 | 13 +++++++++++++ agents/plugins/mk_jolokia | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/.werks/4802 b/.werks/4802 new file mode 100644 index 0000000..ba0045d --- /dev/null +++ b/.werks/4802 @@ -0,0 +1,13 @@ +Title: mk_jolokia: Can now be configured to use the local machine's FQDN to access Jolokia +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501508004 +Class: feature + +Previously, the Jolokia server could be configured via an IP address or an explicit FQDN. +When using HTTPS on a large number of devices, configuring "localhost" or 127.0.0.1 +would lead to certificate errors unless one configured the FQDN for each host individually. +This is unreasonably tedious, and can be avoided using this feature. diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index f00f606..dc0353f 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -478,6 +478,9 @@ conffile = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/jolokia.cfg" if os.path.exists(conffile): execfile(conffile) +if server = "use fqdn": + server = socket.getfqdn() + if instance == None: instance = str(port) @@ -514,4 +517,7 @@ for inst in instances: inst["instance"] = str(inst["port"]) inst["instance"] = inst["instance"].replace(" ", "_") + if inst.get("server") == "use fqdn": + inst["server"] == socket.getfqdn() + query_instance(inst)

6 years, 10 months

Parse time period transitions the C++ way

by Sven Panne

Module: check_mk Branch: master Commit: a55997fb96434434fe86e98781f6a9a92c44c6c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a55997fb964344… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 31 14:14:56 2017 +0200 Parse time period transitions the C++ way Change-Id: I35cf8ff96f926060bbdbe5412cf3895b9c9f4990 --- livestatus/src/TableStateHistory.cc | 104 ++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 47 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index ba28f6e..12f2c22 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "TableStateHistory.h" -#include <cstdlib> #include <cstring> #include <ctime> #include <deque> @@ -31,7 +30,9 @@ #include <mutex> #include <ostream> #include <set> +#include <stdexcept> #include <utility> +#include <vector> #include "Column.h" #include "ColumnFilter.h" #include "Filter.h" @@ -275,6 +276,28 @@ public: bool _value = true; }; + +class TimeperiodTransition { +public: + explicit TimeperiodTransition(const string &str) { + auto fields = mk::split(str, ';'); + if (fields.size() != 3) { + throw std::invalid_argument("expected 3 arguments"); + } + _name = fields[0]; + _from = std::stoi(fields[1]); + _to = std::stoi(fields[2]); + } + + string name() const { return _name; } + int from() const { return _from; } + int to() const { return _to; } + +private: + string _name; + int _from; + int _to; +}; } // namespace void TableStateHistory::answerQuery(Query *query) { @@ -600,29 +623,18 @@ void TableStateHistory::answerQuery(Query *query) { break; } case LogEntryType::timeperiod_transition: { - char *save_ptr; - char *buffer = strdup(entry->_options); - char *tp_name = strtok_r(buffer, ";", &save_ptr); - char *tp_state = strtok_r(nullptr, ";", &save_ptr); - if (tp_state != nullptr) { - tp_state = strtok_r(nullptr, ";", &save_ptr); - } - - if (tp_state == nullptr) { - // This line is broken... + try { + TimeperiodTransition tpt(entry->_options); + _notification_periods[tpt.name()] = tpt.to(); + for (auto &it_hst : state_info) { + updateHostServiceState(query, entry, it_hst.second, + only_update); + } + } catch (const std::logic_error &e) { Warning(logger()) << "Error: Invalid syntax of TIMEPERIOD TRANSITION: " << entry->_complete; - free(buffer); - break; } - - _notification_periods[tp_name] = atoi(tp_state); - for (auto &it_hst : state_info) { - updateHostServiceState(query, entry, it_hst.second, - only_update); - } - free(buffer); break; } case LogEntryType::log_initial_states: { @@ -834,38 +846,36 @@ int TableStateHistory::updateHostServiceState(Query *query, break; } case LogEntryType::timeperiod_transition: { - char *save_ptr; - char *buffer = strdup(entry->_options); - string tp_name = strtok_r(buffer, ";", &save_ptr); - strtok_r(nullptr, ";", &save_ptr); - char *tp_state = strtok_r(nullptr, ";", &save_ptr); - - // if no _host pointer is available the initial status of - // _in_notification_period (1) never changes - if ((hs_state->_host != nullptr) && - (tp_name == hs_state->_notification_period)) { - int new_status = atoi(tp_state); - if (new_status != hs_state->_in_notification_period) { - if (!only_update) { - process(query, hs_state); + try { + TimeperiodTransition tpt(entry->_options); + // if no _host pointer is available the initial status of + // _in_notification_period (1) never changes + if (hs_state->_host != nullptr && + tpt.name() == hs_state->_notification_period) { + if (tpt.to() != hs_state->_in_notification_period) { + if (!only_update) { + process(query, hs_state); + } + hs_state->_debug_info = "TIMEPERIOD "; + hs_state->_in_notification_period = tpt.to(); } - hs_state->_debug_info = "TIMEPERIOD "; - hs_state->_in_notification_period = new_status; } - } - // same for service period - if ((hs_state->_host != nullptr) && - (tp_name == hs_state->_service_period)) { - int new_status = atoi(tp_state); - if (new_status != hs_state->_in_service_period) { - if (!only_update) { - process(query, hs_state); + // same for service period + if (hs_state->_host != nullptr && + tpt.name() == hs_state->_service_period) { + if (tpt.to() != hs_state->_in_service_period) { + if (!only_update) { + process(query, hs_state); + } + hs_state->_debug_info = "TIMEPERIOD "; + hs_state->_in_service_period = tpt.to(); } - hs_state->_debug_info = "TIMEPERIOD "; - hs_state->_in_service_period = new_status; } + } catch (const std::logic_error &e) { + Warning(logger()) + << "Error: Invalid syntax of TIMEPERIOD TRANSITION: " + << entry->_complete; } - free(buffer); break; } }

6 years, 10 months

5022 FIX Fixed timperiod history calculation

by Sven Panne

Module: check_mk Branch: master Commit: 9c46325d8fd39d122ecf5d2d88934bfbf6788340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c46325d8fd39d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 31 13:19:54 2017 +0200 5022 FIX Fixed timperiod history calculation The parsing of the monitoring history had a bug, expecting an incorrect "TIMEPERIOD_TRANSITION:" instead of the correct "TIMERPERIOD TRANSISION:", which could lead to incorrect availibility calculations later (when the Nagios core is used). Change-Id: Ieea33369fb3997bd31799ec368e9d87a32bef104 --- .werks/5022 | 13 +++++++++++++ livestatus/src/LogEntry.cc | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5022 b/.werks/5022 new file mode 100644 index 0000000..0662af8 --- /dev/null +++ b/.werks/5022 @@ -0,0 +1,13 @@ +Title: Fixed timperiod history calculation +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501499838 +Class: fix + +The parsing of the monitoring history had a bug, expecting an incorrect +"TIMEPERIOD_TRANSITION:" instead of the correct "TIMERPERIOD TRANSISION:", +which could lead to incorrect availibility calculations later (when the +Nagios core is used). diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 552786e..940ca08 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -218,7 +218,7 @@ std::vector<LogEntry::LogDef> LogEntry::log_definitions // NOLINT LogEntryType::flapping_service, {Param::HostName, Param::SvcDesc, Param::StateType, Param::Comment}}, //////////////// - LogDef{"TIMEPERIOD_TRANSITION: ", + LogDef{"TIMEPERIOD TRANSITION: ", Class::state, LogEntryType::timeperiod_transition, {}},

6 years, 10 months

Use std::string instead of strdup/free, removing a cruel owneship hack on the way.

by Sven Panne

Module: check_mk Branch: master Commit: 745c1d1eaf6b7bfe3195193a39607e9f35e8ac7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=745c1d1eaf6b7b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 31 09:54:20 2017 +0200 Use std::string instead of strdup/free, removing a cruel owneship hack on the way. Change-Id: I8ed033750b2afa5ecfcbe3f51a6f13b6ee688730 --- livestatus/src/HostServiceState.cc | 8 -------- livestatus/src/HostServiceState.h | 8 +------- livestatus/src/TableStateHistory.cc | 34 +++++++--------------------------- 3 files changed, 8 insertions(+), 42 deletions(-) diff --git a/livestatus/src/HostServiceState.cc b/livestatus/src/HostServiceState.cc index 5a1f721..33f0189 100644 --- a/livestatus/src/HostServiceState.cc +++ b/livestatus/src/HostServiceState.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "HostServiceState.h" -#include <cstdlib> HostServiceState::HostServiceState() : _is_host(false) @@ -53,16 +52,9 @@ HostServiceState::HostServiceState() , _may_no_longer_exist(false) , _has_vanished(false) , _last_known_time(0) - , _log_output(nullptr) , _host(nullptr) , _service(nullptr) {} -HostServiceState::~HostServiceState() { - if (_log_output != nullptr) { - free(_log_output); - } -} - #ifdef CMC void HostServiceState::computePerStateDurations() { _duration_state_UNMONITORED = 0; diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h index c7bf6a9..24852cb 100644 --- a/livestatus/src/HostServiceState.h +++ b/livestatus/src/HostServiceState.h @@ -86,12 +86,7 @@ public: time_t _last_known_time; std::string _debug_info; - - // NOTE: _log_output is the *only* pointer in this class to an object we - // own, all other pointers are to foreign objects. This ownership is - // unfortunate and complicates things quite a lot, see the corresponding - // TODO in TableStateHistory::updateHostServiceState. - char *_log_output; + std::string _log_output; // maybe "": -> no period known, we assume "always" std::string _notification_period; @@ -103,7 +98,6 @@ public: std::string _service_description; // Fallback if service no longer exists HostServiceState(); - ~HostServiceState(); #ifdef CMC void computePerStateDurations(); #endif diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index b14949e..ba28f6e 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -162,7 +162,7 @@ TableStateHistory::TableStateHistory(MonitoringCore *mc, LogCache *log_cache) "service_description", "Description of the service", DANGEROUS_OFFSETOF(HostServiceState, _service_description), -1, -1, -1)); - addColumn(make_unique<OffsetStringColumn>( + addColumn(make_unique<OffsetSStringColumn>( "log_output", "Logfile output relevant for this state", DANGEROUS_OFFSETOF(HostServiceState, _log_output), -1, -1, -1)); addColumn(make_unique<OffsetIntColumn>( @@ -662,10 +662,7 @@ void TableStateHistory::answerQuery(Query *query) { hst->_state = -1; hst->_until = hst->_time; hst->_debug_info = "UNMONITORED"; - if (hst->_log_output != nullptr) { - free(hst->_log_output); - } - hst->_log_output = nullptr; + hst->_log_output = ""; } hst->_time = _until - 1; @@ -710,10 +707,7 @@ int TableStateHistory::updateHostServiceState(Query *query, hs_state->_in_notification_period = 0; hs_state->_in_service_period = 0; hs_state->_is_flapping = 0; - if (hs_state->_log_output != nullptr) { - free(hs_state->_log_output); - } - hs_state->_log_output = nullptr; + hs_state->_log_output = ""; // Apply latest notification period information and set the host_state // to unmonitored @@ -877,28 +871,14 @@ int TableStateHistory::updateHostServiceState(Query *query, } if (entry->_type != LogEntryType::timeperiod_transition) { - if (hs_state->_log_output != nullptr) { - free(hs_state->_log_output); - } - if ((entry->_type == LogEntryType::state_host_initial || entry->_type == LogEntryType::state_service_initial) && (entry->_check_output != nullptr && - (strcmp(entry->_check_output, "(null)") == 0))) { - hs_state->_log_output = nullptr; - + strcmp(entry->_check_output, "(null)") == 0)) { + hs_state->_log_output = ""; } else { - // TODO(sp): Do we really need to strdup? How are the lifetimes of - // entry and hs_state related? This is highly unclear. This strdup - // complicates things like hell, because HostServiceState owns - // _log_output because of it. If this is really needed (hopefully - // not), we should better change the type from a naked pointer to a - // unique_ptr, but this would mean introducing yet another Column - // subclass, because the Column framework is not flexible at all - // regarding the types it handles. - hs_state->_log_output = entry->_check_output != nullptr - ? strdup(entry->_check_output) - : nullptr; + hs_state->_log_output = + entry->_check_output == nullptr ? "" : entry->_check_output; } }

6 years, 10 months

Tests: Remove check for recently dropped hook

by Lars Michelsen

Module: check_mk Branch: master Commit: ea61eb37feff9ab270f8006a7db833a263a4edbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea61eb37feff9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 18:25:00 2017 +0200 Tests: Remove check for recently dropped hook Change-Id: I37181757337d59660c7a33bfe496542a9d0de28e --- tests/omd/test_hooks.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/omd/test_hooks.py b/tests/omd/test_hooks.py index 63eeb9f..205b05b 100644 --- a/tests/omd/test_hooks.py +++ b/tests/omd/test_hooks.py @@ -24,7 +24,6 @@ def test_hooks(site): "MULTISITE_AUTHORISATION", "MULTISITE_COOKIE_AUTH", "NAGIOS_THEME", - "NAGVIS_URLS", "NSCA", "NSCA_TCP_PORT", "PNP4NAGIOS",

6 years, 11 months

5047 FIX EC views: Fixed "Events of host X" views of unrelated events

by Lars Michelsen

Module: check_mk Branch: master Commit: 64a023090f0c190616c0e675f329f862aa35b508 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64a023090f0c19… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 12:06:12 2017 +0200 5047 FIX EC views: Fixed "Events of host X" views of unrelated events When clicking on the host name of an unrelated event (one that has no host in the monitoring core) the target page was not showing any event since Check_MK 1.4. The events are now correctly filtered by the original event host instead of the host name of the found core host. Change-Id: Ib61ae1c3f955845aa0fdfde1ac8c272717605707 --- .werks/5047 | 12 ++++++++++++ web/htdocs/views.py | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/.werks/5047 b/.werks/5047 new file mode 100644 index 0000000..5923403 --- /dev/null +++ b/.werks/5047 @@ -0,0 +1,12 @@ +Title: EC views: Fixed "Events of host X" views of unrelated events +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501236224 +Class: fix + +When clicking on the host name of an unrelated event (one that has no host in the monitoring core) +the target page was not showing any event since Check_MK 1.4. The events are now correctly filtered +by the original event host instead of the host name of the found core host. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 08da98a..ab7822f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1504,6 +1504,22 @@ def show_view(view, show_heading = False, show_buttons = True, if html.has_var('servicegroup') and not html.has_var("optservice_group"): html.set_var("optservice_group", html.var("servicegroup")) + # TODO: Another hack :( Just like the above one: When opening the view "ec_events_of_host", + # which is of single context "host" using a host name of a unrelated event, the list of + # events is always empty since the single context filter "host" is sending a "host_name = ..." + # filter to livestatus which is not matching a "unrelated event". Instead the filter event_host + # needs to be used. + # Another idea: We could change these views to non single context views, but then we would not + # be able to show the buttons to other host related views, which is also bad. So better stick + # with the current mode. + if view["datasource"] in [ "mkeventd_events", "mkeventd_history" ] and "host" in view["single_infos"]: + # Remove the original host name filter + use_filters = [ f for f in use_filters if f.name != "host" ] + + # Set the value for the event host filter + if not html.has_var("event_host"): + html.set_var("event_host", html.var("host")) + # Now populate the HTML vars with context vars from the view definition. Hard # coded default values are treated differently: # @@ -1514,6 +1530,7 @@ def show_view(view, show_heading = False, show_buttons = True, # Check that all needed information for configured single contexts are available visuals.verify_single_contexts('views', view, datasource.get('link_filters', {})) + # Prepare Filter headers for Livestatus # TODO: When this is used by the reporting then *all* filters are # active. That way the inventory data will always be loaded. When

6 years, 11 months

Added debug to config.status target and fixed cmk/ livestatus package build target

by Lars Michelsen

Module: check_mk Branch: master Commit: a80e27be189b0159382d14c0f9ef86887960bcb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a80e27be189b01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 11:12:36 2017 +0200 Added debug to config.status target and fixed cmk/livestatus package build target Change-Id: Ib8f30d6c4249736829e5fab0a6ea44b84c421997 --- Makefile | 1 + omd/packages/check_mk/Makefile | 4 ++-- omd/packages/mk-livestatus/Makefile | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 737bd36..d319c35 100644 --- a/Makefile +++ b/Makefile @@ -410,6 +410,7 @@ ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac autoreconf --install --include=m4 config.status: $(DIST_DEPS) + @echo "Build $@ (newer targets: $?)" @if test -f config.status; then \ echo "update config.status by reconfiguring in the same conditions" ; \ ./config.status --recheck; \ diff --git a/omd/packages/check_mk/Makefile b/omd/packages/check_mk/Makefile index 903fc83..b245aed 100644 --- a/omd/packages/check_mk/Makefile +++ b/omd/packages/check_mk/Makefile @@ -7,8 +7,8 @@ DISTNAME = $(NAME)-$(CMK_VERSION) .PHONY: skel build: clean - if [ ! -f ../../../$(DISTNAME).tar.gz ]; then - $(MAKE) -C ../../.. $(DISTNAME).tar.gz + if [ ! -f ../../../$(DISTNAME).tar.gz ]; then \ + $(MAKE) -C ../../.. $(DISTNAME).tar.gz ; \ fi tar xzf $(REPO_PATH)/$(DISTNAME).tar.gz cd $(DISTNAME) ; \ diff --git a/omd/packages/mk-livestatus/Makefile b/omd/packages/mk-livestatus/Makefile index da750c3..23a77ad 100644 --- a/omd/packages/mk-livestatus/Makefile +++ b/omd/packages/mk-livestatus/Makefile @@ -6,7 +6,9 @@ CXX_FLAGS := -g -O3 -Wall -Wextra # Attention: copy-n-paste from check_mk/Makefile below... build: clean - $(MAKE) -C ../../.. $(DIR).tar.gz + if [ ! -f ../../../$(DIR).tar.gz ]; then \ + $(MAKE) -C ../../.. $(DIR).tar.gz ; \ + fi tar xzf ../../../$(DIR).tar.gz @if test -d ../boost/local ; then \ BOOST_OPT="--with-boost=$(abspath ../boost/local)" ; \

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017