diff --git a/app/modules/roxywi/overview.py b/app/modules/roxywi/overview.py index c9313bb6..55c3f143 100644 --- a/app/modules/roxywi/overview.py +++ b/app/modules/roxywi/overview.py @@ -151,9 +151,10 @@ def show_haproxy_binout(server_ip: str) -> None: server_ip, port) cout, stderr3 = server_mod.subprocess_execute(cmd) bin_bout.append(cout[0]) + lang = roxywi_common.get_user_lang() env = Environment(loader=FileSystemLoader('templates'), autoescape=True) template = env.get_template('ajax/bin_bout.html') - template = template.render(bin_bout=bin_bout, serv=server_ip, service='haproxy') + template = template.render(bin_bout=bin_bout, serv=server_ip, service='haproxy', lang=lang) print(template) @@ -174,9 +175,10 @@ def show_nginx_connections(server_ip: str) -> None: if num == 2: bin_bout.append(line.split(' ')[3]) + lang = roxywi_common.get_user_lang() env = Environment(loader=FileSystemLoader('templates')) template = env.get_template('ajax/bin_bout.html') - template = template.render(bin_bout=bin_bout, serv=server_ip, service='nginx') + template = template.render(bin_bout=bin_bout, serv=server_ip, service='nginx', lang=lang) print(template) else: print('error: cannot connect to NGINX stat page') @@ -197,9 +199,10 @@ def show_apache_bytes(server_ip: str) -> None: if 'ReqPerSec' in line or 'BytesPerSec' in line: bin_bout.append(line.split(' ')[1]) + lang = roxywi_common.get_user_lang() env = Environment(loader=FileSystemLoader('templates')) template = env.get_template('ajax/bin_bout.html') - template = template.render(bin_bout=bin_bout, serv=server_ip, service='apache') + template = template.render(bin_bout=bin_bout, serv=server_ip, service='apache', lang=lang) print(template) else: print('error: cannot connect to Apache stat page') @@ -282,7 +285,8 @@ def show_services_overview() -> None: def keepalived_became_master(server_ip) -> None: commands = ["sudo kill -USR2 $(cat /var/run/keepalived.pid) && sudo grep 'Became master' /tmp/keepalived.stats |awk '{print $3}'"] became_master = server_mod.ssh_command(server_ip, commands) + lang = roxywi_common.get_user_lang() env = Environment(loader=FileSystemLoader('templates')) template = env.get_template('ajax/bin_bout.html') - template = template.render(bin_bout=became_master, serv=server_ip, service='keepalived') + template = template.render(bin_bout=became_master, serv=server_ip, service='keepalived', lang=lang) print(template) diff --git a/app/modules/service/common.py b/app/modules/service/common.py index bbf4d2d3..a9d7c732 100644 --- a/app/modules/service/common.py +++ b/app/modules/service/common.py @@ -71,7 +71,7 @@ def get_exp_version(server_ip: str, service_name: str) -> str: return 'no' -def get_correct_apache_service_name(server_ip=None, server_id=0) -> str: +def get_correct_apache_service_name(server_ip=None, server_id=None) -> str: if server_id is None: server_id = sql.select_server_id_by_ip(server_ip) diff --git a/app/templates/ajax/bin_bout.html b/app/templates/ajax/bin_bout.html index a3da7843..4c730dac 100644 --- a/app/templates/ajax/bin_bout.html +++ b/app/templates/ajax/bin_bout.html @@ -1,12 +1,13 @@ +{% import 'languages/'+lang|default('en')+'.html' as lang %} {% if service == 'haproxy' %}
- Bytes in - - +
{{lang.phrases.bytes_in}}
+
+ - +
{% set total = bin_bout.0|int / 1024 %} @@ -22,7 +23,7 @@ {{total|round(2)}} {{metric}}
- Bytes Out +
{{lang.phrases.bytes_out}}
{% set total = bin_bout.1|int / 1024 %} @@ -42,20 +43,20 @@ {% if service == 'nginx' or service == 'haproxy' %}
- Current ses +
{{lang.phrases.current_ses}}
{% if service == 'nginx' %} - +
- +
{% endif %}
{{bin_bout.2}}
- Total ses +
{{lang.phrases.total_ses}}
{{bin_bout.3}} @@ -65,7 +66,7 @@ {% if service == 'apache' %}
- ReqPerSec +
{{lang.phrases.ReqPerSec}}
@@ -76,7 +77,7 @@ {{bin_bout.0}}
- BytesPerSec +
{{lang.phrases.BytesPerSec}}
{% set total = bin_bout.1|int / 1024 %} @@ -96,15 +97,19 @@ {% if service == 'keepalived' %}
- Became Master - +
{{lang.phrases.became_master}}
+
- +
+ {% if 'No such' in bin_bout %} + {{lang.errors.cannot_get_info}} Keepalived + {% else %} {{bin_bout}} + {% endif %}
{% endif %} diff --git a/app/templates/languages/en.html b/app/templates/languages/en.html index 17a577ed..8aa31e48 100644 --- a/app/templates/languages/en.html +++ b/app/templates/languages/en.html @@ -309,6 +309,15 @@ "server_is_inaccessible_for_editing": "This server is inaccessible for editing by everyone except the admin role", "creating_ha": "Creating a new High Availability cluster", "adding_vrrp": "Adding a new VRRP address", + "find_in_log": "Find in a log file. Supports regular expressions.", + "exclude_in_log": "Exclude from search in a log file. Supports regular expressions.", + "bytes_in": "Bytes in", + "bytes_out": "Bytes out", + "current_ses": "Current sessions", + "total_ses": "Total sessions", + "ReqPerSec": "ReqPerSec", + "BytesPerSec": "BytesPerSec", + "became_master": "Became Master", } %} {% set roles = { diff --git a/app/templates/languages/fr.html b/app/templates/languages/fr.html index 9952390e..9226f630 100644 --- a/app/templates/languages/fr.html +++ b/app/templates/languages/fr.html @@ -309,6 +309,15 @@ "server_is_inaccessible_for_editing": "Ce serveur est inaccessible pour modification par tout le monde sauf le rôle d'administrateur", "creating_ha": "Créer un nouveau cluster haute disponibilité", "adding_vrrp": "Ajout d'une nouvelle adresse VRRP", + "find_in_log": "Rechercher dans un fichier journal. Prend en charge les expressions régulières.", + "exclude_in_log": "Exclure de la recherche dans un fichier journal. Prend en charge les expressions régulières.", + "bytes_in": "Octets dans", + "bytes_out": "Octets sortants", + "current_ses": "Séances en cours", + "total_ses": "Nombre total de séances", + "ReqPerSec": "ReqPerSec", + "BytesPerSec": "Octets par seconde", + "became_master": "Devenu maître", } %} {% set roles = { diff --git a/app/templates/languages/pt-br.html b/app/templates/languages/pt-br.html index acf4043c..2b3c334f 100644 --- a/app/templates/languages/pt-br.html +++ b/app/templates/languages/pt-br.html @@ -309,6 +309,15 @@ "server_is_inaccessible_for_editing": "Este servidor está inacessível para edição por todos, exceto a função de administrador", "creating_ha": "Criando um novo cluster de alta disponibilidade", "adding_vrrp": "Adicionando um novo endereço VRRP", + "find_in_log": "Encontre em um arquivo de log. Suporta expressões regulares.", + "exclude_in_log": "Excluir da pesquisa em um arquivo de log. Suporta expressões regulares.", + "bytes_in": "Bytes em", + "bytes_out": "Bytes fora", + "current_ses": "Current sessões", + "total_ses": "Total de sessões", + "ReqPerSec": "ReqPerSec", + "BytesPerSec": "Bytes Por Segundo", + "became_master": "Tornou-se mestre", } %} {% set roles = { diff --git a/app/templates/languages/ru.html b/app/templates/languages/ru.html index d913019c..d3653d72 100644 --- a/app/templates/languages/ru.html +++ b/app/templates/languages/ru.html @@ -125,7 +125,7 @@ %} {% set errors = dict() %} {% set errors = { - "cannot_get_info": "Не возможно получить информацию о", + "cannot_get_info": "Невозможно получить информацию о", "something_wrong": "Что-то пошло не так", "check_logs": "проверти логи", "select_server": "Сначала выберите сервер", @@ -309,6 +309,15 @@ "server_is_inaccessible_for_editing": "Этот сервер недоступен для редактирования всеми, кроме роли администратора", "creating_ha": "Создание нового кластера высокой доступности", "adding_vrrp": "Добавление нового адреса VRRP", + "find_in_log": "Поиск в лог-файле. Поддерживает регулярные выражения.", + "exclude_in_log": "Исключить из поиска в лог-файле. Поддерживает регулярные выражения.", + "bytes_in": "Входящих байт", + "bytes_out": "Исходящих байт", + "current_ses": "Текущих сессий", + "total_ses": "Всего сессий", + "ReqPerSec": "Запросов в секунду", + "BytesPerSec": "Байт в секунду", + "became_master": "Стал мастером", } %} {% set roles = { diff --git a/inc/css/style-6.3.9.css b/inc/css/style-6.3.9.css index 41ea369d..20305b3e 100644 --- a/inc/css/style-6.3.9.css +++ b/inc/css/style-6.3.9.css @@ -847,6 +847,7 @@ label { color: var(--blue-color); border-bottom: 1px solid #A4C7F5; width: 99%; + height: 25px; } .server-status { border-radius: 50% 50%; @@ -917,6 +918,14 @@ label { width: 110px; margin-left: 12px; } +.bin_bout_text { + height: 24px; + width: 90px; + float: left; +} +.bin_bout_text_without_refresh { + width: 115px; +} .bytes { padding-top: 17px; padding-bottom: 12px; diff --git a/inc/overview-6.3.9.js b/inc/overview-6.3.9.js index 6c024bb3..d93a2cd6 100644 --- a/inc/overview-6.3.9.js +++ b/inc/overview-6.3.9.js @@ -574,8 +574,6 @@ function keepalivedBecameMaster(serv) { data = data.replace(/\s+/g,' '); if (data.indexOf('error:') != '-1') { toastr.error(data); - } else if (data.indexOf('No such') != '-1') { - $("#bin_bout").html('Cannot get information'); } else { $("#bin_bout").html(data); $.getScript("/inc/fontawesome.min.js")