status-im/infra-role-geth
2
0
Fork 0
mirror of https://github.com/status-im/infra-role-geth.git synced 2025-02-02 23:33:33 +00:00
Code Issues Projects Releases Wiki Activity

consul: always use IP for advertised metrics address

Browse Source 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2025-01-07 13:29:39 +01:00
parent e828162c32
commit 31cb16cb45
No known key found for this signature in database
GPG Key ID: FE65CD384D5BF7B4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -116,7 +116,7 @@ geth_public_addr: '{{ ansible_host }}'
# Consul config
geth_consul_enabled: true
geth_consul_service_name: 'geth-{{ geth_network_name }}'
geth_consul_advertised_address: '{{ ansible_local.wireguard.address }}'
geth_consul_rpc_advertised_address: '{{ ansible_local.wireguard.address }}'
geth_consul_scope: 'main'
geth_consul_default_tags:
- 'geth'

15
tasks/consul.yml
View File

@ -22,7 +22,7 @@
name: '{{ geth_consul_service_name }}-metrics'
tags: '{{ geth_consul_tags + ["metrics"] }}'
port: '{{ geth_metrics_port }}'
address: '{{ geth_consul_advertised_address }}'
address: '{{ ansible_local.wireguard.address }}'
disabled: '{{ not geth_metrics_enabled }}'
meta:
container: '{{ geth_cont_name | mandatory }}'
@ -37,10 +37,10 @@
name: '{{ geth_consul_service_name }}-rpc'
tags: '{{ geth_consul_tags + ["rpc"] }}'
port: '{{ geth_rpc_port }}'
address: '{{ geth_consul_advertised_address }}'
address: '{{ geth_consul_rpc_advertised_address }}'
disabled: '{{ not geth_rpc_enabled }}'
meta:
url: 'http://{{ geth_consul_advertised_address }}:{{ geth_rpc_port }}'
url: 'http://{{ geth_consul_rpc_advertised_address }}:{{ geth_rpc_port }}'
version: '{{ geth_cont_tag | regex_replace("^v", "") }}'
checks:
- id: '{{ geth_cont_name }}-rpc-status'
@ -53,10 +53,10 @@
name: '{{ geth_consul_service_name }}-authrpc'
tags: '{{ geth_consul_tags + ["authrpc", "engine"] }}'
port: '{{ geth_authrpc_port }}'
address: '{{ geth_consul_advertised_address }}'
address: '{{ geth_consul_rpc_advertised_address }}'
disabled: '{{ not geth_authrpc_enabled }}'
meta:
url: 'http://{{ geth_consul_advertised_address }}:{{ geth_authrpc_port }}'
url: 'http://{{ geth_consul_rpc_advertised_address }}:{{ geth_authrpc_port }}'
version: '{{ geth_cont_tag | regex_replace("^v", "") }}'
checks:
- id: '{{ geth_cont_name }}-authrpc-status'
@ -68,10 +68,10 @@
name: '{{ geth_consul_service_name }}-ws'
tags: '{{ geth_consul_tags + ["websocket"] }}'
port: '{{ geth_websocket_port }}'
address: '{{ geth_consul_advertised_address }}'
address: '{{ geth_consul_rpc_advertised_address }}'
disabled: '{{ not geth_websocket_enabled }}'
meta:
url: 'ws://{{ geth_consul_advertised_address }}:{{ geth_websocket_port }}'
url: 'ws://{{ geth_consul_rpc_advertised_address }}:{{ geth_websocket_port }}'
version: '{{ geth_cont_tag | regex_replace("^v", "") }}'
checks:
- id: '{{ geth_cont_name }}-ws-status'
@ -79,4 +79,3 @@
type: 'tcp'
tcp: 'localhost:{{ geth_websocket_port }}'
failures_before_critical: 3