Module: check_mk
Branch: master
Commit: d5d5715d0a0d1fd2ac53fb8b5dc6e02fd930f76e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5d5715d0a0d1f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri May 3 12:07:21 2019 +0200
7345 FIX Drop ancient scanparent_hosts configuration variable
The undocumented configuration variable <tt>scanparent_hosts</tt> was removed
from Check_MK base. In the unlikely case you have configured this variable for
some reason, you will have to remove it from your configuration.
Change-Id: Ice7c9c6d9869f6c4d221963a59ad0aa5292f363e
---
.werks/7345 | 12 ++++++++++++
cmk_base/default_config/base.py | 1 -
cmk_base/parent_scan.py | 5 +----
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/.werks/7345 b/.werks/7345
new file mode 100644
index 0000000..989f851
--- /dev/null
+++ b/.werks/7345
@@ -0,0 +1,12 @@
+Title: Drop ancient scanparent_hosts configuration variable
+Level: 1
+Component: core
+Compatible: incomp
+Edition: cre
+Version: 1.6.0i1
+Date: 1556877957
+Class: fix
+
+The undocumented configuration variable <tt>scanparent_hosts</tt> was
removed
+from Check_MK base. In the unlikely case you have configured this variable for
+some reason, you will have to remove it from your configuration.
diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py
index 0124af4..b324505 100644
--- a/cmk_base/default_config/base.py
+++ b/cmk_base/default_config/base.py
@@ -194,7 +194,6 @@ extra_host_conf = {}
extra_service_conf = {}
extra_nagios_conf = ""
service_descriptions = {}
-scanparent_hosts = [(_ALL_HOSTS)]
host_attributes = {} # needed by WATO, ignored by Check_MK
ping_levels = [] # special parameters for host/PING check_command
host_check_commands = [] # alternative host check instead of check_icmp
diff --git a/cmk_base/parent_scan.py b/cmk_base/parent_scan.py
index 3f888b1..724f644 100644
--- a/cmk_base/parent_scan.py
+++ b/cmk_base/parent_scan.py
@@ -48,10 +48,7 @@ def do_scan_parents(hosts):
config_cache = config.get_config_cache()
if not hosts:
- hosts = [
- h for h in config_cache.all_active_realhosts()
- if config_cache.in_binary_hostlist(h, config.scanparent_hosts)
- ]
+ hosts = config_cache.all_active_realhosts()
parent_hosts = []
parent_ips = {}