Skip to content

Commit 2e61772

Browse files
committed
fix: update telemetry ansible
1 parent a37191d commit 2e61772

File tree

4 files changed

+56
-4
lines changed

4 files changed

+56
-4
lines changed

infra/ansible/playbooks/ini/config-telemetry.ini.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ postgresql_telemetry_pass=
2020
cassandra_telemetry_user=
2121
cassandra_telemetry_pass=
2222

23+
environment=
24+
aligned_config_file=
2325
telemetry_aligned_rpc=
2426
telemetry_api_phx_host=
2527
telemetry_api_elixir_hostname=

infra/ansible/playbooks/telemetry.yaml

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,34 @@
6464

6565
tasks:
6666

67+
- name: Add reverse proxy configuration to Caddyfile
68+
become: true
69+
blockinfile:
70+
path: /etc/caddy/Caddyfile
71+
block: |
72+
{{ caddy_metrics_url }} {
73+
reverse_proxy localhost:{{ caddy_metrics_port }}
74+
}
75+
{{ caddy_telemetry_url }} {
76+
@whitelisted {
77+
path /versions*
78+
}
79+
reverse_proxy @whitelisted localhost:{{ caddy_telemetry_port }}
80+
}
81+
{{ caddy_jaeger_url }} {
82+
reverse_proxy localhost:{{ caddy_jaeger_port }}
83+
}
84+
create: yes
85+
prepend_newline: true
86+
vars:
87+
ansible_ssh_user: "{{ admin_user }}"
88+
caddy_metrics_url: "{{ lookup('ini', 'caddy_metrics_url', file=ini_file) }}"
89+
caddy_metrics_port: 3000
90+
caddy_telemetry_url: "{{ lookup('ini', 'caddy_telemetry_url', file=ini_file) }}"
91+
caddy_telemetry_port: 4001
92+
caddy_jaeger_url: "{{ lookup('ini', 'caddy_jaeger_url', file=ini_file) }}"
93+
caddy_jaeger_port: 16686
94+
6795
- name: Make sure /etc/default/tailscaled exists
6896
become: true
6997
file:
@@ -72,11 +100,23 @@
72100
vars:
73101
ansible_ssh_user: "{{ admin_user }}"
74102

103+
- name: Add permit to tailscale for caddy
104+
become: true
105+
lineinfile:
106+
path: /etc/default/tailscaled
107+
line: TS_PERMIT_CERT_UID=caddy
108+
state: present
109+
vars:
110+
ansible_ssh_user: "{{ admin_user }}"
111+
notify:
112+
- Restart caddy
113+
- Restart tailscale
114+
75115
- name: Clone Aligned repository
76116
ansible.builtin.git:
77117
repo: https://github.com/yetanotherco/aligned_layer.git
78118
dest: /home/{{ ansible_user }}/repos/telemetry/aligned_layer
79-
version: v0.12.1
119+
version: 2065-feat-sepolia-deployment
80120
recursive: false
81121

82122
- name: Run telemetry_compile_bls_verifier target
@@ -94,7 +134,9 @@
94134
postgresql_telemetry_db_name: "{{ lookup('ini', 'postgresql_telemetry_db_name file=ini/config-telemetry.ini') }}"
95135
postgresql_telemetry_user: "{{ lookup('ini', 'postgresql_telemetry_user file=ini/config-telemetry.ini') }}"
96136
postgresql_telemetry_pass: "{{ lookup('ini', 'postgresql_telemetry_pass file=ini/config-telemetry.ini') }}"
137+
environment: "{{ lookup('ini', 'environment file=ini/config-telemetry.ini') }}"
97138
telemetry_aligned_rpc: "{{ lookup('ini', 'telemetry_aligned_rpc file=ini/config-telemetry.ini') }}"
139+
aligned_config_file: "{{ lookup('ini', 'aligned_config_file file=ini/config-telemetry.ini') }}"
98140
telemetry_api_phx_host: "{{ lookup('ini', 'telemetry_api_phx_host file=ini/config-telemetry.ini') }}"
99141
telemetry_api_elixir_hostname: "{{ lookup('ini', 'telemetry_api_elixir_hostname file=ini/config-telemetry.ini') }}"
100142
telemetry_api_secret_key_base: "{{ lookup('ini', 'telemetry_api_secret_key_base file=ini/config-telemetry.ini') }}"
@@ -147,6 +189,14 @@
147189
scope: user
148190

149191
handlers:
192+
- name: Restart caddy
193+
become: true
194+
systemd_service:
195+
name: caddy
196+
state: restarted
197+
vars:
198+
ansible_ssh_user: "{{ admin_user }}"
199+
150200
- name: Restart tailscale
151201
become: true
152202
systemd_service:

infra/ansible/playbooks/templates/telemetry_api/telemetry_env.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Network
22
export RPC_URL="{{ telemetry_aligned_rpc }}"
3-
export ENVIRONMENT=holesky
4-
export ALIGNED_CONFIG_FILE="/home/{{ ansible_user }}/repos/telemetry/aligned_layer/contracts/script/output/mainnet/alignedlayer_deployment_output.json"
3+
export ENVIRONMENT="{{ environment }}"
4+
export ALIGNED_CONFIG_FILE="{{ aligned_config_file }}"
55
# Elixir
66
export PHX_HOST="{{ telemetry_api_phx_host }}"
77
export ELIXIR_HOSTNAME="{{ telemetry_api_elixir_hostname }}"

telemetry_api/lib/telemetry_api/periodically.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ defmodule TelemetryApi.Periodically do
99
@registered 1
1010
@deregistered 2
1111

12-
@wait_time_str System.get_env("OPERATOR_FETCHER_WAIT_TIME_MS") ||
12+
@wait_time_str "60000" ||
1313
raise """
1414
environment variable OPERATOR_FETCHER_WAIT_TIME_MS is missing.
1515
"""

0 commit comments

Comments
 (0)