Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,6 @@ optimism_package:
# A list of optional extra params that will be passed to the supervisor container for modifying its behaviour
extra_params: []

# Network name, used to enable syncing of alternative networks
# Defaults to "kurtosis"
network: "kurtosis"

# AltDA Deploy Configuration, which is passed to op-deployer.
#
# For simplicity we currently enforce chains to all be altda or all rollups.
Expand Down
7 changes: 3 additions & 4 deletions src/interop/op-supervisor/op_supervisor_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,11 @@ def launch(
observability_helper,
)

supervisor_service = plan.add_service(
interop_constants.SUPERVISOR_SERVICE_NAME, config
)
service = plan.add_service(interop_constants.SUPERVISOR_SERVICE_NAME, config)

observability.register_op_service_metrics_job(
observability_helper, supervisor_service, supervisor_params.network
observability_helper,
service,
)

return "op_supervisor"
Expand Down
8 changes: 5 additions & 3 deletions src/observability/observability.star
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def new_metrics_job(
}


def register_op_service_metrics_job(helper, service, network_name):
def register_op_service_metrics_job(helper, service, network_name=None):
register_service_metrics_job(
helper,
service_name=service.name,
Expand All @@ -95,17 +95,19 @@ def register_op_service_metrics_job(helper, service, network_name):
def register_service_metrics_job(
helper,
service_name,
network_name,
endpoint,
network_name=None,
metrics_path="",
additional_labels={},
scrape_interval=DEFAULT_SCRAPE_INTERVAL,
):
labels = {
"service": service_name,
"namespace": service_name,
"stack_optimism_io_network": network_name,
}
if network_name != None:
labels["stack_optimism_io_network"] = network_name

labels.update(additional_labels)

add_metrics_job(
Expand Down
2 changes: 0 additions & 2 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ def input_parser(plan, input_args):
"dependency_set"
],
extra_params=results["interop"]["supervisor_params"]["extra_params"],
network=results["interop"]["supervisor_params"]["network"],
),
),
altda_deploy_config=struct(
Expand Down Expand Up @@ -516,7 +515,6 @@ def default_supervisor_params():
"image": DEFAULT_SUPERVISOR_IMAGES["op-supervisor"],
"dependency_set": "",
"extra_params": [],
"network": constants.NETWORK_NAME,
}


Expand Down
1 change: 0 additions & 1 deletion src/package_io/sanity_check.star
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ SUPERVISOR_PARAMS = [
"image",
"dependency_set",
"extra_params",
"network",
]

ALTDA_DEPLOY_CONFIG_PARAMS = [
Expand Down
Loading