Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Florian Kromer

Module: check_mk Branch: master Commit: bce374c5541258307540c984d5bd828784e79096 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bce374c5541258… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Nov 30 13:11:46 2018 +0100 fix minor typo in perle checkmans Change-Id: Ic869fd0db9066453686e53280e6324cc72ec8d64 --- checkman/perle_modules_cm1000 | 4 ++-- checkman/perle_modules_cm1110 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkman/perle_modules_cm1000 b/checkman/perle_modules_cm1000 index bdc8d4a..e8ddd5e 100644 --- a/checkman/perle_modules_cm1000 +++ b/checkman/perle_modules_cm1000 @@ -1,11 +1,11 @@ -title: Perle Mediaconverter: CM 1110 modules states +title: Perle Mediaconverter: CM 1000 modules states agents: snmp catalog: hw/app/perle license: GPL distribution: check_mk description: This check monitors the power state and fiber and copper LPRF and - link status of CM 1110 modules of Perle Meadiconverter devices + link status of CM 1000 modules of Perle Meadiconverter devices which support the PERLE-MCR-MGT MIB. The check reports CRIT if no power to module. Otherwise it is OK. diff --git a/checkman/perle_modules_cm1110 b/checkman/perle_modules_cm1110 index b6bea17..3812f0e 100644 --- a/checkman/perle_modules_cm1110 +++ b/checkman/perle_modules_cm1110 @@ -1,11 +1,11 @@ -title: Perle Mediaconverter: CM 1000 modules states +title: Perle Mediaconverter: CM 1110 modules states agents: snmp catalog: hw/app/perle license: GPL distribution: check_mk description: This check monitors the power state and fiber and copper LPRF and - link status of CM 1000 modules of Perle Meadiconverter devices + link status of CM 1110 modules of Perle Meadiconverter devices which support the PERLE-MCR-MGT MIB. The check reports CRIT if no power to module. Otherwise it is OK.

5 years, 6 months

6694 Increased performance of user profile synchronization between sites

by Andreas Boesl

