From 566f35ed0f1fed58defb10d4e5922de4384b4803 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 3 Sep 2025 00:34:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B8?= =?UTF-8?q?=D0=B7=20master=20=D0=B2=20dev-1=20=D0=B2=D0=B5=D1=82=D0=BA?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bots/telegram-helper-bot | 2 +- docker-compose.yml | 2 ++ infra/monitoring/metrics_collector.py | 2 +- infra/prometheus/prometheus.yml | 2 +- tests/infra/test_metrics_collector.py | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bots/telegram-helper-bot b/bots/telegram-helper-bot index 5c2f9e5..c8c7d50 160000 --- a/bots/telegram-helper-bot +++ b/bots/telegram-helper-bot @@ -1 +1 @@ -Subproject commit 5c2f9e501dbd82e38e8af15930ed89c164ac5a3a +Subproject commit c8c7d50cbb706d5c06f516b4c32f5156abd5bee4 diff --git a/docker-compose.yml b/docker-compose.yml index 84d9e7f..55366dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,6 +55,8 @@ services: build: . container_name: bots_server_monitor restart: unless-stopped + ports: + - "9091:9091" environment: - TELEGRAM_BOT_TOKEN=${TELEGRAM_MONITORING_BOT_TOKEN} - GROUP_FOR_LOGS=${GROUP_MONITORING_FOR_LOGS} diff --git a/infra/monitoring/metrics_collector.py b/infra/monitoring/metrics_collector.py index 2deba8f..bb42300 100644 --- a/infra/monitoring/metrics_collector.py +++ b/infra/monitoring/metrics_collector.py @@ -28,7 +28,7 @@ class MetricsCollector: # PID файлы для отслеживания процессов self.pid_files = { - 'voice_bot': 'voice_bot.pid', + #'voice_bot': 'voice_bot.pid', 'helper_bot': 'helper_bot.pid' } diff --git a/infra/prometheus/prometheus.yml b/infra/prometheus/prometheus.yml index 58ac5ea..49959a9 100644 --- a/infra/prometheus/prometheus.yml +++ b/infra/prometheus/prometheus.yml @@ -22,7 +22,7 @@ scrape_configs: - job_name: 'telegram-helper-bot' static_configs: - - targets: ['bots_telegram_bot:8080'] # Имя контейнера из docker-compose + - targets: ['host.docker.internal:8080'] # Локальный бот на порту 8080 labels: bot_name: 'telegram-helper-bot' environment: 'production' diff --git a/tests/infra/test_metrics_collector.py b/tests/infra/test_metrics_collector.py index 9a26eed..2e22500 100644 --- a/tests/infra/test_metrics_collector.py +++ b/tests/infra/test_metrics_collector.py @@ -14,7 +14,7 @@ from datetime import datetime # Добавляем путь к модулям мониторинга sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../../infra/monitoring')) -from metrics_collector import MetricsCollector +from infra.monitoring.metrics_collector import MetricsCollector class TestMetricsCollector: