Checkmk git commits August 2018

checkmk-commits@lists.checkmk.com

10 participants
351 discussions

Fixed recently introduced issue by werk #6511

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a89ad62d36a00811ba365c1b5946300e73624c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a89ad62d36a00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 29 15:33:56 2018 +0200 Fixed recently introduced issue by werk #6511 Change-Id: Ic9baed6fe24386dae5b94cb053652b987c6cc3d7 --- cmk/gui/i18n.py | 5 ++++- cmk/gui/wato/__init__.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmk/gui/i18n.py b/cmk/gui/i18n.py index c5adef9..bda2d99 100644 --- a/cmk/gui/i18n.py +++ b/cmk/gui/i18n.py @@ -75,7 +75,10 @@ def _get_language_dirs(): def get_language_alias(lang): - # type: (str) -> Text + # type: (Optional[str]) -> Text + if lang is None: + return _("English") + alias = lang for lang_dir in _get_language_dirs(): try: diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 90adb95..179fbd5 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -12656,7 +12656,7 @@ def select_language(user): if languages: active = 'language' in user forms.section(_("Language"), checkbox = ('_set_lang', active, 'language')) - default_label = _('Default: %s') % (cmk.gui.i18n.get_language_alias(config.default_language) or _('English')) + default_label = _('Default: %s') % cmk.gui.i18n.get_language_alias(config.default_language) html.div(default_label, class_="inherited", id_="attr_default_language", style= "display: none" if active else "") html.open_div(id_="attr_entry_language", style="display: none" if not active else "")

6 years, 1 month

6050 FIX Analyze configuration: Execute CMC specific tests only with CMC

by Lars Michelsen

Module: check_mk Branch: master Commit: ea3700913e83167e2896cf3c2ce377db3ac5b240 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea3700913e8316… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 30 07:30:45 2018 +0200 6050 FIX Analyze configuration: Execute CMC specific tests only with CMC Change-Id: I37593460281cf299992710cf8848959f884b3bd0 --- .werks/6050 | 11 +++++++++++ cmk/gui/plugins/wato/ac_tests.py | 30 ++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/.werks/6050 b/.werks/6050 new file mode 100644 index 0000000..7fb5eac --- /dev/null +++ b/.werks/6050 @@ -0,0 +1,11 @@ +Title: Analyze configuration: Execute CMC specific tests only with CMC +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525034508 + + diff --git a/cmk/gui/plugins/wato/ac_tests.py b/cmk/gui/plugins/wato/ac_tests.py index 6241bdb..2e53182 100644 --- a/cmk/gui/plugins/wato/ac_tests.py +++ b/cmk/gui/plugins/wato/ac_tests.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import abc import requests import subprocess @@ -416,8 +417,21 @@ class ACTestBackupNotEncryptedConfigured(ACTest): -# Abstract base class for apache related tests -class BPApacheTest(object): +class ACMicrocoreTest(object): + """Abstract base class for microcore specific tests""" + __metaclass__ = abc.ABCMeta + + def _uses_microcore(self): + local_connection = sites.livestatus.LocalConnection() + version = local_connection.query_value("GET status\nColumns: program_version\n", deflt="") + return version.startswith("Check_MK") + + + +class ACApacheTest(object): + """Abstract base class for apache related tests""" + __metaclass__ = abc.ABCMeta + def _get_number_of_idle_processes(self): apache_status = self._get_apache_status() @@ -449,7 +463,7 @@ class BPApacheTest(object): -class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest): +class ACTestApacheNumberOfProcesses(ACTest, ACApacheTest): def category(self): return ACTestCategories.performance @@ -533,7 +547,7 @@ class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest): -class ACTestApacheProcessUsage(ACTest, BPApacheTest): +class ACTestApacheProcessUsage(ACTest, ACApacheTest): def category(self): return ACTestCategories.performance @@ -575,7 +589,7 @@ class ACTestApacheProcessUsage(ACTest, BPApacheTest): -class ACTestCheckMKHelperUsage(ACTest): +class ACTestCheckMKHelperUsage(ACTest, ACMicrocoreTest): def category(self): return ACTestCategories.performance @@ -606,7 +620,7 @@ class ACTestCheckMKHelperUsage(ACTest): def is_relevant(self): - return True + return self._uses_microcore() def execute(self): @@ -655,7 +669,7 @@ class ACTestCheckMKHelperUsage(ACTest): -class ACTestGenericCheckHelperUsage(ACTest): +class ACTestGenericCheckHelperUsage(ACTest, ACMicrocoreTest): def category(self): return ACTestCategories.performance @@ -679,7 +693,7 @@ class ACTestGenericCheckHelperUsage(ACTest): def is_relevant(self): - return True + return self._uses_microcore() def execute(self):

