Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

by Sven Panne

Module: check_mk Branch: master Commit: dffe883b7c20b80eb38f72cc53df032aca4ff80a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dffe883b7c20b8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 9 12:34:28 2017 +0200 Query EC only for non-host columns. Change-Id: I2c00da81a36c26289849c9b17726f3205be571a0 --- livestatus/src/TableEventConsole.cc | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index ac441a5..9f126c4 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -33,15 +33,10 @@ #include "Logger.h" #include "Query.h" -using std::ostream; -using std::static_pointer_cast; -using std::string; -using std::vector; - namespace { class ECTableConnection : public EventConsoleConnection { public: - ECTableConnection(MonitoringCore *mc, string table_name, Query *query) + ECTableConnection(MonitoringCore *mc, std::string table_name, Query *query) : EventConsoleConnection(mc->loggerLivestatus(), mc->mkeventdSocketPath()) , _mc(mc) @@ -54,21 +49,23 @@ private: os << std::nounitbuf << "GET " << _table_name << "\nOutputFormat: plain\nColumns:"; for (const auto &c : _query->allColumns()) { - os << " " << c->name(); + if (!mk::starts_with(c->name(), "host_")) { + os << " " << c->name(); + } } os << std::endl; } void receiveReply(std::istream &is) override { bool is_header = true; - vector<string> headers; + std::vector<std::string> headers; do { - string line; + std::string line; std::getline(is, line); if (!is || line.empty()) { return; } - vector<string> columns = mk::split(line, '\t'); + std::vector<std::string> columns = mk::split(line, '\t'); if (is_header) { headers = std::move(columns); is_header = false; @@ -115,7 +112,7 @@ bool TableEventConsole::isAuthorizedForEvent(Row row, auto r = rowData<ECRow>(row); // NOTE: Further filtering in the GUI for mkeventd.seeunrelated permission bool result = true; - auto precedence = static_pointer_cast<StringEventConsoleColumn>( + auto precedence = std::static_pointer_cast<StringEventConsoleColumn>( column("event_contact_groups_precedence")) ->getValue(row); if (precedence == "rule") { @@ -134,7 +131,7 @@ bool TableEventConsole::isAuthorizedForEvent(Row row, bool TableEventConsole::isAuthorizedForEventViaContactGroups( const MonitoringCore::Contact *ctc, const ECRow *row, bool &result) const { - auto col = static_pointer_cast<ListEventConsoleColumn>( + auto col = std::static_pointer_cast<ListEventConsoleColumn>( column("event_contact_groups")); if (col->isNone(row)) { return false;

6 years, 11 months

Disabled old-skool cppcheck warnings for flycheck.

by Sven Panne

Module: check_mk Branch: master Commit: e70234b6aefabb0e0a07dcdf13ce454b64d6c99d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e70234b6aefabb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 9 12:32:00 2017 +0200 Disabled old-skool cppcheck warnings for flycheck. Change-Id: I8abb0e9fa890541a71e4f4defae7c595e1331cb5 --- .dir-locals.el | 1 + 1 file changed, 1 insertion(+) diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 0000000..e0be8eb --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1 @@ +((c++-mode . ((flycheck-cppcheck-suppressions . ("passedByValue")))))

6 years, 11 months

5390 FIX MKP: Ignore *.pyc files when creating MKP packages

by Lars Michelsen

Module: check_mk Branch: master Commit: 44449c2dfb69479f46c95510fa50ae1a1245efcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44449c2dfb6947… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 9 12:06:36 2017 +0200 5390 FIX MKP: Ignore *.pyc files when creating MKP packages Packing the compiled pyc files into MKP packages is not a good idea, because they are python version specific and can be created by the target system at any time. So better ignore these files when creating packages. Change-Id: Ie7bf289e711dd4c6eaf38618d0fc49266560f665 --- .werks/5390 | 13 +++++++++++++ cmk_base/packaging.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5390 b/.werks/5390 new file mode 100644 index 0000000..c0fc01d --- /dev/null +++ b/.werks/5390 @@ -0,0 +1,13 @@ +Title: MKP: Ignore *.pyc files when creating MKP packages +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1507543532 +Class: fix + +Packing the compiled pyc files into MKP packages is not a good idea, +because they are python version specific and can be created by the +target system at any time. So better ignore these files when creating +packages. diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index 60e1b08..5ffc0f0 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -591,7 +591,7 @@ def files_in_dir(part, dir, prefix = ""): result = [] files = os.listdir(dir) for f in files: - if f in [ '.', '..' ] or f.startswith('.') or f.endswith('~'): + if f in [ '.', '..' ] or f.startswith('.') or f.endswith('~') or f.endswith(".pyc"): continue ignored = package_ignored_files.get(part, [])

