Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Sven Panne

Module: check_mk Branch: master Commit: da59afe551040e620331cf41ba96e65fa2745268 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da59afe551040e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 11 14:34:56 2019 +0100 Quick fix for CI problem. Change-Id: I512b7208cc0ca725bbbb83c5a05dce30fe454c40 --- 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 6763a83..7b9c490 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -592,7 +592,7 @@ class Site(object): cmk_path() + "/livestatus", cmk_path() + "/livestatus/api/python", cmk_path() + "/bin", - cmk_path() + "/agents", + cmk_path() + "/agents/special", cmk_path() + "/modules", cmk_path() + "/cmk_base", cmk_path() + "/cmk",

5 years, 8 months

Moved notification rule related code to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: c5bac9eae68f43cdefd1961d0d0da323ef220496 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5bac9eae68f43… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 10 23:13:06 2019 +0100 Moved notification rule related code to dedicated module Change-Id: I3ce256588dd45afc9843c31f0468a86293a8c09f --- cmk/gui/wato/pages/host_rename.py | 8 ++++-- cmk/gui/wato/pages/notifications.py | 14 ++++++---- cmk/gui/wato/pages/timeperiods.py | 3 +- cmk/gui/watolib/__init__.py | 38 +------------------------ cmk/gui/watolib/notifications.py | 55 +++++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 45 deletions(-) diff --git a/cmk/gui/wato/pages/host_rename.py b/cmk/gui/wato/pages/host_rename.py index e2caf8a..ca9b347 100644 --- a/cmk/gui/wato/pages/host_rename.py +++ b/cmk/gui/wato/pages/host_rename.py @@ -43,6 +43,10 @@ from cmk.gui.exceptions import HTTPRedirect, MKUserError, MKGeneralException, MK from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.watolib.hosts_and_folders import validate_host_uniqueness +from cmk.gui.watolib.notifications import ( + load_notification_rules, + save_notification_rules, +) from cmk.gui.valuespec import ( Hostname, @@ -538,11 +542,11 @@ def rename_host_in_event_rules(oldname, newname): actions += ["notify_user"] * num_changed some_user_changed = True - rules = watolib.load_notification_rules() + rules = load_notification_rules() num_changed = rename_in_event_rules(rules) if num_changed: actions += ["notify_global"] * num_changed - watolib.save_notification_rules(rules) + save_notification_rules(rules) try: import cmk.gui.cee.plugins.wato.alert_handling as alert_handling diff --git a/cmk/gui/wato/pages/notifications.py b/cmk/gui/wato/pages/notifications.py index 3107da9..3aefcec 100644 --- a/cmk/gui/wato/pages/notifications.py +++ b/cmk/gui/wato/pages/notifications.py @@ -72,6 +72,11 @@ from cmk.gui.plugins.wato import ( rule_option_elements, ) +from cmk.gui.watolib.notifications import ( + save_notification_rules, + load_notification_rules, +) + class NotificationsMode(EventsMode): # TODO: Clean this up. Use inheritance @@ -460,11 +465,10 @@ class ModeNotifications(NotificationsMode): else: return self._generic_rule_list_actions(self._get_notification_rules(), "notification", - _("notification rule"), - watolib.save_notification_rules) + _("notification rule"), save_notification_rules) def _get_notification_rules(self): - return watolib.load_notification_rules() + return load_notification_rules() def _save_notification_display_options(self): config.user.save_file( @@ -870,7 +874,7 @@ class EditNotificationRuleMode(NotificationsMode): user = self._users[self._user_id()] self._rules = user.setdefault("notification_rules", []) else: - self._rules = watolib.load_notification_rules(lock=html.is_transaction()) + self._rules = load_notification_rules(lock=html.is_transaction()) if self._new: if self._clone_nr >= 0 and not html.request.var("_clear"): @@ -1231,7 +1235,7 @@ class EditNotificationRuleMode(NotificationsMode): if self._user_id(): userdb.save_users(self._users) else: - watolib.save_notification_rules(self._rules) + save_notification_rules(self._rules) if self._new: log_what = "new-notification-rule" diff --git a/cmk/gui/wato/pages/timeperiods.py b/cmk/gui/wato/pages/timeperiods.py index 0bc13b9..08670d2 100644 --- a/cmk/gui/wato/pages/timeperiods.py +++ b/cmk/gui/wato/pages/timeperiods.py @@ -36,6 +36,7 @@ from cmk.gui.table import table_element import cmk.gui.forms as forms import cmk.gui.plugins.wato.utils import cmk.gui.wato.mkeventd +from cmk.gui.watolib.notifications import load_notification_rules from cmk.gui.exceptions import MKUserError from cmk.gui.i18n import _ from cmk.gui.globals import html @@ -181,7 +182,7 @@ class ModeTimeperiods(WatoMode): def _find_usages_in_notification_rules(self, tpname): used_in = [] - for index, rule in enumerate(watolib.load_notification_rules()): + for index, rule in enumerate(load_notification_rules()): used_in += self._find_usages_in_notification_rule(tpname, index, rule) return used_in diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index 7b45916..84ec27c 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -133,6 +133,7 @@ import cmk.gui.watolib.git import cmk.gui.watolib.changes # TODO: Cleanup all except declare_host_attribute which is still neded for pre 1.6 plugin # compatibility. For the others: Find the call sites and change to full module import +from cmk.gui.watolib.notifications import save_notification_rules from cmk.gui.watolib.timeperiods import TimeperiodSelection from cmk.gui.watolib.host_attributes import ( all_host_attributes, @@ -4339,43 +4340,6 @@ def find_usages_of_service_group(name): #. -# .--Notifications-(Rule Based)------------------------------------------. -# | _ _ _ _ __ _ _ _ | -# | | \ | | ___ | |_(_)/ _(_) ___ __ _| |_(_) ___ _ __ ___ | -# | | \| |/ _ \| __| | |_| |/ __/ _` | __| |/ _ \| '_ \/ __| | -# | | |\ | (_) | |_| | _| | (_| (_| | |_| | (_) | | | \__ \ | -# | |_| \_|\___/ \__|_|_| |_|\___\__,_|\__|_|\___/|_| |_|___/ | -# | | -# +----------------------------------------------------------------------+ -# | Module for managing the new rule based notifications. | -# '----------------------------------------------------------------------' - - -def load_notification_rules(lock=False): - filename = wato_root_dir + "notifications.mk" - notification_rules = store.load_from_mk_file(filename, "notification_rules", [], lock=lock) - - # Convert to new plugin configuration format - for rule in notification_rules: - if "notify_method" in rule: - method = rule["notify_method"] - plugin = rule["notify_plugin"] - del rule["notify_method"] - rule["notify_plugin"] = (plugin, method) - - return notification_rules - - -def save_notification_rules(rules): - store.mkdir(wato_root_dir) - store.save_to_mk_file( - wato_root_dir + "notifications.mk", - "notification_rules", - rules, - pprint_value=config.wato_pprint_config) - - -#. # .--Users---------------------------------------------------------------. # | _ _ | # | | | | |___ ___ _ __ ___ | diff --git a/cmk/gui/watolib/notifications.py b/cmk/gui/watolib/notifications.py new file mode 100644 index 0000000..b0e840c --- /dev/null +++ b/cmk/gui/watolib/notifications.py @@ -0,0 +1,55 @@ +#!/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. +"""Module for managing the new rule based notifications""" + +import cmk.utils.store as store + +import cmk.gui.config as config +from cmk.gui.watolib.utils import wato_root_dir + + +def load_notification_rules(lock=False): + filename = wato_root_dir + "notifications.mk" + notification_rules = store.load_from_mk_file(filename, "notification_rules", [], lock=lock) + + # Convert to new plugin configuration format + for rule in notification_rules: + if "notify_method" in rule: + method = rule["notify_method"] + plugin = rule["notify_plugin"] + del rule["notify_method"] + rule["notify_plugin"] = (plugin, method) + + return notification_rules + + +def save_notification_rules(rules): + store.mkdir(wato_root_dir) + store.save_to_mk_file( + wato_root_dir + "notifications.mk", + "notification_rules", + rules, + pprint_value=config.wato_pprint_config)

5 years, 8 months

Moved host & folders management code to dedicated files

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c0d5ad57f10a48a2d0440cf664a3a587ddf2be5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c0d5ad57f10a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 9 19:34:22 2019 +0100 Moved host & folders management code to dedicated files There is so much related code that it was necessary to move a lot of other code watolib to dedicated modules in order to be able to move hosts & folders. Change-Id: Ie708242661c2d9f0b452e8abbe16282cb237fd3f --- cmk/gui/plugins/wato/builtin_attributes.py | 2 +- cmk/gui/wato/__init__.py | 2 +- cmk/gui/wato/pages/activate_changes.py | 16 +- cmk/gui/wato/pages/audit_log.py | 2 +- cmk/gui/wato/pages/host_rename.py | 3 +- cmk/gui/wato/pages/host_tags.py | 2 +- cmk/gui/wato/pages/services.py | 23 +- cmk/gui/wato/pages/sites.py | 2 +- cmk/gui/wato/user_profile.py | 10 +- cmk/gui/watolib/__init__.py | 7029 ++++------------------------ cmk/gui/watolib/automations.py | 278 ++ cmk/gui/watolib/changes.py | 1387 ++++++ cmk/gui/watolib/config_domains.py | 144 + cmk/gui/watolib/git.py | 156 + cmk/gui/watolib/host_attributes.py | 117 + cmk/gui/watolib/hosts_and_folders.py | 2411 ++++++++++ cmk/gui/watolib/sidebar_reload.py | 42 + cmk/gui/watolib/sites.py | 597 +++ cmk/gui/watolib/snapshots.py | 396 ++ cmk/gui/watolib/utils.py | 104 + 20 files changed, 6555 insertions(+), 6168 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4c0d5ad57f…

5 years, 8 months

Refactoring: Moved filesystem definitions, variables and some more storage check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: d65e34a4ad254428ddb34aeb3c141da9ca7ad1b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d65e34a4ad2544… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Jan 10 18:27:14 2019 +0100 Refactoring: Moved filesystem definitions, variables and some more storage check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I61bb8a4dc15ff3bdb5db25d80627c177e62c8c77 --- .../plugins/wato/check_parameters/filesystem.py | 42 +++ .../wato/check_parameters/threepar_capacity.py | 53 ++++ .../plugins/wato/check_parameters/threepar_cpgs.py | 37 +++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 322 +------------------- cmk/gui/plugins/wato/check_parameters/utils.py | 328 +++++++++++++++++++++ 5 files changed, 468 insertions(+), 314 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d65e34a4ad…

5 years, 8 months

Refactoring: Moved more storage check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: c120cdcc96d40c62a9b0a7d7bab1120e54cb8cb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c120cdcc96d40c… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Jan 10 17:28:48 2019 +0100 Refactoring: Moved more storage check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: Ie615d7b47bee6c81a57a4385e883d7ffd1d52493 --- .../plugins/wato/check_parameters/blank_tapes.py | 48 ++++ .../plugins/wato/check_parameters/brightness.py | 51 ++++ .../wato/check_parameters/brocade_fcport.py | 175 +++++++++++++ .../plugins/wato/check_parameters/brocade_sfp.py | 60 +++++ cmk/gui/plugins/wato/check_parameters/bvip_link.py | 74 ++++++ .../plugins/wato/check_parameters/fan_failures.py | 49 ++++ .../plugins/wato/check_parameters/fcport_words.py | 46 ++++ .../plugins/wato/check_parameters/filehandler.py | 55 ++++ .../wato/check_parameters/fs_mount_options.py | 48 ++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 281 --------------------- 10 files changed, 606 insertions(+), 281 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c120cdcc96…

5 years, 8 months

Fixed broken webapi after recent refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 9c19c463dc55105566812b0828802aa60ad89746 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c19c463dc5510… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 11 13:18:07 2019 +0100 Fixed broken webapi after recent refactoring Change-Id: I0f129251b4445eb99eca057f692e5ec37759dc4f --- cmk/gui/webapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/webapi.py b/cmk/gui/webapi.py index acd1030..f08e189 100644 --- a/cmk/gui/webapi.py +++ b/cmk/gui/webapi.py @@ -169,9 +169,9 @@ def page_api(): if api_actions[action].get("locking", True): with watolib.exclusive_lock(): - return execute_action() + response = execute_action() else: - return execute_action() + response = execute_action() except MKAuthException as e: response = {

5 years, 8 months

check_mk_agent.solaris: bring back missing replace_datevariable()

by Moritz Kiemer

Module: check_mk Branch: master Commit: dcabc0cb44d67ca17a53cebae29e4a5f6af23963 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcabc0cb44d67c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Sep 26 10:44:42 2018 +0200 check_mk_agent.solaris: bring back missing replace_datevariable() Change-Id: I748e92d29f9fff0cec572bd43a977f646be82c45 --- agents/check_mk_agent.solaris | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 1ebde23..3420367 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -359,6 +359,24 @@ then fi +# Fileinfo-Check: put patterns for files into $MK_CONFDIR/fileinfo.cfg +function replace_datevariable() +{ + # Replace the date variable of the input, e.g. $DATE:%Y%m%d$, by + # the current date. If there's no match just return the input. + local file_name="$1" + local pattern='(\$DATE:(.*)\$)' + + if [[ ! $file_name =~ $pattern ]]; then + echo "$file_name" + else + date_variable="${BASH_REMATCH[1]}" + format_string="${BASH_REMATCH[2]}" + echo "${file_name/$date_variable/$(date +$format_string)}" + fi +} + + # Fileinfo-Check: put patterns for files into /etc/check_mk/fileinfo.cfg if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then echo '<<<fileinfo:sep(124)>>>'

5 years, 8 months

No need for two different register methods.

by Sven Panne

Module: check_mk Branch: master Commit: 45e79a939593218d9a8f07644c07135696a36fc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45e79a93959321… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 11 12:08:26 2019 +0100 No need for two different register methods. Change-Id: Iae7b473482bb16cb45f218c7cdc11eb541e398d4 --- cmk/gui/dashboard.py | 2 +- cmk/gui/plugins/views/icons/utils.py | 2 +- cmk/gui/plugins/wato/builtin_modules.py | 2 +- cmk/gui/plugins/wato/utils/__init__.py | 2 +- cmk/gui/plugins/wato/utils/main_menu.py | 2 +- cmk/gui/plugins/watolib/utils.py | 2 +- cmk/gui/views.py | 2 +- cmk/gui/watolib.py | 5 ++--- cmk/utils/plugin_registry.py | 8 +------- tests/unit/cmk/gui/test_gui_config.py | 2 +- tests/unit/cmk/utils/test_plugin_registry.py | 4 ++-- 11 files changed, 13 insertions(+), 20 deletions(-) diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index 76480bb..08e8a73 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -715,7 +715,7 @@ def dashboard_edit_controls(name, board): return 'create_view_dashlet.py?name=%s&create=0&back=%s' % \ (html.urlencode(name), html.urlencode(html.makeuri([('edit', '1')]))) - dashlet_registry.register_plugin(ExistingView) + dashlet_registry.register(ExistingView) for ty, dashlet_type in sorted(dashlet_registry.items(), key=lambda x: x[1].sort_index()): if dashlet_type.is_selectable(): diff --git a/cmk/gui/plugins/views/icons/utils.py b/cmk/gui/plugins/views/icons/utils.py index 6dbacd9..47134ad 100644 --- a/cmk/gui/plugins/views/icons/utils.py +++ b/cmk/gui/plugins/views/icons/utils.py @@ -176,4 +176,4 @@ def _register_custom_user_icons_and_actions(user_icons_and_actions): "render": lambda self, *args: (self._icon_spec["icon"], self._icon_spec.get("title"), self._icon_spec.get("url")), }) - icon_and_action_registry.register_plugin(icon_class) + icon_and_action_registry.register(icon_class) diff --git a/cmk/gui/plugins/wato/builtin_modules.py b/cmk/gui/plugins/wato/builtin_modules.py index 5ed6ce3..8ef7ef4 100644 --- a/cmk/gui/plugins/wato/builtin_modules.py +++ b/cmk/gui/plugins/wato/builtin_modules.py @@ -555,4 +555,4 @@ class MainModuleDownloadAgents(MainModule): # Register the builtin agent download page on the top level of WATO only when the agent bakery # does not exist (e.g. when using CRE) if cmk.is_raw_edition(): - main_module_registry.register_plugin(MainModuleDownloadAgents) + main_module_registry.register(MainModuleDownloadAgents) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 606dc6b..4341cb6 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -733,7 +733,7 @@ def register_check_parameters(subgroup, checkparams_static_sub_group_class = type("%sStatic" % subgroup.__name__, (subgroup,), { "main_group": main_group_static_class, }) - rulespec_group_registry.register_plugin(checkparams_static_sub_group_class) + rulespec_group_registry.register(checkparams_static_sub_group_class) register_rule( checkparams_static_sub_group_class, diff --git a/cmk/gui/plugins/wato/utils/main_menu.py b/cmk/gui/plugins/wato/utils/main_menu.py index 2185e84..5a47040 100644 --- a/cmk/gui/plugins/wato/utils/main_menu.py +++ b/cmk/gui/plugins/wato/utils/main_menu.py @@ -190,7 +190,7 @@ def register_modules(*args): "description": wato_module.description, "sort_index": wato_module.sort_index, }) - main_module_registry.register_plugin(cls) + main_module_registry.register(cls) def get_modules(): diff --git a/cmk/gui/plugins/watolib/utils.py b/cmk/gui/plugins/watolib/utils.py index 5a5d893..45314b4 100644 --- a/cmk/gui/plugins/watolib/utils.py +++ b/cmk/gui/plugins/watolib/utils.py @@ -286,4 +286,4 @@ def register_configvar(group, "allow_reset": lambda self: allow_reset, "in_global_settings": lambda self: in_global_settings, }) - config_variable_registry.register_plugin(cls) + config_variable_registry.register(cls) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 21e2820..75d6aa7 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -178,7 +178,7 @@ def transform_old_dict_based_icons(): "service_columns": lambda self: self._icon_spec.get("service_columns", []), }) - icon_and_action_registry.register_plugin(icon_class) + icon_and_action_registry.register(icon_class) multisite_views = {} # type: Dict diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 8cfd5ff..f22dd66 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -7705,8 +7705,7 @@ rulespec_group_registry = RulespecGroupRegistry() # TODO: Kept for compatibility with pre 1.6 plugins def register_rulegroup(group_name, title, help_text): - rulespec_group_registry.register_plugin( - _get_legacy_rulespec_group_class(group_name, title, help_text)) + rulespec_group_registry.register(_get_legacy_rulespec_group_class(group_name, title, help_text)) def get_rulegroup(group_name): @@ -7714,7 +7713,7 @@ def get_rulegroup(group_name): group_class = rulespec_group_registry[group_name] except KeyError: group_class = _get_legacy_rulespec_group_class(group_name, group_title=None, help_text=None) - rulespec_group_registry.register_plugin(group_class) + rulespec_group_registry.register(group_class) return group_class() diff --git a/cmk/utils/plugin_registry.py b/cmk/utils/plugin_registry.py index a409d32..14844d0 100644 --- a/cmk/utils/plugin_registry.py +++ b/cmk/utils/plugin_registry.py @@ -56,19 +56,13 @@ class ClassRegistry(object): raise NotImplementedError() def register(self, plugin_class): - """Decorator to register a class with the registry""" + """Register a class with the registry, can be used as a decorator""" if not issubclass(plugin_class, self.plugin_base_class()): raise TypeError('%s is not a subclass of %s' % (plugin_class.__name__, self.plugin_base_class().__name__)) self._register(plugin_class) return plugin_class - def register_plugin(self, plugin_class): - """Method for registering a plugin with the registry. - - Result is equal to use the register() decorator""" - self.register(plugin_class) - @abc.abstractmethod def _register(self, plugin_class): raise NotImplementedError() diff --git a/tests/unit/cmk/gui/test_gui_config.py b/tests/unit/cmk/gui/test_gui_config.py index 80343ee..c591d5c 100644 --- a/tests/unit/cmk/gui/test_gui_config.py +++ b/tests/unit/cmk/gui/test_gui_config.py @@ -555,7 +555,7 @@ def test_permission_sorting(do_sort, result): "description": "bla", "defaults": ["admin"], }) - perms.register_plugin(cls) + perms.register(cls) sorted_perms = [p.name for p in perms.get_sorted_permissions(Sec1())] assert sorted_perms == result diff --git a/tests/unit/cmk/utils/test_plugin_registry.py b/tests/unit/cmk/utils/test_plugin_registry.py index 049510f..562077b 100644 --- a/tests/unit/cmk/utils/test_plugin_registry.py +++ b/tests/unit/cmk/utils/test_plugin_registry.py @@ -18,7 +18,7 @@ class PluginRegistry(cmk.utils.plugin_registry.ClassRegistry): @pytest.fixture(scope="module") def basic_registry(): registry = PluginRegistry() - registry.register_plugin(Plugin) + registry.register(Plugin) return registry @@ -45,7 +45,7 @@ def test_method_registration(): class MethodRegisteredPlugin(Plugin): pass - registry.register_plugin(MethodRegisteredPlugin) + registry.register(MethodRegisteredPlugin) assert registry.get("MethodRegisteredPlugin") == MethodRegisteredPlugin