6 years, 1 month

CMK-871 Export notification/alert queue lengths via Livestatus

by Sven Panne

Module: check_mk Branch: master Commit: 1c1f9cbd1850017443e5c177dc5d18752292cbd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c1f9cbd185001… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 29 11:04:05 2018 +0200 CMK-871 Export notification/alert queue lengths via Livestatus Change-Id: I6ee5cb51e6922894838986432306db6627261bf4 --- livestatus/src/MonitoringCore.h | 3 +++ livestatus/src/StatusSpecialIntColumn.cc | 4 ++++ livestatus/src/StatusSpecialIntColumn.h | 6 +++++- livestatus/src/module.cc | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 09f0892..9cc4c45 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -112,6 +112,9 @@ public: virtual Triggers &triggers() = 0; + virtual size_t numQueuedNotifications() = 0; + virtual size_t numQueuedAlerts() = 0; + // Our escape hatch, this should die in the long run... template <typename T> T *impl() const { diff --git a/livestatus/src/StatusSpecialIntColumn.cc b/livestatus/src/StatusSpecialIntColumn.cc index c518d62..fe7d091 100644 --- a/livestatus/src/StatusSpecialIntColumn.cc +++ b/livestatus/src/StatusSpecialIntColumn.cc @@ -35,6 +35,10 @@ int32_t StatusSpecialIntColumn::getValue(Row /* row */, // Check_MK Inventory touches the file ".last" after each inventory return static_cast<int32_t>( mk_inventory_last(_mc->mkInventoryPath() + "/.last")); + case Type::num_queued_notifications: + return static_cast<int32_t>(_mc->numQueuedNotifications()); + case Type::num_queued_alerts: + return static_cast<int32_t>(_mc->numQueuedAlerts()); } // never reached, make -Wall happy return 0; diff --git a/livestatus/src/StatusSpecialIntColumn.h b/livestatus/src/StatusSpecialIntColumn.h index e022b18..c923a97 100644 --- a/livestatus/src/StatusSpecialIntColumn.h +++ b/livestatus/src/StatusSpecialIntColumn.h @@ -35,7 +35,11 @@ class Row; class StatusSpecialIntColumn : public IntColumn { public: - enum class Type { mk_inventory_last }; + enum class Type { + mk_inventory_last, + num_queued_notifications, + num_queued_alerts + }; StatusSpecialIntColumn(const std::string& name, const std::string& description, int indirect_offset, diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 5995f57..5745f88 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -673,6 +673,9 @@ public: Triggers &triggers() override { return fl_triggers; } + size_t numQueuedNotifications() override { return 0; } + size_t numQueuedAlerts() override { return 0; } + private: void *implInternal() const override { return fl_store; }

6 years, 1 month

Add AC test for alert handlers being configured to handle each check execution

by Lars Michelsen

