diff --git a/config/.env-template b/config/.env-template index 8b59671..cfdacf2 100755 --- a/config/.env-template +++ b/config/.env-template @@ -5,6 +5,11 @@ CFG__ZABBIX__URL=https://example.com CFG__ZABBIX__TOKEN=string CFG__ZABBIX__MIN_SEVERITY=0 CFG__ZABBIX__UPD_INTERVAL=60 +CFG__ZABBIX__ALERT_FAIL_COUNT=3 +CFG__ZABBIX__ALERT_TREAD_ID=0 +CFG__ZABBIX__ALERT_TAG_USER=string +CFG__ZABBIX__ALERT_TEXT_UP=Zabbix service UP +CFG__ZABBIX__ALERT_TEXT_DOWN=Zabbix service DOWN CFG__TGBOT__TOKEN=string CFG__TGBOT__CHAT_ID=00000000 diff --git a/config/config.py b/config/config.py index 9c0c501..793e476 100755 --- a/config/config.py +++ b/config/config.py @@ -49,6 +49,13 @@ class ZabbixConfig(BaseModel): token: str min_severity: int upd_interval: int + alert_fail_count: int + alert_tread_id: int + alert_tag_user: str = "" + alert_text_up: str + alert_text_down: str + change_state_count: int = 0 + api_state: str = "UP" class Settings(BaseSettings): diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 369c50e..22f123f 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -10,8 +10,10 @@ services: command: [redis-server, --protected-mode yes, --port 6379, --requirepass, P@ssw0rd!] tg-bot: - image: git.sm8255082.ru/osnova/zbx-tg-bot:2.0.0 + image: git.sm8255082.ru/osnova/zbx-tg-bot:2.0.1 restart: always + volumes: + - ./logfile.log:/app/logfile.log depends_on: - redis environment: @@ -22,6 +24,11 @@ services: - CFG__ZABBIX__TOKEN=string - CFG__ZABBIX__MIN_SEVERITY=2 - CFG__ZABBIX__UPD_INTERVAL=30 + - CFG__ZABBIX__ALERT_FAIL_COUNT=3 + - CFG__ZABBIX__ALERT_TREAD_ID=0 + - CFG__ZABBIX__ALERT_TAG_USER= + - CFG__ZABBIX__ALERT_TEXT_UP=Zabbix service UP + - CFG__ZABBIX__ALERT_TEXT_DOWN=Zabbix service DOWN - CFG__TGBOT__TOKEN=string - CFG__TGBOT__CHAT_ID=000000 diff --git a/main.py b/main.py index 125ebe7..adeca18 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,5 @@ import logging as log -from zabbix import get_active_problems +from zabbix import get_active_problems, check_state from config import conf, icon_dict from redis_db import ( get_all_keys, @@ -8,13 +8,24 @@ from redis_db import ( del_value, ) import asyncio -from telegram import del_message, send_message, start_bot +from telegram import del_message, send_message, start_bot, send_zabbix_api_alert async def dashboard(): active_alerts = get_active_problems() if active_alerts is None: + if check_state(False) == "DOWN": + send_state = await send_zabbix_api_alert(conf.zabbix.alert_text_down) + if send_state["status"] == 200: + conf.zabbix.api_state = "DOWN" + conf.zabbix.change_state_count = 0 return + else: + if check_state(True) == "UP": + send_state = await send_zabbix_api_alert(conf.zabbix.alert_text_up) + if send_state["status"] == 200: + conf.zabbix.api_state = "UP" + conf.zabbix.change_state_count = 0 telegram_alerts = await get_all_keys() new_alerts_id = [] diff --git a/pyproject.toml b/pyproject.toml index 0c7b748..069f818 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "zbx-tg-bot" -version = "2.0.0" +version = "2.0.1" description = "telegram bot for telegram-zabbix dashboard" requires-python = ">=3.13" dependencies = [ diff --git a/telegram/__init__.py b/telegram/__init__.py index 9a89e27..0215468 100644 --- a/telegram/__init__.py +++ b/telegram/__init__.py @@ -1,6 +1,7 @@ from .message import ( send_message, del_message, + send_zabbix_api_alert, ) from .bot import start_bot @@ -8,4 +9,5 @@ __all__ = [ "send_message", "del_message", "start_bot", + "send_zabbix_api_alert", ] diff --git a/telegram/bot.py b/telegram/bot.py index 3d911ac..a800917 100644 --- a/telegram/bot.py +++ b/telegram/bot.py @@ -2,7 +2,8 @@ from config import conf from aiogram import Bot, Dispatcher, types from aiogram.fsm.storage.memory import MemoryStorage from aiogram import F -from zabbix import event_acknowledge, event_close +from zabbix import event_close +from zabbix import event_acknowledge import logging as log tg_bot = Bot(token=conf.tgbot.token) diff --git a/telegram/message.py b/telegram/message.py index 2a3922f..29109c8 100644 --- a/telegram/message.py +++ b/telegram/message.py @@ -67,9 +67,36 @@ async def del_message( log.warning( f"Message ID {message_id} NOT deleted. Response status: {response.status}" ) + return { "status": response.status, } except Exception as e: log.warning(f"Exception: {e}") return {"status": e} + + +async def send_zabbix_api_alert(message): + url = f"https://api.telegram.org/bot{conf.tgbot.token}/sendMessage" + params = { + "chat_id": conf.tgbot.chat_id, + "message_thread_id": conf.zabbix.alert_tread_id, + "text": conf.zabbix.alert_tag_user + "\n" + message, + } + async with aiohttp.ClientSession() as session: + try: + async with session.post( + url, + json=params, + ) as response: + log.info(f"Response status: {response.status}") + resp = await response.json() + if response.status == 200: + log.info(f"Message with ID: {resp['result']['message_id']} send") + return {"status": response.status} + else: + log.warning(f"Message not send. Response status: {response.status}") + return {"status": response.status} + except Exception as e: + log.warning(f"Exception: {e}") + return {"status": e} diff --git a/zabbix/__init__.py b/zabbix/__init__.py index 7a4de3f..e53c8e7 100644 --- a/zabbix/__init__.py +++ b/zabbix/__init__.py @@ -1,8 +1,8 @@ -from .zabbix_api import get_active_problems, event_acknowledge, event_close - +from .zabbix_api import get_active_problems, event_close, event_acknowledge, check_state __all__ = [ "get_active_problems", "event_acknowledge", "event_close", + "check_state", ] diff --git a/zabbix/zabbix_api.py b/zabbix/zabbix_api.py index 44c6b2a..0f71e9a 100644 --- a/zabbix/zabbix_api.py +++ b/zabbix/zabbix_api.py @@ -3,6 +3,7 @@ import logging as log from pyexpat.errors import messages from zabbix_utils import ZabbixAPI + from config import conf from datetime import datetime, timedelta @@ -80,3 +81,30 @@ def event_close(event_id: int, closed_by: str): except: log.warning(f"Closed event {event_id} from zabbix error") return False + + +def check_state(success: bool) -> str | None: + if success: + if conf.zabbix.api_state == "UP": + log.info("Zabbix API is UP") + conf.zabbix.change_state_count = 0 + else: + if conf.zabbix.change_state_count == conf.zabbix.alert_fail_count: + log.warning( + f"Zabbix API state changed to UP. Count {conf.zabbix.change_state_count}" + ) + return "UP" + else: + conf.zabbix.change_state_count += 1 + else: + if conf.zabbix.api_state == "DOWN": + log.info("Zabbix API is DOWN") + conf.zabbix.change_state_count = 0 + else: + if conf.zabbix.change_state_count == conf.zabbix.alert_fail_count: + log.warning( + f"Zabbix API state changed to DOWN. Count {conf.zabbix.change_state_count}" + ) + return "DOWN" + else: + conf.zabbix.change_state_count += 1