Commit 4e69a4c0 authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub

feat: add http url to el context (#656)

parent 6d2cdb69
...@@ -146,6 +146,7 @@ def launch( ...@@ -146,6 +146,7 @@ def launch(
besu_metrics_info = node_metrics.new_node_metrics_info( besu_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, metrics_url service_name, METRICS_PATH, metrics_url
) )
http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"besu", "besu",
...@@ -155,6 +156,7 @@ def launch( ...@@ -155,6 +156,7 @@ def launch(
RPC_PORT_NUM, RPC_PORT_NUM,
WS_PORT_NUM, WS_PORT_NUM,
ENGINE_HTTP_RPC_PORT_NUM, ENGINE_HTTP_RPC_PORT_NUM,
http_url,
service_name, service_name,
[besu_metrics_info], [besu_metrics_info],
) )
......
...@@ -6,6 +6,7 @@ def new_el_context( ...@@ -6,6 +6,7 @@ def new_el_context(
rpc_port_num, rpc_port_num,
ws_port_num, ws_port_num,
engine_rpc_port_num, engine_rpc_port_num,
rpc_http_url,
service_name="", service_name="",
el_metrics_info=None, el_metrics_info=None,
): ):
...@@ -18,5 +19,6 @@ def new_el_context( ...@@ -18,5 +19,6 @@ def new_el_context(
rpc_port_num=rpc_port_num, rpc_port_num=rpc_port_num,
ws_port_num=ws_port_num, ws_port_num=ws_port_num,
engine_rpc_port_num=engine_rpc_port_num, engine_rpc_port_num=engine_rpc_port_num,
rpc_http_url=rpc_http_url,
el_metrics_info=el_metrics_info, el_metrics_info=el_metrics_info,
) )
...@@ -147,6 +147,8 @@ def launch( ...@@ -147,6 +147,8 @@ def launch(
service_name, METRICS_PATH, metrics_url service_name, METRICS_PATH, metrics_url
) )
http_url = "http://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"erigon", "erigon",
enr, enr,
...@@ -155,6 +157,7 @@ def launch( ...@@ -155,6 +157,7 @@ def launch(
WS_RPC_PORT_NUM, WS_RPC_PORT_NUM,
WS_RPC_PORT_NUM, WS_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM, ENGINE_RPC_PORT_NUM,
http_url,
service_name, service_name,
[erigon_metrics_info], [erigon_metrics_info],
) )
......
...@@ -147,6 +147,8 @@ def launch( ...@@ -147,6 +147,8 @@ def launch(
# metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM) # metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
ethjs_metrics_info = None ethjs_metrics_info = None
http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"ethereumjs", "ethereumjs",
"", # ethereumjs has no enr "", # ethereumjs has no enr
...@@ -155,6 +157,7 @@ def launch( ...@@ -155,6 +157,7 @@ def launch(
RPC_PORT_NUM, RPC_PORT_NUM,
WS_PORT_NUM, WS_PORT_NUM,
ENGINE_RPC_PORT_NUM, ENGINE_RPC_PORT_NUM,
http_url,
service_name, service_name,
[ethjs_metrics_info], [ethjs_metrics_info],
) )
......
...@@ -163,6 +163,8 @@ def launch( ...@@ -163,6 +163,8 @@ def launch(
service_name, METRICS_PATH, metrics_url service_name, METRICS_PATH, metrics_url
) )
http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"geth", "geth",
enr, enr,
...@@ -171,6 +173,7 @@ def launch( ...@@ -171,6 +173,7 @@ def launch(
RPC_PORT_NUM, RPC_PORT_NUM,
WS_PORT_NUM, WS_PORT_NUM,
ENGINE_RPC_PORT_NUM, ENGINE_RPC_PORT_NUM,
http_url,
service_name, service_name,
[geth_metrics_info], [geth_metrics_info],
) )
......
...@@ -144,6 +144,8 @@ def launch( ...@@ -144,6 +144,8 @@ def launch(
service_name, METRICS_PATH, metrics_url service_name, METRICS_PATH, metrics_url
) )
http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"nethermind", "nethermind",
"", # nethermind has no ENR in the eth2-merge-kurtosis-module either "", # nethermind has no ENR in the eth2-merge-kurtosis-module either
...@@ -153,6 +155,7 @@ def launch( ...@@ -153,6 +155,7 @@ def launch(
RPC_PORT_NUM, RPC_PORT_NUM,
WS_PORT_NUM, WS_PORT_NUM,
ENGINE_RPC_PORT_NUM, ENGINE_RPC_PORT_NUM,
http_url,
service_name, service_name,
[nethermind_metrics_info], [nethermind_metrics_info],
) )
......
...@@ -146,6 +146,8 @@ def launch( ...@@ -146,6 +146,8 @@ def launch(
service_name, METRICS_PATH, metric_url service_name, METRICS_PATH, metric_url
) )
http_url = "http://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"nimbus", "nimbus",
"", # nimbus has no enr "", # nimbus has no enr
...@@ -154,6 +156,7 @@ def launch( ...@@ -154,6 +156,7 @@ def launch(
WS_RPC_PORT_NUM, WS_RPC_PORT_NUM,
WS_RPC_PORT_NUM, WS_RPC_PORT_NUM,
ENGINE_RPC_PORT_NUM, ENGINE_RPC_PORT_NUM,
http_url,
service_name, service_name,
[nimbus_metrics_info], [nimbus_metrics_info],
) )
......
...@@ -149,6 +149,8 @@ def launch( ...@@ -149,6 +149,8 @@ def launch(
service_name, METRICS_PATH, metric_url service_name, METRICS_PATH, metric_url
) )
http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
return el_context.new_el_context( return el_context.new_el_context(
"reth", "reth",
"", # reth has no enr "", # reth has no enr
...@@ -157,6 +159,7 @@ def launch( ...@@ -157,6 +159,7 @@ def launch(
RPC_PORT_NUM, RPC_PORT_NUM,
WS_PORT_NUM, WS_PORT_NUM,
ENGINE_RPC_PORT_NUM, ENGINE_RPC_PORT_NUM,
http_url,
service_name, service_name,
[reth_metrics_info], [reth_metrics_info],
) )
......
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