mirror of https://github.com/Aidaho12/haproxy-wi
Aidaho
parent
c54248dd47
commit
3f83e316fa
|
|
@ -262,13 +262,13 @@ def master_slave_upload_and_restart(server_ip, cfg, just_save, service, **kwargs
|
|||
)
|
||||
slave_output += f'<br>slave_server:\n{slv_output}'
|
||||
except Exception as e:
|
||||
return f'error: {e}'
|
||||
slave_output += f'<br>slave_server:\n error: {e}'
|
||||
try:
|
||||
output = upload_and_restart(
|
||||
server_ip, cfg, just_save, service, waf=waf, config_file_name=config_file_name, oldcfg=oldcfg, login=login
|
||||
)
|
||||
except Exception as e:
|
||||
return f'error: {e}'
|
||||
output = f'error: {e}'
|
||||
|
||||
output = server_name + ':\n' + output
|
||||
output = output + slave_output
|
||||
|
|
|
|||
|
|
@ -83,9 +83,12 @@ def create_server():
|
|||
user_subscription = roxywi_common.return_unsubscribed_user_status()
|
||||
roxywi_common.logging('Roxy-WI server', f'Cannot get a user plan: {e}', roxywi=1)
|
||||
|
||||
if add_to_smon:
|
||||
user_group = roxywi_common.get_user_group(id=1)
|
||||
smon_mod.create_smon(hostname, ip, 0, 1, 0, 0, hostname, desc, 0, 0, 0, 56, 'ping', 0, 0, user_group, 0)
|
||||
try:
|
||||
if add_to_smon:
|
||||
user_group = roxywi_common.get_user_group(id=1)
|
||||
smon_mod.create_smon(hostname, ip, 0, 1, 0, 0, hostname, desc, 0, 0, 0, 56, 'ping', 0, 0, user_group, 0)
|
||||
except Exception as e:
|
||||
roxywi_common.logging(ip, f'error: Cannot add server {hostname} to SMON: {e}')
|
||||
|
||||
roxywi_common.logging(ip, f'A new server {hostname} has been created', roxywi=1, login=1, keep_history=1, service='server')
|
||||
|
||||
|
|
|
|||
|
|
@ -153,12 +153,12 @@
|
|||
},
|
||||
"monitoring": {
|
||||
"smon_check_interval": "Check interval for SMON (in minutes)",
|
||||
"port_scan_interval": "Check interval for Checker (in minutes)",
|
||||
"portscanner_keep_history_range": "Check interval for Port scanner (in minutes)",
|
||||
"port_scan_interval": "Check interval for Port scanner (in minutes)",
|
||||
"portscanner_keep_history_range": "Retention period for Port scanner history",
|
||||
"smon_keep_history_range": "Retention period for SMON history",
|
||||
"checker_keep_history_range": "Retention period for Checker history",
|
||||
"checker_maxconn_threshold": "Retention period for Port scanner history",
|
||||
"checker_check_interval": "Threshold value for maxconn alerting, in %",
|
||||
"checker_maxconn_threshold": "Threshold value for maxconn alerting, in %",
|
||||
"checker_check_interval": "Check interval for Checker (in minutes)",
|
||||
"smon_ssl_expire_warning_alert": "Warning alert about a SSL certificate expiration (in days)",
|
||||
"smon_ssl_expire_critical_alert": "Critical alert about a SSL certificate expiration (in days)",
|
||||
"action_keep_history_range": "Retention period for Action history (in days)",
|
||||
|
|
|
|||
|
|
@ -153,11 +153,11 @@
|
|||
},
|
||||
"monitoring": {
|
||||
"smon_check_interval": "Interval de vérification pour SMON (en minutes)",
|
||||
"port_scan_interval": "Interval de vérification pour Checker (en minutes)",
|
||||
"portscanner_keep_history_range": "Interval de vérification pour scanner (in minutes)",
|
||||
"port_scan_interval": "Interval de vérification pour le scanner de Port (en minutes)",
|
||||
"portscanner_keep_history_range": "Période de rétention pour l\'historiques le scanner de Port",
|
||||
"smon_keep_history_range": "Période de rétention pour l\'historiques de SMON",
|
||||
"checker_keep_history_range": "Période de rétention pour l\'historiques de Checker",
|
||||
"checker_maxconn_threshold": "Période de rétention pour l\'historiques le scanner de Port",
|
||||
"checker_maxconn_threshold": "Valeur du seuil pour les alertes maxconn, en %",
|
||||
"checker_check_interval": "Valeur du seuil pour les alertes maxconn, en %",
|
||||
"smon_ssl_expire_warning_alert": "Alerte type warning dès qu'un certificat SSL expire (en jours)",
|
||||
"smon_ssl_expire_critical_alert": "Alerte tpye critical dès qu'un certificat SSL expire (en jours)",
|
||||
|
|
|
|||
|
|
@ -153,12 +153,12 @@
|
|||
},
|
||||
"monitoring": {
|
||||
"smon_check_interval": "Intervalo de verificação para o SMON (em minutos)",
|
||||
"port_scan_interval": "Intervalo de verificação para o Checker (em minutos)",
|
||||
"portscanner_keep_history_range": "Intervalo de verificação por o Port scanner (em minutos)",
|
||||
"port_scan_interval": "Intervalo de verificação para o Port scanner (em minutos)",
|
||||
"portscanner_keep_history_range": "Período de retenção de historico de Port scanner",
|
||||
"smon_keep_history_range": "Período de retenção de historico de SMON",
|
||||
"checker_keep_history_range": "Período de retenção de historico de Checker",
|
||||
"checker_maxconn_threshold": "Período de retenção de historico de Port scanner",
|
||||
"checker_check_interval": "Valor limite para a notificação de maxconn, em %",
|
||||
"checker_maxconn_threshold": "Valor limite para a notificação de maxconn, em %",
|
||||
"checker_check_interval": "Intervalo de verificação para o Checker (em minutos)",
|
||||
"smon_ssl_expire_warning_alert": "Aviso de alerta sobre a expiração do certificado SSL (em dias)",
|
||||
"smon_ssl_expire_critical_alert": "Alerta critico a expiração do certificado SSL (em dias)"
|
||||
"action_keep_history_range": "Período de retenção do histórico de ações (em dias)",
|
||||
|
|
|
|||
|
|
@ -153,12 +153,12 @@
|
|||
},
|
||||
"monitoring": {
|
||||
"smon_check_interval": "Интервал проверки для SMON (в минутах)",
|
||||
"port_scan_interval": "Интервал проверки для Checker (в минутах)",
|
||||
"portscanner_keep_history_range": "Интервал проверки для Port scanner (в минутах)",
|
||||
"port_scan_interval": "Интервал проверки для Port scanner (в минутах)",
|
||||
"portscanner_keep_history_range": "Время хранения истории Port scanner",
|
||||
"smon_keep_history_range": "Время хранения истории SMON",
|
||||
"checker_keep_history_range": "Время хранения истории Checker",
|
||||
"checker_maxconn_threshold": "Время хранения истории Port scanner",
|
||||
"checker_check_interval": "Порог срабатывания уведомления по maxconn, в %",
|
||||
"checker_maxconn_threshold": "Порог срабатывания уведомления по maxconn, в %",,
|
||||
"checker_check_interval": "Интервал проверки для Checker (в минутах)",
|
||||
"smon_ssl_expire_warning_alert": "Предупреждение о истечении SSL-сертификата (в днях)",
|
||||
"smon_ssl_expire_critical_alert": "Критическое предупреждение о истечении SSL-сертификата (в днях)",
|
||||
"action_keep_history_range": "Время хранения истории действий (в днях)",
|
||||
|
|
|
|||
Loading…
Reference in New Issue