6 years, 11 months

Fix the use of singleton Logger in Windows agent

by Jukka Aro

Module: check_mk Branch: master Commit: 41fa907c5f8b59b51981dc7fe4d85b552d39e913 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41fa907c5f8b59… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Oct 9 10:50:02 2017 +0200 Fix the use of singleton Logger in Windows agent It is not possible to store a pointer to the singleton logger in a static variable in check_mk_agent.cc as this may lead to a static initialization order fiasco. Change-Id: If80cab36dac95918482b7b56c05db85715fe4234 --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 52 +++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 3366a54..e43667d 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2960 +2962 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 88ab99f..0b8f0dc 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -184,7 +184,6 @@ class MillisecondsFormatter : public Formatter { // service stuff. At least, let us *not* make these yet another global variables // and access them from other compilation units... const WinApi s_winapi; -Logger *s_logger = Logger::getLogger("winagent"); struct GlobalConfig { Configuration parser; @@ -516,20 +515,21 @@ void usage() { } void do_debug(const Environment &env) { - const auto saveLevel = s_logger->getLevel(); - s_logger->setLevel(LogLevel::notice); + Logger *logger = Logger::getLogger("winagent"); + const auto saveLevel = logger->getLevel(); + logger->setLevel(LogLevel::notice); FileOutputProxy dummy(do_file ? fileout : stdout); output_data(dummy, env, false, *s_config->section_flush); - s_logger->setLevel(saveLevel); + logger->setLevel(saveLevel); } void do_test(bool output_stderr, const Environment &env) { // TODO: Set logger handler to match fileout / stdout with_stderr = output_stderr; FileOutputProxy dummy(do_file ? fileout : stdout); - Notice(s_logger) << "Started in test mode."; + Notice(Logger::getLogger("winagent")) << "Started in test mode."; output_data(dummy, env, false, *s_config->section_flush); } @@ -547,6 +547,7 @@ bool ctrl_handler(DWORD fdwCtrlType) { DWORD WINAPI realtime_check_func(void *data_in) { ThreadData *data = (ThreadData *)data_in; + Logger *logger = Logger::getLogger("winagent"); try { sockaddr_storage current_address; @@ -554,13 +555,12 @@ DWORD WINAPI realtime_check_func(void *data_in) { SOCKET current_socket = INVALID_SOCKET; std::unique_ptr<BufferedSocketProxy> out; - if (*s_config->encrypted_rt) { out.reset(new EncryptingBufferedSocketProxy( - INVALID_SOCKET, *s_config->passphrase, s_logger, s_winapi)); + INVALID_SOCKET, *s_config->passphrase, logger, s_winapi)); } else { out.reset( - new BufferedSocketProxy(INVALID_SOCKET, s_logger, s_winapi)); + new BufferedSocketProxy(INVALID_SOCKET, logger, s_winapi)); } timeval before; @@ -640,7 +640,7 @@ DWORD WINAPI realtime_check_func(void *data_in) { current_socket = s_winapi.socket( current_address.ss_family, SOCK_DGRAM, IPPROTO_UDP); if (current_socket == INVALID_SOCKET) { - Emergency(s_logger) + Emergency(logger) << "failed to establish socket: " << s_winapi.WSAGetLastError(); return 1; @@ -648,7 +648,7 @@ DWORD WINAPI realtime_check_func(void *data_in) { if (s_winapi.connect(current_socket, (const sockaddr *)&current_address, sockaddr_size) == SOCKET_ERROR) { - Emergency(s_logger) << "failed to connect: " + Emergency(logger) << "failed to connect: " << s_winapi.WSAGetLastError(); s_winapi.closesocket(current_socket); current_socket = INVALID_SOCKET; @@ -680,16 +680,17 @@ DWORD WINAPI realtime_check_func(void *data_in) { return 0; } catch (const std::exception &e) { - Alert(s_logger) << "failed to run realtime check: " << e.what(); + Alert(logger) << "failed to run realtime check: " << e.what(); return 1; } } void do_adhoc(const Environment &env) { g_should_terminate = false; + Logger *logger = Logger::getLogger("winagent"); ListenSocket sock(*s_config->port, *s_config->only_from, - *s_config->support_ipv6, s_logger, s_winapi); + *s_config->support_ipv6, logger, s_winapi); printf("Listening for TCP connections (%s) on port %d\n", sock.supportsIPV6() @@ -717,7 +718,7 @@ void do_adhoc(const Environment &env) { foreach_enabled_section( false, [](Section *section) { section->waitForCompletion(); }); - ThreadData thread_data{0, false, env, s_logger, false, + ThreadData thread_data{0, false, env, logger, false, {0}, Mutex{s_winapi}}; Thread realtime_checker(realtime_check_func, thread_data, s_winapi); @@ -730,9 +731,9 @@ void do_adhoc(const Environment &env) { if (*s_config->encrypted) { out.reset(new EncryptingBufferedSocketProxy( - INVALID_SOCKET, *s_config->passphrase, s_logger, s_winapi)); + INVALID_SOCKET, *s_config->passphrase, logger, s_winapi)); } else { - out.reset(new BufferedSocketProxy(INVALID_SOCKET, s_logger, s_winapi)); + out.reset(new BufferedSocketProxy(INVALID_SOCKET, logger, s_winapi)); } while (!g_should_terminate) { @@ -745,7 +746,7 @@ void do_adhoc(const Environment &env) { } std::string ip_hr = sock.readableIP(connection); - Debug(s_logger) + Debug(logger) << "Accepted client connection from " << ip_hr << "."; { // limit lifetime of mutex lock MutexLock guard(thread_data.mutex); @@ -760,7 +761,7 @@ void do_adhoc(const Environment &env) { try { output_data(*out, env, false, *s_config->section_flush); } catch (const std::exception &e) { - Alert(s_logger) << "unhandled exception: " << e.what(); + Alert(Logger::getLogger("winagent")) << "unhandled exception: " << e.what(); } s_winapi.closesocket(connection); } @@ -774,7 +775,7 @@ void do_adhoc(const Environment &env) { if (realtime_checker.wasStarted()) { int res = realtime_checker.join(); - Debug(s_logger) << "Realtime check thread ended with error code " << res + Debug(logger) << "Realtime check thread ended with error code " << res << "."; } @@ -964,10 +965,11 @@ void RunImmediate(const char *mode, int argc, char **argv) { // base directory structure on current working directory or registered dir // (from registry)? bool use_cwd = !strcmp(mode, "adhoc") || !strcmp(mode, "test"); - Environment env(use_cwd, s_logger, s_winapi); + Logger *logger = Logger::getLogger("winagent"); + Environment env(use_cwd, logger, s_winapi); s_config = new GlobalConfig(env); - s_sections = new SectionManager(s_config->parser, s_logger, s_winapi); + s_sections = new SectionManager(s_config->parser, logger, s_winapi); // careful: destroying the section manager destroys the wmi helpers created // for @@ -984,19 +986,19 @@ void RunImmediate(const char *mode, int argc, char **argv) { s_config->parser.readSettings(); if (!*s_config->crash_debug) { // default level already LogLevel::debug - s_logger->setLevel(LogLevel::warning); + logger->setLevel(LogLevel::warning); } const std::string logFilename = env.logDirectory() + "\\agent.log"; if (strcmp(mode, "debug")) { // if not debugging, use log file // TODO: Make logfile rotation parameters configurable - s_logger->setHandler(std::make_unique<RotatingFileHandler>( + logger->setHandler(std::make_unique<RotatingFileHandler>( logFilename, std::make_unique<FileRotationApi>(), 8388608 /* 8 MB */, 5)); } - if (Handler *handler = s_logger->getHandler()) { + if (Handler *handler = logger->getHandler()) { handler->setFormatter(make_unique<MillisecondsFormatter>()); } @@ -1038,7 +1040,7 @@ void RunImmediate(const char *mode, int argc, char **argv) { } inline LONG WINAPI exception_handler(LPEXCEPTION_POINTERS ptrs) { - return CrashHandler(s_logger, s_winapi).handleCrash(ptrs); + return CrashHandler(Logger::getLogger("winagent"), s_winapi).handleCrash(ptrs); } int main(int argc, char **argv) { @@ -1051,7 +1053,7 @@ int main(int argc, char **argv) { if ((argc > 2) && (strcmp(argv[1], "file") && strcmp(argv[1], "unpack"))) { // need to parse config so we can display defaults in usage bool use_cwd = true; - Environment env(use_cwd, s_logger, s_winapi); + Environment env(use_cwd, Logger::getLogger("winagent"), s_winapi); s_config = new GlobalConfig(env); usage(); }

6 years, 11 months

Moved final offset into Column base class, part 4.

by Sven Panne

Module: check_mk Branch: master Commit: 3d66b2d2ee61c6dc6140e7d8bcef207a8195b8b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d66b2d2ee61c6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 6 13:33:09 2017 +0200 Moved final offset into Column base class, part 4. Change-Id: I2f0c4e66ed30b8af5c80631b9ac5b65263b68431 --- livestatus/src/AttributeListAsIntColumn.cc | 5 +- livestatus/src/AttributeListAsIntColumn.h | 10 ++-- livestatus/src/AttributeListColumn.cc | 4 +- livestatus/src/AttributeListColumn.h | 10 ++-- livestatus/src/HostListStateColumn.cc | 5 +- livestatus/src/HostListStateColumn.h | 8 ++- livestatus/src/HostSpecialIntColumn.h | 8 +-- livestatus/src/ServiceListStateColumn.cc | 5 +- livestatus/src/ServiceListStateColumn.h | 10 ++-- livestatus/src/ServiceSpecialIntColumn.h | 8 +-- livestatus/src/StatusSpecialIntColumn.h | 8 +-- livestatus/src/TableContacts.cc | 13 +++-- livestatus/src/TableHostGroups.cc | 80 +++++++++++++++--------------- livestatus/src/TableHosts.cc | 73 ++++++++++++++------------- livestatus/src/TableServiceGroups.cc | 62 +++++++++++------------ livestatus/src/TableServices.cc | 17 +++---- livestatus/src/TableStatus.cc | 2 +- livestatus/src/TableTimeperiods.cc | 2 +- livestatus/src/TimeperiodColumn.cc | 4 +- livestatus/src/TimeperiodColumn.h | 2 +- 20 files changed, 159 insertions(+), 177 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3d66b2d2ee…

6 years, 11 months

5389 FIX Fixed disabling services via discovery page when a host rule exists in wrong folder

by Lars Michelsen

Module: check_mk Branch: master Commit: 22557a5e644b28fcc6ba0f394d53dc9f3a182a1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22557a5e644b28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 9 09:08:24 2017 +0200 5389 FIX Fixed disabling services via discovery page when a host rule exists in wrong folder Fixed two situation where disabling of services did not work correctly: <ul> <li>When a specific disable services rule was existing but not applying to the host, because it was located in a non parent folder.</li> <li>When a specific disable services rule was existing in a partent folder of the host and not in the same folder as the host.</li> </ul> Change-Id: I2ad832b77b967a4b3cc04bf10dfecc92bcb60722 --- .werks/5389 | 18 ++++++++++++++++++ web/htdocs/wato.py | 21 +++++++++++++++++---- web/htdocs/watolib.py | 7 ++++--- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/.werks/5389 b/.werks/5389 new file mode 100644 index 0000000..9eb2e71 --- /dev/null +++ b/.werks/5389 @@ -0,0 +1,18 @@ +Title: Fixed disabling services via discovery page when a host rule exists in wrong folder +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1507532119 + +Fixed two situation where disabling of services did not work correctly: + +<ul> + <li>When a specific disable services rule was existing but not applying to the host, + because it was located in a non parent folder.</li> + <li>When a specific disable services rule was existing in a partent folder of the + host and not in the same folder as the host.</li> +</ul> diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ff3620b..90f19a9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2972,8 +2972,10 @@ class ModeDiscovery(WatoMode): except KeyError: ruleset = Ruleset("ignored_services") + modified_folders = [] + service_patterns = _compile_patterns(services) - self._remove_from_rule_of_host(ruleset, service_patterns, value=not value) + modified_folders += self._remove_from_rule_of_host(ruleset, service_patterns, value=not value) # Check whether or not the service still needs a host specific setting after removing # the host specific setting above and remove all services from the service list @@ -2985,8 +2987,10 @@ class ModeDiscovery(WatoMode): services.remove(service) service_patterns = _compile_patterns(services) - self._update_rule_of_host(ruleset, service_patterns, value=value) - rulesets.save_folder(self._host.folder()) + modified_folders += self._update_rule_of_host(ruleset, service_patterns, value=value) + + for folder in modified_folders: + rulesets.save_folder(folder) def _remove_from_rule_of_host(self, ruleset, service_patterns, value): @@ -2998,6 +3002,10 @@ class ModeDiscovery(WatoMode): if not other_rule.item_list: ruleset.delete_rule(other_rule) + return [ other_rule.folder ] + + return [] + def _update_rule_of_host(self, ruleset, service_patterns, value): folder = self._host.folder() @@ -3014,10 +3022,15 @@ class ModeDiscovery(WatoMode): rule.value = value ruleset.prepend_rule(folder, rule) + if rule: + return [rule.folder] + else: + return [] + def _get_rule_of_host(self, ruleset, value): for folder, index, rule in ruleset.get_rules(): - if rule.is_discovery_rule_of(self._host.name()) and rule.value == value: + if rule.is_discovery_rule_of(self._host) and rule.value == value: return rule return None diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 6687ea0..3c32511 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -8244,10 +8244,11 @@ class Rule(object): return self.rule_options.get("comment", "") - def is_discovery_rule_of(self, host_name): - return self.host_list == [host_name] \ + def is_discovery_rule_of(self, host): + return self.host_list == [host.name()] \ and self.tag_specs == [] \ - and all([ i.endswith("$") for i in self.item_list ]) + and all([ i.endswith("$") for i in self.item_list ]) \ + and self.folder.is_transitive_parent_of(host.folder())

6 years, 11 months

Improved error handling during displaying of global settings values

by Lars Michelsen

Module: check_mk Branch: master Commit: ae6c21b81016324b8b36e056ea72aacf2f02d90e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae6c21b8101632… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 5 17:19:20 2017 +0200 Improved error handling during displaying of global settings values Change-Id: Iddc2ef99bd968047e3ac102464252332f754efa9 --- web/htdocs/wato.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c95a0bf..ff3620b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6827,11 +6827,17 @@ class ModeGlobalSettings(WatoMode): html.strip_tags(help_text), title_text)) if varname in self._current_settings: - to_text = valuespec.value_to_text(self._current_settings[varname]) + value = self._current_settings[varname] elif varname in self._global_settings: - to_text = valuespec.value_to_text(self._global_settings[varname]) + value = self._global_settings[varname] else: - to_text = valuespec.value_to_text(default_value) + value = default_value + + try: + to_text = valuespec.value_to_text(value) + except Exception, e: + log_exception() + to_text = html.render_error(_("Failed to render value: %r") % value) # Is this a simple (single) value or not? change styling in these cases... simple = True @@ -6840,15 +6846,12 @@ class ModeGlobalSettings(WatoMode): forms.section(title, simple=simple) if varname in self._current_settings: - value = self._current_settings[varname] modified_cls = "modified" title = _("This option has been modified.") elif varname in self._global_settings: - value = self._global_settings[varname] modified_cls = "modified globally" title = _("This option has been modified in global settings.") else: - value = default_value modified_cls = None title = None

