From 3bbcca70346d6e1f67bec2023543404df832ffa6 Mon Sep 17 00:00:00 2001 From: Luca Provini Date: Wed, 20 Sep 2023 14:28:17 +0200 Subject: [PATCH] feat: all_el_metrics (#195) Added el_client_contexts to launch_prometheus --------- Co-authored-by: Gyanendra Mishra --- main.star | 1 + src/prometheus/prometheus_launcher.star | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/main.star b/main.star index 3f999a753..a7553fe2b 100644 --- a/main.star +++ b/main.star @@ -146,6 +146,7 @@ def run(plan, args = {}): plan, prometheus_config_template, all_cl_client_contexts, + all_el_client_contexts, ) plan.print("Successfully launched Prometheus") diff --git a/src/prometheus/prometheus_launcher.star b/src/prometheus/prometheus_launcher.star index 201c963e2..e6f17f459 100644 --- a/src/prometheus/prometheus_launcher.star +++ b/src/prometheus/prometheus_launcher.star @@ -15,12 +15,17 @@ USED_PORTS = { HTTP_PORT_ID: shared_utils.new_port_spec(HTTP_PORT_NUMBER, shared_utils.TCP_PROTOCOL, shared_utils.HTTP_APPLICATION_PROTOCOL) } -def launch_prometheus(plan, config_template, cl_client_contexts): - all_cl_nodes_metrics_info = [] +def launch_prometheus(plan, config_template, cl_client_contexts, el_client_contexts): + all_nodes_metrics_info = [] for client in cl_client_contexts: - all_cl_nodes_metrics_info.extend(client.cl_nodes_metrics_info) + all_nodes_metrics_info.extend(client.cl_nodes_metrics_info) - template_data = new_config_template_data(all_cl_nodes_metrics_info) + for client in el_client_contexts: + # etheruemjs doesn't populate metrics just yet + if client.el_metrics_info != [None]: + all_nodes_metrics_info.extend(client.el_metrics_info) + + template_data = new_config_template_data(all_nodes_metrics_info) template_and_data = shared_utils.new_template_and_data(config_template, template_data) template_and_data_by_rel_dest_filepath = {} template_and_data_by_rel_dest_filepath[CONFIG_FILENAME] = template_and_data