Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 205b3e40b3b7874e38b47e9bb5a8b9328513ae4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=205b3e40b3b787… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 6 11:32:47 2018 +0100 added missing license header Change-Id: I248e729ae538dea3d5fe28c2c175c2e1d322bd2b --- web/htdocs/gui_background_job.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/web/htdocs/gui_background_job.py b/web/htdocs/gui_background_job.py index 91d363c..e667175 100644 --- a/web/htdocs/gui_background_job.py +++ b/web/htdocs/gui_background_job.py @@ -1,4 +1,28 @@ -#!/usr/bin/env python +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. import os import config @@ -15,7 +39,6 @@ import cmk.store from background_job import JobStatus - loaded_with_language = False def load_plugins(force): global loaded_with_language

6 years, 4 months

Tiny simplifications.

by Sven Panne

Module: check_mk Branch: master Commit: 5bd2e819befcc358b05886a8339fcc6f41f053de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bd2e819befcc3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 6 12:36:45 2018 +0100 Tiny simplifications. Using braced initializer lists seems to be the more common C++ idiom. Change-Id: I574bbd9279c600b1cbb19accf7f1c212acaf7b56 --- agents/windows/stringutil.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index cbbeb31..d4b00fd 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -302,10 +302,10 @@ OptionalString matchBase(const std::string &input, const std::regex &reg) { std::smatch match; if (std::regex_match(input, match, reg) && match.size() >= 2) { - return std::optional(match[1].str()); + return {match[1].str()}; } - return std::nullopt; + return {}; } OptionalString matchIPv4(const std::string &inputAddr) { @@ -328,7 +328,7 @@ OptionalString matchIPv6Mapped(const std::string &inputAddr) { } } - return std::nullopt; + return {}; } OptionalString matchIPv6(const std::string &inputAddr) {

6 years, 4 months

clang-formatted, with some manual hints.

by Sven Panne

Module: check_mk Branch: master Commit: 2c3c7adc6db4d34c06c14a93451cfcced2ee34f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c3c7adc6db4d3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 6 12:26:27 2018 +0100 clang-formatted, with some manual hints. Change-Id: I77083ac09231ecfd9357fcd007fd5a5fce9aa17d --- agents/windows/stringutil.cc | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index 232e2dc..cbbeb31 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -314,8 +314,8 @@ OptionalString matchIPv4(const std::string &inputAddr) { OptionalString matchIPv6Mapped(const std::string &inputAddr) { const std::string ipv6addrMapped{"::(ffff(:0)?:)?(" + ipv4addr + ")"}; - const std::regex ipv6mapped{ - "^\\[?" + ipv6addrMapped + "(\\]:" + port + ")?$"}; + const std::regex ipv6mapped{"^\\[?" + ipv6addrMapped + "(\\]:" + port + + ")?$"}; std::smatch match; if (std::regex_match(inputAddr, match, ipv6mapped) && match.size() >= 2) { @@ -332,38 +332,38 @@ OptionalString matchIPv6Mapped(const std::string &inputAddr) { } OptionalString matchIPv6(const std::string &inputAddr) { - const std::string ipv6addr{"(" - + ipv6seg + "(:" + ipv6seg + "){7}" - + "|(" + ipv6seg + ":){1,7}:" - + "|(" + ipv6seg + ":){1,6}:" + ipv6seg - + "|(" + ipv6seg + ":){1,5}(:" + ipv6seg + "){1,2}" - + "|(" + ipv6seg + ":){1,4}(:" + ipv6seg + "){1,3}" - + "|(" + ipv6seg + ":){1,3}(:" + ipv6seg + "){1,4}" - + "|(" + ipv6seg + ":){1,2}(:" + ipv6seg + "){1,5}" - + "|" + ipv6seg + ":(:" + ipv6seg + "){1,6}" - + "|:(:" + ipv6seg + "){1,7}" - + "|::" - + ")"}; + const std::string ipv6addr{ + "(" + // + ipv6seg + "(:" + ipv6seg + "){7}" + // + "|(" + ipv6seg + ":){1,7}:" + // + "|(" + ipv6seg + ":){1,6}:" + ipv6seg + // + "|(" + ipv6seg + ":){1,5}(:" + ipv6seg + "){1,2}" + // + "|(" + ipv6seg + ":){1,4}(:" + ipv6seg + "){1,3}" + // + "|(" + ipv6seg + ":){1,3}(:" + ipv6seg + "){1,4}" + // + "|(" + ipv6seg + ":){1,2}(:" + ipv6seg + "){1,5}" + // + "|" + ipv6seg + ":(:" + ipv6seg + "){1,6}" + // + "|:(:" + ipv6seg + "){1,7}" + // + "|::" + // + ")"}; const std::regex ipv6{"^\\[?" + ipv6addr + "(\\]:" + port + ")?$"}; return matchBase(inputAddr, ipv6); } OptionalString matchIPv6Embedded(const std::string &inputAddr) { - const std::string ipv6addrEmbedded{std::string{"("} - + "(" + ipv6seg + ":){1,4}:" + ipv4addr - + ")"}; - const std::regex ipv6embedded{ - "^\\[?" + ipv6addrEmbedded + "(\\]:" + port + ")?$"}; + const std::string ipv6addrEmbedded{std::string{"("} + "(" + ipv6seg + + ":){1,4}:" + ipv4addr + ")"}; + const std::regex ipv6embedded{"^\\[?" + ipv6addrEmbedded + "(\\]:" + port + + ")?$"}; return matchBase(inputAddr, ipv6embedded); } -} // namespace +} // namespace std::string extractIPAddress(const std::string &inputAddr) { - for (const MatchFunc &func : { - matchIPv4, matchIPv6Mapped, matchIPv6, matchIPv6Embedded}) { + for (const MatchFunc &func : + {matchIPv4, matchIPv6Mapped, matchIPv6, matchIPv6Embedded}) { if (const auto match = func(inputAddr)) { return match.value(); }

6 years, 4 months

5711 FIX cisco_mem_asa64: Fix incorrect labelling of graph

by Konstantin Büttner

Module: check_mk Branch: master Commit: ac524d47b6376e46d8dea9e3d279c2df0b59b11e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac524d47b6376e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Mar 6 10:56:51 2018 +0100 5711 FIX cisco_mem_asa64: Fix incorrect labelling of graph Previously, the performance value would be incorrectly displayed as absolute usage in the GUI, when it is in fact relative. This has been fixed. Change-Id: I40de7621818f577bcc3caac3245d489932344d1d --- .werks/5711 | 13 +++++++++++++ web/plugins/metrics/check_mk.py | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/.werks/5711 b/.werks/5711 new file mode 100644 index 0000000..a00b8f6 --- /dev/null +++ b/.werks/5711 @@ -0,0 +1,13 @@ +Title: cisco_mem_asa64: Fix incorrect labelling of graph +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1520330136 + +Previously, the performance value would be incorrectly displayed +as absolute usage in the GUI, when it is in fact relative. +This has been fixed. diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 0eb90d3..1ac6928 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5240,6 +5240,10 @@ check_metrics["check_mk-cisco_mem_asa64"] = { "trend" : { "name" : "mem_trend" }, } +check_metrics["check_mk-cisco_mem_asa64"] = { + "mem_used" : { "name" : "mem_used_percent" } +} + check_metrics["check_mk-fortigate_sessions_base"] = { "session" : { "name" : "active_sessions" } }

6 years, 4 months

Simplify TableEventConsole::getRaw().

by Sven Panne

Module: check_mk Branch: master Commit: 6b1f3d31cca2c77432931f2b95009c6084e155f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b1f3d31cca2c7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 6 10:08:39 2018 +0100 Simplify TableEventConsole::getRaw(). Change-Id: I89625818b338df92e7c53aa22a56a17f5bf14cbc --- livestatus/src/TableEventConsole.h | 43 +++++++++++++------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index c663113..2fe9ccc 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -59,17 +59,15 @@ public: }; protected: - // TODO(sp) Use std::optional<std::string> here. - static bool getRaw(Row row, const Column &column, std::string &result) { + static std::string getRaw(Row row, const Column &column, + const std::string &default_value) { if (auto r = column.columnData<ECRow>(row)) { auto it = r->_map.find(column.name()); - if (it == r->_map.end()) { - return false; + if (it != r->_map.end()) { + return it->second; } - result = it->second; - return true; } - return false; + return default_value; } struct StringEventConsoleColumn : public StringColumn { @@ -78,8 +76,7 @@ protected: : StringColumn(name, description, -1, -1, -1, 0) {} std::string getValue(Row row) const override { - std::string result; - return getRaw(row, *this, result) ? result : ""; + return getRaw(row, *this, ""); } }; @@ -90,10 +87,7 @@ protected: int32_t getValue(Row row, const contact * /* auth_user */) const override { - std::string result; - return getRaw(row, *this, result) - ? static_cast<int32_t>(atol(result.c_str())) - : 0; + return static_cast<int32_t>(atol(getRaw(row, *this, "0").c_str())); } }; @@ -103,8 +97,7 @@ protected: : DoubleColumn(name, description, -1, -1, -1, 0) {} double getValue(Row row) const override { - std::string result; - return getRaw(row, *this, result) ? atof(result.c_str()) : 0; + return atof(getRaw(row, *this, "0").c_str()); } }; @@ -116,11 +109,9 @@ protected: private: std::chrono::system_clock::time_point getRawValue( Row row) const override { - std::string result; return std::chrono::system_clock::from_time_t( - getRaw(row, *this, result) - ? static_cast<std::time_t>(atof(result.c_str())) - : 0); + static_cast<std::time_t>( + atof(getRaw(row, *this, "0").c_str()))); } }; @@ -132,17 +123,13 @@ protected: std::vector<std::string> getValue( Row row, const contact * /*auth_user*/, std::chrono::seconds /*timezone_offset*/) const override { - std::string result; - return getRaw(row, *this, result) && !result.empty() && - result != "\002" - ? mk::split(result.substr(1), '\001') - : std::vector<std::string>(); + auto result = getRaw(row, *this, ""); + return result.empty() || result == "\002" + ? std::vector<std::string>() + : mk::split(result.substr(1), '\001'); } - bool isNone(Row row) const { - std::string result; - return getRaw(row, *this, result) && result == "\002"; - } + bool isNone(Row row) const { return getRaw(row, *this, "") == "\002"; } }; bool isAuthorizedForEvent(Row row, const contact *ctc) const;

6 years, 4 months

Use std::optional instead of ugly special values.

by Sven Panne

Module: check_mk Branch: master Commit: a1758c5aa1997a36ca09930fc616ad97cc5762a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1758c5aa1997a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 6 09:50:20 2018 +0100 Use std::optional instead of ugly special values. Change-Id: Ib8b43487bf7c86bcc24f8ed2556c40b4a3d059d6 --- livestatus/src/AndingFilter.cc | 6 +++--- livestatus/src/AndingFilter.h | 3 ++- livestatus/src/ColumnFilter.h | 2 -- livestatus/src/Filter.cc | 4 ++-- livestatus/src/Filter.h | 3 ++- livestatus/src/ListFilter.cc | 12 ++++++++---- livestatus/src/ListFilter.h | 3 ++- livestatus/src/OringFilter.cc | 12 ++++++------ livestatus/src/OringFilter.h | 3 ++- livestatus/src/Query.cc | 2 +- livestatus/src/Query.h | 3 ++- livestatus/src/StringFilter.cc | 12 ++++++++---- livestatus/src/StringFilter.h | 3 ++- livestatus/src/TableHosts.cc | 3 ++- livestatus/src/TableServices.cc | 9 ++++----- 15 files changed, 46 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a1758c5aa1…

6 years, 4 months

Windows agent: refactor duplicated code away

by Jukka Aro

Module: check_mk Branch: master Commit: 8488090004edb3dd00bf0a50dcd655a843d260be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8488090004edb3… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Mar 6 10:32:52 2018 +0100 Windows agent: refactor duplicated code away --- agents/windows/build_version | 2 +- agents/windows/stringutil.cc | 26 ++++++++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index a32440d..2caf624 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3152 +3154 diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index 75501f9..232e2dc 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -298,16 +298,20 @@ const std::string ipv6seg{"[0-9a-fA-F]{1,4}"}; const std::string port{"[[:digit:]]+"}; const std::regex ipv4{"^" + ipv4addr + "(:" + port + ")?$"}; -OptionalString matchIPv4(const std::string &inputAddr) { +OptionalString matchBase(const std::string &input, const std::regex &reg) { std::smatch match; - if (std::regex_match(inputAddr, match, ipv4) && match.size() >= 2) { + if (std::regex_match(input, match, reg) && match.size() >= 2) { return std::optional(match[1].str()); } return std::nullopt; } +OptionalString matchIPv4(const std::string &inputAddr) { + return matchBase(inputAddr, ipv4); +} + OptionalString matchIPv6Mapped(const std::string &inputAddr) { const std::string ipv6addrMapped{"::(ffff(:0)?:)?(" + ipv4addr + ")"}; const std::regex ipv6mapped{ @@ -318,8 +322,8 @@ OptionalString matchIPv6Mapped(const std::string &inputAddr) { std::smatch subMatch; for (const auto &m : match) { const auto subString{m.str()}; - if (std::regex_match(subString, subMatch, ipv4)) { - return std::optional(subMatch.str()); + if (const auto subMatch = matchBase(subString, ipv4)) { + return subMatch; } } } @@ -341,13 +345,8 @@ OptionalString matchIPv6(const std::string &inputAddr) { + "|::" + ")"}; const std::regex ipv6{"^\\[?" + ipv6addr + "(\\]:" + port + ")?$"}; - std::smatch match; - - if (std::regex_match(inputAddr, match, ipv6) && match.size() >= 2) { - return std::optional(match[1].str()); - } - return std::nullopt; + return matchBase(inputAddr, ipv6); } OptionalString matchIPv6Embedded(const std::string &inputAddr) { @@ -356,13 +355,8 @@ OptionalString matchIPv6Embedded(const std::string &inputAddr) { + ")"}; const std::regex ipv6embedded{ "^\\[?" + ipv6addrEmbedded + "(\\]:" + port + ")?$"}; - std::smatch match; - if (std::regex_match(inputAddr, match, ipv6embedded) && match.size() >= 2) { - return std::optional(match[1].str()); - } - - return std::nullopt; + return matchBase(inputAddr, ipv6embedded); } } // namespace

6 years, 4 months

Made not existing host test handle different DNS resolver situations

by Lars Michelsen

Module: check_mk Branch: master Commit: 617c67ab2cccb3d341e7bdb9924b5db061c79809 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=617c67ab2cccb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 17:31:02 2018 +0100 Made not existing host test handle different DNS resolver situations Change-Id: Icf2029cea449a8ac9f0553639b61701360c0e98d --- tests/cmk_base/test_automations.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/cmk_base/test_automations.py b/tests/cmk_base/test_automations.py index 99ed48f..cc3b6f8 100644 --- a/tests/cmk_base/test_automations.py +++ b/tests/cmk_base/test_automations.py @@ -2,6 +2,7 @@ import pytest import subprocess from testlib import web, repo_path +import re import ast @@ -129,7 +130,7 @@ def test_registered_automations(site): # '----------------------------------------------------------------------' def _execute_automation(site, cmd, args=None, stdin=None, - expect_stdout=None, expect_stderr="", expect_exit_code=0, + expect_stdout=None, expect_stderr="", expect_stderr_pattern="", expect_exit_code=0, parse_data=True): if args is None: args = [] @@ -144,7 +145,12 @@ def _execute_automation(site, cmd, args=None, stdin=None, stdout, stderr = p.communicate(stdin) assert p.wait() == expect_exit_code, "Output: %r, Error: %r" % (stdout, stderr) - assert stderr == expect_stderr + + if expect_stderr_pattern: + assert re.match(expect_stderr_pattern, stderr) is not None + else: + assert stderr == expect_stderr + if expect_stdout != None: assert stdout == expect_stdout @@ -237,7 +243,9 @@ def test_automation_analyse_service_no_check(test_cfg, site): def test_automation_try_discovery_not_existing_host(test_cfg, site): data = _execute_automation(site, "try-inventory", args=["xxx-not-existing-host"], - expect_stderr="Failed to lookup IPv4 address of xxx-not-existing-host via DNS: [Errno -2] Name or service not known\n", + expect_stderr_pattern="Failed to lookup IPv4 address of xxx-not-existing-host " \ + "via DNS: (\[Errno -2\] Name or service not known" + "|\[Errno -3\] Temporary failure in name resolution)\n", expect_stdout="", expect_exit_code=2, parse_data=False,

6 years, 4 months

Completely moved check variables to check contexts

by Lars Michelsen

Module: check_mk Branch: master Commit: 0bb709e5f1884c82460b51cc72edb5979bfb3608 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bb709e5f1884c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 6 08:25:22 2018 +0100 Completely moved check variables to check contexts * The check variables are not duplicated in the global context of the checks.py anymore. * The check variables still need to be added to the config.py and default_config.py context for config loading. At the end of the configuration loading these are unset in both namespaces and stored in the relevant check contexts. * Cleaned up side effects on config.py during check loading. The loading of the checks does not modify the check variables in the config.py nor default_config.py anymore. Change-Id: I1d10d1f7fdc5f04cf22821754adfd3a54b04aee8 --- cmk_base/automations/check_mk.py | 2 +- cmk_base/checks.py | 88 ++++++++++++++++++++++++++++------------ cmk_base/config.py | 28 ++++++------- cmk_base/discovery.py | 15 ++++--- tests/cmk_base/test_checks.py | 6 ++- 5 files changed, 88 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0bb709e5f1…

6 years, 4 months

Host renaming: Add context links from/to background job detail pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 4939b67be0e75e310c3a01564a8adf484eebf90d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4939b67be0e75e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 6 09:38:20 2018 +0100 Host renaming: Add context links from/to background job detail pages Change-Id: Ie11fedfe8e6e79569f12b04d40540f4be26a9963 --- web/htdocs/images/icon_background_job_details.png | Bin 0 -> 3141 bytes web/htdocs/wato.py | 28 ++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/web/htdocs/images/icon_background_job_details.png b/web/htdocs/images/icon_background_job_details.png new file mode 100644 index 0000000..ccbaf13 Binary files /dev/null and b/web/htdocs/images/icon_background_job_details.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0efece1..9a5c0a5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1589,6 +1589,13 @@ def mode_bulk_rename_host(phase): elif phase == "buttons": html.context_button(_("Folder"), watolib.folder_preserving_link([("mode", "folder")]), "back") + host_renaming_job = RenameHostsBackgroundJob() + if host_renaming_job.is_available(): + html.context_button(_("Previous results"), html.makeuri([ + ("mode", "background_job_details"), + ("job_id", host_renaming_job.get_job_id()), + ("back_url", html.makeuri([])), + ], filename="wato.py"), "background_job_details") return elif phase == "action": @@ -1618,7 +1625,11 @@ def mode_bulk_rename_host(phase): host_renaming_job.start() job_id = host_renaming_job.get_job_id() - job_details_url = html.makeuri_contextless([("mode", "background_job_details"), ("job_id", job_id)], filename="wato.py") + job_details_url = html.makeuri_contextless([ + ("mode", "background_job_details"), + ("job_id", job_id), + ("back_url", html.makeuri([])), + ], filename="wato.py") html.http_redirect(job_details_url) elif c == False: # not yet confirmed return "" @@ -1844,6 +1855,15 @@ def mode_rename_host(phase): elif phase == "buttons": global_buttons() html.context_button(_("Host Properties"), host.edit_url(), "back") + + host_renaming_job = RenameHostsBackgroundJob() + if host_renaming_job.is_available(): + html.context_button(_("Previous results"), html.makeuri([ + ("mode", "background_job_details"), + ("job_id", host_renaming_job.get_job_id()), + ("back_url", html.makeuri([])), + ], filename="wato.py"), "background_job_details") + return elif phase == "action": @@ -1865,7 +1885,11 @@ def mode_rename_host(phase): host_renaming_job.start() job_id = host_renaming_job.get_job_id() - job_details_url = html.makeuri_contextless([("mode", "background_job_details"), ("job_id", job_id)], filename="wato.py") + job_details_url = html.makeuri_contextless([ + ("mode", "background_job_details"), + ("job_id", job_id), + ("back_url", host.folder().url()), + ], filename="wato.py") html.http_redirect(job_details_url) elif c == False: # not yet confirmed

6 years, 4 months

← Newer
1
...
22
23
24
25
26
27
28
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018