Module: check_mk Branch: master Commit: b686d5e963e28ec09a9985ba22722d7980c53d6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b686d5e963e28e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 29 15:11:20 2018 +0200 Add AC test for alert handlers being configured to handle each check execution Change-Id: Ifc8cfcb159c1b4baf4182c26a392d8338ce833f5 --- cmk/gui/plugins/wato/ac_tests.py | 66 +++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/cmk/gui/plugins/wato/ac_tests.py b/cmk/gui/plugins/wato/ac_tests.py index 2e53182..d170205 100644 --- a/cmk/gui/plugins/wato/ac_tests.py +++ b/cmk/gui/plugins/wato/ac_tests.py @@ -427,6 +427,26 @@ class ACMicrocoreTest(object): return version.startswith("Check_MK") + def _get_effective_global_setting(self, varname): + global_settings = watolib.load_configuration_settings() + default_values = watolib.ConfigDomain().get_all_default_globals() + + if watolib.is_wato_slave_site(): + current_settings = watolib.load_configuration_settings(site_specific=True) + else: + sites = watolib.SiteManagementFactory.factory().load_sites() + current_settings = sites[config.omd_site()].get("globals", {}) + + if varname in current_settings: + value = current_settings[varname] + elif varname in global_settings: + value = global_settings[varname] + else: + value = default_values[varname] + + return value + + class ACApacheTest(object): """Abstract base class for apache related tests""" @@ -643,29 +663,39 @@ class ACTestCheckMKHelperUsage(ACTest, ACMicrocoreTest): yield cls(_("The current Check_MK helper usage is %.2f%%. The Check_MK services have an " "average check latency of %.3fs.") % (helper_usage_perc, check_latecy_cmk)) + # Only report this as warning in case the user increased the default helper configuration default_values = watolib.ConfigDomain().get_all_default_globals() - def get_effective_global_setting(varname): - global_settings = watolib.load_configuration_settings() + if self._get_effective_global_setting("cmc_cmk_helpers") > default_values["cmc_cmk_helpers"] and helper_usage_perc < 50: + yield ACResultWARN(_("The helper usage is below 50%, you may decrease the number of " + "Check_MK helpers to reduce the memory consumption.")) - if watolib.is_wato_slave_site(): - current_settings = watolib.load_configuration_settings(site_specific=True) - else: - sites = watolib.SiteManagementFactory.factory().load_sites() - current_settings = sites[config.omd_site()].get("globals", {}) - if varname in current_settings: - value = current_settings[varname] - elif varname in global_settings: - value = global_settings[varname] - else: - value = default_values[varname] - return value +class ACTestAlertHandlerEventTypes(ACTest, ACMicrocoreTest): + def category(self): + return ACTestCategories.performance - # Only report this as warning in case the user increased the default helper configuration - if get_effective_global_setting("cmc_cmk_helpers") > default_values["cmc_cmk_helpers"] and helper_usage_perc < 50: - yield ACResultWARN(_("The helper usage is below 50%, you may decrease the number of " - "Check_MK helpers to reduce the memory consumption.")) + + def title(self): + return _("Alert handler: Don't handle all check executions") + + + def help(self): + return _("In general it will result in a significantly increased load when alert handlers are " + "configured to handle all check executions. It is highly recommended to " + "<a href=\"wato.py?mode=edit_configvar&varname=alert_handler_event_types\">disable " + "this</a> in most cases.") + + + def is_relevant(self): + return self._uses_microcore() + + + def execute(self): + if "checkresult" in self._get_effective_global_setting("alert_handler_event_types"): + yield ACResultCRIT(_("Alert handler are configured to handle all check execution.")) + else: + yield ACResultOK(_("Alert handlers will handle state changes."))

6 years, 1 month

6510 FIX Global Settings: Custom localizations recognizes new languages now immediately

by Lars Michelsen

