From 43b238c87ee43fa8fc259469ddbd3177e0a15c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Wed, 7 Jun 2023 18:12:59 +0200
Subject: [PATCH] nimbus.all: use new --validator-monitor-details flag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replaced `--validator-monitor-totals` in:
https://github.com/status-im/nimbus-eth2/pull/4468

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ansible/group_vars/nimbus.mainnet.yml | 2 +-
 ansible/group_vars/nimbus.prater.yml  | 6 +++---
 ansible/group_vars/nimbus.sepolia.yml | 2 +-
 ansible/requirements.yml              | 6 +++---
 ansible/vars/nimbus-sepolia-trial.yml | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ansible/group_vars/nimbus.mainnet.yml b/ansible/group_vars/nimbus.mainnet.yml
index 692e38e..15d8d19 100644
--- a/ansible/group_vars/nimbus.mainnet.yml
+++ b/ansible/group_vars/nimbus.mainnet.yml
@@ -59,7 +59,7 @@ beacon_node_rest_allow_origin: '{{ "*" if node.get("public_api") else "" }}'
 beacon_node_history_retention: '{{ "archive" if node.get("public_api") else node.get("history", "prune") }}'
 # Monitoring
 beacon_node_validator_monitor_auto: true
-beacon_node_validator_monitor_totals: '{{ (node.public_api is defined and node.public_api) }}'
+beacon_node_validator_monitor_details: '{{ node.public_api is not defined or not node.public_api }}'
 # Mainnet validators run on a separate fleet.
 beacon_node_dist_validators_enabled: false
 # Bootnodes should subscribe to all subnets
diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml
index 7e22ac0..2dac61d 100644
--- a/ansible/group_vars/nimbus.prater.yml
+++ b/ansible/group_vars/nimbus.prater.yml
@@ -74,9 +74,9 @@ beacon_node_threads: '{{ (node.branch == "libp2p") | ternary(1, beacon_node_core
 beacon_node_history_retention: '{{ "archive" if node.get("public_api") else node.get("history", "prune") }}'
 # Monitoring
 beacon_node_validator_monitor_auto: true
-beacon_node_validator_monitor_totals: >-
-  {{ (node.public_api is defined and node.public_api)
-  or (node.end is defined and (node.end - node.start) > 64) }}
+beacon_node_validator_monitor_details: >-
+  {{ (node.public_api is not defined or not node.public_api)
+  or (node.end is defined and (node.end - node.start) <= 64) }}
 # Builds
 beacon_node_nim_commit: '{{ node.get("nim_commit", "") }}'
 beacon_node_build_nim_flags: '-d:noSignalHandler {{ node.get("nim_flags", "") }}'
diff --git a/ansible/group_vars/nimbus.sepolia.yml b/ansible/group_vars/nimbus.sepolia.yml
index 496d1f3..dcad680 100644
--- a/ansible/group_vars/nimbus.sepolia.yml
+++ b/ansible/group_vars/nimbus.sepolia.yml
@@ -35,7 +35,7 @@ beacon_node_payload_builder_url: 'https://builder-relay-sepolia.flashbots.net/'
 beacon_node_build_frequency: 'daily'
 # Monitoring
 beacon_node_validator_monitor_auto: true
-beacon_node_validator_monitor_totals: true
+beacon_node_validator_monitor_details: true
 # Execution layer Enginer API
 beacon_node_exec_layer_urls: ['http://localhost:{{ geth_authrpc_port }}']
 beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret | mandatory }}'
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 51e9b9d..e3c842e 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -45,17 +45,17 @@
 
 - name: infra-role-beacon-node-linux
   src: git@github.com:status-im/infra-role-beacon-node-linux.git
-  version: 03511966a3e37a9f938252664e8dd994bc6782e7
+  version: fdce4431166cc9597c37aa4f671f187760f0c215
   scm: git
 
 - name: infra-role-beacon-node-windows
   src: git@github.com:status-im/infra-role-beacon-node-windows.git
-  version: de22753601da174ab1edf87b53fd996941bae4c7
+  version: 17f18a0e445e34ffe24e5664b218c17abf578bb6
   scm: git
 
 - name: infra-role-beacon-node-macos
   src: git@github.com:status-im/infra-role-beacon-node-macos.git
-  version: 04d162bd4b4803324034b7eef6f11e2bf6866838
+  version: e6edefb9f619673690233d0c1c619e98c0ec94d9
   scm: git
 
 - name: infra-role-validator-client
diff --git a/ansible/vars/nimbus-sepolia-trial.yml b/ansible/vars/nimbus-sepolia-trial.yml
index 5c71850..38c63d2 100644
--- a/ansible/vars/nimbus-sepolia-trial.yml
+++ b/ansible/vars/nimbus-sepolia-trial.yml
@@ -27,7 +27,7 @@ beacon_node_build_nim_flags: '-d:noSignalHandler {{ node.get("nim_flags", "") }}
 beacon_node_build_frequency: 'daily'
 # Monitoring
 beacon_node_validator_monitor_auto: true
-beacon_node_validator_monitor_totals: true
+beacon_node_validator_monitor_details: true
 # Execution layer Enginer API
 beacon_node_exec_layer_urls: ['ws://localhost:{{ nimbus_eth1_engine_ws_port }}']
 beacon_node_exec_layer_jwt_secret: '{{ nimbus_eth1_jwt_secret }}'