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: rename set_configuration events to stage_configuration

Browse source 
This reflects corresponding renaming of the client's set-config command to
stage-config, to make it more clear what's happening.
This commit is contained in:
Christian Kreibich 2022-06-22 11:48:11 -07:00
parent 68558e2874
commit 2c1cd1d401
3 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

35
scripts/policy/frameworks/management/controller/api.zeek
View file

@ -32,11 +32,11 @@ export {
result: Management::Result); result: Management::Result);
## The client sends this event to upload a new cluster configuration, ## Upload a configuration to the controller for later deployment.
## including the full cluster topology. The controller validates the ## The client sends this event to the controller, which validates the
## configuration and indicates the outcome in its response event. No ## configuration and indicates the outcome in its response event. No
## deployment takes place yet, and existing deployed configurations and ## deployment takes place yet, and existing deployed configurations and
## clusters remain intact. To trigger deployment of an uploaded ## the running Zeek cluster remain intact. To trigger deployment of an uploaded
## configuration, use :zeek:see:`Management::Controller::API::deploy_request`. ## configuration, use :zeek:see:`Management::Controller::API::deploy_request`.
## ##
## reqid: a request identifier string, echoed in the response event. ## reqid: a request identifier string, echoed in the response event.
@ -44,11 +44,11 @@ export {
## config: a :zeek:see:`Management::Configuration` record ## config: a :zeek:see:`Management::Configuration` record
## specifying the cluster configuration. ## specifying the cluster configuration.
## ##
global set_configuration_request: event(reqid: string, global stage_configuration_request: event(reqid: string,
config: Management::Configuration); config: Management::Configuration);
## Response to a set_configuration_request event. The controller sends ## Response to a stage_configuration_request event. The controller sends
## this back to the client. ## this back to the client, conveying validation results.
## ##
## reqid: the request identifier used in the request event. ## reqid: the request identifier used in the request event.
## ##
@ -57,12 +57,12 @@ export {
## a single result record indicates so. Otherwise, the sequence is ## a single result record indicates so. Otherwise, the sequence is
## all errors, each indicating a configuration validation error. ## all errors, each indicating a configuration validation error.
## ##
global set_configuration_response: event(reqid: string, global stage_configuration_response: event(reqid: string,
result: Management::ResultVec); result: Management::ResultVec);
## The client sends this event to retrieve the currently deployed ## The client sends this event to retrieve the controller's current
## cluster configuration. ## cluster configuration(s).
## ##
## reqid: a request identifier string, echoed in the response event. ## reqid: a request identifier string, echoed in the response event.
## ##
@ -85,13 +85,16 @@ export {
result: Management::Result); result: Management::Result);
## The client sends this event to trigger deployment of a previously ## Trigger deployment of a previously staged configuration. The client
## uploaded configuration. The controller deploys the uploaded ## sends this event to the controller, which deploys the configuration
## configuration to all agents involved in running the former ## to the agents. Agents then terminate any previously running cluster
## configuration or the new one. The agents terminate any previously ## nodes and (re-)launch those defined in the new configuration. Once
## running cluster nodes and (re-)launch those defined in the new ## each agent has responded (or a timeout occurs), the controller sends
## configuration. Once each agent has responded (or a timeout occurs), ## a response event back to the client, aggregating the results from the
## the controller sends a response event back to the client. ## agents. The controller keeps the staged configuration available for
## download, or re-deployment. In addition, the deployed configuration
## becomes available for download as well, with any augmentations
## (e.g. node ports filled in by auto-assignment) reflected.
## ##
## reqid: a request identifier string, echoed in the response event. ## reqid: a request identifier string, echoed in the response event.
## ##

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

@ -866,9 +866,9 @@ event Management::Agent::API::deploy_response(reqid: string, results: Management
Management::Request::finish(req$id); Management::Request::finish(req$id);
} }
event Management::Controller::API::set_configuration_request(reqid: string, config: Management::Configuration) event Management::Controller::API::stage_configuration_request(reqid: string, config: Management::Configuration)
{ {
Management::Log::info(fmt("rx Management::Controller::API::set_configuration_request %s", reqid)); Management::Log::info(fmt("rx Management::Controller::API::stage_configuration_request %s", reqid));
local req = Management::Request::create(reqid); local req = Management::Request::create(reqid);
local res = Management::Result($reqid=req$id); local res = Management::Result($reqid=req$id);
@ -877,10 +877,10 @@ event Management::Controller::API::set_configuration_request(reqid: string, conf
if ( ! config_validate(config, req) ) if ( ! config_validate(config, req) )
{ {
Management::Request::finish(req$id); Management::Request::finish(req$id);
Management::Log::info(fmt("tx Management::Controller::API::set_configuration_response %s", Management::Log::info(fmt("tx Management::Controller::API::stage_configuration_response %s",
Management::Request::to_string(req))); Management::Request::to_string(req)));
Broker::publish(Management::Controller::topic, Broker::publish(Management::Controller::topic,
Management::Controller::API::set_configuration_response, req$id, req$results); Management::Controller::API::stage_configuration_response, req$id, req$results);
return; return;
} }
@ -896,10 +896,10 @@ event Management::Controller::API::set_configuration_request(reqid: string, conf
res$error = fmt("port auto-assignment disabled but nodes %s lack ports", nodes_str); res$error = fmt("port auto-assignment disabled but nodes %s lack ports", nodes_str);
req$results += res; req$results += res;
Management::Log::info(fmt("tx Management::Controller::API::set_configuration_response %s", Management::Log::info(fmt("tx Management::Controller::API::stage_configuration_response %s",
Management::Request::to_string(req))); Management::Request::to_string(req)));
Broker::publish(Management::Controller::topic, Broker::publish(Management::Controller::topic,
Management::Controller::API::set_configuration_response, req$id, req$results); Management::Controller::API::stage_configuration_response, req$id, req$results);
Management::Request::finish(req$id); Management::Request::finish(req$id);
return; return;
} }
@ -918,10 +918,10 @@ event Management::Controller::API::set_configuration_request(reqid: string, conf
req$results += res; req$results += res;
Management::Log::info(fmt( Management::Log::info(fmt(
"tx Management::Controller::API::set_configuration_response %s", "tx Management::Controller::API::stage_configuration_response %s",
Management::result_to_string(res))); Management::result_to_string(res)));
Broker::publish(Management::Controller::topic, Broker::publish(Management::Controller::topic,
Management::Controller::API::set_configuration_response, reqid, req$results); Management::Controller::API::stage_configuration_response, reqid, req$results);
Management::Request::finish(req$id); Management::Request::finish(req$id);
} }

8
scripts/policy/frameworks/management/types.zeek
View file

@ -109,10 +109,10 @@ export {
type ResultVec: vector of Result; type ResultVec: vector of Result;
## In :zeek:see:`Management::Controller::API::set_configuration_response`, ## In :zeek:see:`Management::Controller::API::deploy_response` events,
## events, each :zeek:see:`Management::Result` indicates the outcome of a ## each :zeek:see:`Management::Result` indicates the outcome of a
## requested cluster node. If a node does not launch properly (meaning ## launched cluster node. If a node does not launch properly (meaning
## it doesn't check in with the agent on thee machine it's running on), ## it doesn't check in with the agent on the machine it's running on),
## the result will indicate failure, and its data field will be an ## the result will indicate failure, and its data field will be an
## instance of this record, capturing the stdout and stderr output of ## instance of this record, capturing the stdout and stderr output of
## the failing node. ## the failing node.