enable validator monitoring regardless of branch

Signed-off-by: Jakub Sokołowski <jakub@status.im>

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

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_auto: true
-beacon_node_validator_monitor_totals: >-
+beacon_node_validator_monitor_totals: '{{ (node.public_api is defined and node.public_api) }}'
-  {{ node.branch == "unstable" and
-    (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

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)
-   ((node.public_api is defined and node.public_api)
+  or (node.end is defined and (node.end - node.start) > 64) }}
-     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) }}'

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://") }}'