From 820c011ffcb162266be58093c4fea5dc66d7985c Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Tue, 6 Jun 2023 15:17:46 +0200 Subject: [PATCH] test-all-policy: Do not load nodes-experimental/manager.zeek Turns out loading this script in non-cluster mode uses Cluster::log() and creates cluster.log in the external baselines saying "cluster started". Do not load it into test-all-policy.zeek and instead rely on the new test-all-policy-cluster.test to load it transitively when running as manager for basic checking. --- scripts/test-all-policy.zeek | 5 ++++- scripts/zeekygen/__load__.zeek | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/test-all-policy.zeek b/scripts/test-all-policy.zeek index 285d1f1198..ac6fb4b38f 100644 --- a/scripts/test-all-policy.zeek +++ b/scripts/test-all-policy.zeek @@ -12,7 +12,10 @@ # @load frameworks/control/controllee.zeek # @load frameworks/control/controller.zeek @load frameworks/cluster/experimental.zeek -@load frameworks/cluster/nodes-experimental/manager.zeek +# Loaded via the above through test-all-policy-cluster.test +# when running as a manager, creates cluster.log entries +# even in non-cluster mode if loaded like the below. +# @load frameworks/cluster/nodes-experimental/manager.zeek @load frameworks/management/agent/__load__.zeek @load frameworks/management/agent/api.zeek @load frameworks/management/agent/boot.zeek diff --git a/scripts/zeekygen/__load__.zeek b/scripts/zeekygen/__load__.zeek index d7280b018c..b97b08ab2f 100644 --- a/scripts/zeekygen/__load__.zeek +++ b/scripts/zeekygen/__load__.zeek @@ -3,6 +3,7 @@ # Scripts which are commented out in test-all-policy.zeek. @load protocols/mqtt/__load__.zeek @load protocols/ssl/decryption.zeek +@load frameworks/cluster/nodes-experimental/manager.zeek @load frameworks/control/controllee.zeek @load frameworks/control/controller.zeek @load frameworks/management/agent/main.zeek