feat: VictoriaMetrics и NetBird между панелью и ger-nod-02
ansible-core-net / deploy (push) Canceled after 0s
ansible-core-secrets / deploy (push) Canceled after 0s
ansible-ger-nod-02 / deploy (push) Canceled after 0s
ansible-opnsense / deploy (push) Canceled after 0s
ansible-core-mon / deploy (push) Successful in 58s
ansible-rus-central / deploy (push) Successful in 44s
ansible-core-net / deploy (push) Canceled after 0s
ansible-core-secrets / deploy (push) Canceled after 0s
ansible-ger-nod-02 / deploy (push) Canceled after 0s
ansible-opnsense / deploy (push) Canceled after 0s
ansible-core-mon / deploy (push) Successful in 58s
ansible-rus-central / deploy (push) Successful in 44s
Prometheus остаётся для LAN. Нода отдаёт метрики через vmagent, а панель ходит на неё по отдельному ключу NetBird, не через группу роутеров. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
5704272c18
commit
72a9c86e52
46 files changed
+13496
-25
No files matched your search
@@ -186,6 +186,37 @@
|
||||
group: root
|
||||
mode: "0600"
|
||||
|
||||
- name: Узнать NetBird IP ноды
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
if [ -z "${NB_API_TOKEN:-}" ]; then
|
||||
exit 0
|
||||
fi
|
||||
curl -fsS --max-time 20 -H "Authorization: Token ${NB_API_TOKEN}" \
|
||||
"{{ remnawave_netbird_peers_url }}" \
|
||||
| jq -r --arg h "$NB_HOST" '
|
||||
(if type == "array" then . elif type == "object" then (.items // .peers // []) else [] end)
|
||||
| map(select((.hostname // "") == $h or (.name // "") == $h or (.dns_label // "") == $h))
|
||||
| .[0].ip // empty'
|
||||
args:
|
||||
executable: /bin/bash
|
||||
environment:
|
||||
NB_API_TOKEN: "{{ lookup('env', 'NETBIRD_API_TOKEN', default='') }}"
|
||||
NB_HOST: "{{ remnawave_node_netbird_hostname }}"
|
||||
register: remnawave_node_nb
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
|
||||
- name: Подставить NetBird-адрес ноды
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_node_address: "{{ remnawave_node_nb.stdout | trim }}"
|
||||
when: remnawave_node_nb.stdout | default('') | trim is match('^[0-9.]+$')
|
||||
|
||||
- name: Peer ноды ещё не в NetBird
|
||||
ansible.builtin.debug:
|
||||
msg: "Peer {{ remnawave_node_netbird_hostname }} ещё не в сети, адрес ноды остаётся {{ remnawave_node_address }}"
|
||||
when: remnawave_node_nb.stdout | default('') | trim is not match('^[0-9.]+$')
|
||||
|
||||
- name: Инициализировать админа, API-токен, профиль DE-Yali, ноду и хост
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
@@ -203,6 +234,8 @@
|
||||
RW_NODE_NAME: "{{ remnawave_node_name }}"
|
||||
RW_NODE_ADDR: "{{ remnawave_node_address }}"
|
||||
RW_NODE_PORT: "{{ remnawave_node_port }}"
|
||||
RW_SUB_DOMAIN: "{{ remnawave_sub_domain }}"
|
||||
RW_XRAY_USER: "{{ remnawave_xray_checker_user }}"
|
||||
RW_NODE_CC: "{{ remnawave_node_country }}"
|
||||
RW_SELFSTEAL: "{{ remnawave_selfsteal_domain }}"
|
||||
RW_XHTTP_PATH: "{{ remnawave_xhttp_path }}"
|
||||
@@ -231,6 +264,7 @@
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_api_token: "{{ (remnawave_bootstrap_secrets.content | b64decode | from_json).api_token }}"
|
||||
remnawave_node_secret: "{{ (remnawave_bootstrap_secrets.content | b64decode | from_json).node_secret }}"
|
||||
remnawave_xray_checker_url: "{{ (remnawave_bootstrap_secrets.content | b64decode | from_json).xray_checker_subscription_url | default('') }}"
|
||||
no_log: true
|
||||
|
||||
- name: Проверить, что SECRET_KEY ноды получен
|
||||
@@ -250,14 +284,20 @@
|
||||
- name: Сохранить API-токен и SECRET_KEY ноды в Infisical
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
args=(
|
||||
"REMNAWAVE_API_TOKEN=${RW_API_TOKEN}"
|
||||
"REMNANODE_SECRET_KEY=${RW_NODE_SECRET}"
|
||||
)
|
||||
if [ -n "${RW_XRAY_URL:-}" ]; then
|
||||
args+=("XRAY_CHECKER_SUBSCRIPTION_URL=${RW_XRAY_URL}")
|
||||
fi
|
||||
infisical secrets set \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--token="${INFISICAL_TOKEN}" \
|
||||
--env=prod \
|
||||
--projectId="${INFISICAL_PROJECT_ID}" \
|
||||
--path="/services/remnawave" \
|
||||
"REMNAWAVE_API_TOKEN=${RW_API_TOKEN}" \
|
||||
"REMNANODE_SECRET_KEY=${RW_NODE_SECRET}" \
|
||||
"${args[@]}" \
|
||||
--silent >/dev/null
|
||||
args:
|
||||
executable: /bin/bash
|
||||
@@ -269,6 +309,7 @@
|
||||
INFISICAL_PROJECT_ID: "{{ lookup('env', 'INFISICAL_PROJECT_ID') }}"
|
||||
RW_API_TOKEN: "{{ remnawave_api_token }}"
|
||||
RW_NODE_SECRET: "{{ remnawave_node_secret | default(lookup('env', 'REMNANODE_SECRET_KEY', default='')) }}"
|
||||
RW_XRAY_URL: "{{ remnawave_xray_checker_url | default('') }}"
|
||||
when: remnawave_api_token | default('') | length > 0
|
||||
changed_when: true
|
||||
no_log: true
|
||||
@@ -321,5 +362,6 @@
|
||||
- "Админ создан в этом прогоне: {{ remnawave_bootstrap.admin_created | default(false) }}"
|
||||
- "API-токен обновлён в Infisical: {{ remnawave_bootstrap.token_updated | default(false) }}"
|
||||
- "Профиль {{ remnawave_profile_name }}: {{ remnawave_bootstrap.profile_uuid | default('n/a') }}"
|
||||
- "Нода {{ remnawave_node_name }}: {{ remnawave_bootstrap.node_uuid | default('n/a') }}"
|
||||
- "Нода {{ remnawave_node_name }}: {{ remnawave_bootstrap.node_uuid | default('n/a') }} адрес {{ remnawave_bootstrap.node_address | default(remnawave_node_address) }}"
|
||||
- "Ссылка Xray Checker записана в Infisical: {{ remnawave_bootstrap.xray_checker_url_saved | default(false) }}"
|
||||
- "Host {{ remnawave_selfsteal_domain }}: {{ remnawave_bootstrap.host_uuid | default('n/a') }}"
|
||||
Reference in new issue
Block a user