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

Remove deprecated Cluster::Node::interface field

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-08-05 12:05:34 -07:00
parent 9142a48725
commit 4e9d843cec
5 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -176,8 +176,6 @@ export {
## The port that this node will listen on for peer connections. ## 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. ## A value of ``0/unknown`` means the node is not pre-configured to listen.
p: port &default=0/unknown; 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. ## Name of the manager node this node uses. For workers and proxies.
manager: string &optional; manager: string &optional;
## A unique identifier assigned to the node by the broker framework. ## A unique identifier assigned to the node by the broker framework.

4
scripts/base/frameworks/cluster/supervisor.zeek
View file

@ -43,10 +43,6 @@ function __init_cluster_nodes(): bool
typ = rolemap[endp$role]; typ = rolemap[endp$role];
cnode = [$node_type=typ, $ip=endp$host, $p=endp$p]; 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 ) if ( |manager_name| > 0 && cnode$node_type != Cluster::MANAGER )
cnode$manager = manager_name; cnode$manager = manager_name;
if ( endp?$metrics_port ) if ( endp?$metrics_port )

10
testing/btest/Baseline/language.init-integration/out
View file

@ -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-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=<uninitialized>, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>] [worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>]
} }
{ {
[worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, interface=<uninitialized>, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>], [worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>],
[worker-5] = [node_type=Cluster::WORKER, ip=3.4.5.6, zone_id=, p=15/tcp, interface=<uninitialized>, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>] [worker-5] = [node_type=Cluster::WORKER, ip=3.4.5.6, zone_id=, p=15/tcp, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>]
} }
{ {
[worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, interface=<uninitialized>, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>], [worker-4] = [node_type=Cluster::WORKER, ip=2.3.4.5, zone_id=, p=13/udp, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>],
[worker-6] = [node_type=Cluster::WORKER, ip=4.5.6.7, zone_id=, p=17/udp, interface=<uninitialized>, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>] [worker-6] = [node_type=Cluster::WORKER, ip=4.5.6.7, zone_id=, p=17/udp, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>]
} }
{ {
[3.0, 4] [3.0, 4]

2
testing/btest/Baseline/supervisor.large-cluster/zeek.bare-1.node.out
View file

@ -1,5 +1,5 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
supervised node zeek_init() supervised node zeek_init()
1024, cluster_nodes! 1024, cluster_nodes!
[node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, interface=<uninitialized>, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>] [node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>]
supervised node zeek_done() supervised node zeek_done()

2
testing/btest/Baseline/supervisor.large-cluster/zeek.bare-32.node.out
View file

@ -1,5 +1,5 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
supervised node zeek_init() supervised node zeek_init()
1024, cluster_nodes! 1024, cluster_nodes!
[node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, interface=<uninitialized>, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>] [node_type=Cluster::WORKER, ip=127.0.0.1, zone_id=, p=0/tcp, manager=<uninitialized>, id=<uninitialized>, metrics_port=<uninitialized>]
supervised node zeek_done() supervised node zeek_done()