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

Prometheus остаётся для LAN. Нода отдаёт метрики через vmagent, а панель ходит на неё по отдельному ключу NetBird, не через группу роутеров.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
karpenokandCursor committed 2026-11-12 16:50:44 +07:00
1 parent 5704272c18
commit 72a9c86e52
46 files changed
+13496 -25

No files matched your search

@@ -29,6 +29,9 @@ remnawave_api_token: "{{ lookup('env', 'REMNAWAVE_API_TOKEN', default='') }}"
# Нода Ger-nod-02 / SelfSteal — создаётся через API панели
remnawave_node_name: "Ger-nod-02"
remnawave_node_address: "150.241.64.209"
remnawave_node_netbird_hostname: "ger-nod-02"
remnawave_netbird_peers_url: "https://central.gunihome.ru/api/peers"
remnawave_xray_checker_user: "homelab"
remnawave_node_port: 2222
remnawave_node_country: "DE"
remnawave_selfsteal_domain: "yali.gunis.top"
@@ -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') }}"
@@ -10,6 +10,7 @@ admin_created=0
token_updated=0
profile_created=0
node_created=0
node_address_updated=0
host_created=0
node_secret=""
active_token="${RW_API_TOKEN:-}"
@@ -20,7 +21,7 @@ redact_json() {
jq 'walk(
if type == "object" then
with_entries(
if (.key | test("(?i)privateKey|privKey|secretKey|SECRET_KEY|accessToken|apiToken|password|^token$|vlessUuid|trojanPassword|ssPassword|shortUuid|subscriptionUrl"))
if (.key | test("(?i)privateKey|privKey|secretKey|SECRET_KEY|accessToken|apiToken|password|^token$|vlessUuid|trojanPassword|ssPassword|shortUuid|subscriptionUrl|setupKey|setup_key|METRICS_PASS"))
then .value = "[REDACTED]"
else .
end
@@ -223,20 +224,29 @@ if [ -z "${node_uuid}" ]; then
node_created=1
fi
current_addr=$(printf '%s' "${nodes_json}" | jq -r --arg n "$RW_NODE_NAME" '(.response // []) | map(select(.name == $n)) | .[0].address // empty')
if [ -n "${RW_NODE_ADDR}" ] && [ "${current_addr}" != "${RW_NODE_ADDR}" ]; then
node_address_updated=1
fi
node_update=$(jq -n \
--arg u "$node_uuid" \
--arg pu "$profile_uuid" \
--arg iu "$inbound_uuid" \
--arg addr "$RW_NODE_ADDR" \
--argjson port "$RW_NODE_PORT" \
'{
uuid: $u,
address: $addr,
port: $port,
configProfile: {
activeConfigProfileUuid: $pu,
activeInbounds: [$iu]
}
}')
api PATCH /nodes/ -d "${node_update}" >/dev/null 2>&1 \
|| api PUT /nodes/ -d "${node_update}" >/dev/null 2>&1 \
|| true
if ! api PATCH /nodes/ -d "${node_update}" >/dev/null \
&& ! api PUT /nodes/ -d "${node_update}" >/dev/null; then
echo "WARN: не удалось обновить адрес ноды ${RW_NODE_NAME}" >&2
fi
hosts_json=$(api GET /hosts/)
host_uuid=$(printf '%s' "${hosts_json}" | jq -r --arg a "$RW_SELFSTEAL" '
@@ -420,11 +430,33 @@ if [ -n "${RW_USERS_FILE:-}" ] && [ -f "${RW_USERS_FILE}" ]; then
done < <(printf '%s' "${existing}" | jq -r '.response.users[]? | "\(.username)\t\(.uuid)"')
fi
xray_url=""
xray_user="${RW_XRAY_USER:-homelab}"
if [ -n "${xray_user}" ]; then
users_now=$(api GET "/users/?size=500" || api GET /users/ || echo '{}')
xray_url=$(printf '%s' "${users_now}" | jq -r --arg u "${xray_user}" '
.response.users[]? | select(.username == $u) | .subscriptionUrl // empty' | head -1)
if [ -z "${xray_url}" ]; then
short=$(printf '%s' "${users_now}" | jq -r --arg u "${xray_user}" '
.response.users[]? | select(.username == $u) | .shortUuid // empty' | head -1)
if [ -n "${short}" ] && [ -n "${RW_SUB_DOMAIN:-}" ]; then
xray_url="https://${RW_SUB_DOMAIN}/${short}"
fi
fi
fi
xray_saved=0
if [ -n "${xray_url}" ]; then
xray_saved=1
fi
# Секреты только в файл 0600. В stdout — статус без значений ключей.
secrets_file="${RW_SECRETS_FILE:-/opt/remnawave/.bootstrap-secrets.json}"
umask 077
jq -n --arg api_token "${active_token}" --arg node_secret "${node_secret}" \
'{api_token: $api_token, node_secret: $node_secret}' > "${secrets_file}"
jq -n \
--arg api_token "${active_token}" \
--arg node_secret "${node_secret}" \
--arg xray_url "${xray_url}" \
'{api_token: $api_token, node_secret: $node_secret, xray_checker_subscription_url: $xray_url}' > "${secrets_file}"
chmod 600 "${secrets_file}"
jq -n \
@@ -432,22 +464,28 @@ jq -n \
--arg node_uuid "${node_uuid}" \
--arg host_uuid "${host_uuid}" \
--arg reality_pub "${pub}" \
--arg node_address "${RW_NODE_ADDR}" \
--argjson admin_created "${admin_created}" \
--argjson token_updated "${token_updated}" \
--argjson profile_created "${profile_created}" \
--argjson node_created "${node_created}" \
--argjson node_address_updated "${node_address_updated}" \
--argjson host_created "${host_created}" \
--argjson users_changed "${users_changed}" \
--argjson xray_saved "${xray_saved}" \
'{
profile_uuid: $profile_uuid,
node_uuid: $node_uuid,
host_uuid: $host_uuid,
node_address: $node_address,
reality_public_key: $reality_pub,
admin_created: ($admin_created == 1),
token_updated: ($token_updated == 1),
profile_created: ($profile_created == 1),
node_created: ($node_created == 1),
node_address_updated: ($node_address_updated == 1),
host_created: ($host_created == 1),
users_changed: ($users_changed == 1),
changed: (($admin_created + $token_updated + $profile_created + $node_created + $host_created + $users_changed) > 0)
xray_checker_url_saved: ($xray_saved == 1),
changed: (($admin_created + $token_updated + $profile_created + $node_created + $node_address_updated + $host_created + $users_changed + $xray_saved) > 0)
}'