From a716903f3aa379ee4428c2c71b4a416c8278612e Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Sat, 3 Aug 2024 11:29:51 -0700 Subject: [PATCH] Remove deprecated time machine settings --- scripts/base/frameworks/cluster/main.zeek | 13 ------------- .../frameworks/cluster/setup-connections.zeek | 15 --------------- scripts/base/init-bare.zeek | 3 --- .../btest/Baseline/language.init-integration/out | 10 +++++----- .../supervisor.large-cluster/zeek.bare-1.node.out | 2 +- .../zeek.bare-32.node.out | 2 +- 6 files changed, 7 insertions(+), 38 deletions(-) diff --git a/scripts/base/frameworks/cluster/main.zeek b/scripts/base/frameworks/cluster/main.zeek index e3e45a0cbc..d53a695a97 100644 --- a/scripts/base/frameworks/cluster/main.zeek +++ b/scripts/base/frameworks/cluster/main.zeek @@ -40,10 +40,6 @@ export { ## worker nodes in a cluster. Used with broker-enabled cluster communication. const worker_topic = "zeek/cluster/worker" &redef; - ## The topic name used for exchanging messages that are relevant to - ## time machine nodes in a cluster. Used with broker-enabled cluster communication. - const time_machine_topic = "zeek/cluster/time_machine" &redef &deprecated="Remove in v7.1: Unused."; - ## A set of topic names to be used for broadcasting messages that are ## relevant to all nodes in a cluster. Currently, there is not a common ## topic to broadcast to, because enabling implicit Broker forwarding would @@ -53,9 +49,6 @@ export { manager_topic, proxy_topic, worker_topic, -@pragma push ignore-deprecations - time_machine_topic, -@pragma pop ignore-deprecations }; ## The topic prefix used for exchanging messages that are relevant to @@ -169,10 +162,6 @@ export { PROXY, ## The node type doing all the actual traffic analysis. WORKER, - ## A node acting as a traffic recorder using the - ## `Time Machine `_ - ## software. - TIME_MACHINE &deprecated="Remove in v7.1: Unused.", }; ## Record type to indicate a node in a cluster. @@ -191,8 +180,6 @@ export { 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; - ## Name of a time machine node with which this node connects. - time_machine: string &optional &deprecated="Remove in v7.1: Unused."; ## A unique identifier assigned to the node by the broker framework. ## This field is only set while a node is connected. id: string &optional; diff --git a/scripts/base/frameworks/cluster/setup-connections.zeek b/scripts/base/frameworks/cluster/setup-connections.zeek index 5cd3e310fd..ba3010129c 100644 --- a/scripts/base/frameworks/cluster/setup-connections.zeek +++ b/scripts/base/frameworks/cluster/setup-connections.zeek @@ -94,11 +94,6 @@ event zeek_init() &priority=-10 case WORKER: Broker::subscribe(Cluster::worker_topic); break; -@pragma push ignore-deprecations - case TIME_MACHINE: - Broker::subscribe(Cluster::time_machine_topic); - break; -@pragma pop ignore-deprecations default: Reporter::error(fmt("Unhandled cluster node type: %s", self$node_type)); return; @@ -121,11 +116,6 @@ event zeek_init() &priority=-10 case MANAGER: connect_peers_with_type(LOGGER); -@pragma push ignore-deprecations - if ( self?$time_machine ) - connect_peer(TIME_MACHINE, self$time_machine); -@pragma pop ignore-deprecations - break; case PROXY: connect_peers_with_type(LOGGER); @@ -141,11 +131,6 @@ event zeek_init() &priority=-10 if ( self?$manager ) connect_peer(MANAGER, self$manager); -@pragma push ignore-deprecations - if ( self?$time_machine ) - connect_peer(TIME_MACHINE, self$time_machine); -@pragma pop ignore-deprecations - break; } } diff --git a/scripts/base/init-bare.zeek b/scripts/base/init-bare.zeek index 1d04c2ee09..9ac3870e8b 100644 --- a/scripts/base/init-bare.zeek +++ b/scripts/base/init-bare.zeek @@ -5256,9 +5256,6 @@ const dpd_ignore_ports = F &redef; ## connection if it misses the initial handshake. const likely_server_ports: set[port] &redef; -## If true, output profiling for Time-Machine queries. -const time_machine_profiling = F &redef &deprecated="Remove in v7.1. Unused."; - ## Holds the filename of the trace file given with ``-w`` (empty if none). ## ## .. zeek:see:: record_all_packets diff --git a/testing/btest/Baseline/language.init-integration/out b/testing/btest/Baseline/language.init-integration/out index 12ca8b84ce..60d67b2490 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=, time_machine=, 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-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, interface=, manager=, time_machine=, id=, metrics_port=], -[worker-5] = [node_type=Cluster::WORKER, ip=3.4.5.6, zone_id=, p=15/tcp, interface=, manager=, time_machine=, 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, interface=, manager=, time_machine=, id=, metrics_port=], -[worker-6] = [node_type=Cluster::WORKER, ip=4.5.6.7, zone_id=, p=17/udp, interface=, manager=, time_machine=, 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=] } { [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 8837c1f15f..add93767e0 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=, time_machine=, id=, metrics_port=] +[node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, interface=, 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 8837c1f15f..add93767e0 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=, time_machine=, id=, metrics_port=] +[node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, interface=, manager=, id=, metrics_port=] supervised node zeek_done()