feat: enable prom and grafana to be ran separatly

.github/tests/mev-commit-boost.yaml

@@ -8,7 +8,8 @@ additional_services:
   - custom_flood
   - forkmon
   - dora
-  - prometheus_grafana
+  - prometheus
+  - grafana
 mev_params:
   mev_boost_image: ghcr.io/commit-boost/pbs:latest
 network_params:

.github/tests/mev-pectra.yaml

@@ -21,8 +21,8 @@ participants:
     el_image: erigontech/erigon:v3.0.2
     el_extra_params: ["--miner.extradata=prysmFromLocal"]
     cl_type: prysm
-    cl_image: prysmaticlabs/prysm-beacon-chain:v6.0.1
-    vc_image: prysmaticlabs/prysm-validator:v6.0.1
+    cl_image: offchainlabs/prysm-beacon-chain:v6.0.1
+    vc_image: offchainlabs/prysm-validator:v6.0.1
 
   - el_type: besu
     el_image: hyperledger/besu:25.4.1

.github/tests/mev.yaml

@@ -14,7 +14,8 @@ additional_services:
   - custom_flood
   - spamoor
   - dora
-  - prometheus_grafana
+  - prometheus
+  - grafana
 network_params:
   seconds_per_slot: 6
 docker_cache_params:

.github/tests/mix-public.yaml

@@ -40,7 +40,8 @@ additional_services:
   - tx_fuzz
   - forkmon
   - dora
-  - prometheus_grafana
+  - prometheus
+  - grafana
   - custom_flood
   - blobscan
   - dugtrio

.github/tests/mix-with-tools-mev.yaml

@@ -15,7 +15,8 @@ additional_services:
   - tx_fuzz
   - forkmon
   - dora
-  - prometheus_grafana
+  - prometheus
+  - grafana
   - custom_flood
   - blobscan
   - blockscout

.github/tests/mix-with-tools-minimal.yaml

@@ -17,7 +17,8 @@ additional_services:
   - tx_fuzz
   - forkmon
   - dora
-  - prometheus_grafana
+  - prometheus
+  - grafana
   - custom_flood
   - blobscan
   - blockscout

.github/tests/mix-with-tools.yaml

@@ -17,7 +17,8 @@ additional_services:
   - tx_fuzz
   - forkmon
   - dora
-  - prometheus_grafana
+  - prometheus
+  - grafana
   - custom_flood
   - blobscan
   - dugtrio

.github/tests/pectra.yaml.norun

@@ -20,8 +20,8 @@ participants_matrix:
     - cl_type: lodestar
       cl_image: chainsafe/lodestar:v1.29.0
     - cl_type: prysm
-      cl_image: prysmaticlabs/prysm-beacon-chain:v6.0.0
-      vc_image: prysmaticlabs/prysm-validator:v6.0.0
+      cl_image: offchainlabs/prysm-beacon-chain:v6.0.0
+      vc_image: offchainlabs/prysm-validator:v6.0.0
 network_params:
   electra_fork_epoch: 1
   min_validator_withdrawability_delay: 1

.github/tests/peerdas-fulu.yaml.norun

@@ -73,7 +73,8 @@ network_params:
 additional_services:
   - dora
   - spamoor
-  - prometheus_grafana
+  - prometheus
+  - grafana
 
 snooper_enabled: false
 

README.md

@@ -229,7 +229,7 @@ participants:
     # - lighthouse: sigp/lighthouse:latest
     # - teku: consensys/teku:latest
     # - nimbus: statusim/nimbus-eth2:multiarch-latest
-    # - prysm: gcr.io/prysmaticlabs/prysm/beacon-chain:latest
+    # - prysm: gcr.io/offchainlabs/prysm/beacon-chain:latest
     # - lodestar: chainsafe/lodestar:next
     # - grandine: sifrai/grandine:stable
     cl_image: ""
@@ -299,7 +299,7 @@ participants:
     # - lighthouse: sigp/lighthouse:latest
     # - lodestar: chainsafe/lodestar:latest
     # - nimbus: statusim/nimbus-validator-client:multiarch-latest
-    # - prysm: gcr.io/prysmaticlabs/prysm/validator:latest
+    # - prysm: gcr.io/offchainlabs/prysm/validator:latest
     # - teku: consensys/teku:latest
     # - vero: ghcr.io/serenita-org/vero:master
     vc_image: ""
@@ -730,7 +730,8 @@ additional_services:
   - blockscout
   - dora
   - full_beaconchain_explorer
