github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v7.2.2.0 

Fix tools status showing for Docker
pull/375/head
Aidaho 2024-03-21 09:04:37 +03:00
parent 396d6b85e9
commit f57b418d74
4 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/tools/common.py
View File

@ -61,7 +61,7 @@ def update_roxy_wi(service: str) -> str:
def is_tool_active(tool_name: str) -> str:
is_in_docker = roxywi_mod.is_docker()
if is_in_docker:
cmd = f"supervisorctl status {tool_name}|awk '{{print $2}}'"
cmd = f"sudo supervisorctl status {tool_name}|awk '{{print $2}}'"
else:
cmd = f"systemctl is-active {tool_name}"
status, stderr = server_mod.subprocess_execute(cmd)

53
app/templates/ajax/load_services.html
View File

@ -13,60 +13,61 @@
'rabbitmq-server': { 'name': 'RabbitMQ', 'desc': 'RabbitMQ server' },
}
%}
{% for s in services %}
{% for service in services %}
{% set is_service_started_class = '' %}
{% set is_service_stopped_class = '' %}
{% set onclick_start_action = "confirmAjaxServiceAction('start', '"+s.0+"')" %}
{% set onclick_stop_action = "confirmAjaxServiceAction('stop', '"+s.0+"')" %}
{% set is_service_started_title = lang.words.start|title()+" "+lang.words.and+" "+lang.words.enable+" "+services_name[s.0]['name']+" "+lang.words.service %}
{% set is_service_stopped_title = lang.words.stop|title()+" "+lang.words.and+" "+lang.words.disable+" "+services_name[s.0]['name']+" "+lang.words.service %}
<tr class="{{ loop.cycle('odd', 'even') }}" id="{{s.0}}">
{% set onclick_start_action = "confirmAjaxServiceAction('start', '"+service.0+"')" %}
{% set onclick_stop_action = "confirmAjaxServiceAction('stop', '"+service.0+"')" %}
{% set is_service_started_title = lang.words.start|title()+" "+lang.words.and+" "+lang.words.enable+" "+services_name[service.0]['name']+" "+lang.words.service %}
{% set is_service_stopped_title = lang.words.stop|title()+" "+lang.words.and+" "+lang.words.disable+" "+services_name[service.0]['name']+" "+lang.words.service %}
<tr class="{{ loop.cycle('odd', 'even') }}" id="{{service.0}}">
<td class="padding10 first-collumn">
{% if s.1 == 'active' or s.1 == 'RUNNING' %}
<span title="{{lang.words.service|title()}} {{services_name[s.0]['name']}} {{lang.words.started}}"><span class="serverUp server-status"></span></span>
{{ service }}
{% if service.1 == 'active' or service.1 == 'RUNNING' %}
<span title="{{lang.words.service|title()}} {{services_name[service.0]['name']}} {{lang.words.started}}"><span class="serverUp server-status"></span></span>
{% set is_service_started_class = 'disabled-button' %}
{% set onclick_start_action = "" %}
{% set is_service_started_title = lang.words.service|title()+" "+services_name[s.0]['name']+" "+lang.words.already+" "+lang.words.started %}
{% set is_service_started_title = lang.words.service|title()+" "+services_name[service.0]['name']+" "+lang.words.already+" "+lang.words.started %}
{% else %}
{% if (s.1 == 'inactive' or s.1 == 'failed' or s.1 == 'activating' or s.1 == 'STOPPED') and 'is not installed' not in s.2['current_version'] %}
<span title="{{lang.words.service|title()}} {{services_name[s.0]['name']}} {{lang.words.stopped}}"><span class="serverDown server-status"></span></span>
{% if (service.1 == 'inactive' or service.1 == 'failed' or service.1 == 'activating' or service.1 == 'STOPPED') and 'is not installed' not in service.2['current_version'] %}
<span title="{{lang.words.service|title()}} {{services_name[service.0]['name']}} {{lang.words.stopped}}"><span class="serverDown server-status"></span></span>
{% set is_service_stopped_class = 'disabled-button' %}
{% set onclick_stop_action = "" %}
{% set is_service_stopped_title = lang.words.service|title()+" "+services_name[s.0]['name']+" "+lang.words.already+" "+lang.words.stopped %}
{% set is_service_stopped_title = lang.words.service|title()+" "+services_name[service.0]['name']+" "+lang.words.already+" "+lang.words.stopped %}
{% else %}
<span title="{{lang.words.service|title()}} {{services_name[s.0]['name']}} {{lang.words.not}} {{lang.words.installed}}"><span class="serverNone server-status"></span></span>
<span title="{{lang.words.service|title()}} {{services_name[service.0]['name']}} {{lang.words.not}} {{lang.words.installed}}"><span class="serverNone server-status"></span></span>
{% endif %}
{% endif %}
{{services_name[s.0]['name']}}
{{services_name[service.0]['name']}}
</td>
<td class="padding10 first-collumn">
{% if 'is not installed' in s.2['current_version'] or not s.2['current_version'] or s.2['current_version'] == '0' %}
{% if s.0 in ('prometheus', 'grafana-server') %}
{% if 'is not installed' in service.2['current_version'] or not service.2['current_version'] or service.2['current_version'] == '0' %}
{% if service.0 in ('prometheus', 'grafana-server') %}
<a href="/app/install#monitoring" class="ui-button ui-widget ui-corner-all" title="{{lang.words.install|title()}} {{service_name}}">{{lang.words.install|title()}}</a>
{% elif s.0 in ('rabbitmq-server', 'fail2ban') %}
<a class="ui-button ui-widget ui-corner-all" href="https://roxy-wi.org/tools/{{s.0.split('-')[0]}}" title="{{lang.words.install|title()}} {{services_name[s.0]['name']}}" target="_blank">{{lang.words.install|title()}}</a>
{% elif service.0 in ('rabbitmq-server', 'fail2ban') %}
<a class="ui-button ui-widget ui-corner-all" href="https://roxy-wi.org/tools/{{service.0.split('-')[0]}}" title="{{lang.words.install|title()}} {{services_name[service.0]['name']}}" target="_blank">{{lang.words.install|title()}}</a>
{% else %}
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('{{s.0}}', 'install')" title="{{lang.words.install|title()}} {{service_name}}">{{lang.words.install|title()}}</a>
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('{{service.0}}', 'install')" title="{{lang.words.install|title()}} {{service_name}}">{{lang.words.install|title()}}</a>
{% endif %}
{% else %}
<a id="start-{{ s.0 }}" class="start" title="{{is_service_started_title}}">
<a id="start-{{ service.0 }}" class="start" title="{{is_service_started_title}}">
<span class="service-start {{is_service_started_class}}" onclick="{{onclick_start_action}}"></span>
</a>
<a id="restart-{{ s.2 }}" class="restart" title="{{lang.words.restart|title()}} {{services_name[s.0]['name']}} {{lang.words.service}}">
<span class="service-reload service-restart" onclick="confirmAjaxServiceAction('restart', '{{s.0}}')"></span>
<a id="restart-{{ service.2 }}" class="restart" title="{{lang.words.restart|title()}} {{services_name[service.0]['name']}} {{lang.words.service}}">
<span class="service-reload service-restart" onclick="confirmAjaxServiceAction('restart', '{{service.0}}')"></span>
</a>
<a id="stop-{{ s.0 }}" class="stop" title="{{is_service_stopped_title}}">
<a id="stop-{{ service.0 }}" class="stop" title="{{is_service_stopped_title}}">
<span class="service-stop {{is_service_stopped_class}}" onclick="{{onclick_stop_action}}"></span>
</a>
{% endif %}
</td>
<td>
{% if 'is not installed' not in s.2['current_version'] %}
{{s.2['current_version']}}
{% if 'is not installed' not in service.2['current_version'] %}
{{service.2['current_version']}}
{% endif %}
</td>
<td colspan="2">
{{ services_name[s.0]['desc'] | safe }}
{{ services_name[service.0]['desc'] | safe }}
</td>
</tr>
{% endfor %}

