From b69e1c8f939233f9719ed9520ab03cf19e2afef3 Mon Sep 17 00:00:00 2001 From: karpenok Date: Thu, 12 Nov 2026 17:32:48 +0700 Subject: [PATCH] =?UTF-8?q?fix(monitoring):=20=D0=BF=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D1=8F=D1=82=D1=8C=20Xray=20=D0=BF=D0=BE=20HTTP-?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D1=83,=20=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=BE=20IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Профиль ноды блокирует api.ipify.org, поэтому метод ip всегда помечал рабочий прокси офлайн. Co-authored-by: Cursor --- ansible/roles/core-mon/monitoring/tasks/main.yml | 6 ++++++ .../roles/core-mon/monitoring/templates/xray-checker.env.j2 | 1 + 2 files changed, 7 insertions(+) diff --git a/ansible/roles/core-mon/monitoring/tasks/main.yml b/ansible/roles/core-mon/monitoring/tasks/main.yml index 2cfd1fa..0df7c7a 100644 --- a/ansible/roles/core-mon/monitoring/tasks/main.yml +++ b/ansible/roles/core-mon/monitoring/tasks/main.yml @@ -144,6 +144,7 @@ group: root mode: "0600" no_log: true + register: xray_checker_env when: xray_checker_subscription_url | length > 0 - name: Scrape Xray Checker @@ -169,6 +170,11 @@ register: compose_up changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr" +- name: Пересоздать Xray Checker, чтобы подхватить метод проверки + ansible.builtin.command: docker compose -f {{ monitoring_dir }}/compose.yaml up -d --force-recreate --no-deps xray-checker + when: xray_checker_env is changed + changed_when: true + - name: Пересоздать Prometheus, чтобы подхватить конфиг ansible.builtin.command: docker compose -f {{ monitoring_dir }}/compose.yaml up -d --force-recreate --no-deps prometheus when: prometheus_config is changed or prometheus_alerts is changed or monitoring_compose is changed diff --git a/ansible/roles/core-mon/monitoring/templates/xray-checker.env.j2 b/ansible/roles/core-mon/monitoring/templates/xray-checker.env.j2 index 5b3d65c..93cd7b5 100644 --- a/ansible/roles/core-mon/monitoring/templates/xray-checker.env.j2 +++ b/ansible/roles/core-mon/monitoring/templates/xray-checker.env.j2 @@ -1,3 +1,4 @@ SUBSCRIPTION_URL={{ xray_checker_subscription_url }} +PROXY_CHECK_METHOD=status PROXY_STATUS_CHECK_URL=http://google.com/generate_204 PROXY_CHECK_INTERVAL=60