Module: check_mk Branch: master Commit: 9a48b9ddd3c97017d709b6f9889b6d39195c6721 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a48b9ddd3c970… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 30 09:27:19 2018 +0100 6694 Increased performance of user profile synchronization between sites User profiles may now be synchronized in bulks. CMK-1358 Change-Id: Ia57bacde37eaf65ac9ce638c18f5ba1515419225 --- .werks/6694 | 10 +++++++ cmk/gui/plugins/userdb/ldap_connector.py | 25 ++++++++++------ cmk/gui/wato/user_profile.py | 4 ++- cmk/gui/watolib.py | 49 ++++++++++++++++++++++++++++++-- tests/unit/cmk/gui/test_watolib.py | 1 + 5 files changed, 78 insertions(+), 11 deletions(-) diff --git a/.werks/6694 b/.werks/6694 new file mode 100644 index 0000000..4c6be39 --- /dev/null +++ b/.werks/6694 @@ -0,0 +1,10 @@ +Title: Increased performance of user profile synchronization between sites +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1543567554 +Class: feature + +User profiles may now be synchronized in bulks. diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 951f820..adafa28 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -1168,6 +1168,7 @@ class LDAPUserConnector(UserConnector): del users[user_id] # remove the user changes.append(_("LDAP [%s]: Removed user %s") % (connection_id, user_id)) + profiles_to_synchronize = {} for user_id, ldap_user in ldap_users.items(): mode_create, user = load_user(user_id) user_connection_id = userdb.cleanup_connection_id(user.get('connector')) @@ -1238,7 +1239,7 @@ class LDAPUserConnector(UserConnector): # Synchronize new user profile to remote sites if needed if pw_changed and not changed and config.has_wato_slave_sites(): - synchronize_profile_to_sites(self._logger, user_id, user) + profiles_to_synchronize[user_id] = user if changed: for key, (old_value, new_value) in sorted(changed.items()): @@ -1249,6 +1250,8 @@ class LDAPUserConnector(UserConnector): _("LDAP [%s]: Modified user %s (%s)") % (connection_id, user_id, ', '.join(details))) + synchronize_profiles_to_sites(self._logger, profiles_to_synchronize) + duration = time.time() - start_time self._logger.info( 'SYNC FINISHED - Duration: %0.3f sec, Queries: %d' % (duration, self._num_queries)) @@ -2576,18 +2579,21 @@ class SynchronizationResult(object): self.succeeded = succeeded -def synchronize_profile_to_sites(logger, user_id, profile): +def synchronize_profiles_to_sites(logger, profiles_to_synchronize): + if not profiles_to_synchronize: + return + import cmk.gui.watolib as watolib - remote_sites = [(site_id, config.site(site_id)) for site_id in config.get_login_sites()] + remote_sites = [(site_id, config.site(site_id)) for site_id in config.get_login_slave_sites()] - logger.info( - 'Credentials changed: %s. Trying to sync to %d sites' % (user_id, len(remote_sites))) + logger.info('Credentials changed for %s. Trying to sync to %d sites' % (", ".join( + profiles_to_synchronize.keys()), len(remote_sites))) synchronization_jobs = [] states = sites.states() for site_id, site in remote_sites: - synchronization_jobs.append((states, site_id, site, user_id, profile)) + synchronization_jobs.append((states, site_id, site, profiles_to_synchronize)) pool = ThreadPool() results = pool.map(_sychronize_profile_worker, synchronization_jobs) @@ -2614,7 +2620,7 @@ def synchronize_profile_to_sites(logger, user_id, profile): def _sychronize_profile_worker(site_configuration): import cmk.gui.watolib as watolib - states, site_id, site, user_id, profile = site_configuration + states, site_id, site, profiles_to_synchronize = site_configuration if not site.get("replication"): return SynchronizationResult(site_id, disabled=True) @@ -2628,7 +2634,10 @@ def _sychronize_profile_worker(site_configuration): site_id, error_text=_("Site %s is dead") % site_id, failed=True) try: - watolib.push_user_profile_to_site(site, user_id, profile) + result = watolib.push_user_profiles_to_site_transitional_wrapper( + site, profiles_to_synchronize) + if result != True: + return SynchronizationResult(site_id, error_text=result, failed=True) return SynchronizationResult(site_id, succeeded=True) except RequestTimeout: # This function is currently only used by the background job diff --git a/cmk/gui/wato/user_profile.py b/cmk/gui/wato/user_profile.py index b2a0c53..8ce0e37 100644 --- a/cmk/gui/wato/user_profile.py +++ b/cmk/gui/wato/user_profile.py @@ -372,7 +372,9 @@ class ModeAjaxProfileReplication(WatoWebApiMode): raise MKUserError(None, _('The requested user does not exist')) start = time.time() - result = watolib.push_user_profile_to_site(site, user_id, users[user_id]) + result = watolib.push_user_profiles_to_site_transitional_wrapper( + site, {user_id: users[user_id]}) + duration = time.time() - start watolib.ActivateChanges().update_activation_time( site_id, watolib.ACTIVATION_TIME_PROFILE_SYNC, duration) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 7ff47fb..562f31f 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -4830,8 +4830,25 @@ class AutomationPushSnapshot(AutomationCommand): shutil.rmtree(tmp_dir) -# TODO: Recode to new sync? -def push_user_profile_to_site(site, user_id, profile): +def push_user_profiles_to_site_transitional_wrapper(site, user_profiles): + try: + return push_user_profiles_to_site(site, user_profiles) + except MKAutomationException as e: + if "Invalid automation command: push-profiles" in "%s" % e: + failed_info = [] + for user_id, user in user_profiles.iteritems(): + result = legacy_push_user_profile_to_site(site, user_id, user) + if result != True: + failed_info.append(result) + + if failed_info: + return "\n".join(failed_info) + return True + else: + raise + + +def legacy_push_user_profile_to_site(site, user_id, profile): url = site["multisiteurl"] + "automation.py?" + html.urlencode_vars([ ("command", "push-profile"), ("secret", site["secret"]), @@ -4856,6 +4873,34 @@ def push_user_profile_to_site(site, user_id, profile): return response +def push_user_profiles_to_site(site, user_profiles): + return do_remote_automation(site, "push-profiles", [("profiles", repr(user_profiles))]) + + +PushUserProfilesRequest = typing.NamedTuple("PushUserProfilesRequest", [("user_profiles", dict)]) + + +(a)automation_command_registry.register +class PushUserProfilesToSite(AutomationCommand): + def command_name(self): + return "push-profiles" + + def get_request(self): + return PushUserProfilesRequest(ast.literal_eval(html.var("profiles"))) + + def execute(self, request): + user_profiles = request.user_profiles + + if not user_profiles: + raise MKGeneralException(_('Invalid call: No profiles set.')) + + users = userdb.load_users(lock=True) + for user_id, profile in user_profiles.iteritems(): + users[user_id] = profile + userdb.save_users(users) + return True + + # Add pending entry to make sync possible later for admins def add_profile_replication_change(site_id, result): add_change( diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index 731ce48..4d545d4 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -65,6 +65,7 @@ def test_registered_automation_commands(): registered = sorted(watolib.automation_command_registry.keys()) assert registered == sorted([ 'activate-changes', + 'push-profiles', 'check-analyze-config', 'execute-dcd-command', 'network-scan',

