From 8109cbc620ae03df3d65e8fd877f44cdc1ad01d9 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 16 May 2026 15:44:04 +0700 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20TELEGRAM=5FAPI=5FURL=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=BA=D1=81=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- monitor.py | 3 ++- stack.yml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/monitor.py b/monitor.py index 3489365..1f67eca 100644 --- a/monitor.py +++ b/monitor.py @@ -24,6 +24,7 @@ MIKROTIK_PASSWORD = os.environ["MIKROTIK_PASSWORD"] TELEGRAM_BOT_TOKEN = os.environ["TELEGRAM_BOT_TOKEN"] TELEGRAM_CHAT_ID = os.environ["TELEGRAM_CHAT_ID"] +TELEGRAM_API_URL = os.getenv("TELEGRAM_API_URL", "https://api.telegram.org") # Имя address-list в MikroTik (/ip firewall address-list) ADDRESS_LIST_NAME = os.environ["ADDRESS_LIST_NAME"] @@ -48,7 +49,7 @@ log = logging.getLogger(__name__) # Telegram # ────────────────────────────────────────────── async def send_telegram(message: str) -> None: - url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendMessage" + url = f"{TELEGRAM_API_URL}/bot{TELEGRAM_BOT_TOKEN}/sendMessage" payload = {"chat_id": TELEGRAM_CHAT_ID, "text": message, "parse_mode": "HTML"} async with httpx.AsyncClient(timeout=10) as client: try: diff --git a/stack.yml b/stack.yml index d2d6b60..1523ef6 100644 --- a/stack.yml +++ b/stack.yml @@ -32,6 +32,8 @@ services: # Telegram - TELEGRAM_BOT_TOKEN=123456:AABBcc # ← токен от @BotFather - TELEGRAM_CHAT_ID=-1001234567890 # ← ID чата/группы + # URL API (замените на прокси если api.telegram.org заблокирован) + - TELEGRAM_API_URL=https://api.telegram.org # Имя address-list из /ip firewall address-list на MikroTik - ADDRESS_LIST_NAME=monitor