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

btest/frameworks/sumstats: Use generic cluster-layout.zeek

Browse source
This commit is contained in:
Arne Welzel 2025-05-18 16:19:10 +02:00
parent 0a06a77c69
commit 4dec63936e
14 changed files with 51 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

0
testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager-1..stdout → testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager..stdout
View file

0
testing/btest/Baseline/scripts.base.frameworks.sumstats.cluster-intermediate-update/manager-1..stdout → testing/btest/Baseline/scripts.base.frameworks.sumstats.cluster-intermediate-update/manager..stdout
View file

0
testing/btest/Baseline/scripts.base.frameworks.sumstats.last-cluster/manager-1..stdout → testing/btest/Baseline/scripts.base.frameworks.sumstats.last-cluster/manager..stdout
View file

0
testing/btest/Baseline/scripts.base.frameworks.sumstats.manual-epoch-cluster/manager-1..stdout → testing/btest/Baseline/scripts.base.frameworks.sumstats.manual-epoch-cluster/manager..stdout
View file

0
testing/btest/Baseline/scripts.base.frameworks.sumstats.on-demand-cluster/manager-1..stdout → testing/btest/Baseline/scripts.base.frameworks.sumstats.on-demand-cluster/manager..stdout
View file

0
testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout → testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager..stdout
View file

0
testing/btest/Baseline/scripts.base.frameworks.sumstats.topk-cluster/manager-1..stdout → testing/btest/Baseline/scripts.base.frameworks.sumstats.topk-cluster/manager..stdout
View file

20
testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek
View file

@ -1,25 +1,19 @@
# @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_MANAGER_PORT
# @TEST-PORT: BROKER_PORT2 # @TEST-PORT: BROKER_WORKER1_PORT
# @TEST-PORT: BROKER_PORT3 # @TEST-PORT: BROKER_WORKER2_PORT
# #
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT # @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek .
#
# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager 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-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-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-bg-wait 30
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout
@load base/frameworks/sumstats @load base/frameworks/sumstats
@load policy/frameworks/cluster/experimental @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"))],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
};
# @TEST-END-FILE
redef Log::default_rotation_interval = 0secs; redef Log::default_rotation_interval = 0secs;
global n = 0; global n = 0;

22
testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek
View file