Module: check_mk Branch: master Commit: 98a3608cf1271601e492e78a0d79e5ce1a097777 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98a3608cf12716… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 29 10:21:00 2018 +0200 6510 FIX Global Settings: Custom localizations recognizes new languages now immediately Change-Id: I9d9bc37a56313cf5c5a9b7c55a7250f820b86218 --- .werks/6510 | 11 +++++++++++ cmk/gui/plugins/wato/check_mk_configuration.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6510 b/.werks/6510 new file mode 100644 index 0000000..45dcd0d --- /dev/null +++ b/.werks/6510 @@ -0,0 +1,11 @@ +Title: Global Settings: Custom localizations recognizes new languages now immediately +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535530852 + + diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 49a988f..6ae87ae 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -682,7 +682,7 @@ register_configvar(group, TextUnicode(title = _("Original Text"), size = 40), Dictionary( title = _("Translations"), - elements = [ + elements = lambda: [ ( l or "en", TextUnicode(title = a, size = 32) ) for (l,a) in cmk.gui.i18n.get_languages() ],

6 years, 1 month

6511 FIX Global Settings: Custom localizations fixed possible exception when language alias contains non-ascii characters

by Lars Michelsen

Module: check_mk Branch: master Commit: abb20a16e94602dfe6711ed83dafca75da3a50ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abb20a16e94602… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 29 14:36:29 2018 +0200 6511 FIX Global Settings: Custom localizations fixed possible exception when language alias contains non-ascii characters An exception could occur when using a localized GUI and a language which uses non-ascii characters in it's alias file (local/share/check_mk/locale/[lang]/alias). Change-Id: Ic6254e85dbac48f7f1c2a62710196efc3a87c78c --- .werks/6511 | 12 ++++++++++++ cmk/gui/i18n.py | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/6511 b/.werks/6511 new file mode 100644 index 0000000..4cc4cc6 --- /dev/null +++ b/.werks/6511 @@ -0,0 +1,12 @@ +Title: Global Settings: Custom localizations fixed possible exception when language alias contains non-ascii characters +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535531405 + +An exception could occur when using a localized GUI and a language which uses non-ascii characters +in it's alias file (local/share/check_mk/locale/[lang]/alias). diff --git a/cmk/gui/i18n.py b/cmk/gui/i18n.py index b0318d8..c5adef9 100644 --- a/cmk/gui/i18n.py +++ b/cmk/gui/i18n.py @@ -54,7 +54,7 @@ Translation = NamedTuple("Translation", [ _translation = None # type: Optional[Translation] def _(message): - # type: (str) -> unicode + # type: (str) -> Text if not _translation: return unicode(message) else: @@ -75,18 +75,18 @@ def _get_language_dirs(): def get_language_alias(lang): - # type: (str) -> unicode + # type: (str) -> Text alias = lang for lang_dir in _get_language_dirs(): try: alias = open('%s/%s/alias' % (lang_dir, lang), 'r').read().strip() except (OSError, IOError): pass - return alias + return alias.decode("utf-8") def get_languages(): - # type: () -> List[Tuple[str, unicode]] + # type: () -> List[Tuple[str, Text]] # Add the hard coded english language to the language list # It must be choosable even if the administrator changed the default # language to a custom value

6 years, 1 month

6513 FIX hp_msa: Hide password from GUI in configuration dialogs

by Lars Michelsen

Module: check_mk Branch: master Commit: 27f6a596d4c2ffba9e740b1a339c47f368c5b640 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27f6a596d4c2ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 29 11:41:11 2018 +0200 6513 FIX hp_msa: Hide password from GUI in configuration dialogs Change-Id: I043212c83491872f0853930da96bb8a964436906 --- .werks/6513 | 11 +++++++++++ cmk/gui/plugins/wato/datasource_programs.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6513 b/.werks/6513 new file mode 100644 index 0000000..2659d37 --- /dev/null +++ b/.werks/6513 @@ -0,0 +1,11 @@ +Title: hp_msa: Hide password from GUI in configuration dialogs +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535535649 + + diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index 8d19500..f6a9034 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -251,7 +251,7 @@ register_rule(group, ) ), ( "password", - TextAscii( + Password( title = _("Password"), allow_empty = False, )

6 years, 1 month

6512 FIX agent_3par: Fixed broken 3par special agent (

by Lars Michelsen

Regression in 1.5.0p1, #6420) Message-ID: <5b868628.r2Av4+Qnf1gpOexK%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 0a0678ea5fc47f9145211a7560e610df475e1ddc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a0678ea5fc47f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 29 11:35:12 2018 +0200 6512 FIX agent_3par: Fixed broken 3par special agent (Regression in 1.5.0p1, #6420) Change-Id: Id6f3dd6c928e472054ede2704ea61a0dc0374a55 --- .werks/6512 | 11 +++++++++++ checks/agent_3par | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6512 b/.werks/6512 new file mode 100644 index 0000000..bedd1fa --- /dev/null +++ b/.werks/6512 @@ -0,0 +1,11 @@ +Title: agent_3par: Fixed broken 3par special agent (Regression in 1.5.0p1, #6420) +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535535275 + + diff --git a/checks/agent_3par b/checks/agent_3par index 57edac2..cb74add 100644 --- a/checks/agent_3par +++ b/checks/agent_3par @@ -29,7 +29,7 @@ def agent_3par_arguments(params, hostname, ipaddress): args += " -u " + quote_shell_string(params["user"]) args += " -p " + quote_shell_string(params["password"]) - args += quote_shell_string(" --verify-certs=%s" % ("yes" if params.get("verify_cert", False) else "no")) + args += " --verify-certs=%s" % ("yes" if params.get("verify_cert", False) else "no") if "values" in params: args += " -v " + quote_shell_string(",".join(params["values"]))

6 years, 1 month

6471 FIX New Theme: Updated fixes

by Marcel Arentz

Module: check_mk Branch: master Commit: 6dc21814dec51478e6ec021eee442c11d3c8add8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dc21814dec514… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Aug 29 10:11:16 2018 +0200 6471 FIX New Theme: Updated fixes This werk includes some minor fixes for: - Missing highlighting of ineffective rules - Too small arrow WATO > Hosts for folder order - White title of folder if the folder is locked Change-Id: I7d2cecc8fbe1c22ececa17394998f1ee9be27732 --- .werks/6471 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/6471 b/.werks/6471 new file mode 100644 index 0000000..f59ff5a --- /dev/null +++ b/.werks/6471 @@ -0,0 +1,13 @@ +Title: New Theme: Updated fixes +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535530091 +Class: fix + +This werk includes some minor fixes for: +- Missing highlighting of ineffective rules +- Too small arrow WATO > Hosts for folder order +- White title of folder if the folder is locked

6 years, 1 month

CMK-807: Fixed missing highlighting as ineffective rules

by Marcel Arentz

Module: check_mk Branch: master Commit: 1361ae12f454b8ac7c3a998856fd355e17ee50bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1361ae12f454b8… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Aug 27 17:19:55 2018 +0200 CMK-807: Fixed missing highlighting as ineffective rules Change-Id: I82a9ee850308631059863ce8d859c7b9e46ad95b --- web/htdocs/themes/facelift/theme.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index a85951d..3da362a 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -352,6 +352,8 @@ table { background-color: transparent; } table.data.oddeven > tbody > tr.groupheader { background-color: transparent; } + table.data.oddeven > tbody > .matches_search > td, table.data.oddeven > tbody > .matches_search > td { + background-color: #afb !important; } table.data.headerleft { border-spacing: 0px; } table.data.headerleft tbody tr td, table.data.headerleft tbody tr th, table.data.headerleft tbody tr td:nth-child(odd), table.data.headerleft tbody tr th:nth-child(odd), table.data.headerleft tbody tr td:nth-child(even), table.data.headerleft tbody tr th:nth-child(even) {

6 years, 1 month

← Newer
1
2
3
4
5
6
7
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2018