diff --git a/testing/btest/bifs/hll_cluster.zeek b/testing/btest/bifs/hll_cluster.zeek index dae968ad66..1008f6354b 100644 --- a/testing/btest/bifs/hll_cluster.zeek +++ b/testing/btest/bifs/hll_cluster.zeek @@ -26,7 +26,7 @@ redef Log::default_rotation_interval = 0secs; global hll_data: event(data: opaque of cardinality); -@if ( Cluster::local_node_type() == Cluster::WORKER ) +@if ( Cluster::local_node_type() == Cluster::WORKER ) &analyze event zeek_init() { @@ -89,7 +89,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) @endif -@if ( Cluster::local_node_type() == Cluster::MANAGER ) +@if ( Cluster::local_node_type() == Cluster::MANAGER ) &analyze global result_count = 0; global hll: opaque of cardinality; diff --git a/testing/btest/scripts/base/files/x509/log-caching-cluster.test b/testing/btest/scripts/base/files/x509/log-caching-cluster.test index f7a0373f24..7f8e03e0a0 100644 --- a/testing/btest/scripts/base/files/x509/log-caching-cluster.test +++ b/testing/btest/scripts/base/files/x509/log-caching-cluster.test @@ -33,7 +33,7 @@ event terminate_me() { terminate(); } -@if ( Cluster::local_node_type() == Cluster::WORKER ) +@if ( Cluster::local_node_type() == Cluster::WORKER ) &analyze event zeek_init() { suspend_processing(); diff --git a/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test b/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test index 7e44945cd3..afaf88702a 100644 --- a/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test +++ b/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test @@ -35,7 +35,7 @@ event terminate_me() { terminate(); } -@if ( Cluster::local_node_type() == Cluster::WORKER ) +@if ( Cluster::local_node_type() == Cluster::WORKER ) &analyze event zeek_init() { suspend_processing(); diff --git a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek index df0b081c06..dd2b6cf3f3 100644 --- a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek +++ b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek @@ -43,7 +43,7 @@ event zeek_init() Broker::auto_publish(Cluster::worker_topic, ready_for_data); } -@if ( Cluster::node == "worker-1" ) +@if ( Cluster::node == "worker-1" ) &analyze event Cluster::Experimental::cluster_started() { Config::set_value("testport", 44/tcp); diff --git a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek index fb9bf793a8..15abe79015 100644 --- a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek +++ b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek @@ -38,14 +38,14 @@ global n = 0; event ready_for_data() { -@if ( Cluster::node == "manager-1" ) - Config::set_value("testcount", 1); -@endif + if ( Cluster::node == "manager-1" ) + Config::set_value("testcount", 1); -@if ( Cluster::node == "worker-1" ) - Config::set_value("testport", 44/tcp); - Config::set_value("teststring", "b", "comment"); -@endif + if ( Cluster::node == "worker-1" ) + { + Config::set_value("testport", 44/tcp); + Config::set_value("teststring", "b", "comment"); + } } global option_changed_count = 0; @@ -72,7 +72,7 @@ event zeek_init() &priority=5 Option::set_change_handler("testcount", option_changed, -100); } -@if ( Cluster::local_node_type() == Cluster::MANAGER ) +@if ( Cluster::local_node_type() == Cluster::MANAGER ) &analyze global peer_count = 0; event Cluster::node_up(name: string, id: string) &priority=-5 diff --git a/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek b/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek index 1b2538478e..7f3ca8730e 100644 --- a/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek +++ b/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek @@ -94,7 +94,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) terminate(); } -@if ( Cluster::is_enabled() && Cluster::local_node_type() == Cluster::MANAGER ) +@if ( Cluster::is_enabled() && Cluster::local_node_type() == Cluster::MANAGER ) &analyze event die() { terminate(); 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 833214f502..a4c09e8950 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 @@ -33,7 +33,7 @@ redef Log::default_rotation_interval=0sec; module Intel; -@if ( Cluster::local_node_type() == Cluster::MANAGER ) +@if ( Cluster::local_node_type() == Cluster::MANAGER ) &analyze redef Intel::read_files += { "../intel.dat" }; @endif diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek index 175237cd39..8f67d5f0ef 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek @@ -20,7 +20,7 @@ redef Cluster::nodes = { @load base/frameworks/reporter @load base/protocols/conn -@if ( Cluster::node == "worker-1" ) +@if ( Cluster::node == "worker-1" ) &analyze redef exit_only_after_terminate = T; @endif diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek index bd61ad37f5..cbd47256c3 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek @@ -18,7 +18,7 @@ redef Cluster::nodes = { @load base/protocols/http @load base/frameworks/cluster -@if ( Cluster::node == "worker-1" ) +@if ( Cluster::node == "worker-1" ) &analyze redef exit_only_after_terminate = T; @endif diff --git a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek index c9056cc1b7..6e64cb4712 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek @@ -26,7 +26,7 @@ redef exit_only_after_terminate = T; @load base/frameworks/netcontrol -@if ( Cluster::local_node_type() == Cluster::WORKER ) +@if ( Cluster::local_node_type() == Cluster::WORKER ) &analyze event zeek_init() { suspend_processing(); diff --git a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek index 68d4407e74..035a9f7e6f 100644 --- a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek @@ -61,7 +61,7 @@ event Notice::begin_suppression(ts: time, suppress_for: interval, note: Notice:: Broker::publish(Cluster::node_topic("manager-1"), proceed); } -@if ( Cluster::local_node_type() == Cluster::MANAGER ) +@if ( Cluster::local_node_type() == Cluster::MANAGER ) &analyze event Cluster::Experimental::cluster_started() { diff --git a/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek b/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek index c3a0d10de2..6753f84110 100644 --- a/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek @@ -21,7 +21,7 @@ redef Log::default_rotation_interval = 0secs; global of_controller: OpenFlow::Controller; -@if ( Cluster::local_node_type() == Cluster::WORKER ) +@if ( Cluster::local_node_type() == Cluster::WORKER ) &analyze event zeek_init() { suspend_processing(); diff --git a/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek index 8732b2aea9..2482eaf1b2 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek @@ -78,7 +78,7 @@ event ready_for_data() did_data = T; } -@if ( Cluster::local_node_type() == Cluster::MANAGER ) +@if ( Cluster::local_node_type() == Cluster::MANAGER ) &analyze event second_test() { diff --git a/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek b/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek index 56ea828b36..43fefc3477 100644 --- a/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek +++ b/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek @@ -66,7 +66,7 @@ event run_test() } } -@if ( Cluster::node == "manager-1" ) +@if ( Cluster::node == "manager-1" ) &analyze # Use a dynamic metrics port for testing to avoid colliding on 9911/tcp # when running tests in parallel. global orig_metrics_port = Broker::metrics_port; diff --git a/testing/btest/scripts/policy/frameworks/management/controller/agent-checkin.zeek b/testing/btest/scripts/policy/frameworks/management/controller/agent-checkin.zeek index be0881c6ad..58cfc13525 100644 --- a/testing/btest/scripts/policy/frameworks/management/controller/agent-checkin.zeek +++ b/testing/btest/scripts/policy/frameworks/management/controller/agent-checkin.zeek @@ -22,7 +22,7 @@ redef Management::Agent::name = "agent"; # Tell the agent where to locate the controller. redef Management::Agent::controller = [$address="127.0.0.1", $bound_port=to_port(getenv("ZEEK_CONTROLLER_PORT"))]; -@if ( Supervisor::is_supervised() ) +@if ( Supervisor::is_supervised() ) &analyze @load policy/frameworks/management/agent/api diff --git a/testing/btest/supervisor/config-cluster-pcap.zeek b/testing/btest/supervisor/config-cluster-pcap.zeek index 88130c20f2..8388204309 100644 --- a/testing/btest/supervisor/config-cluster-pcap.zeek +++ b/testing/btest/supervisor/config-cluster-pcap.zeek @@ -11,7 +11,7 @@ redef Log::default_rotation_interval = 0sec; -@if ( Supervisor::is_supervisor() ) +@if ( Supervisor::is_supervisor() ) &analyze redef SupervisorControl::enable_listen = T;