diff --git a/scripts/base/frameworks/cluster/main.zeek b/scripts/base/frameworks/cluster/main.zeek index d53a695a97..f112e9669c 100644 --- a/scripts/base/frameworks/cluster/main.zeek +++ b/scripts/base/frameworks/cluster/main.zeek @@ -176,8 +176,6 @@ export { ## The port that this node will listen on for peer connections. ## A value of ``0/unknown`` means the node is not pre-configured to listen. p: port &default=0/unknown; - ## Identifier for the interface a worker is sniffing. - interface: string &optional &deprecated="Remove in v7.1: interface is not required and not set consistently on workers. Replace usages with packet_source() or keep a separate worker-to-interface mapping in a global table."; ## Name of the manager node this node uses. For workers and proxies. manager: string &optional; ## A unique identifier assigned to the node by the broker framework. diff --git a/scripts/base/frameworks/cluster/supervisor.zeek b/scripts/base/frameworks/cluster/supervisor.zeek index ba0d676c6a..cea4a6f96c 100644 --- a/scripts/base/frameworks/cluster/supervisor.zeek +++ b/scripts/base/frameworks/cluster/supervisor.zeek @@ -43,10 +43,6 @@ function __init_cluster_nodes(): bool typ = rolemap[endp$role]; cnode = [$node_type=typ, $ip=endp$host, $p=endp$p]; -@pragma push ignore-deprecations - if ( endp?$interface ) - cnode$interface = endp$interface; -@pragma pop ignore-deprecations if ( |manager_name| > 0 && cnode$node_type != Cluster::MANAGER ) cnode$manager = manager_name; if ( endp?$metrics_port ) diff --git a/testing/btest/Baseline/language.init-integration/out b/testing/btest/Baseline/language.init-integration/out index 60d67b2490..cc8864b11c 100644 --- a/testing/btest/Baseline/language.init-integration/out +++ b/testing/btest/Baseline/language.init-integration/out @@ -13,15 +13,15 @@ init_key2 in state2: 1 [worker-1] = [node_type=Cluster::WORKER, ip=127.0.0.1, p=5/udp, manager=manager-1] } { -[worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, interface=, manager=, id=, metrics_port=] +[worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, manager=, id=, metrics_port=] } { -[worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, interface=, manager=, id=, metrics_port=], -[worker-5] = [node_type=Cluster::WORKER, ip=3.4.5.6, zone_id=, p=15/tcp, interface=, manager=, id=, metrics_port=] +[worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, manager=, id=, metrics_port=], +[worker-5] = [node_type=Cluster::WORKER, ip=3.4.5.6, zone_id=, p=15/tcp, manager=, id=, metrics_port=] } { -[worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, interface=, manager=, id=, metrics_port=], -[worker-6] = [node_type=Cluster::WORKER, ip=4.5.6.7, zone_id=, p=17/udp, interface=, manager=, id=, metrics_port=] +[worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, manager=, id=, metrics_port=], +[worker-6] = [node_type=Cluster::WORKER, ip=4.5.6.7, zone_id=, p=17/udp, manager=, id=, metrics_port=] } { [3.0, 4] diff --git a/testing/btest/Baseline/supervisor.large-cluster/zeek.bare-1.node.out b/testing/btest/Baseline/supervisor.large-cluster/zeek.bare-1.node.out index add93767e0..4a385b6968 100644 --- a/testing/btest/Baseline/supervisor.large-cluster/zeek.bare-1.node.out +++ b/testing/btest/Baseline/supervisor.large-cluster/zeek.bare-1.node.out @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. supervised node zeek_init() 1024, cluster_nodes! -[node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, interface=, manager=, id=, metrics_port=] +[node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, manager=, id=, metrics_port=] supervised node zeek_done() diff --git a/testing/btest/Baseline/supervisor.large-cluster/zeek.bare-32.node.out b/testing/btest/Baseline/supervisor.large-cluster/zeek.bare-32.node.out index add93767e0..4a385b6968 100644 --- a/testing/btest/Baseline/supervisor.large-cluster/zeek.bare-32.node.out +++ b/testing/btest/Baseline/supervisor.large-cluster/zeek.bare-32.node.out @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. supervised node zeek_init() 1024, cluster_nodes! -[node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, interface=, manager=, id=, metrics_port=] +[node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, manager=, id=, metrics_port=] supervised node zeek_done()