Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

fix: pass in list for metrics for el clients #129

Merged
merged 3 commits into from
Sep 20, 2023
Merged

fix: pass in list for metrics for el clients #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3c4861
pass in array as expected
h4ck3rk3y Sep 20, 2023
ff5c68b
fix eth js
h4ck3rk3y Sep 20, 2023
a9e5b9b
fix eth js
h4ck3rk3y Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/el/besu/besu_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def launch(

jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)

metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
besu_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metrics_url)

return el_client_context.new_el_client_context(
Expand All @@ -109,7 +109,7 @@ def launch(
ENGINE_HTTP_RPC_PORT_NUM,
jwt_secret,
service_name,
besu_metrics_info,
[besu_metrics_info],
)


Expand Down
4 changes: 2 additions & 2 deletions src/el/erigon/erigon_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def launch(

jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)

metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
erigon_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metrics_url)

return el_client_context.new_el_client_context(
Expand All @@ -107,7 +107,7 @@ def launch(
ENGINE_RPC_PORT_NUM,
jwt_secret,
service_name,
erigon_metrics_info
[erigon_metrics_info]
)


Expand Down
4 changes: 2 additions & 2 deletions src/el/ethereumjs/ethereumjs_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def launch(

# TODO: Passing empty string for metrics_url for now https://github.com/kurtosis-tech/eth-network-package/issues/127
# metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
ethjs_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, "")
ethjs_metrics_info = None

return el_client_context.new_el_client_context(
"ethereumjs",
Expand All @@ -119,7 +119,7 @@ def launch(
ENGINE_RPC_PORT_NUM,
jwt_secret,
service_name,
ethjs_metrics_info,
[ethjs_metrics_info],
)

def get_config(
Expand Down
4 changes: 2 additions & 2 deletions src/el/geth/geth_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def launch(

jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)

metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
geth_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metrics_url)

return el_client_context.new_el_client_context(
Expand All @@ -127,7 +127,7 @@ def launch(
ENGINE_RPC_PORT_NUM,
jwt_secret,
service_name,
geth_metrics_info,
[geth_metrics_info],
)

def get_config(
Expand Down
4 changes: 2 additions & 2 deletions src/el/nethermind/nethermind_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def launch(

jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)

metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
nethermind_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metrics_url)

return el_client_context.new_el_client_context(
Expand All @@ -108,7 +108,7 @@ def launch(
ENGINE_RPC_PORT_NUM,
jwt_secret,
service_name,
nethermind_metrics_info,
[nethermind_metrics_info],
)


Expand Down
4 changes: 2 additions & 2 deletions src/el/reth/reth_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def launch(

jwt_secret = shared_utils.read_file_from_service(plan, service_name, jwt_secret_json_filepath_on_client)

metric_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metric_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
reth_metrics_info = node_metrics.new_node_metrics_info(service_name, METRICS_PATH, metric_url)

return el_client_context.new_el_client_context(
Expand All @@ -113,7 +113,7 @@ def launch(
ENGINE_RPC_PORT_NUM,
jwt_secret,
service_name,
reth_metrics_info,
[reth_metrics_info],
)

def get_config(
Expand Down