add assertoor and assertoor-admin

ethpandaops · Aug 9, 2024 · 681714a · 681714a
1 parent da9ee36
commit 681714a
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 30 deletions.
diff --git a/ansible/inventories/devnet-2/group_vars/all/all.sops.yaml b/ansible/inventories/devnet-2/group_vars/all/all.sops.yaml
@@ -19,14 +19,17 @@ secret_xatu_sentry:
 tx_fuzz_blobs_privkey: ENC[AES256_GCM,data:XUiDF6puTOcP0veM5k2x9PmPSA2vP1FeoxSY7rn0bxLMB0b/DsB7y7bfsjBlgPIiL9f2AOSfsol8WWxd3zT6IA==,iv:qTk22/lpJyWFycayBupQp0sBaw2E2oq7peWypQh+0Ic=,tag:Eeqpv2JCfrsQd5ovOcpdVg==,type:str]
 tx_fuzz_txs_privkey: ENC[AES256_GCM,data:c52KtPzcxyZPj3vQ6tx0Di5uLFy5JoRUSZ5ZH/WEj7nqC7JTwRw3+bNPk8Y43wjE7caqRZ7eq0la0Bc42ydpew==,iv:gHO+ttqzJCbRBCUvmlsTVNQK6vpnGXamIag63HS/fas=,tag:1Qultc6tndFGDuSKjm/TVg==,type:str]
 goomy_private_key: ENC[AES256_GCM,data:+AwqAcOobrvR5gXxdABQki0rH41Ns8H3sJvVtQb5sh/596u1oDPq2bEh6Tpkfx8B+x4rSp+MRQi5wHwk9/Nqcw==,iv:Ibm4sLvU+tNk7EqaSPs/2CRLU1yLlNDgSWjR+uNPrvQ=,tag:oWbWW/jt9pPTWFcRoVTBsg==,type:str]