5 years, 6 months

6941 FIX mk_logwatch.aix: Don't clear systems error log

by Moritz Kiemer

Module: check_mk Branch: master Commit: f01183dc594ef43beca8befeef55461ba6b0f9e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f01183dc594ef4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Nov 23 09:44:54 2018 +0100 6941 FIX mk_logwatch.aix: Don't clear systems error log The systems error log (errpt) is no longer cleared ("errclear 0"). Previously the errorlog has been cleared after each run of the plugin, and a backup file of the error log has been created as /var/log/errpt_$DATE.log. This is no longer the case, as a less intrusive way to avoid redundant log messages has been established. Change-Id: I239d67767e7d5f258fee4616bbd45cd3a89c803f --- .werks/6941 | 16 +++++ agents/plugins/mk_logwatch.aix | 33 ++++++++--- tests/unit/plugins/test_mk_logwatch_aix.py | 93 ++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 7 deletions(-) diff --git a/.werks/6941 b/.werks/6941 new file mode 100644 index 0000000..1225d43 --- /dev/null +++ b/.werks/6941 @@ -0,0 +1,16 @@ +Title: mk_logwatch.aix: Don't clear systems error log +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542962724 +Class: fix + +The systems error log (errpt) is no longer cleared ("errclear 0"). +Previously the errorlog has been cleared after each run of the plugin, +and a backup file of the error log has been created as +/var/log/errpt_$DATE.log. + +This is no longer the case, as a less intrusive way to avoid +redundant log messages has been established. diff --git a/agents/plugins/mk_logwatch.aix b/agents/plugins/mk_logwatch.aix index 8996093..ceb7ec0 100755 --- a/agents/plugins/mk_logwatch.aix +++ b/agents/plugins/mk_logwatch.aix @@ -1,13 +1,32 @@ #!/usr/bin/ksh # Logfile monitoring for AIX via errpt -# Beware: This Plugin clears the errors after each run, -# but it creates an detailed backup in /var/log/errpt_TIMESTAMP.log + +## Output of errpt looks like this, newest first +## (timestamp is month-day-hour-minute-year): +# IDENTIFIER TIMESTAMP T C RESOURCE_NAME DESCRIPTION +# 8650BE3F 0820122810 I H ent2 ETHERCHANNEL RECOVERY +# F3846E13 0820122510 P H ent2 ETHERCHANNEL FAILOVER +# 8650BE3F 0820104410 I H ent2 ETHERCHANNEL RECOVERY +# F3846E13 0820093810 P H ent2 ETHERCHANNEL FAILOVER +# 8650BE3F 0820090910 I H ent2 ETHERCHANNEL RECOVERY +# + +MK_LOGWATCH_AIX_STATE="$MK_VARDIR/mk_logwatch_aix.last_reported" echo "<<<logwatch>>>" echo "[[[errorlog]]]" -OUT=$(errpt | awk 'NR>1 { printf "C %s\n", $0 }') -if [[ $OUT != '' ]];then - echo "$OUT" - errpt -a > /var/log/errpt_$(date +%s).log - errclear 0 + +# the last line we already reported (may be empty) +LINE=$(tail -n1 "$MK_LOGWATCH_AIX_STATE" 2> /dev/null) + +if [[ "$LINE" ]]; then # get rid of all lines after that: + OUT=$(errpt | awk '/'"$LINE"'/ {exit}; (NR>1) {printf "C %s\n", $0}') +else # LINE is empty -> report all + OUT=$(errpt | awk '(NR>1) {printf "C %s\n", $0}') fi + +if [[ "$OUT" ]]; then + # output data; if successful, remember most recent + echo "$OUT" && echo "$OUT" | head -n1 | sed 's/^C\ //' > "$MK_LOGWATCH_AIX_STATE" +fi + diff --git a/tests/unit/plugins/test_mk_logwatch_aix.py b/tests/unit/plugins/test_mk_logwatch_aix.py new file mode 100644 index 0000000..2840f37 --- /dev/null +++ b/tests/unit/plugins/test_mk_logwatch_aix.py @@ -0,0 +1,93 @@ +import os +import subprocess +import pytest +from testlib import cmk_path + +PLUGIN = os.path.join(cmk_path(), 'agents', 'plugins', 'mk_logwatch.aix') + +ERRPT_OUTPUT = [ + 'IDENTIFIER TIMESTAMP T C RESOURCE_NAME DESCRIPTION', + '8650BE3F 0820122810 I H ent2 ETHERCHANNEL RECOVERY', + 'F3846E13 0820122510 P H ent2 ETHERCHANNEL FAILOVER', + '8650BE3F 0820104410 I H ent2 ETHERCHANNEL RECOVERY', + 'F3846E13 0820093810 P H ent2 ETHERCHANNEL FAILOVER', + '8650BE3F 0820090910 I H ent2 ETHERCHANNEL RECOVERY', +] + + +def _prepare_mock_errpt(tmpdir, errpt_output): + errpt_name = str(tmpdir.join('errpt')) + errpt_script = ''.join(['#!/bin/sh\n'] + ['echo "%s"\n' % line for line in errpt_output]) + with open(errpt_name, 'w') as errpt_file: + errpt_file.write(errpt_script) + os.chmod(errpt_name, 0777) + + +def _get_env(tmpdir): + env = os.environ.copy() + env.update({"PATH": '%s:%s' % (tmpdir, os.getenv("PATH")), "MK_VARDIR": "%s" % tmpdir}) + return env + + +class StateFile(object): + def __init__(self, tmpdir): + super(StateFile, self).__init__() + self.name = str(tmpdir.join('mk_logwatch_aix.last_reported')) + + def set(self, state): + if state is None: + try: + os.remove(self.name) + except OSError: + pass + return + with open(self.name, 'w') as statefile: + statefile.write("%s\n" % state) + + def content(self): + try: + content = open(self.name).read() + # ends with newline + assert content[-1] == '\n' + return content[:-1] + except IOError: + return None + + +def _format_expected(lines): + added_prefix = ['C %s\n' % line for line in lines] + added_header = ['<<<logwatch>>>\n', '[[[errorlog]]]\n'] + added_prefix + return ''.join(added_header) + + +(a)pytest.mark.parametrize( + "errpt_output,last_reported,expectations", + [ + ( + ERRPT_OUTPUT, + [None, "", ERRPT_OUTPUT[3], ERRPT_OUTPUT[1], "something else entirely"], + [ERRPT_OUTPUT[1:], ERRPT_OUTPUT[1:], ERRPT_OUTPUT[1:3], [], ERRPT_OUTPUT[1:]], + ), + ( + ERRPT_OUTPUT[:1], # no output, just header + [None, "", "what ever"], + [[], [], []], + ), + ]) +def test_mk_logwatch_aix(tmpdir, errpt_output, last_reported, expectations): + + _prepare_mock_errpt(tmpdir, errpt_output) + env = _get_env(tmpdir) + statefile = StateFile(tmpdir) + + for state, expected in zip(last_reported, expectations): + + statefile.set(state) + + output = subprocess.check_output(PLUGIN, env=env) + + assert output == _format_expected(expected) + if len(errpt_output) > 1: # we should have updated state file + assert statefile.content() == errpt_output[1] + else: # it should not have changed + assert statefile.content() == state

