Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ethereum-package
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
ethereum-package
Commits
a4bdcb34
Commit
a4bdcb34
authored
Dec 15, 2022
by
pk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added support for application protocol to eth2 package
parent
879038a5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
16 deletions
+13
-16
changelog.md
docs/changelog.md
+3
-0
forkmon_launcher.star
src/forkmon/forkmon_launcher.star
+1
-2
grafana_launcher.star
src/grafana/grafana_launcher.star
+1
-3
lighthouse_launcher.star
...articipant_network/cl/lighthouse/lighthouse_launcher.star
+3
-3
prometheus_launcher.star
src/prometheus/prometheus_launcher.star
+1
-4
shared_utils.star
src/shared_utils/shared_utils.star
+4
-4
No files found.
docs/changelog.md
View file @
a4bdcb34
# TBD
# TBD
### Breaking Change
-
Introduced optional application protocol and renamed protocol to transport_protocol
# 0.1.0
# 0.1.0
### Breaking changes
### Breaking changes
...
...
src/forkmon/forkmon_launcher.star
View file @
a4bdcb34
...
@@ -6,14 +6,13 @@ IMAGE_NAME = "ralexstokes/ethereum_consensus_monitor:latest"
...
@@ -6,14 +6,13 @@ IMAGE_NAME = "ralexstokes/ethereum_consensus_monitor:latest"
HTTP_PORT_ID = "http"
HTTP_PORT_ID = "http"
HTTP_PORT_NUMBER = 80
HTTP_PORT_NUMBER = 80
HTTP_PROTOCOL = "TCP"
FORKMON_CONFIG_FILENAME = "forkmon-config.toml"
FORKMON_CONFIG_FILENAME = "forkmon-config.toml"
FORKMON_CONFIG_MOUNT_DIRPATH_ON_SERVICE = "/config"
FORKMON_CONFIG_MOUNT_DIRPATH_ON_SERVICE = "/config"
USED_PORTS = {
USED_PORTS = {
HTTP_PORT_ID:
shared_utils.new_port_spec(HTTP_PORT_NUMBER, HTTP
_PROTOCOL)
HTTP_PORT_ID:
shared_utils.new_port_spec(HTTP_PORT_NUMBER, shared_utils.TCP_PROTOCOL, shared_utils.HTTP_APPLICATION
_PROTOCOL)
}
}
...
...
src/grafana/grafana_launcher.star
View file @
a4bdcb34
shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star")
shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star")
static_files = import_module("github.com/kurtosis-tech/eth2-package/src/static_files/static_files.star")
static_files = import_module("github.com/kurtosis-tech/eth2-package/src/static_files/static_files.star")
SERVICE_ID = "grafana"
SERVICE_ID = "grafana"
IMAGE_NAME = "grafana/grafana-enterprise:9.2.3"
IMAGE_NAME = "grafana/grafana-enterprise:9.2.3"
HTTP_PORT_ID = "http"
HTTP_PORT_ID = "http"
HTTP_PORT_NUMBER_UINT16 = 3000
HTTP_PORT_NUMBER_UINT16 = 3000
HTTP_PORT_PROTOCOL= "TCP"
DATASOURCE_CONFIG_REL_FILEPATH = "datasources/datasource.yml"
DATASOURCE_CONFIG_REL_FILEPATH = "datasources/datasource.yml"
...
@@ -23,7 +21,7 @@ GRAFANA_DASHBOARDS_FILEPATH_ON_SERVICE = GRAFANA_DASHBOARDS_DIRPATH_ON_SERVICE +
...
@@ -23,7 +21,7 @@ GRAFANA_DASHBOARDS_FILEPATH_ON_SERVICE = GRAFANA_DASHBOARDS_DIRPATH_ON_SERVICE +
USED_PORTS = {
USED_PORTS = {
HTTP_PORT_ID: shared_utils.new_port_spec(HTTP_PORT_NUMBER_UINT16,
HTTP_PORT
_PROTOCOL)
HTTP_PORT_ID: shared_utils.new_port_spec(HTTP_PORT_NUMBER_UINT16,
shared_utils.TCP_PROTOCOL, shared_utils.HTTP_APPLICATION
_PROTOCOL)
}
}
...
...
src/participant_network/cl/lighthouse/lighthouse_launcher.star
View file @
a4bdcb34
...
@@ -48,13 +48,13 @@ PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER"
...
@@ -48,13 +48,13 @@ PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER"
BEACON_USED_PORTS = {
BEACON_USED_PORTS = {
BEACON_TCP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(BEACON_DISCOVERY_PORT_NUM, shared_utils.TCP_PROTOCOL),
BEACON_TCP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(BEACON_DISCOVERY_PORT_NUM, shared_utils.TCP_PROTOCOL),
BEACON_UDP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(BEACON_DISCOVERY_PORT_NUM, shared_utils.UDP_PROTOCOL),
BEACON_UDP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(BEACON_DISCOVERY_PORT_NUM, shared_utils.UDP_PROTOCOL),
BEACON_HTTP_PORT_ID: shared_utils.new_port_spec(BEACON_HTTP_PORT_NUM, shared_utils.TCP_PROTOCOL),
BEACON_HTTP_PORT_ID: shared_utils.new_port_spec(BEACON_HTTP_PORT_NUM, shared_utils.TCP_PROTOCOL
, shared_utils.HTTP_APPLICATION_PROTOCOL
),
BEACON_METRICS_PORT_ID: shared_utils.new_port_spec(BEACON_METRICS_PORT_NUM, shared_utils.TCP_PROTOCOL),
BEACON_METRICS_PORT_ID: shared_utils.new_port_spec(BEACON_METRICS_PORT_NUM, shared_utils.TCP_PROTOCOL
, shared_utils.HTTP_APPLICATION_PROTOCOL
),
}
}
VALIDATOR_USED_PORTS = {
VALIDATOR_USED_PORTS = {
VALIDATOR_HTTP_PORT_ID: shared_utils.new_port_spec(VALIDATOR_HTTP_PORT_NUM, shared_utils.TCP_PROTOCOL),
VALIDATOR_HTTP_PORT_ID: shared_utils.new_port_spec(VALIDATOR_HTTP_PORT_NUM, shared_utils.TCP_PROTOCOL),
VALIDATOR_METRICS_PORT_ID: shared_utils.new_port_spec(VALIDATOR_METRICS_PORT_NUM, shared_utils.TCP_PROTOCOL),
VALIDATOR_METRICS_PORT_ID: shared_utils.new_port_spec(VALIDATOR_METRICS_PORT_NUM, shared_utils.TCP_PROTOCOL
, shared_utils.HTTP_APPLICATION_PROTOCOL
),
}
}
LIGHTHOUSE_LOG_LEVELS = {
LIGHTHOUSE_LOG_LEVELS = {
...
...
src/prometheus/prometheus_launcher.star
View file @
a4bdcb34
...
@@ -7,17 +7,14 @@ IMAGE_NAME = "prom/prometheus:latest"
...
@@ -7,17 +7,14 @@ IMAGE_NAME = "prom/prometheus:latest"
HTTP_PORT_ID = "http"
HTTP_PORT_ID = "http"
HTTP_PORT_NUMBER = 9090
HTTP_PORT_NUMBER = 9090
HTTP_PORT_PROTOCOL = "TCP"
CONFIG_FILENAME = "prometheus-config.yml"
CONFIG_FILENAME = "prometheus-config.yml"
CONFIG_DIR_MOUNTPOINT_ON_PROMETHEUS = "/config"
CONFIG_DIR_MOUNTPOINT_ON_PROMETHEUS = "/config"
USED_PORTS = {
USED_PORTS = {
HTTP_PORT_ID: shared_utils.new_port_spec(HTTP_PORT_NUMBER,
HTTP_PORT
_PROTOCOL)
HTTP_PORT_ID: shared_utils.new_port_spec(HTTP_PORT_NUMBER,
shared_utils.TCP_PROTOCOL, shared_utils.HTTP_APPLICATION
_PROTOCOL)
}
}
def launch_prometheus(config_template, cl_client_contexts):
def launch_prometheus(config_template, cl_client_contexts):
all_cl_nodes_metrics_info = []
all_cl_nodes_metrics_info = []
for client in cl_client_contexts:
for client in cl_client_contexts:
...
...
src/shared_utils/shared_utils.star
View file @
a4bdcb34
TCP_PROTOCOL = "TCP"
TCP_PROTOCOL = "TCP"
UDP_PROTOCOL = "UDP"
UDP_PROTOCOL = "UDP"
HTTP_APPLICATION_PROTOCOL = "http"
OPTIONAL_APPLICATION_PROTOCOL = ""
def new_template_and_data(template, template_data_json):
def new_template_and_data(template, template_data_json):
return struct(template = template, data = template_data_json)
return struct(template = template, data = template_data_json)
...
@@ -24,5 +24,5 @@ def path_dir(path):
...
@@ -24,5 +24,5 @@ def path_dir(path):
return "/".join(split_path) or "/"
return "/".join(split_path) or "/"
def new_port_spec(number,
protocol
):
def new_port_spec(number,
transport_protocol, application_protocol= OPTIONAL_APPLICATION_PROTOCOL
):
return PortSpec(number = number,
protocol =
protocol)
return PortSpec(number = number,
transport_protocol = transport_protocol, application_protocol=application_
protocol)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment