Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

time machine: Mark leftovers for removal in v7.1

Browse source 
I suspect we could just drop these directly, but lets follow the
deprecation cycle.
This commit is contained in:
Arne Welzel 2023-11-02 17:37:16 +01:00
parent 384453346d
commit cd24acdfc8
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/base/frameworks/cluster/main.zeek
View file

@ -42,14 +42,21 @@ export {
## The topic name used for exchanging messages that are relevant to ## The topic name used for exchanging messages that are relevant to
## time machine nodes in a cluster. Used with broker-enabled cluster communication. ## time machine nodes in a cluster. Used with broker-enabled cluster communication.
const time_machine_topic = "zeek/cluster/time_machine" &redef; 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 ## 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 ## relevant to all nodes in a cluster. Currently, there is not a common
## topic to broadcast to, because enabling implicit Broker forwarding would ## topic to broadcast to, because enabling implicit Broker forwarding would
## cause a routing loop for this topic. ## cause a routing loop for this topic.
const broadcast_topics = { logger_topic, manager_topic, proxy_topic, const broadcast_topics = {
worker_topic, time_machine_topic }; logger_topic,
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 ## The topic prefix used for exchanging messages that are relevant to
## a named node in a cluster. Used with broker-enabled cluster communication. ## a named node in a cluster. Used with broker-enabled cluster communication.
@ -165,7 +172,7 @@ export {
## A node acting as a traffic recorder using the ## A node acting as a traffic recorder using the
## `Time Machine <https://github.com/zeek/time-machine>`_ ## `Time Machine <https://github.com/zeek/time-machine>`_
## software. ## software.
TIME_MACHINE, TIME_MACHINE &deprecated="Remove in v7.1: Unused.",
}; };
## Record type to indicate a node in a cluster. ## Record type to indicate a node in a cluster.
@ -185,7 +192,7 @@ export {
## Name of the manager node this node uses. For workers and proxies. ## Name of the manager node this node uses. For workers and proxies.
manager: string &optional; manager: string &optional;
## Name of a time machine node with which this node connects. ## Name of a time machine node with which this node connects.
time_machine: string &optional; time_machine: string &optional &deprecated="Remove in v7.1: Unused.";
## A unique identifier assigned to the node by the broker framework. ## A unique identifier assigned to the node by the broker framework.
## This field is only set while a node is connected. ## This field is only set while a node is connected.
id: string &optional; id: string &optional;

6
scripts/base/frameworks/cluster/setup-connections.zeek
View file

@ -94,9 +94,11 @@ event zeek_init() &priority=-10
case WORKER: case WORKER:
Broker::subscribe(Cluster::worker_topic); Broker::subscribe(Cluster::worker_topic);
break; break;
@pragma push ignore-deprecations
case TIME_MACHINE: case TIME_MACHINE:
Broker::subscribe(Cluster::time_machine_topic); Broker::subscribe(Cluster::time_machine_topic);
break; break;
@pragma pop ignore-deprecations
default: default:
Reporter::error(fmt("Unhandled cluster node type: %s", self$node_type)); Reporter::error(fmt("Unhandled cluster node type: %s", self$node_type));
return; return;
@ -119,8 +121,10 @@ event zeek_init() &priority=-10
case MANAGER: case MANAGER:
connect_peers_with_type(LOGGER); connect_peers_with_type(LOGGER);
@pragma push ignore-deprecations
if ( self?$time_machine ) if ( self?$time_machine )
connect_peer(TIME_MACHINE, self$time_machine); connect_peer(TIME_MACHINE, self$time_machine);
@pragma pop ignore-deprecations
break; break;
case PROXY: case PROXY:
@ -137,8 +141,10 @@ event zeek_init() &priority=-10
if ( self?$manager ) if ( self?$manager )
connect_peer(MANAGER, self$manager); connect_peer(MANAGER, self$manager);
@pragma push ignore-deprecations
if ( self?$time_machine ) if ( self?$time_machine )
connect_peer(TIME_MACHINE, self$time_machine); connect_peer(TIME_MACHINE, self$time_machine);
@pragma pop ignore-deprecations
break; break;
} }

2
scripts/base/init-bare.zeek
View file

@ -5189,7 +5189,7 @@ const dpd_ignore_ports = F &redef;
const likely_server_ports: set[port] &redef; const likely_server_ports: set[port] &redef;
## If true, output profiling for Time-Machine queries. ## If true, output profiling for Time-Machine queries.
const time_machine_profiling = F &redef; const time_machine_profiling = F &redef &deprecated="Remove in v7.1. Unused.";
## If true, warns about unused event handlers at startup. ## If true, warns about unused event handlers at startup.
const check_for_unused_event_handlers = F &redef; const check_for_unused_event_handlers = F &redef;