-  - prometheus_grafana
+  - prometheus
+  - grafana
   - blobscan
   - dugtrio
   - blutgang
@@ -1192,7 +1193,7 @@ network_params:
 </details>
 
 <details>
-    <summary>A 2-node geth/lighthouse network with optional services (Grafana, Prometheus, tx_fuzz, EngineAPI snooper, and a testnet verifier)</summary>
+    <summary>A 2-node geth/lighthouse network with optional services (Grafana, Prometheus, tx_fuzz, EngineAPI snooper)</summary>
 
 ```yaml
 participants:
@@ -1201,7 +1202,9 @@ participants:
     count: 2
 snooper_enabled: true
 additional_services:
-  - prometheus_grafana
+  - prometheus
+  - grafana
+  - tx_fuzz
 ethereum_metrics_exporter_enabled: true
 ```
 

main.star

@@ -640,6 +640,36 @@ def run(plan, args={}):
                 index,
             )
             plan.print("Successfully launched full-beaconchain-explorer")
+        elif additional_service == "grafana":
+            plan.print("Launching grafana...")
+            grafana.launch_grafana(
+                plan,
+                grafana_datasource_config_template,
+                grafana_dashboards_config_template,
+                prometheus_private_url,
+                global_node_selectors,
+                args_with_right_defaults.grafana_params,
+                args_with_right_defaults.port_publisher,
+                index,
+            )
+            plan.print("Successfully launched grafana")
+        elif additional_service == "prometheus":
+            plan.print("Launching prometheus...")
+            prometheus_private_url = prometheus.launch_prometheus(
+                plan,
+                all_el_contexts,
+                all_cl_contexts,
+                all_vc_contexts,
+                all_remote_signer_contexts,
+                prometheus_additional_metrics_jobs,
+                all_ethereum_metrics_exporter_contexts,
+                all_xatu_sentry_contexts,
+                global_node_selectors,
+                args_with_right_defaults.prometheus_params,
+                args_with_right_defaults.port_publisher,
+                index,
+            )
+            plan.print("Successfully launched prometheus")
         elif additional_service == "prometheus_grafana":
             # Allow prometheus to be launched last so is able to collect metrics from other services
             launch_prometheus_grafana = True

src/package_io/input_parser.star

@@ -20,7 +20,7 @@ DEFAULT_CL_IMAGES = {
     "lighthouse": "sigp/lighthouse:latest",
     "teku": "consensys/teku:develop",
     "nimbus": "statusim/nimbus-eth2:multiarch-latest",
-    "prysm": "gcr.io/prysmaticlabs/prysm/beacon-chain:stable",
+    "prysm": "gcr.io/offchainlabs/prysm/beacon-chain:stable",
     "lodestar": "chainsafe/lodestar:latest",
     "grandine": "sifrai/grandine:stable",
 }
@@ -38,7 +38,7 @@ DEFAULT_VC_IMAGES = {
     "lighthouse": "sigp/lighthouse:latest",
     "lodestar": "chainsafe/lodestar:latest",
     "nimbus": "statusim/nimbus-validator-client:multiarch-latest",
-    "prysm": "gcr.io/prysmaticlabs/prysm/validator:stable",
+    "prysm": "gcr.io/offchainlabs/prysm/validator:stable",
     "teku": "consensys/teku:develop",
     "grandine": "sifrai/grandine:stable",
     "vero": "ghcr.io/serenita-org/vero:master",
@@ -232,6 +232,18 @@ def input_parser(plan, input_args):
     if result["port_publisher"]["nat_exit_ip"] == "auto":
         result["port_publisher"]["nat_exit_ip"] = get_public_ip(plan)
 
+    if "prometheus_grafana" in result["additional_services"]:
+        plan.print(
+            "prometheus_grafana in no longer supported, please use 'prometheus' and 'grafana' instead in the additional_services field"
+        )
+        if (
+            "grafana" in result["additional_services"]
+            or "prometheus" in result["additional_services"]
+        ):
+            fail(
+                "Please do not define 'grafana' or 'prometheus' in the additional_services field when 'prometheus_grafana' is used to launch both"
+            )
+
     return struct(
         participants=[
             struct(

src/package_io/sanity_check.star

@@ -308,6 +308,8 @@ ADDITIONAL_SERVICES_PARAMS = [
     "dora",
     "full_beaconchain_explorer",
     "prometheus_grafana",
+    "prometheus",
+    "grafana",
     "blobscan",
     "dugtrio",
     "blutgang",