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: distinguish internally and externally requested deployments

Browse source 
The controller's deployment request state now features a bit that indicates
whether the deployment was requested by a client, or triggered internally. This
affects logging and the transmission of deployment response events via Broker,
which are skipped when the deployment is internal.

This is in preparation of resilience features when the controller (re-)boots.
This commit is contained in:
Christian Kreibich 2022-06-19 17:34:12 -07:00
parent 7787d84739
commit 3120fbc75e
1 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,9 @@ export {
type DeployState: record { type DeployState: record {
## The cluster configuration the controller is deploying. ## The cluster configuration the controller is deploying.
config: Management::Configuration; config: Management::Configuration;
## Whether this is a controller-internal deployment, or
## triggered via a request by a remote peer/client.
is_internal: bool &default=F;
## Request state for every controller/agent transaction. ## Request state for every controller/agent transaction.
requests: set[string] &default=set(); requests: set[string] &default=set();
}; };
@ -729,10 +732,14 @@ event Management::Agent::API::deploy_response(reqid: string, results: Management
local res = Management::Result($reqid=req$id, $data=config$id); local res = Management::Result($reqid=req$id, $data=config$id);
req$results += res; req$results += res;
Management::Log::info(fmt("tx Management::Controller::API::deploy_response %s", if ( ! req$deploy_state$is_internal )
Management::Request::to_string(req))); {
Broker::publish(Management::Controller::topic, Management::Log::info(fmt("tx Management::Controller::API::deploy_response %s",
Management::Controller::API::deploy_response, req$id, req$results); Management::Request::to_string(req)));
Broker::publish(Management::Controller::topic,
Management::Controller::API::deploy_response, req$id, req$results);
}
Management::Request::finish(req$id); Management::Request::finish(req$id);
} }
@ -950,10 +957,14 @@ event Management::Controller::API::deploy_request(reqid: string)
local res = Management::Result($reqid=req$id, $data=config$id); local res = Management::Result($reqid=req$id, $data=config$id);
req$results += res; req$results += res;
Management::Log::info(fmt("tx Management::Controller::API::deploy_response %s", if ( ! req$deploy_state$is_internal )
Management::Request::to_string(req))); {
Broker::publish(Management::Controller::topic, Management::Log::info(fmt("tx Management::Controller::API::deploy_response %s",
Management::Controller::API::deploy_response, req$id, req$results); Management::Request::to_string(req)));
Broker::publish(Management::Controller::topic,
Management::Controller::API::deploy_response, req$id, req$results);
}
Management::Request::finish(req$id); Management::Request::finish(req$id);
return; return;
} }
@ -1229,10 +1240,13 @@ event Management::Request::request_expired(req: Management::Request::Request)
g_config_reqid_pending = ""; g_config_reqid_pending = "";
req$results += res; req$results += res;
Management::Log::info(fmt("tx Management::Controller::API::deploy_response %s", if ( ! req$deploy_state$is_internal )
Management::Request::to_string(req))); {
Broker::publish(Management::Controller::topic, Management::Log::info(fmt("tx Management::Controller::API::deploy_response %s",
Management::Controller::API::deploy_response, req$id, req$results); Management::Request::to_string(req)));
Broker::publish(Management::Controller::topic,
Management::Controller::API::deploy_response, req$id, req$results);
}
} }
if ( req?$get_nodes_state ) if ( req?$get_nodes_state )