5 years, 8 months

6955 lparstat_aix: Add CPU entitlement info to HW/SW inventory

by Moritz Kiemer

Module: check_mk Branch: master Commit: 70942f23d7c0440662094cb2d1b4c8e60567008c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70942f23d7c044… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jan 11 11:04:37 2019 +0100 6955 lparstat_aix: Add CPU entitlement info to HW/SW inventory CMK-1297 Change-Id: I2d33e54d9597cbfcd4c8c0afd08e2273d36bb37f --- .werks/6955 | 10 +++++++++ checks/lparstat_aix | 3 +++ cmk/gui/plugins/views/inventory.py | 8 ++++++- inventory/lparstat_aix | 46 ++++++++++++++++++++++++++++++++++++++ inventory/prtconf | 10 +++++---- 5 files changed, 72 insertions(+), 5 deletions(-) diff --git a/.werks/6955 b/.werks/6955 new file mode 100644 index 0000000..b253010 --- /dev/null +++ b/.werks/6955 @@ -0,0 +1,10 @@ +Title: lparstat_aix: Add CPU entitlement info to HW/SW inventory +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547200846 +Class: feature + + diff --git a/checks/lparstat_aix b/checks/lparstat_aix index 76980e9..b1ae2f0 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -40,6 +40,9 @@ def parse_lparstat_aix(info): # get system config: kv_pairs = (word for word in info[0] if '=' in word) parsed = {'system_config': dict(kv.split('=', 1) for kv in kv_pairs)} + # from ibm.com: 'If there are two SMT threads, the row is displayed as "on."' + if parsed['system_config'].get('smt', '').lower() == 'on': + parsed['system_config']['smt'] = '2' for index, key in enumerate(info[1]): name = key.lstrip('%') diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 53f6192..8d3f142 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -616,13 +616,19 @@ inventory_displayhints.update({ ".hardware.cpu.cores_per_cpu": {"title": _("Cores per CPU"), "paint": "count"}, ".hardware.cpu.threads_per_cpu": {"title": _("Hyperthreads per CPU"), "paint": "count"}, ".hardware.cpu.threads": {"title": _("Total Number of Hyperthreads"), "paint": "count"}, + ".hardware.cpu.smt_threads": {"title": _("Simultaneous multithreading"), "paint": "count"}, + ".hardware.cpu.sharing_mode": {"title": _("CPU sharing mode")}, ".hardware.cpu.cpus": { - "title": _("Total Number of CPUs"), "short": _("CPUs"), "paint": "count" + "title": _("Number of physical CPUs"), "short": _("CPUs"), "paint": "count" + }, + ".hardware.cpu.logical_cpus": { + "title": _("Number of logical CPUs"), "short": _("Logical CPUs"), "paint": "count" }, ".hardware.cpu.arch": {"title": _("CPU Architecture"), "short": _("CPU Arch")}, ".hardware.cpu.cores": { "title": _("Total Number of Cores"), "short": _("Cores"), "paint": "count" }, + ".hardware.cpu.entitlement": {"title": _("CPU Entitlement")}, ".hardware.memory.": {"title": _("Memory (RAM)")}, ".hardware.memory.total_ram_usable": {"title": _("Total usable RAM"), "paint": "bytes_rounded"}, ".hardware.memory.total_swap": {"title": _("Total swap space"), "paint": "bytes_rounded"}, diff --git a/inventory/lparstat_aix b/inventory/lparstat_aix new file mode 100644 index 0000000..e548ce3 --- /dev/null +++ b/inventory/lparstat_aix @@ -0,0 +1,46 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + + +def inv_lparstat_aix(parsed, inventory_tree): + data = parsed.get('system_config', {}) + node = inventory_tree.get_dict('hardware.cpu.') + + sharing_mode = '-'.join(data.get(k) for k in ('type', 'mode') if data.get(k)) + if sharing_mode: + node['sharing_mode'] = sharing_mode + + for nkey, dkey in [("smt_threads", "smt"), ("entitlement", "ent"), ("cpus", "psize"), + ("logical_cpus", "lcpu")]: + try: + node[nkey] = data[dkey] + except KeyError: + pass + + +inv_info['lparstat_aix'] = { + "inv_function": inv_lparstat_aix, +} diff --git a/inventory/prtconf b/inventory/prtconf index 6aeeb8a..3164545 100644 --- a/inventory/prtconf +++ b/inventory/prtconf @@ -59,13 +59,15 @@ def inv_prtconf(info): if line[0].startswith("========="): break # ignore the rest of the output currently + cpu_dict = inv_tree("hardware.cpu.") + for varname, value in confdict.items(): if varname == "CPU Type": if value == "64-bit": arch = "ppc64" else: arch = "ppc" - inv_tree("hardware.cpu.")["arch"] = arch + cpu_dict["arch"] = arch elif varname == "Kernel Type": if value == "64-bit": @@ -75,13 +77,13 @@ def inv_prtconf(info): inv_tree("software.os.")["arch"] = arch elif varname == "Processor Type": - inv_tree("hardware.cpu.")["model"] = value + cpu_dict["model"] = value elif varname == "Processor Clock Speed": - inv_tree("hardware.cpu.")["max_speed"] = float(value.split()[0]) * 1000 * 1000 + cpu_dict["max_speed"] = float(value.split()[0]) * 1000 * 1000 elif varname == "Number Of Processors": - inv_tree("hardware.cpu.")["cpus"] = int(value) + cpu_dict.setdefault("cpus", int(value)) elif varname == "Firmware Version": inv_tree("hardware.bios.")["version"] = value

