Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

Check_MK python programs use the environments python interpreter now

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d071da76531b2fba06a7a6d2e1a544598e2a2d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d071da76531b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 6 21:10:37 2016 +0200 Check_MK python programs use the environments python interpreter now --- agents/special/agent_activemq | 2 +- agents/special/agent_allnet_ip_sensoric | 2 +- agents/special/agent_appdynamics | 5 ++--- agents/special/agent_emcvnx | 2 +- agents/special/agent_fritzbox | 2 +- agents/special/agent_hivemanager | 2 +- agents/special/agent_hp_msa | 4 ++-- agents/special/agent_ibmsvc | 2 +- agents/special/agent_innovaphone | 2 +- agents/special/agent_ipmi_sensors | 4 ++-- agents/special/agent_jolokia | 2 +- agents/special/agent_netapp | 2 +- agents/special/agent_prism | 4 ++-- agents/special/agent_random | 2 +- agents/special/agent_ruckus_spot | 2 +- agents/special/agent_siemens_plc | 4 ++-- agents/special/agent_tinkerforge | 4 ++-- agents/special/agent_ucs_bladecenter | 2 +- agents/special/agent_vsphere | 2 +- agents/special/agent_vsphere.pysphere | 2 +- bin/mkeventd | 6 +++--- check_mk | 2 +- doc/treasures/active_checks/check_bi_aggr | 4 ++-- doc/treasures/active_checks/check_cpu_peaks | 2 +- doc/treasures/active_checks/check_form_submit | 6 +++--- doc/treasures/active_checks/check_mail | 6 +++--- doc/treasures/active_checks/check_mail_loop | 6 +++--- doc/treasures/active_checks/check_mailboxes | 6 +++--- doc/treasures/active_checks/check_mkevents.cc | 2 +- doc/treasures/active_checks/check_mkevents.py | 2 +- doc/treasures/active_checks/check_notify_count | 4 ++-- doc/treasures/active_checks/check_sql | 4 ++-- doc/treasures/active_checks/check_traceroute | 6 +++--- doc/treasures/active_checks/check_uniserv | 4 ++-- modules/check_mk.py | 2 +- notifications/asciimail | 2 +- notifications/mail | 2 +- notifications/pushover | 2 +- notifications/sms | 2 +- notifications/spectrum | 2 +- scripts/autodetect.py | 2 +- web/htdocs/index.py | 2 +- 42 files changed, 64 insertions(+), 65 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d071da765…

8 years, 1 month

3620 FIX Do not longer put SNMP MIB files into WATO snapshots

by Mathias Kettner