5 years, 6 months

Finish rulespec group refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 4bc41624afd3092f0af5d2c40865bcd442272ed1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bc41624afd309… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 29 21:00:45 2018 +0100 Finish rulespec group refactoring * Changed all register_rule() calls to use the rulegroup classes instead of their internal identifiers * Removed the widely used plugin file global "group" variable * Add test for legacy ruleset and check parameter registration Change-Id: Iffbf91f5d8a3fbf76daef298a4e67bf57e691b2a --- cmk/gui/plugins/wato/active_checks.py | 44 ++++--- cmk/gui/plugins/wato/check_mk_configuration.py | 158 +++++++++++-------------- cmk/gui/plugins/wato/check_parameters.py | 56 ++++----- cmk/gui/plugins/wato/datasource_programs.py | 63 +++++----- cmk/gui/plugins/wato/inventory.py | 8 +- cmk/gui/plugins/wato/utils/__init__.py | 21 ++-- cmk/gui/wato/mkeventd.py | 37 +++--- cmk/gui/watolib.py | 9 +- tests/unit/cmk/gui/test_watolib.py | 70 ++++++++++- 9 files changed, 251 insertions(+), 215 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4bc41624af…

5 years, 7 months

Refactored check parameters to new rule group registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 8dbee015fa765f78cc794894fec0f318613edd37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dbee015fa765f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 27 16:51:42 2018 +0100 Refactored check parameters to new rule group registration * Refactored all main groups to implement the new rulespec group registration API. They all base on on the new RulespecGroup() class * Besides these main groups the checks are members of sub groups. All subgroups are now explicitly registered and based on the RulespecSubGroup() class * 3rd party checks that use either register_rule() or register_check_parameters() may refer to non standard rulespec groups. These are created automatically on demand for best compatibility. Next step is to refactor all the register_rule() and register_check_parameters() calls to a plugin registry. Change-Id: Ib2145e5653d181bedbc66c83a881f135672c5c25 --- cmk/gui/plugins/wato/__init__.py | 13 +- cmk/gui/plugins/wato/active_checks.py | 23 +- cmk/gui/plugins/wato/check_mk_configuration.py | 255 ++++- cmk/gui/plugins/wato/check_parameters.py | 941 ++++++++--------- cmk/gui/plugins/wato/datasource_programs.py | 33 +- cmk/gui/plugins/wato/inventory.py | 26 +- cmk/gui/plugins/wato/utils/__init__.py | 177 +++- cmk/gui/wato/__init__.py | 20 + cmk/gui/wato/mkeventd.py | 22 +- cmk/gui/watolib.py | 78 +- tests/unit/cmk/gui/test_watolib.py | 1295 +++++++++++++++++++++++- 11 files changed, 2346 insertions(+), 537 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8dbee015fa…

