From ffebf99badc81d76f42c8a009994dedab0e3ca29 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Tue, 12 Jul 2022 17:51:32 -0700
Subject: [PATCH] Management framework: additional logging tweaks

Ensure the framework's log stream exists prior to using it in zeek_init(), and
use a node-is-live message similar to those in agent and controller also in
launched nodes.
---
 scripts/policy/frameworks/management/log.zeek       | 3 ++-
 scripts/policy/frameworks/management/node/main.zeek | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/policy/frameworks/management/log.zeek b/scripts/policy/frameworks/management/log.zeek
index 95798421a7..bc952f0971 100644
--- a/scripts/policy/frameworks/management/log.zeek
+++ b/scripts/policy/frameworks/management/log.zeek
@@ -122,7 +122,8 @@ function error(message: string)
 			 $role=r2s[Management::role], $message=message]);
 	}
 
-event zeek_init()
+# Bump priority to ensure the log stream exists when other zeek_init handlers use it.
+event zeek_init() &priority=5
 	{
 	if ( ! Supervisor::is_supervised() )
 		return;
diff --git a/scripts/policy/frameworks/management/node/main.zeek b/scripts/policy/frameworks/management/node/main.zeek
index df65d754b9..7c3709cc0d 100644
--- a/scripts/policy/frameworks/management/node/main.zeek
+++ b/scripts/policy/frameworks/management/node/main.zeek
@@ -118,4 +118,6 @@ event zeek_init()
 
 	Broker::peer(epi$network$address, epi$network$bound_port, Management::connect_retry);
 	Broker::subscribe(node_topic);
+
+	Management::Log::info(fmt("node %s is live, Broker ID %s", Cluster::node, Broker::node_id()));
 	}