Module: check_mk Branch: master Commit: e66bb81267d3af9dcf26337f5705e4aa472fab62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e66bb81267d3af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 6 16:00:47 2016 +0200 3620 FIX Do not longer put SNMP MIB files into WATO snapshots WATO used to put uploaded MIB files into the automatically created snapshots. The snapshots are used for configuration roll back in case of a manually garbled configuration. They are not ment to replace a real backup. MIB files slew down configuration creation on {{Activate changes}} a lot. No any longer... --- .werks/3620 | 14 ++++++++++++++ ChangeLog | 1 + web/plugins/wato/backup_domains.py | 1 - 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3620 b/.werks/3620 new file mode 100644 index 0000000..7dde0ac --- /dev/null +++ b/.werks/3620 @@ -0,0 +1,14 @@ +Title: Do not longer put SNMP MIB files into WATO snapshots +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1465221527 + +WATO used to put uploaded MIB files into the automatically created +snapshots. The snapshots are used for configuration roll back in +case of a manually garbled configuration. They are not ment to replace +a real backup. MIB files slew down configuration creation on +{{Activate changes}} a lot. No any longer... diff --git a/ChangeLog b/ChangeLog index 99a5756..e3e8e5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -422,6 +422,7 @@ * 3579 FIX: Fixed visibility of SNMP community attribute when SNMP tag is inherited * 3583 FIX: Fixed loosing some services after saving services in WATO... * 3588 FIX: BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches + * 3620 FIX: Do not longer put SNMP MIB files into WATO snapshots... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index f50898a..f354096 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -216,7 +216,6 @@ else: "paths" : [ ("dir", "local/share/check_mk/mibs"), ], - "default" : True }, "extensions" : { "title" : _("Extensions in <tt>~/local/</tt> and MKPs"),

8 years, 1 month

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 18b0391de5260fd4853dbebbf84b83aa1ea9e8d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18b0391de5260f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 6 15:06:33 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/DownCommColumn.h | 2 +- livestatus/src/DowntimeOrComment.h | 9 ++++++--- livestatus/src/HostServiceState.h | 5 +++-- livestatus/src/LogCache.h | 2 +- livestatus/src/Logfile.h | 2 +- livestatus/src/MetricsColumn.h | 2 +- livestatus/src/TableEventConsole.h | 2 +- livestatus/src/TableEventConsoleEvents.h | 2 +- livestatus/src/TableEventConsoleHistory.h | 2 +- livestatus/src/TableEventConsoleStatus.h | 2 +- livestatus/src/TableHosts.h | 2 +- livestatus/src/TableHostsByGroup.h | 2 +- livestatus/src/TableLog.h | 2 +- livestatus/src/TableServices.h | 2 +- livestatus/src/TableServicesByGroup.h | 2 +- livestatus/src/TableServicesByHostGroup.h | 2 +- livestatus/src/TableStateHistory.h | 4 ++-- livestatus/src/TableStatus.h | 2 +- 18 files changed, 26 insertions(+), 22 deletions(-) diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h index b049eba..efdc7bc 100644 --- a/livestatus/src/DownCommColumn.h +++ b/livestatus/src/DownCommColumn.h @@ -29,7 +29,7 @@ #include <string> #include "Column.h" #include "ListColumn.h" -struct DowntimeOrComment; +class DowntimeOrComment; class DowntimesOrComments; class Query; diff --git a/livestatus/src/DowntimeOrComment.h b/livestatus/src/DowntimeOrComment.h index bfc082f..e74f4d9 100644 --- a/livestatus/src/DowntimeOrComment.h +++ b/livestatus/src/DowntimeOrComment.h @@ -78,7 +78,8 @@ }nebstruct_comment_data; */ -struct DowntimeOrComment { +class DowntimeOrComment { +public: int _type; host *_host; service *_service; @@ -92,7 +93,8 @@ struct DowntimeOrComment { virtual ~DowntimeOrComment(); }; -struct Downtime : public DowntimeOrComment { +class Downtime : public DowntimeOrComment { +public: time_t _start_time; time_t _end_time; int _fixed; @@ -101,7 +103,8 @@ struct Downtime : public DowntimeOrComment { explicit Downtime(nebstruct_downtime_struct *dt); }; -struct Comment : public DowntimeOrComment { +class Comment : public DowntimeOrComment { +public: time_t _expire_time; int _persistent; int _source; diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h index 9ae14e6..7df779b 100644 --- a/livestatus/src/HostServiceState.h +++ b/livestatus/src/HostServiceState.h @@ -30,13 +30,14 @@ #include <time.h> #include <vector> #include "nagios.h" // IWYU pragma: keep -struct HostServiceState; +class HostServiceState; typedef std::vector<HostServiceState *> HostServices; typedef void *HostServiceKey; -struct HostServiceState { +class HostServiceState { +public: bool _is_host; time_t _time; int _lineno; diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 778f3fa..d436de3 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -33,7 +33,7 @@ class Column; class CommandsHolder; #ifdef CMC -struct Core; +class Core; #endif class Logfile; diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index d450803..9e14d6e 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -36,7 +36,7 @@ class Query; struct LogEntry; #ifdef CMC -struct World; +class World; #endif #define MAX_LOGLINE 65536 diff --git a/livestatus/src/MetricsColumn.h b/livestatus/src/MetricsColumn.h index 64e5b51..4ecb77a 100644 --- a/livestatus/src/MetricsColumn.h +++ b/livestatus/src/MetricsColumn.h @@ -29,7 +29,7 @@ #include <string> #include "Column.h" #ifdef CMC -struct Core; +class Core; #endif class Query; diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index eb63163..32eee11 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -43,7 +43,7 @@ #include "Table.h" #ifdef CMC #include "cmc.h" -struct Core; +class Core; #else #include "nagios.h" #endif diff --git a/livestatus/src/TableEventConsoleEvents.h b/livestatus/src/TableEventConsoleEvents.h index 56f75ac..bfead95 100644 --- a/livestatus/src/TableEventConsoleEvents.h +++ b/livestatus/src/TableEventConsoleEvents.h @@ -30,7 +30,7 @@ class Table; #ifdef CMC #include <mutex> -struct Core; +class Core; class Notes; #else class DowntimesOrComments; diff --git a/livestatus/src/TableEventConsoleHistory.h b/livestatus/src/TableEventConsoleHistory.h index f8e73bd..e4b16b9 100644 --- a/livestatus/src/TableEventConsoleHistory.h +++ b/livestatus/src/TableEventConsoleHistory.h @@ -29,7 +29,7 @@ #include "TableEventConsole.h" #ifdef CMC #include <mutex> -struct Core; +class Core; class Notes; #else class DowntimesOrComments; diff --git a/livestatus/src/TableEventConsoleStatus.h b/livestatus/src/TableEventConsoleStatus.h index 23d9d9e..5726ede 100644 --- a/livestatus/src/TableEventConsoleStatus.h +++ b/livestatus/src/TableEventConsoleStatus.h @@ -28,7 +28,7 @@ #include "config.h" // IWYU pragma: keep #include "TableEventConsole.h" #ifdef CMC -struct Core; +class Core; #endif class TableEventConsoleStatus : public TableEventConsole { diff --git a/livestatus/src/TableHosts.h b/livestatus/src/TableHosts.h index 4aec773..075eceb 100644 --- a/livestatus/src/TableHosts.h +++ b/livestatus/src/TableHosts.h @@ -31,7 +31,7 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -struct Core; +class Core; class Notes; #else class DowntimesOrComments; diff --git a/livestatus/src/TableHostsByGroup.h b/livestatus/src/TableHostsByGroup.h index ccb3bec..9573592 100644 --- a/livestatus/src/TableHostsByGroup.h +++ b/livestatus/src/TableHostsByGroup.h @@ -30,7 +30,7 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -struct Core; +class Core; class Notes; #else class DowntimesOrComments; diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h index 5d40d28..8ba78a4 100644 --- a/livestatus/src/TableLog.h +++ b/livestatus/src/TableLog.h @@ -32,7 +32,7 @@ class Column; #ifdef CMC #include <mutex> -struct Core; +class Core; class Notes; #else class DowntimesOrComments; diff --git a/livestatus/src/TableServices.h b/livestatus/src/TableServices.h index 8fc3980..b87e766 100644 --- a/livestatus/src/TableServices.h +++ b/livestatus/src/TableServices.h @@ -31,7 +31,7 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -struct Core; +class Core; class Notes; #else class DowntimesOrComments; diff --git a/livestatus/src/TableServicesByGroup.h b/livestatus/src/TableServicesByGroup.h index 5024d2a..d10a7de 100644 --- a/livestatus/src/TableServicesByGroup.h +++ b/livestatus/src/TableServicesByGroup.h @@ -30,7 +30,7 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -struct Core; +class Core; class Notes; #else class DowntimesOrComments; diff --git a/livestatus/src/TableServicesByHostGroup.h b/livestatus/src/TableServicesByHostGroup.h index afe11bd..9519141 100644 --- a/livestatus/src/TableServicesByHostGroup.h +++ b/livestatus/src/TableServicesByHostGroup.h @@ -30,7 +30,7 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -struct Core; +class Core; class Notes; #else class DowntimesOrComments; diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index 4e461a8..91d2e90 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -35,13 +35,13 @@ class Column; #ifdef CMC #include <mutex> -struct Core; +class Core; class Notes; #else class DowntimesOrComments; #endif class Query; -struct HostServiceState; +class HostServiceState; struct LogEntry; #define CLASSMASK_STATEHIST 0xC6 diff --git a/livestatus/src/TableStatus.h b/livestatus/src/TableStatus.h index bca736a..9f9cb3b 100644 --- a/livestatus/src/TableStatus.h +++ b/livestatus/src/TableStatus.h @@ -28,7 +28,7 @@ #include "config.h" // IWYU pragma: keep #include "Table.h" #ifdef CMC -struct Core; +class Core; #endif class Query;

8 years, 1 month

Fixed bug where view sort links could set wrong display options

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b336305baec12eed346d82876a5d0e776b70911 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b336305baec12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 6 15:02:05 2016 +0200 Fixed bug where view sort links could set wrong display options --- web/htdocs/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 236f0db..ad955ee 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -364,8 +364,7 @@ def prepare_display_options(): # "DisplayOptions.options" but this contains the implicit options which should # not be added to the URLs. So the real parameters need to be preserved for # this case. - if html.var('display_options'): - DisplayOptions.title_options = html.var("display_options") + DisplayOptions.title_options = html.var("display_options") # If display option 'M' is set, then all links are targetet to the 'main' # frame. Also the display options are removed since the view in the main

8 years, 1 month

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: e95f01b1539ba26cfb7ee7316daf8b1128433ca8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e95f01b1539ba2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 6 13:50:14 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/DynamicColumn.h | 3 +- .../src/DynamicEventConsoleReplicationColumn.cc | 4 +- .../src/DynamicEventConsoleReplicationColumn.h | 5 +- livestatus/src/DynamicLogwatchFileColumn.cc | 56 +++++--------------- livestatus/src/DynamicLogwatchFileColumn.h | 3 +- livestatus/src/Table.cc | 32 +++++++---- livestatus/src/Table.h | 10 ++-- livestatus/src/TableEventConsoleReplication.h | 2 + 8 files changed, 53 insertions(+), 62 deletions(-) diff --git a/livestatus/src/DynamicColumn.h b/livestatus/src/DynamicColumn.h index f37fcc5..e210d8c 100644 --- a/livestatus/src/DynamicColumn.h +++ b/livestatus/src/DynamicColumn.h @@ -35,7 +35,8 @@ public: int indirect_offset, int extra_offset); virtual ~DynamicColumn(); std::string name() const; - virtual Column *createColumn(const std::string &arguments) = 0; + virtual Column *createColumn(const std::string &name, + const std::string &arguments) = 0; protected: const std::string _name; diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc index 93034be..73746bc 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -92,7 +92,7 @@ DynamicEventConsoleReplicationColumn::DynamicEventConsoleReplicationColumn( } Column *DynamicEventConsoleReplicationColumn::createColumn( - const std::string &arguments) { + const std::string &name, const std::string &arguments) { #ifdef CMC string path = _core->_world->_config->_mkeventd_socket_path; #else @@ -100,6 +100,6 @@ Column *DynamicEventConsoleReplicationColumn::createColumn( #endif ECTableConnection ec(path, "REPLICATE " + arguments); ec.run(); - return new ReplicationColumn("replication", "replication value", -1, -1, + return new ReplicationColumn(name, "replication value", -1, -1, ec.getResult()); } diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.h b/livestatus/src/DynamicEventConsoleReplicationColumn.h index f9603be..b5b2b86 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.h +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.h @@ -29,7 +29,9 @@ #include <string> #include "DynamicColumn.h" class Column; +#ifdef CMC class Core; +#endif class DynamicEventConsoleReplicationColumn : public DynamicColumn { public: @@ -41,7 +43,8 @@ public: Core *core #endif ); - Column *createColumn(const std::string &arguments) override; + Column *createColumn(const std::string &name, + const std::string &arguments) override; #ifdef CMC private: Core *_core; diff --git a/livestatus/src/DynamicLogwatchFileColumn.cc b/livestatus/src/DynamicLogwatchFileColumn.cc index 49c844f..b722a0e 100644 --- a/livestatus/src/DynamicLogwatchFileColumn.cc +++ b/livestatus/src/DynamicLogwatchFileColumn.cc @@ -23,16 +23,12 @@ // Boston, MA 02110-1301 USA. #include "DynamicLogwatchFileColumn.h" -#include <string.h> -#include <syslog.h> -#include <vector> +#include <ostream> #include "HostFileColumn.h" -#include "logger.h" +#include "Logger.h" #include "mk_logwatch.h" -#include "strutil.h" using std::string; -using std::vector; // Replace \\ with \ and \s with space string unescape_filename(string filename) { @@ -55,47 +51,23 @@ string unescape_filename(string filename) { return filename_native; } -Column *DynamicLogwatchFileColumn::createColumn(const std::string &arguments) { - // We expect: - // COLNAME:FILENAME - - // Example: - // file_contents:var\log\messages - - vector<char> args(arguments.begin(), arguments.end()); - args.push_back('\0'); - char *scan = &args[0]; - - char *colname = next_token(&scan, ':'); - if ((colname == nullptr) || (colname[0] == 0)) { - logger(LOG_WARNING, - "Invalid arguments for column %s: missing result column name", - _name.c_str()); - return nullptr; - } - - // Start time of queried range - UNIX time stamp - char *filename = scan; - if ((filename == nullptr) || (filename[0] == 0)) { - logger(LOG_WARNING, - "Invalid arguments for column %s: missing file name", - _name.c_str()); +Column *DynamicLogwatchFileColumn::createColumn(const std::string &name, + const std::string &arguments) { + // arguments contains a file name + if (arguments.empty()) { + Warning() << "Invalid arguments for column '" << _name + << "': missing file name"; return nullptr; } - if (nullptr != strchr(filename, '/')) { - logger(LOG_WARNING, - "Invalid arguments for column %s: file name '%s' contains slash", - _name.c_str(), filename); + if (arguments.find('/') != string::npos) { + Warning() << "Invalid arguments for column '" << _name + << "': file name '" << arguments << "' contains slash"; return nullptr; } - string filename_native = unescape_filename(filename); - - string suffix("/"); - suffix += filename_native; - - return new HostFileColumn(colname, "Contents of logwatch file", - MK_LOGWATCH_PATH, suffix.c_str(), + return new HostFileColumn(name, "Contents of logwatch file", + MK_LOGWATCH_PATH, + ("/" + unescape_filename(arguments)).c_str(), _indirect_offset, _extra_offset); } diff --git a/livestatus/src/DynamicLogwatchFileColumn.h b/livestatus/src/DynamicLogwatchFileColumn.h index a60cf22..9258489 100644 --- a/livestatus/src/DynamicLogwatchFileColumn.h +++ b/livestatus/src/DynamicLogwatchFileColumn.h @@ -36,7 +36,8 @@ public: int indirect_offset, int extra_offset = -1) : DynamicColumn(name, description, indirect_offset, extra_offset) {} ~DynamicLogwatchFileColumn() {} - Column *createColumn(const std::string &arguments) override; + Column *createColumn(const std::string &name, + const std::string &arguments) override; }; #endif // DynamicLogwatchFileColumn_h diff --git a/livestatus/src/Table.cc b/livestatus/src/Table.cc index 0411066..8cb2dea 100644 --- a/livestatus/src/Table.cc +++ b/livestatus/src/Table.cc @@ -24,8 +24,10 @@ #include "Table.h" #include <string.h> +#include <ostream> #include "Column.h" #include "DynamicColumn.h" +#include "Logger.h" using std::string; @@ -63,8 +65,9 @@ Column *Table::column(const char *colname) { colname += prefix_len; } - if (strchr(colname, ':') != nullptr) { - return dynamicColumn(colname); + const char *sep_pos = strchr(colname, ':'); + if (sep_pos != nullptr) { + return dynamicColumn(string(colname, sep_pos), string(sep_pos + 1)); } // First try exact match... @@ -83,17 +86,26 @@ Column *Table::column(const char *colname) { return nullptr; } -Column *Table::dynamicColumn(const char *colname_with_args) { - const char *sep_pos = strchr(colname_with_args, ':'); - string name(colname_with_args, sep_pos - colname_with_args); +Column *Table::dynamicColumn(const string &name, const string &rest) { + auto it = _dynamic_columns.find(name); + if (it == _dynamic_columns.end()) { + Warning() << "Unknown dynamic column '" << name << "'"; + return nullptr; + } - const char *argstring = sep_pos + 1; + auto sep_pos = rest.find(':'); + if (sep_pos == string::npos) { + Warning() << "Missing separator in dynamic column '" << name << "'"; + return nullptr; + } - auto it = _dynamic_columns.find(name); - if (it != _dynamic_columns.end()) { - return it->second->createColumn(argstring); + string name2 = rest.substr(0, sep_pos); + if (name2.empty()) { + Warning() << "Empty column name for dynamic column '" << name << "'"; + return nullptr; } - return nullptr; + + return it->second->createColumn(name2, rest.substr(sep_pos + 1)); } bool Table::isAuthorized(contact * /*unused*/, void * /*unused*/) { diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h index e02124a..515d59a 100644 --- a/livestatus/src/Table.h +++ b/livestatus/src/Table.h @@ -69,10 +69,10 @@ public: /// \brief Retrieve a column with a give name. /// /// If the name contains a ':' then we have a dynamic column with column - /// arguments: The part before the colon is the column name and the part - /// after it represents the arguments, which are passed to - /// DynamicColumn::createColumn. This whole mechanism is used to access RRD - /// metrics data. + /// arguments: The part before the colon is the column name of the dynamic + /// column and the part after it is the name of the fresh, dynamically + /// created column (up to the 2nd ':') and further arguments. This whole + /// mechanism is e.g. used to access RRD metrics data. /// /// \todo This member function is virtual just because TableStateHistory and /// TableLog override it for some dubious reason: They first try the normal @@ -85,7 +85,7 @@ public: virtual void *findObject(char *objectspec); private: - Column *dynamicColumn(const char *colname_with_args); + Column *dynamicColumn(const std::string &name, const std::string &rest); std::map<std::string, Column *> _columns; std::map<std::string, DynamicColumn *> _dynamic_columns; diff --git a/livestatus/src/TableEventConsoleReplication.h b/livestatus/src/TableEventConsoleReplication.h index 558b6e4..cff08d0 100644 --- a/livestatus/src/TableEventConsoleReplication.h +++ b/livestatus/src/TableEventConsoleReplication.h @@ -27,7 +27,9 @@ #include "config.h" // IWYU pragma: keep #include "Table.h" +#ifdef CMC class Core; +#endif class Query; class TableEventConsoleReplication : public Table {

8 years, 1 month

2239 FIX Fixed exception in WATO snapins Folders, Tree of folders and Virtual Host Tree

by Sven Rueß

Module: check_mk Branch: master Commit: 2f6e0b09080e9b3d760e2580649aada26ac90731 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f6e0b09080e9b… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Mon Jun 6 13:40:29 2016 +0200 2239 FIX Fixed exception in WATO snapins Folders, Tree of folders and Virtual Host Tree An exception is thrown, if you want to use the WATO snapins Folders, Tree of folders and Virtual Host Tree in a distributed monitoring setup. The master site is used as viewer for the slave sites. If you create folders on slave sites and activate one of the snapins at teh master site there is an error shown like No WATO folder ... . This have been fixed. --- .werks/2239 | 13 +++++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 3 ++- web/plugins/sidebar/wato.py | 9 +++++---- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.werks/2239 b/.werks/2239 new file mode 100644 index 0000000..07c04f0 --- /dev/null +++ b/.werks/2239 @@ -0,0 +1,13 @@ +Title: Fixed exception in WATO snapins Folders, Tree of folders and Virtual Host Tree +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1465212884 + +An exception is thrown, if you want to use the WATO snapins Folders, Tree of folders and +Virtual Host Tree in a distributed monitoring setup. The master site is used as viewer +for the slave sites. If you create folders on slave sites and activate one of the snapins +at teh master site there is an error shown like No WATO folder ... . This have been fixed. diff --git a/ChangeLog b/ChangeLog index 4f45f9e..99a5756 100644 --- a/ChangeLog +++ b/ChangeLog @@ -338,6 +338,7 @@ * 3576 FIX: LDAP: Fixed "Internal error" when using the "Filter Group" option in an LDAP connection... * 3627 FIX: fixed double graphs of database size * 3586 FIX: Fixed file locking issues (rare and random errors that settings file could not be loaded) + * 2239 FIX: Fixed exception in WATO snapins Folders, Tree of folders and Virtual Host Tree... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index c3f54f8..640450e 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1619,7 +1619,8 @@ def compute_tag_tree(taglist): if wato_folder.startswith("/wato/"): folder_path = wato_folder[6:-9] folder_path_components = folder_path.split("/") - folder_titles = wato.get_folder_title_path(folder_path)[1:] # omit main folder + if wato.Folder.folder_exists(folder_path): + folder_titles = wato.get_folder_title_path(folder_path)[1:] # omit main folder else: folder_titles = [] diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 74b2cf8..f1dc800 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -146,10 +146,11 @@ def compute_foldertree(): for num_parts in range(0, len(path_parts)): this_folder_path = '/'.join(path_parts[:num_parts]) - if this_folder_path not in user_folders: - user_folders[this_folder_path] = get_folder(this_folder_path, num) - else: - user_folders[this_folder_path]['.num_hosts'] += num + if wato.Folder.folder_exists(this_folder_path): + if this_folder_path not in user_folders: + user_folders[this_folder_path] = get_folder(this_folder_path, num) + else: + user_folders[this_folder_path]['.num_hosts'] += num # # Now build the folder tree

8 years, 1 month

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: c355e12bd77de9895a6f5b85fcc8190effa98c95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c355e12bd77de9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 6 12:14:45 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/DynamicColumn.cc | 8 +++++--- livestatus/src/DynamicColumn.h | 2 +- livestatus/src/DynamicEventConsoleReplicationColumn.cc | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/livestatus/src/DynamicColumn.cc b/livestatus/src/DynamicColumn.cc index c17c86d..351304c 100644 --- a/livestatus/src/DynamicColumn.cc +++ b/livestatus/src/DynamicColumn.cc @@ -23,13 +23,15 @@ // Boston, MA 02110-1301 USA. #include "DynamicColumn.h" +#include <utility> +using std::move; using std::string; -DynamicColumn::DynamicColumn(const string& name, const string& description, +DynamicColumn::DynamicColumn(string name, string description, int indirect_offset, int extra_offset) - : _name(name) - , _description(description) + : _name(move(name)) + , _description(move(description)) , _indirect_offset(indirect_offset) , _extra_offset(extra_offset) {} diff --git a/livestatus/src/DynamicColumn.h b/livestatus/src/DynamicColumn.h index aa5ef65..f37fcc5 100644 --- a/livestatus/src/DynamicColumn.h +++ b/livestatus/src/DynamicColumn.h @@ -31,7 +31,7 @@ class Column; class DynamicColumn { public: - DynamicColumn(const std::string &name, const std::string &description, + DynamicColumn(std::string name, std::string description, int indirect_offset, int extra_offset); virtual ~DynamicColumn(); std::string name() const; diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc index 0f510b2..93034be 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -40,6 +40,7 @@ extern char g_mkeventd_socket_path[4096]; #endif using std::make_unique; +using std::move; using std::string; using std::unique_ptr; using std::vector; @@ -64,9 +65,9 @@ public: ReplicationColumn(string name, string description, int indirect_offset, int extra_offset, string blob) : BlobColumn(name, description, indirect_offset, extra_offset) - , _blob(blob) {} + , _blob(move(blob)) {} - unique_ptr<vector<char>> getBlob(void *) override { + unique_ptr<vector<char>> getBlob(void * /* unused */) override { return make_unique<vector<char>>(_blob.begin(), _blob.end()); };

8 years, 1 month

Addition to Werk #3394: service non-downtime annotation also disable host downtimes now

by Mathias Kettner

Module: check_mk Branch: master Commit: 3d2cd7f9498f6e75974ca66191e70f1b347eb62b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d2cd7f9498f6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 6 12:08:24 2016 +0200 Addition to Werk #3394: service non-downtime annotation also disable host downtimes now --- web/htdocs/availability.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 9c1dbd8..be04b12 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -834,6 +834,14 @@ def reclassify_service_by_annotation(history_entry, annotation, key_to_change): new_entry["duration"] = p_until - p_from if is_in: new_entry[key_to_change] = annotation["downtime"] and 1 or 0 + # If the annotation removes a downtime from the services, but + # the actual reason for the service being in downtime is a host + # downtime, then we must cancel the host downtime (also), or else + # that would override the unset service downtime. + if key_to_change == "in_downtime" \ + and history_entry.get("in_host_downtime") \ + and annotation["downtime"] == False: + new_entry["in_host_downtime"] = 0 new_history.append(new_entry) else: new_history.append(history_entry)

8 years, 1 month

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 283f963fe8c5ca415239e987a925b7a69e369a36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=283f963fe8c5ca… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 6 11:40:46 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/DynamicEventConsoleReplicationColumn.cc | 2 +- livestatus/src/TableEventConsoleReplication.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc index c8b4ef2..0f510b2 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -23,12 +23,12 @@ // Boston, MA 02110-1301 USA. #include "DynamicEventConsoleReplicationColumn.h" +#include <iosfwd> #include <memory> #include <utility> #include <vector> #include "BlobColumn.h" #include "EventConsoleConnection.h" -#include "Logger.h" #ifdef CMC #include "Config.h" #include "Core.h" diff --git a/livestatus/src/TableEventConsoleReplication.h b/livestatus/src/TableEventConsoleReplication.h index 301ba11..558b6e4 100644 --- a/livestatus/src/TableEventConsoleReplication.h +++ b/livestatus/src/TableEventConsoleReplication.h @@ -32,11 +32,11 @@ class Query; class TableEventConsoleReplication : public Table { public: - TableEventConsoleReplication( #ifdef CMC - Core *core + explicit TableEventConsoleReplication(Core *core); +#else + TableEventConsoleReplication(); #endif - ); const char *name() const override; const char *namePrefix() const override; void answerQuery(Query *query) override;

8 years, 1 month

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: b777444fe3ff94aa0720c790df4e6fdb0fcacaa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b777444fe3ff94… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 6 11:32:21 2016 +0200 Fetched Livestatus from downstream. --- .../src/DynamicEventConsoleReplicationColumn.cc | 75 +++++++++++++++++++- .../src/DynamicEventConsoleReplicationColumn.h | 12 +++- livestatus/src/TableEventConsoleReplication.cc | 18 ++++- livestatus/src/TableEventConsoleReplication.h | 7 +- 4 files changed, 104 insertions(+), 8 deletions(-) diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc index 7f3d22d..c8b4ef2 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -23,13 +23,82 @@ // Boston, MA 02110-1301 USA. #include "DynamicEventConsoleReplicationColumn.h" +#include <memory> +#include <utility> +#include <vector> +#include "BlobColumn.h" +#include "EventConsoleConnection.h" +#include "Logger.h" +#ifdef CMC +#include "Config.h" +#include "Core.h" +#include "World.h" +#else +extern "C" { +extern char g_mkeventd_socket_path[4096]; +} +#endif + +using std::make_unique; +using std::string; +using std::unique_ptr; +using std::vector; + +namespace { +class ECTableConnection : public EventConsoleConnection { +public: + ECTableConnection(string path, string command) + : EventConsoleConnection(path), _command(move(command)) {} + string getResult() const { return _result; } + +private: + void sendRequest(std::ostream &os) override { os << _command; } + bool receiveReply() override { return getline(_result); } + + const string _command; + string _result; +}; + +class ReplicationColumn : public BlobColumn { +public: + ReplicationColumn(string name, string description, int indirect_offset, + int extra_offset, string blob) + : BlobColumn(name, description, indirect_offset, extra_offset) + , _blob(blob) {} + + unique_ptr<vector<char>> getBlob(void *) override { + return make_unique<vector<char>>(_blob.begin(), _blob.end()); + }; + +private: + const string _blob; +}; +} // namespace DynamicEventConsoleReplicationColumn::DynamicEventConsoleReplicationColumn( std::string name, std::string description, int indirect_offset, - int extra_offset) - : DynamicColumn(name, description, indirect_offset, extra_offset) {} + int extra_offset +#ifdef CMC + , + Core *core +#endif + ) + : DynamicColumn(name, description, indirect_offset, extra_offset) +#ifdef CMC + , _core(core) +#endif +{ +} Column *DynamicEventConsoleReplicationColumn::createColumn( const std::string &arguments) { - return nullptr; +#ifdef CMC + string path = _core->_world->_config->_mkeventd_socket_path; +#else + string path = g_mkeventd_socket_path; +#endif + ECTableConnection ec(path, "REPLICATE " + arguments); + ec.run(); + return new ReplicationColumn("replication", "replication value", -1, -1, + ec.getResult()); } diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.h b/livestatus/src/DynamicEventConsoleReplicationColumn.h index 804463b..f9603be 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.h +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.h @@ -29,13 +29,23 @@ #include <string> #include "DynamicColumn.h" class Column; +class Core; class DynamicEventConsoleReplicationColumn : public DynamicColumn { public: DynamicEventConsoleReplicationColumn(std::string name, std::string description, - int indirect_offset, int extra_offset); + int indirect_offset, int extra_offset +#ifdef CMC + , + Core *core +#endif + ); Column *createColumn(const std::string &arguments) override; +#ifdef CMC +private: + Core *_core; +#endif }; #endif // DynamicEventConsoleReplicationColumn_h diff --git a/livestatus/src/TableEventConsoleReplication.cc b/livestatus/src/TableEventConsoleReplication.cc index 78e5357..42550e7 100644 --- a/livestatus/src/TableEventConsoleReplication.cc +++ b/livestatus/src/TableEventConsoleReplication.cc @@ -24,10 +24,20 @@ #include "TableEventConsoleReplication.h" #include "DynamicEventConsoleReplicationColumn.h" +#include "Query.h" -TableEventConsoleReplication::TableEventConsoleReplication() { +TableEventConsoleReplication::TableEventConsoleReplication( +#ifdef CMC + Core *core +#endif + ) { addDynamicColumn(new DynamicEventConsoleReplicationColumn( - "value", "The replication value", -1, -1)); + "value", "The replication value", -1, -1 +#ifdef CMC + , + core +#endif + )); } const char *TableEventConsoleReplication::name() const { @@ -38,4 +48,6 @@ const char *TableEventConsoleReplication::namePrefix() const { return "eventconsolereplication_"; } -void TableEventConsoleReplication::answerQuery(Query *query) {} +void TableEventConsoleReplication::answerQuery(Query *query) { + query->processDataset(nullptr); +} diff --git a/livestatus/src/TableEventConsoleReplication.h b/livestatus/src/TableEventConsoleReplication.h index c19a553..301ba11 100644 --- a/livestatus/src/TableEventConsoleReplication.h +++ b/livestatus/src/TableEventConsoleReplication.h @@ -27,11 +27,16 @@ #include "config.h" // IWYU pragma: keep #include "Table.h" +class Core; class Query; class TableEventConsoleReplication : public Table { public: - TableEventConsoleReplication(); + TableEventConsoleReplication( +#ifdef CMC + Core *core +#endif + ); const char *name() const override; const char *namePrefix() const override; void answerQuery(Query *query) override;

8 years, 1 month

← Newer
1
...
11
12
13
14
15
16
17
18
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016