5 years, 7 months

Refactored rule group registration to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 225faa2be39ddaf5c367b2801d7a79da0ffc9a57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=225faa2be39dda… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 27 16:38:58 2018 +0100 Refactored rule group registration to plugin registry * The internal construct g_rulegroups has been replaced by the rulespec_group_registry * A group is now represented by a RulespecGroup() object * The register_rulegroup() call, which may be used by WATO plugins, is now deprecated. It will be kept working for 1 or 2 versions to keep the plugins compatible. Change-Id: I64718130273ab6b41680cd9593fed4bcea036fda --- cmk/gui/watolib.py | 63 +++++++++++++++++++++++++++++--------- tests/unit/cmk/gui/test_watolib.py | 63 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 15 deletions(-) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index d75909c..c5d164b 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -211,7 +211,6 @@ if config.mkeventd_enabled: backup_domains = {} g_rulespecs = None -g_rulegroups = {} # Global datastructure holding all attributes (in a defined order) # as pairs of (attr, topic). Topic is the title under which the @@ -7522,20 +7521,58 @@ def user_script_title(what, name): # '---------------------------------------------------------------------- -# TODO: Better rename this and also get_rulegroup() to rulespec group -class Rulegroup(object): - def __init__(self, name, title=None, help_text=None): - self.name = name - self.title = title or name - self.help = help_text +class RulespecGroup(object): + __metaclass__ = abc.ABCMeta + + @abc.abstractproperty + def name(self): + # type: () -> Text + """Unique internal key of this group""" + raise NotImplementedError() + + @abc.abstractproperty + def title(self): + # type: () -> Text + """Human readable title of this group""" + raise NotImplementedError() + + @abc.abstractproperty + def help(self): + # type: () -> Text + """Helpful description of this group""" + raise NotImplementedError() +class RulespecGroupRegistry(cmk.plugin_registry.ClassRegistry): + def plugin_base_class(self): + return RulespecGroup + + def _register(self, plugin_class): + self._entries[plugin_class().name] = plugin_class + + +rulespec_group_registry = RulespecGroupRegistry() + + +# TODO: Kept for compatibility with pre 1.6 plugins def register_rulegroup(group_name, title, help_text): - g_rulegroups[group_name] = Rulegroup(group_name, title, help_text) + rulespec_group_registry.register_plugin( + _get_legacy_rulespec_group_class(group_name, title, help_text)) def get_rulegroup(group_name): - return g_rulegroups.get(group_name, Rulegroup(group_name)) + group_class = rulespec_group_registry.get( + group_name, _get_legacy_rulespec_group_class(group_name, group_title=None, help_text=None)) + return group_class() + + +def _get_legacy_rulespec_group_class(group_name, group_title, help_text): + group_title = group_title or group_name + return type("LegacyRulespecGroup%s" % group_name.title(), (RulespecGroup,), { + "name": group_name, + "title": group_title, + "help": help_text, + }) class Rulespecs(object): @@ -7585,18 +7622,14 @@ class Rulespecs(object): choices = [] for main_group_name in self.get_main_groups(): - main_group = g_rulegroups.get(main_group_name) - if main_group: - main_group_title = main_group.title - else: - main_group_title = main_group_name + main_group = get_rulegroup(main_group_name) if mode == "static_checks" and main_group_name != "static": continue elif mode != "static_checks" and main_group_name == "static": continue - choices.append((main_group_name, main_group_title)) + choices.append((main_group_name, main_group.title)) for group_name in self._by_group: if group_name.startswith(main_group_name + "/"): diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index 3579145..bb6eb16 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -279,3 +279,66 @@ def test_legacy_configvar_order_access(): with pytest.raises(NotImplementedError) as e: configvar_order()["x"] = 10 assert "werk #6911" in "%s" % e + + +def test_registered_rulespec_groups(): + registered = sorted(watolib.rulespec_group_registry.keys()) + assert registered == sorted([ + 'activechecks', + 'agent', + 'agents', + 'checkparams', + 'datasource_programs', + 'eventconsole', + 'grouping', + 'inventory', + 'monconf', + 'static', + 'user_interface', + ]) + + +def test_legacy_register_rulegroup(monkeypatch): + monkeypatch.setattr(watolib, "rulespec_group_registry", watolib.RulespecGroupRegistry()) + watolib.register_rulegroup("abc", "A B C", "abc 123") + + group = watolib.get_rulegroup("abc") + assert isinstance(group, watolib.RulespecGroup) + assert group.name == "abc" + assert group.title == "A B C" + assert group.help == "abc 123" + + +def test_legacy_get_not_existing_rulegroup(monkeypatch): + monkeypatch.setattr(watolib, "rulespec_group_registry", watolib.RulespecGroupRegistry()) + + group = watolib.get_rulegroup("xyz") + assert isinstance(group, watolib.RulespecGroup) + assert group.name == "xyz" + assert group.title == "xyz" + assert group.help is None + + +(a)pytest.mark.parametrize("mode,result", [ + ("rulesets", [ + ('activechecks', u'Active checks (HTTP, TCP, etc.)'), + ('agent', u'Access to Agents'), + ('agents', u'Monitoring Agents'), + ('checkparams', u'Parameters for discovered services'), + ('datasource_programs', u'Datasource Programs'), + ('eventconsole', u'Event Console'), + ('grouping', u'Grouping'), + ('inventory', u'Hardware/Software-Inventory'), + ('monconf', u'Monitoring Configuration'), + ('user_interface', u'User Interface'), + ]), + ("static_checks", [ + ('static', 'Manual Checks'), + ]), +]) +def test_rulespec_group_choices(mode, result, monkeypatch): + monkeypatch.setattr(watolib.Rulespecs, "get_main_groups", + lambda self: watolib.rulespec_group_registry.keys()) + + rulespecs = watolib.Rulespecs() + assert sorted(rulespecs.get_group_choices(mode=mode)) == sorted(result)

