[checkmk-commits] 7342 FIX Removed legacy_checks configuration variable

Module: check_mk Branch: master Commit: d4f74b4870b20d6b7a1eb7ef4435c0914f2aca5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4f74b4870b20d… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Apr 24 19:23:14 2019 +0200 7342 FIX Removed legacy_checks configuration variable The long time deprecated configuration variable <tt>legacy_checks</tt> has been removed now. It was replaced by the <tt>custom_checks</tt> option which is working a bit different. In case you configured Check_MK only via WATO you will not be affected by this issue, since legacy_checks could only be configured directly in the configuration files. In case you need to migrate your configuration, you could move the configuration to the WATO ruleset "Classical Active and Passive Monitoring Checks". If you need to migrate the configuration by hand have a look at the CMC migration documentation (https://mathias-kettner.com/cms_cmc_migration.html#legacy_checks) which describes the steps. Change-Id: I6389bf68d8acba073ebd757f28f55cc078f02b32 --- .werks/7342 | 21 +++++++++++++++++++++ cmk/gui/wato/pages/services.py | 8 +++++++- cmk_base/config.py | 13 ++++++++++--- cmk_base/core_nagios.py | 42 +---------------------------------------- cmk_base/default_config/base.py | 2 +- cmk_base/discovery.py | 5 ----- 6 files changed, 40 insertions(+), 51 deletions(-) diff --git a/.werks/7342 b/.werks/7342 new file mode 100644 index 0000000..21657a2 --- /dev/null +++ b/.werks/7342 @@ -0,0 +1,21 @@ +Title: Removed legacy_checks configuration variable +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1556126309 +Class: fix + +The long time deprecated configuration variable <tt>legacy_checks</tt> has been +removed now. It was replaced by the <tt>custom_checks</tt> option which is working +a bit different. + +In case you configured Check_MK only via WATO you will not be affected by this issue, +since legacy_checks could only be configured directly in the configuration files. + +In case you need to migrate your configuration, you could move the configuration to +the WATO ruleset "Classical Active and Passive Monitoring Checks". If you need to +migrate the configuration by hand have a look at the CMC migration documentation +(https://mathias-kettner.com/cms_cmc_migration.html#legacy_checks) which describes +the steps. diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index 0fb5979..605cf60 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -95,13 +95,15 @@ class DiscoveryState(object): MANUAL = "manual" ACTIVE = "active" CUSTOM = "custom" - LEGACY = "legacy" CLUSTERED_OLD = "clustered_old" CLUSTERED_NEW = "clustered_new" CLUSTERED_VANISHED = "clustered_vanished" CLUSTERED_IGNORED = "clustered_ignored" ACTIVE_IGNORED = "active_ignored" CUSTOM_IGNORED = "custom_ignored" + # TODO: Were removed in 1.6 from base. Keeping this for + # compatibility with older remote sites. Remove with 1.7. + LEGACY = "legacy" LEGACY_IGNORED = "legacy_ignored" @classmethod @@ -1483,6 +1485,8 @@ class DiscoveryPageRenderer(object): "These services have not been found by the discovery but have been added " "manually by a rule in the WATO module <i>Manual checks</i>."), ), + # TODO: Were removed in 1.6 from base. Keeping this for + # compatibility with older remote sites. Remove with 1.7. TableGroupEntry( table_group=DiscoveryState.LEGACY, show_bulk_actions=False, @@ -1546,6 +1550,8 @@ class DiscoveryPageRenderer(object): "These services have been disabled by creating a rule in the rule set " "<i>Disabled services</i> oder <i>Disabled checks</i>."), ), + # TODO: Were removed in 1.6 from base. Keeping this for + # compatibility with older remote sites. Remove with 1.7. TableGroupEntry( table_group=DiscoveryState.LEGACY_IGNORED, show_bulk_actions=False, diff --git a/cmk_base/config.py b/cmk_base/config.py index a7fe904..e103ef2 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -166,7 +166,7 @@ def load(with_conf_d=True, validate_hosts=True, exclude_parents_mk=False): verify_non_invalid_variables(vars_before_config) _verify_no_deprecated_check_rulesets() - verify_snmp_communities_type() + _verify_no_deprecated_variables_used() def load_packed_config(): @@ -405,12 +405,19 @@ def verify_non_invalid_variables(vars_before_config): sys.exit(1) -def verify_snmp_communities_type(): - # Special handling for certain deprecated variables +def _verify_no_deprecated_variables_used(): if isinstance(snmp_communities, dict): console.error("ERROR: snmp_communities cannot be a dict any more.\n") sys.exit(1) + # Legacy checks have never been supported by CMC, were not configurable via WATO + # and have been removed with Check_MK 1.6 + if legacy_checks: + console.error( + "Check_MK does not support the configuration variable \"legacy_checks\" anymore. " + "Please use custom_checks or active_checks instead.\n") + sys.exit(1) + def _verify_no_deprecated_check_rulesets(): deprecated_rulesets = [ diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 71ae7c4..9b3f5fd 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -358,46 +358,6 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): service_spec.update(_extra_service_conf_of(cfg, config_cache, hostname, "Check_MK")) outfile.write(_format_nagios_object("service", service_spec).encode("utf-8")) - # legacy checks via legacy_checks - legchecks = config_cache.host_extra_conf(hostname, config.legacy_checks) - if len(legchecks) > 0: - outfile.write("\n\n# Legacy checks\n") - for command, description, has_perfdata in legchecks: - description = config.get_final_service_description(hostname, description) - if do_omit_service(hostname, description): - continue - - if description in used_descriptions: - cn, it = used_descriptions[description] - core_config.warning( - "ERROR: Duplicate service description (legacy check) '%s' for host '%s'!\n" - " - 1st occurrance: checktype = %s, item = %r\n" - " - 2nd occurrance: checktype = legacy(%s), item = None\n" % (description, hostname, - cn, it, command)) - continue - - else: - used_descriptions[description] = ("legacy(" + command + ")", description) - - if has_perfdata: - template = "check_mk_perf," - else: - template = "" - - service_spec = { - "use": "%scheck_mk_default" % template, - "host_name": hostname, - "service_description": description, - "check_command": _simulate_command(cfg, command), - "active_checks_enabled": 1, - } - service_spec.update(core_config.get_service_attributes(hostname, description, config_cache)) - service_spec.update(_extra_service_conf_of(cfg, config_cache, hostname, description)) - outfile.write(_format_nagios_object("service", service_spec).encode("utf-8")) - - # write service dependencies for legacy checks - outfile.write(get_dependencies(hostname, description).encode("utf-8")) - # legacy checks via active_checks actchecks = [] for plugin_name, entries in host_config.active_checks: @@ -576,7 +536,7 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): }).encode("utf-8")) # No check_mk service, no legacy service -> create PING service - if not have_at_least_one_service and not legchecks and not actchecks and not custchecks: + if not have_at_least_one_service and not actchecks and not custchecks: _add_ping_service(cfg, config_cache, host_config, host_attrs["address"], host_config.is_ipv6_primary and 6 or 4, "PING", host_attrs.get("_NODEIPS")) diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py index ea13432..0124af4 100644 --- a/cmk_base/default_config/base.py +++ b/cmk_base/default_config/base.py @@ -134,7 +134,6 @@ static_checks = {} check_parameters = [] checkgroup_parameters = {} inv_parameters = {} # for HW/SW-Inventory -legacy_checks = [] # non-WATO variant of legacy checks active_checks = {} # WATO variant for fully formalized checks special_agents = {} # WATO variant for datasource_programs custom_checks = [] # WATO variant for free-form custom checks without formalization @@ -229,3 +228,4 @@ aggregate_check_mk = False aggregation_output_format = "multiline" # new in 1.1.6. Possible also: "multiline" aggr_summary_hostname = "%s-s" status_data_inventory = [] +legacy_checks = [] diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 89c9a85..e392eeb 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -936,7 +936,6 @@ DiscoveredServicesTable = Dict[Tuple[str, str], Tuple[str, str]] # "new" : Check is discovered but currently not yet monitored # "old" : Check is discovered and already monitored (most common) # "vanished" : Check had been discovered previously, but item has vanished -# "legacy" : Check is defined via legacy_checks # "active" : Check is defined via active_checks # "custom" : Check is defined via custom_checks # "manual" : Check is a manual Check_MK check without service discovery @@ -1022,10 +1021,6 @@ def _merge_manual_services(host_config, services, on_error): services[(check_plugin_name, item)] = ('manual', repr(params)) config_cache = config.get_config_cache() - # Add legacy checks -> "legacy" - legchecks = config_cache.host_extra_conf(hostname, config.legacy_checks) - for _unused_cmd, descr, _unused_perf in legchecks: - services[('legacy', descr)] = ('legacy', 'None') # Add custom checks -> "custom" custchecks = config_cache.host_extra_conf(hostname, config.custom_checks)