From 2a3f2d00047bb14d236d4a4c8730cfe824e0d656 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 16:47:13 +0200 Subject: [PATCH] btest/policy: Use generic cluster-layout.zeek Catch-all for cluster scripts in policy directory. --- .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 ...{manager-1.intel.log => manager.intel.log} | 0 ...er-1.services.out => manager.services.out} | 2 +- ...eird_stats.log => manager.weird_stats.log} | 0 .../frameworks/cluster/cluster_started.zeek | 26 ++++++---------- .../cluster/cluster_started_logger.zeek | 31 +++++++------------ .../frameworks/intel/seen/smtp-cluster.zeek | 25 ++++++--------- .../frameworks/telemetry/prometheus.zeek | 23 +++++++------- .../policy/misc/weird-stats-cluster.zeek | 22 +++++-------- 10 files changed, 51 insertions(+), 78 deletions(-) rename testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/{manager-1.intel.log => manager.intel.log} (100%) rename testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/{manager-1.services.out => manager.services.out} (89%) rename testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/{manager-1.weird_stats.log => manager.weird_stats.log} (100%) diff --git a/testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/manager-1..stdout b/testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/manager-1..stdout rename to testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/manager..stdout diff --git a/testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/manager-1..stdout b/testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/manager-1..stdout rename to testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/manager..stdout diff --git a/testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/manager-1.intel.log b/testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/manager-1.intel.log rename to testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/manager.intel.log diff --git a/testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager-1.services.out b/testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager.services.out similarity index 89% rename from testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager-1.services.out rename to testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager.services.out index ab13f24568..eab828e89f 100644 --- a/testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager-1.services.out +++ b/testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager.services.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. -endpoint="manager-1" +endpoint="manager" endpoint="logger-1" endpoint="proxy-1" endpoint="worker-1" diff --git a/testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/manager-1.weird_stats.log b/testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/manager.weird_stats.log similarity index 100% rename from testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/manager-1.weird_stats.log rename to testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/manager.weird_stats.log diff --git a/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek b/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek index f05a45f093..a2373c91f1 100644 --- a/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek +++ b/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek @@ -1,30 +1,22 @@ # @TEST-DOC: Run a simple cluster to verify cluster_started() and node_fully_connected() are generated. -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @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 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 40 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout @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 - redef Log::default_rotation_interval = 0secs; event Cluster::Experimental::node_fully_connected(name: string, id: string, resending: bool) diff --git a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek index b20748c9cf..7ee8f774be 100644 --- a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek +++ b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek @@ -1,33 +1,24 @@ # @TEST-DOC: Run a cluster that includes a dedicated logger to verify cluster_started() and node_fully_connected() are generated. -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 -# @TEST-PORT: BROKER_PORT6 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_LOGGER1_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-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 logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-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 40 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout @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"))], - ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT6")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; event Cluster::Experimental::node_fully_connected(name: string, id: string, resending: bool) diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek b/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek index 5ce363af46..ba6883ee1c 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek +++ b/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek @@ -1,24 +1,19 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 - -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# +# @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-wait 90 -# @TEST-EXEC: btest-diff manager-1/intel.log +# @TEST-EXEC: btest-diff manager/intel.log # @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url example@gmail.com Intel::EMAIL source1 test entry http://some-data-distributor.com/100000 # @TEST-END-FILE -# @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 - @load base/frameworks/cluster @load base/frameworks/intel @load frameworks/intel/seen @@ -67,7 +62,7 @@ event proceed() event Cluster::node_up(name: string, id: string) { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; connected = T; @@ -83,7 +78,7 @@ event Cluster::node_down(name: string, id: string) event Input::end_of_data(name: string, source: string) { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; done_reading = T; diff --git a/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek b/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek index ae1072f138..8f15087403 100644 --- a/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek +++ b/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek @@ -4,10 +4,11 @@ # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1" # @TEST-REQUIRES: which jq # -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_LOGGER1_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# # @TEST-PORT: METRICS_PORT1 # @TEST-PORT: METRICS_PORT2 # @TEST-PORT: METRICS_PORT3 @@ -15,19 +16,19 @@ # # @TEST-REQUIRES: which curl # @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 manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-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 worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/services.out +# @TEST-EXEC: btest-diff manager/services.out # @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")), $metrics_port=to_port(getenv("METRICS_PORT1"))], - ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $metrics_port=to_port(getenv("METRICS_PORT2"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1", $metrics_port=to_port(getenv("METRICS_PORT3"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1", $metrics_port=to_port(getenv("METRICS_PORT4"))], + ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_MANAGER_PORT")), $metrics_port=to_port(getenv("METRICS_PORT1"))], + ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_LOGGER1_PORT")), $manager="manager", $metrics_port=to_port(getenv("METRICS_PORT2"))], + ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PROXY1_PORT")), $manager="manager", $metrics_port=to_port(getenv("METRICS_PORT3"))], + ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_WORKER1_PORT")), $manager="manager", $metrics_port=to_port(getenv("METRICS_PORT4"))], }; # @TEST-END-FILE @@ -60,7 +61,7 @@ done # So the cluster nodes don't terminate right away. #redef exit_only_after_terminate=T; -@if ( Cluster::node == "manager-1" ) +@if ( Cluster::node == "manager" ) @load base/utils/exec diff --git a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek index b84675beb1..e65300add8 100644 --- a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek +++ b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek @@ -1,21 +1,15 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @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-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/weird_stats.log - -# @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 +# @TEST-EXEC: btest-diff manager/weird_stats.log @load misc/weird-stats @load policy/frameworks/cluster/experimental @@ -42,7 +36,7 @@ event ready_again() event Cluster::Experimental::cluster_started() { - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) return; local n = 0;