From e947e1d1c2ead83bb36243bbef649c546335b45b Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Tue, 5 Jul 2022 17:19:36 -0700 Subject: [PATCH] Management framework: additional context in a few log messages This adds request IDs in a few places that didn't mention them, and makes requests to the Supervisor that act on all current nodes explicit. --- scripts/policy/frameworks/management/agent/main.zeek | 12 ++++++++---- .../frameworks/management/controller/main.zeek | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/policy/frameworks/management/agent/main.zeek b/scripts/policy/frameworks/management/agent/main.zeek index 690c5ae29e..54b9b28362 100644 --- a/scripts/policy/frameworks/management/agent/main.zeek +++ b/scripts/policy/frameworks/management/agent/main.zeek @@ -359,7 +359,8 @@ function supervisor_status(node: string): Management::Request::Request local req = Management::Request::create(); req$supervisor_state_agent = SupervisorState($node = node); - Management::Log::info(fmt("tx SupervisorControl::status_request %s %s", req$id, node)); + Management::Log::info(fmt("tx SupervisorControl::status_request %s %s", + req$id, node == "" ? "" : node)); Broker::publish(SupervisorControl::topic_prefix, SupervisorControl::status_request, req$id, node); @@ -371,7 +372,8 @@ function supervisor_create(nc: Supervisor::NodeConfig): Management::Request::Req local req = Management::Request::create(); req$supervisor_state_agent = SupervisorState($node = nc$name); - Management::Log::info(fmt("tx SupervisorControl::create_request %s %s", req$id, nc$name)); + Management::Log::info(fmt("tx SupervisorControl::create_request %s %s", + req$id, nc$name)); Broker::publish(SupervisorControl::topic_prefix, SupervisorControl::create_request, req$id, nc); @@ -383,7 +385,8 @@ function supervisor_destroy(node: string): Management::Request::Request local req = Management::Request::create(); req$supervisor_state_agent = SupervisorState($node = node); - Management::Log::info(fmt("tx SupervisorControl::destroy_request %s %s", req$id, node)); + Management::Log::info(fmt("tx SupervisorControl::destroy_request %s %s", + req$id, node == "" ? "" : node)); Broker::publish(SupervisorControl::topic_prefix, SupervisorControl::destroy_request, req$id, node); @@ -395,7 +398,8 @@ function supervisor_restart(node: string): Management::Request::Request local req = Management::Request::create(); req$supervisor_state_agent = SupervisorState($node = node); - Management::Log::info(fmt("tx SupervisorControl::restart_request %s %s", req$id, node)); + Management::Log::info(fmt("tx SupervisorControl::restart_request %s %s", + req$id, node == "" ? "" : node)); Broker::publish(SupervisorControl::topic_prefix, SupervisorControl::restart_request, req$id, node); diff --git a/scripts/policy/frameworks/management/controller/main.zeek b/scripts/policy/frameworks/management/controller/main.zeek index c88e3127d0..be3052af19 100644 --- a/scripts/policy/frameworks/management/controller/main.zeek +++ b/scripts/policy/frameworks/management/controller/main.zeek @@ -236,7 +236,7 @@ function add_instance(inst: Management::Instance) local req = Management::Request::create(); - Management::Log::info(fmt("tx Management::Agent::API::agent_welcome_request to %s", inst$name)); + Management::Log::info(fmt("tx Management::Agent::API::agent_welcome_request %s to %s", req$id, inst$name)); Broker::publish(Management::Agent::topic_prefix + "/" + inst$name, Management::Agent::API::agent_welcome_request, req$id); } @@ -767,7 +767,7 @@ event Management::Agent::API::notify_agent_hello(instance: string, id: string, c # context for it from the configuration. Tell agent. local req = Management::Request::create(); - Management::Log::info(fmt("tx Management::Agent::API::agent_welcome_request to %s", instance)); + Management::Log::info(fmt("tx Management::Agent::API::agent_welcome_request %s to %s", req$id, instance)); Broker::publish(Management::Agent::topic_prefix + "/" + instance, Management::Agent::API::agent_welcome_request, req$id); }