Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

3975 FIX Improved error handling when trying to edit not existing global setting

by Lars Michelsen

Module: check_mk Branch: master Commit: cfd201ddd029097d5f7600524e2cb49f1e44d102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfd201ddd02909… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 09:55:57 2016 +0100 3975 FIX Improved error handling when trying to edit not existing global setting --- .werks/3975 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3975 b/.werks/3975 new file mode 100644 index 0000000..f1067a3 --- /dev/null +++ b/.werks/3975 @@ -0,0 +1,9 @@ +Title: Improved error handling when trying to edit not existing global setting +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i2 +Date: 1478508930 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b407499..ca82417 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 3951 FIX: oracle_sessions: fixed bug with default absolute levels... * 4039 FIX: Fix UnicodeEncodeError exception in WATO folder display... * 4041 FIX: Fix exception when editing global configuration settings... + * 3975 FIX: Improved error handling when trying to edit not existing global setting Notifications: * 3957 mail: now allows extra HTML section between body and table diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3501720..b9fcbfd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6537,7 +6537,11 @@ def mode_edit_configvar(phase, what = 'globalvars'): return varname = html.var("varname") - domain, valuespec, need_restart, allow_reset, in_global_settings = configvars()[varname] + try: + domain, valuespec, need_restart, allow_reset, in_global_settings = configvars()[varname] + except KeyError: + raise MKGeneralException(_("The global setting \"%s\" does not exist.") % varname) + if siteid: current_settings = site.setdefault("globals", {}) else:

7 years, 10 months

Removed link to deprecated option mkeventd_contact_group_handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 73ea4fb5bc338b8af236e9d2511c8ce89361972a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73ea4fb5bc338b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 09:52:45 2016 +0100 Removed link to deprecated option mkeventd_contact_group_handling --- web/plugins/config/mkeventd.py | 1 - web/plugins/wato/mkeventd.py | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/web/plugins/config/mkeventd.py b/web/plugins/config/mkeventd.py index 24d5cb3..cda0c76 100644 --- a/web/plugins/config/mkeventd.py +++ b/web/plugins/config/mkeventd.py @@ -33,7 +33,6 @@ mkeventd_connect_timeout = 10 log_level = 0 log_rulehits = False rule_optimizer = True -mkeventd_contact_group_handling = "host" mkeventd_service_levels = [ (0, _("(no Service level)")), diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index ac3f506..07fff57 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -347,9 +347,7 @@ vs_mkeventd_rule = Dictionary( "1. If you activate this option and do not specify any group, then " "users with restricted permissions can never see these events.<br>" "2. If both the host is found in the monitoring <b>and</b> contact groups are " - "specified in the rule then usually the host's contact groups have precedence. " - "But you can change that via a " - "<a href=\"wato.py?mode=mkeventd_edit_configvar&varname=mkeventd_contact_group_handling\">global setting</a>.<br> "), + "specified in the rule then usually the host's contact groups have precedence. "), optional_keys = [], )), ( "actions",

7 years, 10 months

3938 FIX tactical overview: fixed wrong display of number of service problems when stale services are available

by Marcel Schulte

Module: check_mk Branch: master Commit: 8eeb7d1172d09aa6fb4997932026a880470c8c12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eeb7d1172d09a… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Nov 7 08:28:54 2016 +0100 3938 FIX tactical overview: fixed wrong display of number of service problems when stale services are available When stale services where available number of "service problems" and "service problems unhandled" where the same as stale services in tactical overview snapin. This has been fixed now. --- .werks/3938 | 11 +++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3938 b/.werks/3938 new file mode 100644 index 0000000..036e74d --- /dev/null +++ b/.werks/3938 @@ -0,0 +1,11 @@ +Title: tactical overview: fixed wrong display of number of service problems when stale services are available +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1478503370 +Class: fix + +When stale services where available number of "service problems" and "service problems unhandled" where the same as stale services in tactical overview snapin. +This has been fixed now. + diff --git a/ChangeLog b/ChangeLog index 9815b8b..b407499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... * 4046 FIX: Repaired html rendering.... + * 3938 FIX: tactical overview: fixed wrong display of number of service problems when stale services are available... WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 3230753..e93c2fa 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -729,7 +729,7 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): for value, ty in [ (problems, "handled"), (unhandled_problems, "unhandled") ]: url = html.makeuri_contextless(row["views"][ty] + extra_url_variables, filename="view.py") html.open_td(class_=[td_class, "states prob" if value != 0 else None]) - link(str(stales), url) + link(str(value), url) html.close_td() if td_class == 'col4':

