From 9b54c84d96822d8a4324209a66421db54b8236e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 21 Jan 2022 12:27:06 +0100 Subject: [PATCH] enable validator monitoring flags for unstable nodes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Once the next release is out we can drop the `unstable` conditionals. Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.mainnet.yml | 9 +++++++-- ansible/group_vars/nimbus.prater.yml | 11 +++++++++-- ansible/group_vars/nimbus.pyrmont.yml | 9 ++++++++- ansible/requirements.yml | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ansible/group_vars/nimbus.mainnet.yml b/ansible/group_vars/nimbus.mainnet.yml index 9bec513..fc3e579 100644 --- a/ansible/group_vars/nimbus.mainnet.yml +++ b/ansible/group_vars/nimbus.mainnet.yml @@ -19,6 +19,11 @@ beacon_node_firewall_libp2p_open: '{{ node.get("open_libp2p_ports", true) }}' 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) }} # Mainnet validators run on a separate fleet. beacon_node_dist_validators_enabled: false # Bootnodes should subscribe to all subnets @@ -44,13 +49,13 @@ nodes_layout: - { branch: 'stable', num: 2 } - { branch: 'testing', num: 1, open_libp2p_ports: false } - { branch: 'testing', num: 2 } - - { branch: 'unstable', num: 1 } # Public Beacon API + - { branch: 'unstable', num: 1, public_api: true } - { branch: 'unstable', num: 2 } 'metal-02.he-eu-hel1.nimbus.mainnet': - { branch: 'stable', nun: 1 } - { branch: 'stable', num: 2 } - - { branch: 'testing', num: 1 } # Public Beacon API + - { branch: 'testing', num: 1, public_api: true } - { branch: 'testing', num: 2 } - { branch: 'unstable', num: 1, open_libp2p_ports: false } - { branch: 'unstable', num: 2 } diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index 692e6ac..ffe85af 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -16,6 +16,13 @@ beacon_node_firewall_libp2p_open: '{{ node.get("open_libp2p_ports", true) }}' # Tuning beacon_node_max_peers: 300 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) + 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) }}' @@ -50,7 +57,7 @@ nodes_layout: - { branch: 'testing', num: 1, start: 22500, end: 25000, build_freq: '*-*-* 14:00:00', open_libp2p_ports: false } - { branch: 'testing', num: 2, build_freq: '*-*-* 15:00:00' } - { branch: 'unstable', num: 1, start: 35000, end: 37500, build_freq: '*-*-* 16:00:00', open_libp2p_ports: false } - - { branch: 'unstable', num: 2, build_freq: '*-*-* 17:00:00' } # Public Beacon API + - { branch: 'unstable', num: 2, build_freq: '*-*-* 17:00:00', public_api: true } - { branch: 'libp2p', num: 1, start: 38750, end: 40000, build_freq: '*-*-* 18:00:00' } # 1250 validators - { branch: 'libp2p', num: 2, build_freq: '*-*-* 19:00:00' } @@ -58,7 +65,7 @@ nodes_layout: - { branch: 'stable', num: 1, start: 5000, end: 7500, build_freq: '*-*-* 12:00:00' } - { branch: 'stable', num: 2, build_freq: '*-*-* 13:00:00' } - { branch: 'testing', num: 1, start: 17500, end: 20000, build_freq: '*-*-* 14:00:00' } - - { branch: 'testing', num: 2, build_freq: '*-*-* 15:00:00' } # Public Beacon API + - { branch: 'testing', num: 2, build_freq: '*-*-* 15:00:00', public_api: true } - { branch: 'unstable', num: 1, start: 30000, end: 32500, build_freq: '*-*-* 16:00:00' } - { branch: 'unstable', num: 2, build_freq: '*-*-* 17:00:00' } - { branch: 'libp2p', num: 1, start: 37500, end: 38750, build_freq: '*-*-* 18:00:00' } # 1250 validators diff --git a/ansible/group_vars/nimbus.pyrmont.yml b/ansible/group_vars/nimbus.pyrmont.yml index 345e977..a68729c 100644 --- a/ansible/group_vars/nimbus.pyrmont.yml +++ b/ansible/group_vars/nimbus.pyrmont.yml @@ -13,6 +13,13 @@ beacon_node_rpc_port: '{{ 9900 + port_offset }}' # Tuning beacon_node_max_peers: 250 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) + or + (node.end is defined and (node.end - node.start) > 64)) }} # Builds beacon_node_build_frequency: '{{ node.build_frequency }}' # Validators from nimbus-private repo @@ -31,7 +38,7 @@ beacon_node_web3_urls: | nodes_layout: 'metal-01.he-eu-hel1.nimbus.pyrmont': # 4000 validators each - { branch: 'stable', start: 0, end: 4000, build_frequency: '*-*-* 11:00:00' } - - { branch: 'unstable', start: 4000, end: 8000, build_frequency: '*-*-* 13:00:00' } # Public Beacon API + - { branch: 'unstable', start: 4000, end: 8000, build_frequency: '*-*-* 13:00:00', public_api: true } - { branch: 'testing', start: 8000, end: 12000, build_frequency: '*-*-* 15:00:00' } - { branch: 'libp2p', start: 12000, end: 16000, build_frequency: '*-*-* 17:00:00' } 'metal-02.he-eu-hel1.nimbus.pyrmont': # 989 validators each diff --git a/ansible/requirements.yml b/ansible/requirements.yml index ef61150..1cc517c 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -16,7 +16,7 @@ - name: infra-role-bootstrap-linux src: git@github.com:status-im/infra-role-bootstrap-linux.git - version: a5ab4b97d0ccdaed3489dba535624f85ab484f9f + version: d66b056486676bef9ff67fb5b7fc52221e08c94a scm: git - name: infra-role-bootstrap-windows