6 years, 11 months

htmllib: added render_{error, warning, info} methods

by Lars Michelsen

Module: check_mk Branch: master Commit: 9577eb61fa6b0c4720e9c662283cf4968cd3f7d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9577eb61fa6b0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 5 17:18:59 2017 +0200 htmllib: added render_{error,warning,info} methods Change-Id: I29bda3b61c046e25e9ddcc07a573709e67cdda6d --- web/htdocs/htmllib.py | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0364e18..d9c8e79 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1672,8 +1672,24 @@ class html(HTMLGenerator, RequestHandler): self.message(msg, 'warning') - # obj might be either a string (str or unicode) or an exception object + def render_info(self, msg): + return self.render_message(msg, 'message') + + + def render_error(self, msg): + return self.render_message(msg, 'error') + + + def render_warning(self, msg): + return self.render_message(msg, 'warning') + + def message(self, msg, what='message'): + self.write(self.render_message(msg, what)) + + + # obj might be either a string (str or unicode) or an exception object + def render_message(self, msg, what='message'): if what == 'message': cls = 'success' prefix = _('MESSAGE') @@ -1684,18 +1700,16 @@ class html(HTMLGenerator, RequestHandler): cls = 'error' prefix = _('ERROR') + code = "" + if self.output_format == "html": + code += self.render_div(self.render_text(msg), class_=cls) if self.mobile: - self.open_center() - self.open_div(class_=cls) - self.write_text(msg) - self.close_div() - if self.mobile: - self.close_center() + code += self.render_center(code) else: - self.write_text('%s: %s\n' % (prefix, self.strip_tags(msg))) + code += self.render_text('%s: %s\n' % (prefix, self.strip_tags(msg))) - #self.guitest_record_output("message", (what, msg)) + return code def show_localization_hint(self):