5 years, 7 months

Refactored main module registration to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d71b4089b89695f4ec4ef62e862d320409d2cf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d71b4089b8969… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 30 08:20:42 2018 +0100 Refactored main module registration to plugin registry * The main module entries are now registered using the cmk.gui.plugins.wato.utils.main_menu.main_module_registry. * A main module entry is now represented by a class that implements the MainModule() API * The modules registered using register_modules() and the WatoModule() class are still supported (at least for the next version) and are migrated automatically to the new scheme Change-Id: Id6802d4f7bf3b4fb6ff35308738b0ad66f09ddc6 Next: Refactor all shipped register_module() calls to the new mechanism. --- cmk/gui/plugins/wato/__init__.py | 4 +- cmk/gui/plugins/wato/background_job.py | 41 ++-- cmk/gui/plugins/wato/utils/__init__.py | 2 + cmk/gui/plugins/wato/utils/main_menu.py | 117 +++++++++-- cmk/gui/wato/__init__.py | 3 +- .../cmk/gui/plugins/wato/utils/test_main_menu.py | 229 +++++++++++++++++++++ 6 files changed, 370 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8d71b4089b…

5 years, 7 months

Refactored all standard main modules to new API

by Lars Michelsen

Module: check_mk Branch: master Commit: bf6ab3a8a32a51eabadc25a882627556d537fc8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6ab3a8a32a51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 30 10:04:27 2018 +0100 Refactored all standard main modules to new API Change-Id: Ifc068c533e51cfc2fefe5076b74abdb00c513388 --- cmk/gui/plugins/wato/bi.py | 34 +- cmk/gui/plugins/wato/builtin_modules.py | 569 +++++++++++++++++++-- cmk/gui/plugins/wato/utils/main_menu.py | 2 +- cmk/gui/wato/mkeventd.py | 41 +- .../cmk/gui/plugins/wato/utils/test_main_menu.py | 2 +- 5 files changed, 578 insertions(+), 70 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bf6ab3a8a3…

