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: comment and layouting tweaks, no functional change

Browse source 
Also remove additional instances of the term "data cluster".
This commit is contained in:
Christian Kreibich 2022-05-12 13:07:03 -07:00
parent d4d6f10299
commit bd6c1683a2
5 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/policy/frameworks/management/agent/config.zeek
View file

@ -55,12 +55,12 @@ export {
$address="0.0.0.0", $bound_port=0/unknown] &redef; $address="0.0.0.0", $bound_port=0/unknown] &redef;
## An optional custom output directory for stdout/stderr. Agent and ## An optional custom output directory for stdout/stderr. Agent and
## controller currently only log locally, not via the data cluster's ## controller currently only log locally, not via the Zeek cluster's
## logger node. This means that if both write to the same log file, ## logger node. This means that if both write to the same log file,
## output gets garbled. ## output gets garbled.
const directory = "" &redef; const directory = "" &redef;
## The working directory for data cluster nodes created by this ## The working directory for Zeek cluster nodes created by this
## agent. If you make this a relative path, note that the path is ## agent. If you make this a relative path, note that the path is
## relative to the agent's working directory, since it creates data ## relative to the agent's working directory, since it creates data
## cluster nodes. ## cluster nodes.

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

@ -172,7 +172,13 @@ event Management::Agent::API::set_configuration_request(reqid: string, config: M
g_cluster[node$name] = cep; g_cluster[node$name] = cep;
} }
# Apply the new configuration via the supervisor # Apply the new configuration via the supervisor.
#
# XXX this should launch in the nodes in controlled order (loggers ->
# manager -> proxies -> workers), ideally checking that one stage is up
# before launching the next. This is tricky because that's not the point
# of the Supervisor's response event. Until we have this, bootstrap
# might be noisy, particular in the Broker log.
for ( nodename in g_nodes ) for ( nodename in g_nodes )
{ {

2
scripts/policy/frameworks/management/controller/config.zeek
View file

@ -44,7 +44,7 @@ export {
const topic = "zeek/management/controller" &redef; const topic = "zeek/management/controller" &redef;
## An optional custom output directory for stdout/stderr. Agent and ## An optional custom output directory for stdout/stderr. Agent and
## controller currently only log locally, not via the data cluster's ## controller currently only log locally, not via the Zeek cluster's
## logger node. This means that if both write to the same log file, ## logger node. This means that if both write to the same log file,
## output gets garbled. ## output gets garbled.
const directory = "" &redef; const directory = "" &redef;

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

@ -81,11 +81,10 @@ global null_config: function(): Management::Configuration;
global is_null_config: function(config: Management::Configuration): bool; global is_null_config: function(config: Management::Configuration): bool;
# Checks whether the given instance is one that we know with different # Checks whether the given instance is one that we know with different
# communication settings: a a different peering direction, a different listening # communication settings: a different peering direction, a different listening
# port, etc. Used as a predicate to indicate when we need to drop the existing # port, etc. Used as a predicate to indicate when we need to drop the existing
# one from our internal state. # one from our internal state.
global is_instance_connectivity_change: function global is_instance_connectivity_change: function(inst: Management::Instance): bool;
(inst: Management::Instance): bool;
# The set of agents the controller interacts with to manage to currently # The set of agents the controller interacts with to manage to currently
# configured cluster. This may be a subset of all the agents known to the # configured cluster. This may be a subset of all the agents known to the

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

@ -81,7 +81,7 @@ export {
state: State; state: State;
## Role the node plays in cluster management. ## Role the node plays in cluster management.
mgmt_role: Role &default=NONE; mgmt_role: Role &default=NONE;
## Role the node plays in the data cluster. ## Role the node plays in the Zeek cluster.
cluster_role: Supervisor::ClusterRole &default=Supervisor::NONE; cluster_role: Supervisor::ClusterRole &default=Supervisor::NONE;
## Process ID of the node. This is optional because the Supervisor may not have ## Process ID of the node. This is optional because the Supervisor may not have
## a PID when a node is still bootstrapping. ## a PID when a node is still bootstrapping.