6 years, 11 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: cd7601bb93da0bc1188f6062001a993a086c6186 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd7601bb93da0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 9 08:42:28 2017 +0200 Reserved 20 Werk IDS Change-Id: I160fa51dc83beb70aeca80be4bf6b1deb1d5df12 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e9e79fa..71624a7 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5388 +5408

6 years, 11 months

5388 FIX Dokuwiki: Fixed missing page edit dialog toolbar when using SLES

by Lars Michelsen

Module: check_mk Branch: master Commit: 9976e3815e2228859950c2cf63ada9753f803a5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9976e3815e2228… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 9 08:44:02 2017 +0200 5388 FIX Dokuwiki: Fixed missing page edit dialog toolbar when using SLES The toolbar above the page edit text area on the edit page was missing when Check_MK is running on a SLES server. Change-Id: Iee95fe98509072b05f6c8f621ba7b93d1dfa1c81 --- .werks/5388 | 11 +++++++++++ omd/packages/dokuwiki/preload.php | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5388 b/.werks/5388 new file mode 100644 index 0000000..927c53c --- /dev/null +++ b/.werks/5388 @@ -0,0 +1,11 @@ +Title: Dokuwiki: Fixed missing page edit dialog toolbar when using SLES +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1507531365 +Class: fix + +The toolbar above the page edit text area on the edit page was missing when Check_MK +is running on a SLES server. diff --git a/omd/packages/dokuwiki/preload.php b/omd/packages/dokuwiki/preload.php index 2ae6e1b..6755519 100644 --- a/omd/packages/dokuwiki/preload.php +++ b/omd/packages/dokuwiki/preload.php @@ -78,7 +78,9 @@ $config_cascade = array( 'all' => DOKU_CONF.'userall.css', ), 'userscript' => array( - 'default' => DOKU_CONF.'userscript.js' + 'default' => array( + DOKU_CONF.'userscript.js', + ), ), );

6 years, 11 months

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017