From 58daff207d3ff36dac61a29854cd522e2c35fdd6 Mon Sep 17 00:00:00 2001 From: Loocapro Date: Thu, 14 Sep 2023 15:38:24 +0200 Subject: [PATCH 1/5] feat: all_el_metrics --- main.star | 1 + src/prometheus/prometheus_launcher.star | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/main.star b/main.star index fccf2ca10..075505cb7 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_clients_contexts, ) plan.print("Successfully launched Prometheus") diff --git a/src/prometheus/prometheus_launcher.star b/src/prometheus/prometheus_launcher.star index 201c963e2..f7b7dd399 100644 --- a/src/prometheus/prometheus_launcher.star +++ b/src/prometheus/prometheus_launcher.star @@ -15,12 +15,15 @@ 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: + all_nodes_metrics_info.extend(client.el_nodes_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 From 596827b89d895bda0e91cfef77cd7faa068766a7 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Wed, 20 Sep 2023 13:22:01 +0200 Subject: [PATCH 2/5] Update main.star --- main.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.star b/main.star index b425d5c22..a7553fe2b 100644 --- a/main.star +++ b/main.star @@ -146,7 +146,7 @@ def run(plan, args = {}): plan, prometheus_config_template, all_cl_client_contexts, - all_el_clients_contexts, + all_el_client_contexts, ) plan.print("Successfully launched Prometheus") From 41ce821ea41886bd0757b5be941e03d39eb19711 Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Wed, 20 Sep 2023 13:29:49 +0200 Subject: [PATCH 3/5] Update prometheus_launcher.star --- src/prometheus/prometheus_launcher.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prometheus/prometheus_launcher.star b/src/prometheus/prometheus_launcher.star index f7b7dd399..339cd6a96 100644 --- a/src/prometheus/prometheus_launcher.star +++ b/src/prometheus/prometheus_launcher.star @@ -21,7 +21,7 @@ def launch_prometheus(plan, config_template, cl_client_contexts, el_client_conte all_nodes_metrics_info.extend(client.cl_nodes_metrics_info) for client in el_client_contexts: - all_nodes_metrics_info.extend(client.el_nodes_metrics_info) + 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) From 74600e62dd3e049353d1e0c3c01bcf49c6cec29d Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Wed, 20 Sep 2023 13:35:34 +0200 Subject: [PATCH 4/5] Update prometheus_launcher.star --- src/prometheus/prometheus_launcher.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prometheus/prometheus_launcher.star b/src/prometheus/prometheus_launcher.star index 339cd6a96..94f1d30ed 100644 --- a/src/prometheus/prometheus_launcher.star +++ b/src/prometheus/prometheus_launcher.star @@ -21,7 +21,7 @@ def launch_prometheus(plan, config_template, cl_client_contexts, el_client_conte all_nodes_metrics_info.extend(client.cl_nodes_metrics_info) for client in el_client_contexts: - all_nodes_metrics_info.extend(client..el_metrics_info) + 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) From 5fa959b7a6557771b399c99b9c67c593c3285bdd Mon Sep 17 00:00:00 2001 From: Gyanendra Mishra Date: Wed, 20 Sep 2023 13:59:34 +0200 Subject: [PATCH 5/5] Update prometheus_launcher.star --- src/prometheus/prometheus_launcher.star | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/prometheus/prometheus_launcher.star b/src/prometheus/prometheus_launcher.star index 94f1d30ed..e6f17f459 100644 --- a/src/prometheus/prometheus_launcher.star +++ b/src/prometheus/prometheus_launcher.star @@ -21,7 +21,9 @@ def launch_prometheus(plan, config_template, cl_client_contexts, el_client_conte all_nodes_metrics_info.extend(client.cl_nodes_metrics_info) for client in el_client_contexts: - all_nodes_metrics_info.extend(client.el_metrics_info) + # 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)