From 3366cd40efccf0d3869bf54f0e1778a3c3bd8a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Wed, 1 Jun 2022 11:47:50 +0200
Subject: [PATCH] enable validator monitoring regardless of branch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ansible/group_vars/nimbus.kiln.yml    | 3 +++
 ansible/group_vars/nimbus.mainnet.yml | 6 ++----
 ansible/group_vars/nimbus.prater.yml  | 8 +++-----
 ansible/group_vars/nimbus.ropsten.yml | 3 +++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ansible/group_vars/nimbus.kiln.yml b/ansible/group_vars/nimbus.kiln.yml
index 2869d9c..bc44e77 100644
--- a/ansible/group_vars/nimbus.kiln.yml
+++ b/ansible/group_vars/nimbus.kiln.yml
@@ -39,6 +39,9 @@ beacon_node_network: 'kiln'
 beacon_node_repo_branch: 'kiln-dev-auth'
 # Builds
 beacon_node_build_frequency: 'daily'
+# Monitoring
+beacon_node_validator_monitor_auto: true
+beacon_node_validator_monitor_totals: true
 # Eth1 Sync
 beacon_node_web3_urls: ['ws://{{ hostname }}.wg:{{ geth_websocket_port }}']
 # Light client data
diff --git a/ansible/group_vars/nimbus.mainnet.yml b/ansible/group_vars/nimbus.mainnet.yml
index b1b2cae..2bee0a4 100644
--- a/ansible/group_vars/nimbus.mainnet.yml
+++ b/ansible/group_vars/nimbus.mainnet.yml
@@ -20,10 +20,8 @@ beacon_node_build_frequency: '*-*-* {{ 12 + port_offset }}:00:00'
 # Tuning
 beacon_node_threads: '{{ (node.branch == "testing") | ternary(4, 1) }}'
 # Monitoring
-beacon_node_validator_monitor_auto: '{{ node.branch == "unstable" }}'
-beacon_node_validator_monitor_totals: >-
-  {{ node.branch == "unstable" and
-    (node.public_api is defined and node.public_api) }}
+beacon_node_validator_monitor_auto: true
+beacon_node_validator_monitor_totals: '{{ (node.public_api is defined and 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 76e7e80..f7fb64c 100644
--- a/ansible/group_vars/nimbus.prater.yml
+++ b/ansible/group_vars/nimbus.prater.yml
@@ -25,12 +25,10 @@ beacon_node_threads: >-
        (node.branch == "testing") | ternary(4, 1)
   ) }}
 # Monitoring
-beacon_node_validator_monitor_auto: '{{ node.branch == "unstable" }}'
+beacon_node_validator_monitor_auto: true
 beacon_node_validator_monitor_totals: >-
-  {{ node.branch == "unstable" and
-   ((node.public_api is defined and node.public_api)
-     or
-    (node.end is defined and (node.end - node.start) > 64)) }}
+  {{ (node.public_api is defined and node.public_api)
+  or (node.end is defined and (node.end - node.start) > 64) }}
 # Builds
 beacon_node_build_frequency: '{{ node.get("build_freq", "daily") }}'
 beacon_node_build_start_time: '{{ node.get("build_start", omit) }}'
diff --git a/ansible/group_vars/nimbus.ropsten.yml b/ansible/group_vars/nimbus.ropsten.yml
index bec0a13..dc817e0 100644
--- a/ansible/group_vars/nimbus.ropsten.yml
+++ b/ansible/group_vars/nimbus.ropsten.yml
@@ -5,6 +5,9 @@ beacon_node_network: 'ropsten'
 beacon_node_repo_branch: 'unstable'
 # Builds
 beacon_node_build_frequency: 'daily'
+# Monitoring
+beacon_node_validator_monitor_auto: true
+beacon_node_validator_monitor_totals: true
 # HTTP RPC support is unstable
 beacon_node_web3_urls: '{{ beacon_node_web3_urls_all | reject("match", "^http://") }}'