Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Management framework: additional context in a few log messages

Browse source 
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.
This commit is contained in:
Christian Kreibich 2022-07-05 17:19:36 -07:00
parent f6597ffabf
commit e947e1d1c2
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/policy/frameworks/management/agent/main.zeek
View file

@ -359,7 +359,8 @@ function supervisor_status(node: string): Management::Request::Request
local req = Management::Request::create(); local req = Management::Request::create();
req$supervisor_state_agent = SupervisorState($node = node); 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 == "" ? "<all>" : node));
Broker::publish(SupervisorControl::topic_prefix, Broker::publish(SupervisorControl::topic_prefix,
SupervisorControl::status_request, req$id, node); SupervisorControl::status_request, req$id, node);
@ -371,7 +372,8 @@ function supervisor_create(nc: Supervisor::NodeConfig): Management::Request::Req
local req = Management::Request::create(); local req = Management::Request::create();
req$supervisor_state_agent = SupervisorState($node = nc$name); 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, Broker::publish(SupervisorControl::topic_prefix,
SupervisorControl::create_request, req$id, nc); SupervisorControl::create_request, req$id, nc);
@ -383,7 +385,8 @@ function supervisor_destroy(node: string): Management::Request::Request
local req = Management::Request::create(); local req = Management::Request::create();
req$supervisor_state_agent = SupervisorState($node = node); 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 == "" ? "<all>" : node));
Broker::publish(SupervisorControl::topic_prefix, Broker::publish(SupervisorControl::topic_prefix,
SupervisorControl::destroy_request, req$id, node); SupervisorControl::destroy_request, req$id, node);
@ -395,7 +398,8 @@ function supervisor_restart(node: string): Management::Request::Request
local req = Management::Request::create(); local req = Management::Request::create();
req$supervisor_state_agent = SupervisorState($node = node); 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 == "" ? "<all>" : node));
Broker::publish(SupervisorControl::topic_prefix, Broker::publish(SupervisorControl::topic_prefix,
SupervisorControl::restart_request, req$id, node); SupervisorControl::restart_request, req$id, node);

4
scripts/policy/frameworks/management/controller/main.zeek
View file

@ -236,7 +236,7 @@ function add_instance(inst: Management::Instance)
local req = Management::Request::create(); 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, Broker::publish(Management::Agent::topic_prefix + "/" + inst$name,
Management::Agent::API::agent_welcome_request, req$id); 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. # context for it from the configuration. Tell agent.
local req = Management::Request::create(); 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, Broker::publish(Management::Agent::topic_prefix + "/" + instance,
Management::Agent::API::agent_welcome_request, req$id); Management::Agent::API::agent_welcome_request, req$id);
} }