7 years, 10 months

avaya_88xx_cpu: Fetch more OIDs (preparatory step toward additional checks )

by Konstantin Büttner

Module: check_mk Branch: master Commit: b27c185f470b1fe85d5bcb318ecd06b4d6e0ccb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b27c185f470b1f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Sun Nov 6 12:20:09 2016 +0100 avaya_88xx_cpu: Fetch more OIDs (preparatory step toward additional checks) --- checks/avaya_88xx_cpu | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/avaya_88xx_cpu b/checks/avaya_88xx_cpu index 5e20d51..fe614f0 100644 --- a/checks/avaya_88xx_cpu +++ b/checks/avaya_88xx_cpu @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + factory_settings["avaya_88xx_cpu_default_levels"] = { "levels" : (90, 95), } @@ -35,7 +36,7 @@ def check_avaya_88xx_cpu(_no_item, params, info): if not info: return - return check_cpu_util(int(info[0][0]), params, time.time()) + return check_cpu_util(int(info[0][1]), params, time.time()) check_info["avaya_88xx_cpu"] = { 'check_function': check_avaya_88xx_cpu, @@ -45,7 +46,7 @@ check_info["avaya_88xx_cpu"] = { 'group': 'cpu_utilization', 'has_perfdata': True, # RAPID-CITY MIB - 'snmp_info': ( ".1.3.6.1.4.1.2272.1.1", [ 20 ]), # rcSysCpuUtil + 'snmp_info': ( ".1.3.6.1.4.1.2272.1.1", [ 13, 20, 21, 41, 47 ]), # rcSysCpuUtil 'snmp_scan_function': lambda oid: ".1.3.6.1.4.1.2272" in oid(".1.3.6.1.2.1.1.2.0"), 'includes': [ 'cpu_util.include' ], }

7 years, 10 months

Handle EC_foobar commands. Various cleanups.

by Sven Panne

Module: check_mk Branch: master Commit: e30264671eeff02057db776d6b9e60a76e8f79aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e30264671eeff0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 4 16:17:04 2016 +0100 Handle EC_foobar commands. Various cleanups. --- livestatus/src/ClientQueue.cc | 1 + livestatus/src/ClientQueue.h | 1 - livestatus/src/Store.cc | 82 +++++++++++++++++++++++++++++++++---------- livestatus/src/Store.h | 5 +-- 4 files changed, 67 insertions(+), 22 deletions(-) diff --git a/livestatus/src/ClientQueue.cc b/livestatus/src/ClientQueue.cc index 8a4d134..57d7916 100644 --- a/livestatus/src/ClientQueue.cc +++ b/livestatus/src/ClientQueue.cc @@ -25,6 +25,7 @@ #include "ClientQueue.h" #include <unistd.h> #include <algorithm> +#include <memory> using std::for_each; using std::lock_guard; diff --git a/livestatus/src/ClientQueue.h b/livestatus/src/ClientQueue.h index 60309c8..455f474 100644 --- a/livestatus/src/ClientQueue.h +++ b/livestatus/src/ClientQueue.h @@ -28,7 +28,6 @@ #include "config.h" // IWYU pragma: keep #include <condition_variable> #include <deque> -#include <memory> #include <mutex> class ClientQueue { diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 65d3b1d..dcf6cf3 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -28,11 +28,14 @@ #include <ctime> #include <ostream> #include <utility> +#include <vector> +#include "EventConsoleConnection.h" #include "InputBuffer.h" #include "Logger.h" #include "MonitoringCore.h" #include "OutputBuffer.h" #include "Query.h" +#include "StringUtils.h" #include "Table.h" #include "data_encoding.h" #include "mk_logwatch.h" @@ -41,6 +44,8 @@ extern Encoding g_data_encoding; extern unsigned long g_max_cached_messages; +using mk::split; +using mk::starts_with; using std::chrono::duration_cast; using std::chrono::milliseconds; using std::chrono::system_clock; @@ -49,8 +54,9 @@ using std::lock_guard; using std::mutex; using std::string; -Store::Store(MonitoringCore *mc) - : _logger(mc->loggerLivestatus()) +Store::Store(MonitoringCore *core) + : _core(core) + , _logger(core->loggerLivestatus()) , _log_cache(_logger, _commands_holder, g_max_cached_messages) , _table_contacts(_logger) , _table_commands(_commands_holder, _logger) @@ -69,10 +75,10 @@ Store::Store(MonitoringCore *mc) , _table_log(&_log_cache, _downtimes, _comments, _logger) , _table_statehistory(&_log_cache, _downtimes, _comments, _logger) , _table_columns(_logger) - , _table_eventconsoleevents(mc, _downtimes, _comments) - , _table_eventconsolehistory(mc, _downtimes, _comments) - , _table_eventconsolestatus(mc) - , _table_eventconsolereplication(mc) { + , _table_eventconsoleevents(core, _downtimes, _comments) + , _table_eventconsolehistory(core, _downtimes, _comments) + , _table_eventconsolestatus(core) + , _table_eventconsolereplication(core) { addTable(&_table_columns); addTable(&_table_commands); addTable(&_table_comments); @@ -190,7 +196,14 @@ bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) { } void Store::answerCommandRequest(const char *command) { - if (answerLogwatchCommandRequest(command)) { + int len = strlen(command); + if (len < 14 || command[0] != '[' || command[11] != ']' || + command[12] != ' ') { + Warning(_logger) << "Ignoring malformed command '" << command << "'"; + return; + } + + if (handleCommand(command + 13)) { return; } @@ -204,23 +217,54 @@ void Store::answerCommandRequest(const char *command) { #endif } -bool Store::answerLogwatchCommandRequest(const char *command) { - // Handle special command "[1462191638] - // MK_LOGWATCH_ACKNOWLEDGE;host123;\var\log\syslog" - if (strlen(command) >= 37 && command[0] == '[' && command[11] == ']' && - (strncmp(command + 13, "MK_LOGWATCH_ACKNOWLEDGE;", 24) == 0)) { - const char *host_name_begin = command + 37; - const char *host_name_end = strchr(host_name_begin, ';'); - if (host_name_end == nullptr) { +namespace { +class ECTableConnection : public EventConsoleConnection { +public: + ECTableConnection(Logger *logger, string path, string command) + : EventConsoleConnection(logger, path), _command(move(command)) {} + +private: + void sendRequest(std::ostream &os) override { os << _command; } + bool receiveReply() override { return true; } + string _command; +}; +} // namespace + +bool Store::handleCommand(const string &command) { + auto parts = split(command, ';'); + if (parts.empty()) { + return false; + } + string command_name = parts[0]; + + if (command_name == "MK_LOGWATCH_ACKNOWLEDGE") { + // COMMAND [1462191638] MK_LOGWATCH_ACKNOWLEDGE;host123;\var\log\syslog + if (parts.size() != 3) { + Warning(_logger) << "MK_LOGWATCH_ACKNOWLEDGE expects 2 arguments"; return false; } - std::string host_name(host_name_begin, host_name_end - host_name_begin); - std::string file_name(host_name_end + 1); extern char g_mk_logwatch_path[]; - mk_logwatch_acknowledge(_logger, g_mk_logwatch_path, host_name, - file_name); + mk_logwatch_acknowledge(_logger, g_mk_logwatch_path, parts[1], + parts[2]); + return true; + } + + if (starts_with(command_name, "EC_")) { + if (parts.size() != 1) { + Warning(_logger) << command_name << "expects 0 arguments"; + return false; + } + if (_core->mkeventdEnabled()) { + ECTableConnection(_logger, _core->mkeventdSocketPath(), + "COMMAND " + command_name.substr(3)) + .run(); + } else { + Notice(_logger) << "event console disabled, ignoring command '" + << command << "'"; + } return true; } + return false; } diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index f77a409..85d594d 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -63,13 +63,14 @@ class Table; class Store { public: - explicit Store(MonitoringCore *mc); + explicit Store(MonitoringCore *core); bool answerRequest(InputBuffer *, OutputBuffer *); void registerDowntime(nebstruct_downtime_data *); void registerComment(nebstruct_comment_data *); private: + MonitoringCore *_core; Logger *const _logger; CommandsHolderNagios _commands_holder; DowntimesOrComments _downtimes; @@ -108,7 +109,7 @@ private: void answerGetRequest(const std::list<std::string> &lines, OutputBuffer *, const char *); void answerCommandRequest(const char *); - bool answerLogwatchCommandRequest(const char *); + bool handleCommand(const std::string &command); }; #endif // Store_h

7 years, 10 months

4046 FIX Repaired html rendering.

by Roland Halbig

Module: check_mk Branch: master Commit: a2d37f16685a9dfe1d081907ac12230b0234282d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2d37f16685a9d… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Nov 4 13:40:19 2016 +0100 4046 FIX Repaired html rendering. Inplace html tags were visible in the GUI, this has been fixed. --- .werks/4046 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/4046 b/.werks/4046 new file mode 100644 index 0000000..26200ae --- /dev/null +++ b/.werks/4046 @@ -0,0 +1,11 @@ +Title: Repaired html rendering. +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1478263134 + +Inplace html tags were visible in the GUI, this has been fixed. + diff --git a/ChangeLog b/ChangeLog index 2d765e6..9815b8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * 3973 FIX: Backup: Fixed displaying wrong finish time after backup completion * 3974 FIX: Sorting comments in hover menu of comments icon by time now * 4040 FIX: Fix error in view about "No WATO folder ..." in case of host imported via cmcdump... + * 4046 FIX: Repaired html rendering.... WATO: * 3915 User access times: New icon when never logged in; New column "last seen"

7 years, 10 months

Reserved 10 Werk IDS

by Roland Halbig

Module: check_mk Branch: master Commit: 2d2294b17e814a00cd856b1b6935a8a22ae82aaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d2294b17e814a… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Nov 4 13:37:00 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 596dd59..f44294f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4046 +4056

7 years, 10 months

Reserved 10 Werk IDS

by Roland Halbig

Module: check_mk Branch: master Commit: a7a2dbe757c7ef2e04661404baf6fc343e3b6b50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7a2dbe757c7ef… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Nov 4 13:37:24 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index f44294f..696fa2a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4056 +4066

7 years, 10 months

Fixed audacious html.write_text.

by Roland Halbig

Module: check_mk Branch: master Commit: 0fdbb87171b54d3b35d1bc2b55e022ca7f0456c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fdbb87171b54d… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Nov 4 13:32:53 2016 +0100 Fixed audacious html.write_text. --- web/htdocs/forms.py | 2 +- web/htdocs/sidebar.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 72432d1..2c28273 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -270,7 +270,7 @@ def section(title = None, checkbox = None, id = None, simple=False, hide = False html.open_td(class_=["legend", "simple" if simple else None]) if title: html.open_div(class_=["title", "withcheckbox" if checkbox else None]) - html.write_text(title) + html.write(title) html.span('.'*100, class_="dots") html.close_div() if checkbox: diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 5680f24..db4b48c 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -107,7 +107,7 @@ def bulletlink(text, url, target="main", onclick = None): def iconlink(text, url, icon): html.open_a(class_=["iconlink", "link"], target="main", href=url) html.icon(icon=icon, help=None, cssclass="inline") - html.write_text(text) + html.write(text) html.close_a() html.br()

7 years, 10 months

Changed expected html code to match after refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: a29b3c2dc950a8dfc19a91c0a63fed85f928894f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a29b3c2dc950a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 4 13:29:11 2016 +0100 Changed expected html code to match after refactoring --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 661c6f8..6f16b27 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -735,7 +735,7 @@ class CMKEventConsole(CMKWebSession): def enable_remote_status_port(self, web): html = web.get("wato.py?mode=mkeventd_config").text - assert "mode=mkeventd_edit_configvar&site=&varname=remote_status" in html + assert "mode=mkeventd_edit_configvar&site=&varname=remote_status" in html html = web.get("wato.py?folder=&mode=mkeventd_edit_configvar&site=&varname=remote_status").text assert "Save" in html

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