5 years, 8 months

Refactoring: Moved more storage check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 43460ff5302afeff436e1104b73896a73c2017f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43460ff5302afe… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Jan 10 17:01:31 2019 +0100 Refactoring: Moved more storage check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I3197a257ca0bc65ac3610eb19382a5316763ee97 --- .../plugins/wato/check_parameters/apc_symentra.py | 135 +++++++ .../wato/check_parameters/apc_system_events.py | 46 +++ cmk/gui/plugins/wato/check_parameters/ceph_mgrs.py | 58 +++ cmk/gui/plugins/wato/check_parameters/ceph_osds.py | 62 ++++ .../plugins/wato/check_parameters/ceph_status.py | 43 +++ .../wato/check_parameters/ddn_s2a_port_errors.py | 106 ++++++ .../plugins/wato/check_parameters/ddn_s2a_wait.py | 88 +++++ .../plugins/wato/check_parameters/storage_iops.py | 63 ++++ .../wato/check_parameters/storage_throughput.py | 63 ++++ .../wato/check_parameters/storcli_pdisks.py | 74 ++++ .../wato/check_parameters/storcli_vdrives.py | 67 ++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 402 --------------------- 12 files changed, 805 insertions(+), 402 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=43460ff530…

5 years, 8 months

← Newer
1
...
29
30
31
32
33
34
35
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019