update values

ethpandaops · Nov 22, 2024 · 2bdb628 · 2bdb628
1 parent 86986ee
commit 2bdb628
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 38 deletions.
diff --git a/ansible/inventories/devnet-0/group_vars/all/all.yaml b/ansible/inventories/devnet-0/group_vars/all/all.yaml
@@ -102,6 +102,12 @@ node_exporter_container_image: "{{ default_tooling_images.node_exporter }}"
 prometheus_container_image: "{{ default_tooling_images.prometheus }}"
 vector_container_image: "{{ default_tooling_images.vector }}"
 json_rpc_snooper_container_image: "{{ default_tooling_images.snooper }}"
+docker_nginx_proxy_container_image: "{{ default_tooling_images.nginx }}"
+
+# role: ethpandaops.general.eth_testnet_config
+eth_testnet_config_git_enabled: true
+eth_testnet_config_git_repo: https://github.com/ethpandaops/nft-devnets.git
+eth_testnet_config_git_version: master
 
 # role: ethpandaops.general.ethereum_node
 ethereum_node_images_always_pull: true
@@ -132,7 +138,7 @@ traffic_control_rules:
 
 # role: ethpandaops.general.xatu_sentry
 xatu_sentry_container_image: "{{ default_tooling_images.xatu_sentry }}"
-xatu_sentry_config_name: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+xatu_sentry_config_name: "{{ inventory_hostname }}"
 xatu_sentry_config_server_address: "{{ secret_xatu_sentry.server_address }}"
 xatu_sentry_config_server_auth_user: "{{ secret_xatu_sentry.user }}"
 xatu_sentry_config_server_auth_password: "{{ secret_xatu_sentry.password }}"

diff --git a/ansible/inventories/devnet-0/group_vars/all/images.yaml b/ansible/inventories/devnet-0/group_vars/all/images.yaml
@@ -1,6 +1,6 @@
 default_ethereum_client_images:
 ### Consensus layer clients
-  lighthouse: docker.ethquokkaops.io/dh/sigp/lighthouse:v5.3.0
+  lighthouse: docker.ethquokkaops.io/dh/sigp/lighthouse:latest-unstable
   lodestar: docker.ethquokkaops.io/dh/chainsafe/lodestar:v1.23.0
   nimbus: docker.ethquokkaops.io/dh/statusim/nimbus-eth2:multiarch-v24.10.0
   prysm: docker.ethquokkaops.io/gcr/prysmaticlabs/prysm/beacon-chain:latest
@@ -27,13 +27,15 @@ default_tooling_images:
   ethstats: docker.ethquokkaops.io/dh/skylenet/ethstats-server:poa-no-geoip
   homepage: docker.ethquokkaops.io/dh/ethpandaops/ethereum-testnet-homepage:latest
   checkpointz: docker.ethquokkaops.io/dh/ethpandaops/checkpointz:latest
-  blockscout: docker.ethquokkaops.io/dh/blockscout/blockscout:master
+  blockscout: docker.ethquokkaops.io/dh/blockscout/blockscout:latest
+  blockscout_frontend: docker.ethquokkaops.io/dh/ghcr.io/blockscout/frontend:latest
   beacon_metrics_gazer: docker.ethquokkaops.io/dh/dapplion/beacon-metrics-gazer:latest
   eth_fauceth: docker.ethquokkaops.io/dh/chainflag/eth-faucet:latest
   blobscan: docker.ethquokkaops.io/dh/blossomlabs/blobscan:latest
   blobscan_indexer: docker.ethquokkaops.io/dh/blossomlabs/blobscan-indexer:latest
   node_exporter: docker.ethquokkaops.io/dh/prom/node-exporter:v1.5.0
   vector: docker.ethquokkaops.io/dh/timberio/vector:0.30.0-alpine
+  nginx: docker.ethquokkaops.io/dh/nginx:alpine
   prometheus: docker.ethquokkaops.io/dh/prom/prometheus:v2.40.7
   snooper: docker.ethquokkaops.io/dh/ethpandaops/json-rpc-snoop:1.1.0
   dora: docker.ethquokkaops.io/dh/ethpandaops/dora:master

diff --git a/ansible/inventories/devnet-0/group_vars/backbone_nodes.yaml b/ansible/inventories/devnet-0/group_vars/backbone_nodes.yaml
@@ -0,0 +1,5 @@
+# role: ethpandaops.general.traffic_control
+traffic_control_rules:
+  - interface: eth0
+    rate_download: 500mbit
+    rate_upload: 500mbit
diff --git a/ansible/inventories/devnet-0/group_vars/erigon.yaml b/ansible/inventories/devnet-0/group_vars/erigon.yaml
@@ -31,7 +31,7 @@ prometheus_config: |
     evaluation_interval: 30s
     scrape_timeout: 10s
     external_labels:
-      instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+      instance: "{{ inventory_hostname }}"
       ip_address: "{{ ansible_host }}"
       network: "{{ ethereum_network_name }}"
       testnet: "{{ ethereum_network_name }}"
