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

Merge branch 'topic/christian/management-multinode-metrics-ports'

Browse source 
* topic/christian/management-multinode-metrics-ports:
  Bump cluster testsuite to pull in updated Prometheus tests
  Management framework: move up addition of agent IPs into deployable cluster configs
  Support multiple instances per host addr in auto metrics generation
  When auto-generating metrics ports for worker nodes, get them more uniform across instances.
This commit is contained in:
Christian Kreibich 2025-01-31 15:58:37 -08:00
commit 8ef333ff32
4 changed files with 51 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CHANGES
View file

@ -1,3 +1,12 @@
7.2.0-dev.129 | 2025-01-31 15:58:37 -0800
* Management framework:
- Bump cluster testsuite to pull in updated Prometheus tests (Christian Kreibich, Corelight)
- move up addition of agent IPs into deployable cluster configs (Christian Kreibich, Corelight)
- Support multiple instances per host addr in auto metrics generation (Michael Dopheide)
- When auto-generating metrics ports for worker nodes, get them more uniform across instances. (Michael Dopheide)
7.2.0-dev.124 | 2025-01-30 10:51:14 -0700
* Pack some classes for better memory usages (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.2.0-dev.124
7.2.0-dev.129

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

@ -186,24 +186,6 @@ global g_configs: table[ConfigState] of Management::Configuration
function config_deploy_to_agents(config: Management::Configuration, req: Management::Request::Request)
{
# Make any final changes to the configuration we send off.
# If needed, fill in agent IP address info as learned from their peerings.
# XXX this will need revisiting when we support host names.
local instances: set[Management::Instance];
for ( inst in config$instances )
{
if ( inst$name in g_instances_known
&& inst$host == 0.0.0.0
&& g_instances_known[inst$name]$host != 0.0.0.0 )
inst$host = g_instances_known[inst$name]$host;
add instances[inst];
}
config$instances = instances;
for ( name in g_instances )
{
if ( name !in g_instances_ready )
@ -414,27 +396,34 @@ function config_assign_metrics_ports(config: Management::Configuration)
[Supervisor::WORKER] = 3,
};
local p = port_to_count(Management::Controller::auto_assign_metrics_start_port);
local ports_set: set[count];
local instance_metrics_start_port: table[addr] of count;
local instance_ports_set: table[addr] of set[count];
local instance_addr_lookup: table[string] of addr;
local node: Management::Node;
local node_addr: addr;
# Pre-populate agents ports, if we have them:
for ( inst in config$instances )
{
# build instance name -> addr lookup table
instance_addr_lookup[inst$name] = inst$host;
instance_metrics_start_port[inst$host] = port_to_count(Management::Controller::auto_assign_metrics_start_port);
instance_ports_set[inst$host] = {};
if ( inst?$listen_port )
add ports_set[port_to_count(inst$listen_port)];
add instance_ports_set[inst$host][port_to_count(inst$listen_port)];
}
# Pre-populate nodes with pre-defined metrics ports, as well
# as their Broker ports:
for ( node in config$nodes )
node_addr = instance_addr_lookup[node$instance];
{
if ( node?$p )
add ports_set[port_to_count(node$p)];
add instance_ports_set[node_addr][port_to_count(node$p)];
if ( node?$metrics_port )
{
add ports_set[port_to_count(node$metrics_port)];
add instance_ports_set[node_addr][port_to_count(node$metrics_port)];
add new_nodes[node];
}
}
@ -466,17 +455,18 @@ function config_assign_metrics_ports(config: Management::Configuration)
for ( i in nodes )
{
node = nodes[i];
node_addr = instance_addr_lookup[node$instance];
# Find next available port ...
while ( p in ports_set )
++p;
while ( instance_metrics_start_port[node_addr] in instance_ports_set[node_addr] )
++instance_metrics_start_port[node_addr];
node$metrics_port = count_to_port(p, tcp);
node$metrics_port = count_to_port(instance_metrics_start_port[node_addr], tcp);
add new_nodes[node];
add ports_set[p];
add instance_ports_set[node_addr][instance_metrics_start_port[node_addr]];
# ... and consume it.
++p;
++instance_metrics_start_port[node_addr];
}
config$nodes = new_nodes;
@ -1029,6 +1019,27 @@ event Management::Controller::API::stage_configuration_request(reqid: string, co
g_configs[STAGED] = config;
config_copy = copy(config);
# The staged config is preserved as the client sent it to us. For the
# ready-to-deploy version we fill in additional details here.
#
# One such bit of information is that we know the IP addresses of
# instances that connected to the controller from their Broker peering.
#
# XXX this will need revisiting when we support host names.
local instances: set[Management::Instance];
for ( inst in config_copy$instances )
{
if ( inst$name in g_instances_known
&& inst$host == 0.0.0.0
&& g_instances_known[inst$name]$host != 0.0.0.0 )
inst$host = g_instances_known[inst$name]$host;
add instances[inst];
}
config_copy$instances = instances;
if ( Management::Controller::auto_assign_broker_ports )
config_assign_broker_ports(config_copy);
if ( Management::Controller::auto_assign_metrics_ports )

2
testing/external/commit-hash.zeek-testing-cluster vendored
View file

@ -1 +1 @@
43966c3a8c1a1a9d2cc3c77aebdbded602bf2cb3
2f042c950d493a164fd2c7ef5172213bb1205642