19
app/templates/ajax/show_services_ovw.html
View File

@ -1,7 +1,8 @@
{% import 'languages/'+lang|default('en')+'.html' as lang %}
<tr class="odd">
<td class="padding10 first-collumn-wi">
{% if roxy_tools_status['roxy-wi-metrics'] == 'active' %}
{{ roxy_tools_status }}
{% if roxy_tools_status['roxy-wi-metrics'] == 'active' or roxy_tools_status['roxy-wi-metrics'] == 'RUNNING' %}
<span class="serverUp server-status-small" title="Metrics master {{lang.words.started}}"></span>
{% if role <= 1 %}
<a href="{{ url_for('logs.logs_internal') }}" title="{{lang.words.view|title()}} {{lang.words.logs2}}" class="logs_link">
@ -11,7 +12,7 @@
Metrics master
{% endif %}
{% else %}
{% if roxy_tools_status['roxy-wi-metrics'] == 'inactive' or roxy_tools_status['roxy-wi-metrics'] == 'failed' %}
{% if roxy_tools_status['roxy-wi-metrics'] == 'inactive' or roxy_tools_status['roxy-wi-metrics'] == 'failed' or roxy_tools_status['roxy-wi-metrics'] == 'ERROR' %}
<span class="serverDown server-status-small" title="Metrics {{lang.words.stopped}}"></span>
{% if role <= 1 %}
<a href="{{ url_for('admin.admin') }}#tools" title="{{lang.words.start|title()}} Metrics" class="logs_link">
@ -29,7 +30,7 @@
{% endif %}
</td>
<td class="third-collumn-wi">
{% if roxy_tools_status['roxy-wi-checker'] == 'active' %}
{% if roxy_tools_status['roxy-wi-checker'] == 'active' or roxy_tools_status['roxy-wi-checker'] == 'RUNNING' %}
<span class="serverUp server-status-small" title="Checker master {{lang.words.started}}"></span>
{% if role <= 1 %}
<a href="{{ url_for('logs.logs_internal') }}" title="{{lang.words.view|title()}} {{lang.words.logs2}}" class="logs_link">
@ -57,7 +58,7 @@
{% endif %}
</td>
<td class="third-collumn-wi">
{% if roxy_tools_status['roxy-wi-keep_alive'] == 'active' %}
{% if roxy_tools_status['roxy-wi-keep_alive'] == 'active' or roxy_tools_status['roxy-wi-keep_alive'] == 'RUNNING' %}
<span class="serverUp server-status-small" title="Auto start {{lang.words.started}}"></span>
{% if role <= 1 %}
<a href="{{ url_for('logs.logs_internal') }}" title="{{lang.words.view|title()}} {{lang.words.logs2}}" class="logs_link">
@ -67,7 +68,7 @@
Auto star
{% endif %}
{% else %}
{% if roxy_tools_status['roxy-wi-keep_alive'] == 'inactive' or roxy_tools_status['roxy-wi-keep_alive'] == 'failed' %}
{% if roxy_tools_status['roxy-wi-keep_alive'] == 'inactive' or roxy_tools_status['roxy-wi-keep_alive'] == 'failed' or roxy_tools_status['roxy-wi-keep_alive'] == 'ERROR' %}
<span class="serverDown server-status-small" title="Auto start {{lang.words.stopped}}"></span>
{% if role <= 1 %}
<a href="{{ url_for('admin.admin') }}#services" title="{{lang.words.start|title()}} Auto star {{lang.words.service}}" class="logs_link">
@ -156,7 +157,7 @@
{% endif %}
</td>
<td {% if role != 1 %}class="padding10 first-collumn-wi"{%endif%}>
{% if roxy_tools_status['roxy-wi-socket'] == 'active' %}
{% if roxy_tools_status['roxy-wi-socket'] == 'active' or roxy_tools_status['roxy-wi-socket'] == 'RUNNING' %}
<span class="serverUp server-status-small" title="Socket {{lang.words.started}}"></span>
{% if role <= 1 %}
<a href="{{ url_for('logs.logs_internal') }}" title="{{lang.words.view|title()}} {{lang.words.logs2}}" class="logs_link">
@ -166,7 +167,7 @@
Socket service
{% endif %}
{% else %}
{% if roxy_tools_status['roxy-wi-socket'] == 'inactive' or roxy_tools_status['roxy-wi-socket'] == 'failed' %}
{% if roxy_tools_status['roxy-wi-socket'] == 'inactive' or roxy_tools_status['roxy-wi-socket'] == 'failed' or roxy_tools_status['roxy-wi-socket'] == 'ERROR' %}
<span class="serverDown server-status-small" title="Socket {{lang.words.stopped}}"></span>
<a href="{{ url_for('admin.admin') }}#services" title="{{lang.words.start|title()}} Socket" class="logs_link">
Socket service
@ -180,13 +181,13 @@
{% endif %}
</td>
<td>
{% if roxy_tools_status['roxy-wi-portscanner'] == 'active' %}
{% if roxy_tools_status['roxy-wi-portscanner'] == 'active' or roxy_tools_status['roxy-wi-portscanner'] == 'RUNNING' %}
<span class="serverUp server-status-small" title="Port scanner {{lang.words.started}}"></span>
<a href="{{ url_for('portscanner.portscanner') }}" title="Port scanner Dashboard" class="logs_link">
Port scanner
</a>
{% else %}
{% if roxy_tools_status['roxy-wi-portscanner'] == 'inactive' or roxy_tools_status['roxy-wi-portscanner'] == 'failed' %}
{% if roxy_tools_status['roxy-wi-portscanner'] == 'inactive' or roxy_tools_status['roxy-wi-portscanner'] == 'failed' or roxy_tools_status['roxy-wi-portscanner'] == 'ERROR' %}
<span class="serverDown server-status-small" title="Port scanner {{lang.words.stopped}}"></span>
<a href="{{ url_for('admin.admin') }}#services" title="{{lang.words.start|title()}} Port scanner" class="logs_link">
Port scanner

2
inc/metrics.js
View File

@ -574,4 +574,4 @@ function updatingCpuRamCharts() {
} else {
removeData();
}
}Œ
}