+nethermind_seq_api_key: ENC[AES256_GCM,data:fxY/OkvHP2w5r2WdAwwGkdPOG9Q=,iv:8RFbkiSRAdtEPHM5JvmQskIHybMuZdbzP1CV1rGp1DM=,tag:HWEciIkJpTbJhumao1CaHA==,type:str]
+nethermind_seq_server: ENC[AES256_GCM,data:tNMBXIUTbUfXP2quBzmzLHUk+/+Dg5wzIQ==,iv:N0JY8nvNIqVQuBvUZF+TtBhgrnwtzCEu40axAxTMwWc=,tag:zFCJZekruevCbvdDAlmakg==,type:str]
+nethermind_push_gateway: ENC[AES256_GCM,data:ZZVpFiiuIPhj1bttOr9pA03/wHS3lY+f6n/DD05PRLEK1Vtla0Pu3I9k1vjZdkkbMYFeLwy+dDUxk6UQeQTFpS430E68O51ers31YF9M4kOFiKVWM1q2cO705QKRjysd2Y52OI1UMk1G3yTJdmIim0cBvt1yZafso05dIZa1Thi+cYQNg0Z6re3QU53GMzbSfg==,iv:TwKc357lNh4ICSQBR/0QbBJrVCZuTOI+1wWXEoVT2Ys=,tag:Hq55iZFPmCPALhR3SWaRNg==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2024-07-30T08:32:14Z"
-    mac: ENC[AES256_GCM,data:WBxuBlwiBcI/Ve98XLMstlfgmWyY+vwB/O1bizT8Lpy530S1atoTZqmVxXitWYUCq98OkgsuEA3lkYo0xdtkfOmNYH6zXoq6uSvxuhrindxJW4Y+f0P7HDsyPi6zOG4wKZOtpSeiqVm2MxBqeKNumqz/pBzsweJvCXmIusrmS/I=,iv:1csI6Ry9j/0PEBskIpNKnUvEVeQo6pTz+sq4hWsPpA8=,tag:uPN0We23FySlIZNmlWrlCQ==,type:str]
+    lastmodified: "2024-08-07T15:20:40Z"
+    mac: ENC[AES256_GCM,data:yb5RtgqdREDi7Nx2QeWdx1l77NxLl2bBNT2yzzGDLiy0NF632QJP2CI/UFiJpZV1r4N9DCGyzPZEKgnR3TQSs4PLNjTBWSYgaeWuqEXuU30gX4r1GxvRtzVLvQhUAFP7yzEfBIkWzkxpGboYvo5DXyrO4Tso2KnvO3UzqVoaGIk=,iv:uR+h6MMS4Qtmw1h1vCGsySPbQILnT6v5OiU1i1BwWJo=,tag:GDdjr+b382mTeiKeNax5qQ==,type:str]
     pgp:
         - created_at: "2023-09-28T11:48:21Z"
           enc: |-

diff --git a/ansible/inventories/devnet-2/group_vars/all/images.yaml b/ansible/inventories/devnet-2/group_vars/all/images.yaml
@@ -1,18 +1,18 @@
 default_ethereum_client_images:
 ### Consensus layer clients
   lighthouse: ethpandaops/lighthouse:electra-devnet-1-51d51f5
-  lodestar: ethpandaops/lodestar:electra-fork-rebasejul30
-  nimbus: ethpandaops/nimbus-eth2:unstable-ae0a148
+  lodestar: ethpandaops/lodestar:electra-fork-rebasejul30-7db51a1
+  nimbus: ethpandaops/nimbus-eth2:unstable-f5d360d
   prysm: ethpandaops/prysm-beacon-chain:develop-4d823ac
   prysm_validator: ethpandaops/prysm-validator:develop-4d823ac
   teku: ethpandaops/teku:master-2d2d17b
-  grandine: ethpandaops/grandine:electra-5a2ffe2
+  grandine: ethpandaops/grandine:electra-d61707d
 ### Execution layer clients
   besu: ethpandaops/besu:main-ec8429f
   geth: ethpandaops/geth:lightclient-prague-devnet-1-37c4b03
   erigon: thorax/erigon:docker_pectra
-  ethereumjs: ethpandaops/ethereumjs:master-b543d2f
-  nethermind: nethermindeth/nethermind:pectra-fix
+  ethereumjs: ethpandaops/ethereumjs:master-f9788a1
+  nethermind: nethermindeth/nethermind:pectra
   reth: ethpandaops/reth:onbjerg-devnet-2-36bc13d
 
 
@@ -39,3 +39,4 @@ default_tooling_images:
   ncli: status-im/nimbus-eth2:unstable
   lcli: sigp/lighthouse:electra-devnet-1
   zcli: electra
+  assertoor: ethpandaops/assertoor:electra-support
diff --git a/ansible/inventories/devnet-2/group_vars/ethereum_node.yaml b/ansible/inventories/devnet-2/group_vars/ethereum_node.yaml
@@ -1,8 +1,9 @@
 ethereum_cl_bootnodes:
   - "{{ hostvars['bootnode-1']['cl_bootnode_fact_enr'] }}"
   - "{{ hostvars['bootnode-1']['ethereum_node_fact_cl_enr'] }}"
+  - "{{ hostvars['lighthouse-geth-1']['ethereum_node_fact_cl_enr'] }}"
 
-ethereum_el_bootnodes: 
+ethereum_el_bootnodes:
   - "{{ hostvars['bootnode-1']['ethereum_node_fact_el_enode'] }}"
   - "{{ hostvars['lighthouse-geth-1']['ethereum_node_fact_el_enode'] }}"
   - "{{ hostvars['lodestar-geth-1']['ethereum_node_fact_el_enode'] }}"

diff --git a/ansible/inventories/devnet-2/group_vars/grandine.yaml b/ansible/inventories/devnet-2/group_vars/grandine.yaml
@@ -34,6 +34,8 @@ grandine_container_command_extra_args:
   - --boot-nodes={{ ethereum_cl_bootnodes | join(',') }}
   - --graffiti={{ ansible_hostname }}
   - --features=WarnOnStateCacheSlotProcessing
+  - --features=LogHttpRequests
+  - --features=LogHttpBodies
 grandine_validator_container_volumes:
   - "{{ grandine_validator_datadir }}:/validator-data"
   - "{{ eth_testnet_config_dir }}:/network-config:ro"

diff --git a/ansible/inventories/devnet-2/group_vars/nethermind.yaml b/ansible/inventories/devnet-2/group_vars/nethermind.yaml
@@ -35,11 +35,15 @@ nethermind_container_command_extra_args:
   - --Init.IsMining=false
   - --Pruning.Mode=None
   - --config=none.cfg
-  - --EthStats.Enabled=true
-  - --EthStats.Name={{ inventory_hostname }}
-  - --EthStats.Secret={{ ethstats_secret }}
-  - --EthStats.Server=wss://{{ ethstats_url }}/api/
-  - --log=DEBUG
+  # - --EthStats.Enabled=true
+  # - --EthStats.Name={{ inventory_hostname }}
+  # - --EthStats.Secret={{ ethstats_secret }}
+  # - --EthStats.Server=wss://{{ ethstats_url }}/api/
+  - --log=INFO
+  - --Seq.MinLevel=Info
+  - --Seq.ServerUrl={{ nethermind_seq_server }}
+  - --Seq.ApiKey={{ nethermind_seq_api_key }}
+  - --Metrics.PushGatewayUrl={{ nethermind_push_gateway }}
 
 nethermind_container_pull: true
 

diff --git a/ansible/inventories/devnet-2/group_vars/reth.yaml b/ansible/inventories/devnet-2/group_vars/reth.yaml
@@ -21,7 +21,7 @@ reth_container_volumes:
 reth_container_command_extra_args:
   - --chain=/network-config/genesis.json
   - --bootnodes={{ ethereum_el_bootnodes | join(',') }}
-  - --http.api=trace,rpc,eth,debug,web3
+  - --http.api=trace,rpc,eth,debug,web3,admin
 prometheus_config: |
   global:
     scrape_interval: 30s

diff --git a/ansible/inventories/devnet-2/inventory.ini b/ansible/inventories/devnet-2/inventory.ini
@@ -4,7 +4,7 @@ localhost
 ethereum_network_name=pectra-devnet-2
 
 [bootnode]
-bootnode-1 ansible_host=68.183.76.52 ipv6=2a03:b0c0:3:d0::1b58:5001 cloud=digitalocean cloud_region=fra1 
+bootnode-1 ansible_host=68.183.76.52 ipv6=2a03:b0c0:3:d0::1b58:5001 cloud=digitalocean cloud_region=fra1
 
 [grandine_besu]
 grandine-besu-1 ansible_host=46.101.214.247 ipv6=2a03:b0c0:3:d0::1c7d:a001 cloud=digitalocean cloud_region=fra1 validator_start=5700 validator_end=5900
@@ -124,14 +124,13 @@ lighthouse_ethereumjs
 lighthouse_geth
 lighthouse_nethermind
 lighthouse_reth
-lodestar_erigon
-grandine_erigon
 [lodestar:children]
 lodestar_besu
 lodestar_ethereumjs
 lodestar_geth
 lodestar_nethermind
 lodestar_reth
+lodestar_erigon
 [nimbus:children]
 nimbus_besu
 nimbus_erigon
@@ -159,6 +158,7 @@ grandine_ethereumjs
 grandine_geth
 grandine_nethermind
 grandine_reth
+grandine_erigon
 
 # Execution client groups
 
@@ -174,15 +174,15 @@ grandine_ethereumjs
 lighthouse_ethereumjs
 lodestar_ethereumjs
 teku_ethereumjs
+nimbus_ethereumjs
+prysm_ethereumjs
 [geth:children]
 grandine_geth
 lighthouse_geth
 lodestar_geth
 nimbus_geth
 prysm_geth
 teku_geth
-nimbus_ethereumjs
-prysm_ethereumjs
 [nethermind:children]
 grandine_nethermind
 lighthouse_nethermind
@@ -227,4 +227,10 @@ consensus_node
 execution_node
 
 [tx_fuzz_txs]
+bootnode-1
+
+[tx_fuzz_blobs]
+bootnode-1
+
+[goomy]
 bootnode-1
diff --git a/kubernetes/devnet-2/assertoor/values.yaml b/kubernetes/devnet-2/assertoor/values.yaml
@@ -21,21 +21,21 @@ assertoor:
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt-production
     hosts:
-      - host: assertoor-admin.pectra-devnet-2.ethpandaops.io
+      - host: assertoor.pectra-devnet-2.ethpandaops.io
         paths:
           - path: /
             pathType: Prefix
 
-  # ingressAdmin:
-  #   enabled: true
-  #   className: ingress-nginx-public
-  #   annotations:
-  #     cert-manager.io/cluster-issuer: letsencrypt-production
-  #   hosts:
-  #     - host: assertoor-admin.pectra-devnet-2.ethpandaops.io
-  #       paths:
-  #         - path: /
-  #           pathType: Prefix
+  ingressAdmin:
+    enabled: true
+    className: ingress-nginx-public
+    annotations:
+      cert-manager.io/cluster-issuer: letsencrypt-production
+    hosts:
+      - host: assertoor-admin.pectra-devnet-2.ethpandaops.io
+        paths:
+          - path: /
+            pathType: Prefix
 
   endpoints:
     - name:  bootnode-1