Commit 9ef5e2d6 authored by Gyanendra Mishra's avatar Gyanendra Mishra Committed by GitHub

Merge branch 'master' into gyani/module-io

parents d9a0db7d 6721cd2d
...@@ -70,4 +70,4 @@ def new_cl_client_info(ip_addr, port_num): ...@@ -70,4 +70,4 @@ def new_cl_client_info(ip_addr, port_num):
return { return {
"IPAddr": ip_addr, "IPAddr": ip_addr,
"PortNum": port_num "PortNum": port_num
} }
\ No newline at end of file
...@@ -3,8 +3,7 @@ load("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star", ...@@ -3,8 +3,7 @@ load("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star",
SERVICE_ID = "grafana" SERVICE_ID = "grafana"
# TODO I'm not sure if we should use latest version or ping an specific version instead IMAGE_NAME = "grafana/grafana-enterprise:9.2.3"
IMAGE_NAME = "grafana/grafana-enterprise:latest"
HTTP_PORT_ID = "http" HTTP_PORT_ID = "http"
HTTP_PORT_NUMBER_UINT16 = 3000 HTTP_PORT_NUMBER_UINT16 = 3000
...@@ -64,4 +63,4 @@ def new_datasource_config_template_data(prometheus_url): ...@@ -64,4 +63,4 @@ def new_datasource_config_template_data(prometheus_url):
def new_dashboard_providers_config_template_data(dashboards_dirpath): def new_dashboard_providers_config_template_data(dashboards_dirpath):
return { return {
"DashboardsDirpath": dashboards_dirpath "DashboardsDirpath": dashboards_dirpath
} }
\ No newline at end of file
# differs from eth2 in the sense it dosen't have the rest_client # differs from kurtosis-tech/eth2-merge-kurtosis-module in the sense it dosen't have the rest_client
def new_cl_client_context(client_name, enr, ip_addr, http_port_num, cl_nodes_metrics_info): def new_cl_client_context(client_name, enr, ip_addr, http_port_num, cl_nodes_metrics_info):
return struct( return struct(
client_name = client_name, client_name = client_name,
......
...@@ -67,4 +67,4 @@ def get_service_config(config_files_artifact_uuid): ...@@ -67,4 +67,4 @@ def get_service_config(config_files_artifact_uuid):
def new_config_template_data(cl_nodes_metrics_info): def new_config_template_data(cl_nodes_metrics_info):
return { return {
"CLNodesMetricsInfo": cl_nodes_metrics_info "CLNodesMetricsInfo": cl_nodes_metrics_info
} }
\ No newline at end of file
...@@ -8,6 +8,7 @@ SYNCHRONOUS_ENTRYPOINT_ARGS = { ...@@ -8,6 +8,7 @@ SYNCHRONOUS_ENTRYPOINT_ARGS = {
} }
# this is broken check - https://github.com/ethereum/merge-testnet-verifier/issues/4
def launch_testnet_verifier(params, el_client_contexts, cl_client_contexts): def launch_testnet_verifier(params, el_client_contexts, cl_client_contexts):
service_config = get_asynchronous_verification_service_config(params, el_client_contexts, cl_client_contexts) service_config = get_asynchronous_verification_service_config(params, el_client_contexts, cl_client_contexts)
add_service(SERVICE_ID, service_config) add_service(SERVICE_ID, service_config)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment