Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 13:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

broker/cluster: Add cluster shims for 7.0

Browse source 
For making Zeek 7.0 compatible with the new Cluster::* methods coming
with Zeek 7.1/7.2.
This commit is contained in:
Arne Welzel 2025-06-06 16:37:43 +02:00
parent 4021a0c654
commit 8600cfa882
8 changed files with 143 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

84
testing/btest/scripts/base/frameworks/cluster/shims.zeek Normal file
View file

@ -0,0 +1,84 @@
# @TEST-PORT: BROKER_PORT1
# @TEST-PORT: BROKER_PORT2
# @TEST-PORT: BROKER_PORT3
# @TEST-PORT: BROKER_PORT4
# @TEST-PORT: BROKER_PORT5
#
# @TEST-EXEC: zeek --parse-only %INPUT
#
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT
# @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT
# @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT
# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT
# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 5
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
# @TEST-EXEC: btest-diff proxy-1/.stdout
# @TEST-EXEC: btest-diff proxy-2/.stdout
# @TEST-EXEC: btest-diff worker-1/.stdout
# @TEST-EXEC: btest-diff worker-2/.stdout
@load base/frameworks/cluster
@load policy/frameworks/cluster/experimental
@TEST-START-FILE cluster-layout.zeek
redef Cluster::nodes = {
["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"],
};
@TEST-END-FILE
global got_pings = 0;
event zeek_init() {
if ( Cluster::local_node_type() == Cluster::MANAGER )
Cluster::subscribe("/manager/ping");
else
Cluster::subscribe("/other/ping");
}
event ping(msg: string) {
print "ping", msg;
++got_pings;
if ( Cluster::local_node_type() == Cluster::MANAGER )
{
if ( got_pings == 4 )
Cluster::publish("/other/ping", ping, "end");
}
else
{
if ( msg != "end")
Cluster::publish("/manager/ping", ping, "reply");
else
{
print "terminate";
terminate();
}
}
}
event Cluster::Experimental::cluster_started()
{
print "started";
if ( Cluster::local_node_type() == Cluster::MANAGER )
Cluster::publish("/other/ping", ping, "hello");
}
global node_downs = 0;
event Cluster::node_down(name: string, id: string)
{
if ( Cluster::local_node_type() != Cluster::MANAGER )
return;
++node_downs;
print "node_down", node_downs;
if ( node_downs == 4 )
terminate();
}