@ -1,24 +1,18 @@
# @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_MANAGER_PORT
# @TEST-PORT: BROKER_PORT2 # @TEST-PORT: BROKER_WORKER1_PORT
# @TEST-PORT: BROKER_PORT3 # @TEST-PORT: BROKER_WORKER2_PORT
# #
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT # @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek .
#
# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager 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-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-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-bg-wait 45
# @TEST-EXEC: btest-diff manager-1/.stdout # @TEST-EXEC: btest-diff manager/.stdout
@load base/frameworks/cluster @load base/frameworks/cluster
@load base/frameworks/sumstats @load base/frameworks/sumstats
# @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"))],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
};
# @TEST-END-FILE
redef Log::default_rotation_interval = 0secs; redef Log::default_rotation_interval = 0secs;
event zeek_init() &priority=5 event zeek_init() &priority=5
@ -62,7 +56,7 @@ event do_stats(i: count)
event Cluster::node_up(name: string, id: string) event Cluster::node_up(name: string, id: string)
{ {
if ( name == "manager-1" ) if ( name == "manager" )
{ {
if ( Cluster::node == "worker-1" ) if ( Cluster::node == "worker-1" )
{ {

19
testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek
View file

@ -1,22 +1,17 @@
# @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_MANAGER_PORT
# @TEST-PORT: BROKER_PORT2 # @TEST-PORT: BROKER_WORKER1_PORT
# #
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT # @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek .
#
# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager 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-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 25 # @TEST-EXEC: btest-bg-wait 25
# @TEST-EXEC: btest-diff manager-1/.stdout # @TEST-EXEC: btest-diff manager/.stdout
@load base/frameworks/sumstats @load base/frameworks/sumstats
@load base/frameworks/cluster @load base/frameworks/cluster
# @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"))],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
};
# @TEST-END-FILE
global c = 0; global c = 0;
event do_observe() event do_observe()
@ -57,7 +52,7 @@ event Cluster::node_up(name: string, id: string)
{ {
print "node up", name; print "node up", name;
if ( Cluster::node == "worker-1" && name == "manager-1" ) if ( Cluster::node == "worker-1" && name == "manager" )
schedule 0.1secs { do_observe() }; schedule 0.1secs { do_observe() };
} }

20
testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek
View file

@ -1,25 +1,19 @@
# @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_MANAGER_PORT
# @TEST-PORT: BROKER_PORT2 # @TEST-PORT: BROKER_WORKER1_PORT
# @TEST-PORT: BROKER_PORT3 # @TEST-PORT: BROKER_WORKER2_PORT
# #
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT # @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek .
#
# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager 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-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-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-bg-wait 30
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout
@load base/frameworks/sumstats @load base/frameworks/sumstats
@load policy/frameworks/cluster/experimental @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"))],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
};
# @TEST-END-FILE
redef Log::default_rotation_interval = 0secs; redef Log::default_rotation_interval = 0secs;
global n = 0; global n = 0;

22
testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek
View file

@ -1,26 +1,20 @@
# @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_MANAGER_PORT
# @TEST-PORT: BROKER_PORT2 # @TEST-PORT: BROKER_WORKER1_PORT
# @TEST-PORT: BROKER_PORT3 # @TEST-PORT: BROKER_WORKER2_PORT
# #
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT # @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek .
#
# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager 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-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-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-bg-wait 30
# @TEST-EXEC: btest-diff manager-1/.stdout # @TEST-EXEC: btest-diff manager/.stdout
# #
@load policy/frameworks/cluster/experimental @load policy/frameworks/cluster/experimental
@load base/frameworks/sumstats @load base/frameworks/sumstats
# @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"))],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
};
# @TEST-END-FILE
redef Log::default_rotation_interval = 0secs; redef Log::default_rotation_interval = 0secs;
global n = 0; global n = 0;
@ -47,7 +41,7 @@ event on_demand()
if ( "test" in result ) if ( "test" in result )
print fmt(" Host: %s -> %.0f", host, result["test"]$sum); print fmt(" Host: %s -> %.0f", host, result["test"]$sum);
if ( Cluster::node == "manager-1" ) if ( Cluster::node == "manager" )
terminate(); terminate();
} }
} }

20
testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek
View file

@ -1,25 +1,19 @@
# @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_MANAGER_PORT
# @TEST-PORT: BROKER_PORT2 # @TEST-PORT: BROKER_WORKER1_PORT
# @TEST-PORT: BROKER_PORT3 # @TEST-PORT: BROKER_WORKER2_PORT
# #
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT # @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek .
#
# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager 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-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-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT
# This timeout needs to be large to accommodate ZAM compilation delays. # This timeout needs to be large to accommodate ZAM compilation delays.
# @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-bg-wait 45
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout
@load base/frameworks/sumstats @load base/frameworks/sumstats
@load policy/frameworks/cluster/experimental @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"))],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
};
# @TEST-END-FILE
redef Log::default_rotation_interval = 0secs; redef Log::default_rotation_interval = 0secs;
global did_data = F; global did_data = F;

19
testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek
View file

@ -1,21 +1,16 @@
# @TEST-PORT: BROKER_PORT1 # @TEST-PORT: BROKER_MANAGER_PORT
# @TEST-PORT: BROKER_PORT2 # @TEST-PORT: BROKER_WORKER1_PORT
# @TEST-PORT: BROKER_PORT3 # @TEST-PORT: BROKER_WORKER2_PORT
# #
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT # @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek .
#
# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager 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-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-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-bg-wait 45
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout
# #
# @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"))],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
};
# @TEST-END-FILE
@load base/frameworks/sumstats @load base/frameworks/sumstats
@load policy/frameworks/cluster/experimental @load policy/frameworks/cluster/experimental