5 years, 7 months

Output detailed version/build info in NEB, too.

by Sven Panne

Module: check_mk Branch: master Commit: 6173515c4e4c7024e15973780a79186a1151a24a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6173515c4e4c70… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 30 09:23:39 2018 +0100 Output detailed version/build info in NEB, too. Centralized some #ifdef logic on the way. Change-Id: Iec4da3bde05ec87e375289366a717d96e38d920d --- livestatus/src/RegExp.cc | 7 +++++++ livestatus/src/RegExp.h | 2 ++ livestatus/src/module.cc | 9 +++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/livestatus/src/RegExp.cc b/livestatus/src/RegExp.cc index 71840d7..eff949d 100644 --- a/livestatus/src/RegExp.cc +++ b/livestatus/src/RegExp.cc @@ -53,6 +53,8 @@ public: return RE2::PartialMatch(str, _regex); } + static std::string engine() { return "RE2"; } + private: RE2 _regex; @@ -98,6 +100,8 @@ public: return regex_search(str, _regex); } + static std::string engine() { return "C++11"; } + private: std::regex _regex; }; @@ -124,3 +128,6 @@ std::string RegExp::replace(const std::string &str, bool RegExp::match(const std::string &str) const { return _impl->match(str); } bool RegExp::search(const std::string &str) const { return _impl->search(str); } + +// static +std::string RegExp::engine() { return Impl::engine(); } diff --git a/livestatus/src/RegExp.h b/livestatus/src/RegExp.h index aae4a9e..c0e82b1 100644 --- a/livestatus/src/RegExp.h +++ b/livestatus/src/RegExp.h @@ -49,6 +49,8 @@ public: bool match(const std::string &str) const; bool search(const std::string &str) const; + static std::string engine(); + private: class Impl; std::unique_ptr<Impl> _impl; diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 3764223..ceeb3e5 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -57,6 +57,7 @@ #include "MonitoringCore.h" #include "OutputBuffer.h" #include "Poller.h" +#include "RegExp.h" #include "Store.h" #include "StringUtils.h" #include "TimeperiodsCache.h" @@ -1102,8 +1103,12 @@ void livestatus_parse_arguments(const char *args_orig) { void omd_advertize() { Notice(fl_logger_nagios) - << "Livestatus " << VERSION << " by Mathias Kettner. Socket: '" - << fl_socket_path << "'"; + << "Livestatus by Mathias Kettner started with PID " << getpid(); + Notice(fl_logger_nagios) << "version " << VERSION << " compiled " + << BUILD_DATE << " on " << BUILD_HOSTNAME; + Notice(fl_logger_nagios) << "built with " << BUILD_CXX << ", using " + << RegExp::engine() << " regex engine"; + Notice(fl_logger_nagios) << "Using socket at '" << fl_socket_path << "'"; Notice(fl_logger_nagios) << "Please visit us at http://mathias-kettner.de/"; if (char *omd_site = getenv("OMD_SITE")) { Informational(fl_logger_nagios)