@@ -55,28 +55,28 @@ prometheus_config: |
       static_configs:
         - targets: ["localhost:9090"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "node"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["172.17.0.1:9100"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "exporter"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["ethereum-metrics-exporter:9090"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "consensus_node"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["{{ vars[ethereum_node_cl + '_container_name'] }}:{{ ethereum_node_cl_ports_metrics }}"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "execution"
       metrics_path: "/debug/metrics/prometheus"
       static_configs:
         - targets: ["execution:{{ ethereum_node_el_ports_metrics }}"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
diff --git a/ansible/inventories/devnet-0/group_vars/geth.yaml b/ansible/inventories/devnet-0/group_vars/geth.yaml
@@ -36,7 +36,7 @@ prometheus_config: |
     evaluation_interval: 30s
     scrape_timeout: 10s
     external_labels:
-      instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+      instance: "{{ inventory_hostname }}"
       ip_address: "{{ ansible_host }}"
       network: "{{ ethereum_network_name }}"
       testnet: "{{ ethereum_network_name }}"
@@ -60,28 +60,28 @@ prometheus_config: |
       static_configs:
         - targets: ["localhost:9090"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "node"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["172.17.0.1:9100"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "exporter"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["ethereum-metrics-exporter:9090"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "consensus_node"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["{{ vars[ethereum_node_cl + '_container_name'] }}:{{ ethereum_node_cl_ports_metrics }}"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "execution"
       metrics_path: "/debug/metrics/prometheus"
       static_configs:
         - targets: ["execution:{{ ethereum_node_el_ports_metrics }}"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
diff --git a/ansible/inventories/devnet-0/group_vars/nethermind.yaml b/ansible/inventories/devnet-0/group_vars/nethermind.yaml
@@ -47,7 +47,7 @@ prometheus_config: |
     evaluation_interval: 30s
     scrape_timeout: 10s
     external_labels:
-      instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+      instance: "{ inventory_hostname }}"
       ip_address: "{{ ansible_host }}"
       network: "{{ ethereum_network_name }}"
       testnet: "{{ ethereum_network_name }}"
@@ -71,28 +71,28 @@ prometheus_config: |
       static_configs:
         - targets: ["localhost:9090"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "node"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["172.17.0.1:9100"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "exporter"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["ethereum-metrics-exporter:9090"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "consensus_node"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["{{ vars[ethereum_node_cl + '_container_name'] }}:{{ ethereum_node_cl_ports_metrics }}"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "execution"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["execution:{{ ethereum_node_el_ports_metrics }}"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
diff --git a/ansible/inventories/devnet-0/group_vars/reth.yaml b/ansible/inventories/devnet-0/group_vars/reth.yaml
@@ -25,7 +25,7 @@ prometheus_config: |
     evaluation_interval: 30s
     scrape_timeout: 10s
     external_labels:
-      instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+      instance: "{{ inventory_hostname }}"
       ip_address: "{{ ansible_host }}"
       network: "{{ ethereum_network_name }}"
       testnet: "{{ ethereum_network_name }}"
@@ -49,28 +49,28 @@ prometheus_config: |
       static_configs:
         - targets: ["localhost:9090"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "node"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["172.17.0.1:9100"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "exporter"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["ethereum-metrics-exporter:9090"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "consensus_node"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["{{ vars[ethereum_node_cl + '_container_name'] }}:{{ ethereum_node_cl_ports_metrics }}"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
     - job_name: "execution"
       metrics_path: "/metrics"
       static_configs:
         - targets: ["execution:{{ ethereum_node_el_ports_metrics }}"]
           labels:
-            instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
+            instance: "{{ inventory_hostname }}"
diff --git a/ansible/inventories/devnet-0/inventory.ini b/ansible/inventories/devnet-0/inventory.ini
@@ -681,3 +681,26 @@ reth
 [ethereum_node:children]
 consensus_node
 execution_node
+
+[backbone_nodes]
+teku-geth-1
+teku-geth-2
+teku-geth-3
+teku-geth-4
+teku-geth-5
+teku-nethermind-1
+teku-nethermind-2
+lighthouse-geth-1
+lighthouse-geth-2
+lighthouse-geth-3
+lighthouse-geth-4
+lighthouse-geth-5
+lighthouse-nethermind-1
+lighthouse-nethermind-2
+prysm-geth-1
+prysm-geth-2
+prysm-geth-3
+prysm-geth-4
+prysm-geth-5
+prysm-netehrmind-1
+prysm-nethermind-2
diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml
@@ -70,17 +70,10 @@
       tags: [docker_nginx_proxy]
     - role: ethpandaops.general.generate_basic_auth_nginx
       tags: [docker_nginx_proxy]
-  post_tasks:
-    - name: Wait between runs
-      tags: [ethereum, ethereum_node]
-      ansible.builtin.pause:
-        seconds: >-
-          {{
-            batch_count is defined | ternary(
-                (batch_wait_seconds | default(30)),
-                0
-              )
-          }}
+
+- hosts: bootnode
+  become: true
+  tasks:
     - name: Refresh inventory web
       ansible.builtin.import_role:
         name: ethpandaops.general.ethereum_inventory_web