Merge remote-tracking branch 'git.udochudo.ru/master'

# Conflicts:
#	telezab.py
This commit is contained in:
Влад Зверев 2025-02-13 17:27:21 +05:00
commit d0e91f5259

View File

@ -51,7 +51,8 @@ region_api = RegionAPI(DB_PATH)
user_state_manager = UserStateManager() user_state_manager = UserStateManager()
# Initialize Flask application # Initialize Flask application
app = Flask(__name__,static_url_path='/static', template_folder='templates') app = Flask(__name__,static_url_path='/telezab/static', template_folder='templates')
# Инициализация LogManager # Инициализация LogManager
log_manager = LogManager(log_dir='logs', retention_days=30) log_manager = LogManager(log_dir='logs', retention_days=30)
@ -1297,6 +1298,7 @@ def get_zabbix_triggers(group_id):
output=["hostid", "ip"] output=["hostid", "ip"]
) )
host_ip_map = {iface["hostid"]: iface["ip"] for iface in host_interfaces} host_ip_map = {iface["hostid"]: iface["ip"] for iface in host_interfaces}
# print(host_ip_map)
# Получение itemid для триггеров на основе их описания # Получение itemid для триггеров на основе их описания
item_map = {} item_map = {}