5 years, 7 months

Make IWYU happy again.

by Sven Panne

Module: check_mk Branch: master Commit: bf2b7c12a15c0a7366be0094f02bf11bbec5977b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf2b7c12a15c0a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 30 11:12:55 2018 +0100 Make IWYU happy again. It is a bit unclear why these #include changes are necessary locally, but not on our CI. Versionitis again? This has to be investigated... Change-Id: I4100893d13082a49f4fcc40c1bdb5c0c5486326e --- livestatus/src/DowntimeColumn.cc | 1 - livestatus/src/HostSpecialDoubleColumn.cc | 1 - livestatus/src/Query.cc | 1 - 3 files changed, 3 deletions(-) diff --git a/livestatus/src/DowntimeColumn.cc b/livestatus/src/DowntimeColumn.cc index 41bef80..97b9004 100644 --- a/livestatus/src/DowntimeColumn.cc +++ b/livestatus/src/DowntimeColumn.cc @@ -24,7 +24,6 @@ #include "DowntimeColumn.h" #include <cstdint> -#include <type_traits> #include "MonitoringCore.h" #include "Renderer.h" #include "Row.h" diff --git a/livestatus/src/HostSpecialDoubleColumn.cc b/livestatus/src/HostSpecialDoubleColumn.cc index 02a680f..d8c4d1f 100644 --- a/livestatus/src/HostSpecialDoubleColumn.cc +++ b/livestatus/src/HostSpecialDoubleColumn.cc @@ -27,7 +27,6 @@ #ifdef CMC #include <chrono> -#include <type_traits> #include "Object.h" #include "State.h" #include "Timeperiod.h" diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index e475d92..a19e8f3 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -31,7 +31,6 @@ #include <ratio> #include <sstream> #include <stdexcept> -#include <type_traits> #include <utility> #include "Aggregator.h" #include "AndingFilter.h"

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018