From 00a12a4cc5aebcb93991af18f5703360531dcc07 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 16:31:46 +0200 Subject: [PATCH] btest/frameworks/intel: Use generic cluster-layout.zeek --- .../{manager-1..stdout => manager..stdout} | 6 ++-- ...{manager-1.intel.log => manager.intel.log} | 0 .../{manager-1..stdout => manager..stdout} | 6 ++-- ...{manager-1.intel.log => manager.intel.log} | 0 .../{manager-1..stdout => manager..stdout} | 0 ...{manager-1.intel.log => manager.intel.log} | 0 .../{manager-1..stdout => manager..stdout} | 0 ...{manager-1.intel.log => manager.intel.log} | 0 .../cluster-transparency-with-proxy.zeek | 31 +++++++----------- .../intel/cluster-transparency.zeek | 26 ++++++--------- .../intel/read-file-dist-cluster.zeek | 32 ++++++++----------- .../frameworks/intel/remove-item-cluster.zeek | 23 ++++++------- 12 files changed, 50 insertions(+), 74 deletions(-) rename testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/{manager-1..stdout => manager..stdout} (59%) rename testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/{manager-1.intel.log => manager.intel.log} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/{manager-1..stdout => manager..stdout} (59%) rename testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/{manager-1.intel.log => manager.intel.log} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/{manager-1.intel.log => manager.intel.log} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/{manager-1.intel.log => manager.intel.log} (100%) diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager..stdout similarity index 59% rename from testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager..stdout index a7343538ef..37a086e8dc 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager..stdout @@ -2,6 +2,6 @@ ### NOTE: This file has been sorted with diff-sort. insert_item: 123.123.123.123 inserted by worker-1 insert_item: 4.3.2.1 inserted by worker-2 -new_item triggered for 1.2.3.4 by manager on manager-1 -new_item triggered for 123.123.123.123 by worker-1 on manager-1 -new_item triggered for 4.3.2.1 by worker-2 on manager-1 +new_item triggered for 1.2.3.4 by manager on manager +new_item triggered for 123.123.123.123 by worker-1 on manager +new_item triggered for 4.3.2.1 by worker-2 on manager diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager.intel.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager..stdout similarity index 59% rename from testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager..stdout index a7343538ef..37a086e8dc 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager..stdout @@ -2,6 +2,6 @@ ### NOTE: This file has been sorted with diff-sort. insert_item: 123.123.123.123 inserted by worker-1 insert_item: 4.3.2.1 inserted by worker-2 -new_item triggered for 1.2.3.4 by manager on manager-1 -new_item triggered for 123.123.123.123 by worker-1 on manager-1 -new_item triggered for 4.3.2.1 by worker-2 on manager-1 +new_item triggered for 1.2.3.4 by manager on manager +new_item triggered for 123.123.123.123 by worker-1 on manager +new_item triggered for 4.3.2.1 by worker-2 on manager diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager.intel.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager-1.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager-1.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager.intel.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager-1.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager-1.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager.intel.log diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek index 6e5ba59935..6bc1b56ac8 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek @@ -2,29 +2,22 @@ # manager and both workers insert intel items, and both workers do lookups that # we expect to hit. -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_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 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-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 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 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 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 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager-1/intel.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"], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], -}; -# @TEST-END-FILE +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager/intel.log @load policy/frameworks/cluster/experimental @load base/frameworks/intel diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek index de0e944d8a..4b790e4ab3 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek @@ -1,26 +1,20 @@ # This test verifies intel data propagation via a cluster. The manager and both # workers insert intel items, and both workers do lookups that we expect to hit. -# @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: 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: 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 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 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager-1/intel.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: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager/intel.log @load policy/frameworks/cluster/experimental @load base/frameworks/intel diff --git a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek index dda19545fd..2632f7fa6a 100644 --- a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek @@ -1,24 +1,18 @@ -# @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: 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: 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 40 -# @TEST-EXEC: btest-diff manager-1/.stdout -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager-1/intel.log +# @TEST-EXEC: btest-diff manager/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager/intel.log # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.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 - # @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url 1.2.3.4 Intel::ADDR source1 this host is just plain baaad http://some-data-distributor.com/1234 @@ -43,7 +37,7 @@ redef enum Intel::Where += { event do_it() { - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) { Broker::publish(Cluster::node_topic("worker-2"), do_it); return; @@ -53,7 +47,7 @@ event do_it() Intel::seen([$indicator="e@mail.com", $indicator_type=Intel::EMAIL, $where=Intel::IN_A_TEST]); if ( Cluster::node == "worker-1" ) - Broker::publish(Cluster::node_topic("manager-1"), do_it); + Broker::publish(Cluster::node_topic("manager"), do_it); } event start_it() @@ -63,7 +57,7 @@ event start_it() event Cluster::Experimental::cluster_started() { - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) # Give more time for intel distribution. schedule 1sec { start_it() }; } diff --git a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek index 6ec58eefe6..f5c9b8ed53 100644 --- a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek @@ -1,23 +1,18 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # -# @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-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 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 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout -# @TEST-EXEC: btest-diff manager-1/intel.log +# @TEST-EXEC: btest-diff manager/intel.log @load base/frameworks/intel @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"], -}; -# @TEST-END-FILE - module Intel; redef Log::default_rotation_interval=0sec; @@ -43,7 +38,7 @@ event test_manager() event Cluster::Experimental::cluster_started() { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; # Insert the data once all workers are connected.