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

v4.4.2.0 

Changelog: https://haproxy-wi.org/changelog.py#4_4_2
pull/246/head
Pavel Loginov 2020-09-02 11:49:42 +06:00
parent 710575dbab
commit 7278908117
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/overview.py
View File

@ -70,7 +70,7 @@ try:
prometheus, stderr = funct.subprocess_execute(cmd) prometheus, stderr = funct.subprocess_execute(cmd)
host = os.environ.get('HTTP_HOST', '') host = os.environ.get('HTTP_HOST', '')
cmd = "ps ax |grep metrics_master |grep -v grep |wc -l" cmd = "systemctl status metrics_haproxy |grep Act |awk '{print $2}'"
metrics_master, stderr = funct.subprocess_execute(cmd) metrics_master, stderr = funct.subprocess_execute(cmd)
cmd = "systemctl status checker_haproxy |grep Act |awk '{print $2}'" cmd = "systemctl status checker_haproxy |grep Act |awk '{print $2}'"
checker_master, stderr = funct.subprocess_execute(cmd) checker_master, stderr = funct.subprocess_execute(cmd)

28
app/templates/ovw.html
View File

@ -87,17 +87,27 @@
</tr> </tr>
<tr> <tr>
<td class="padding10 first-collumn-wi"> <td class="padding10 first-collumn-wi">
{% if metrics_master|int() >= 1 %} {% if metrics_master == 'active' %}
<span title="running {{ metrics_master }} master processes"><span class="serverUp server-status"></span></span> <span title="running {{ metrics_master }} master processes"><span class="serverUp server-status"></span></span>
{% else %} {% if role <= 1 %}
<span class="serverDown server-status"></span> <a href="/app/viewlogs.py?viewlogs={{metrics_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View metrics master's logs" class="logs_link">
{% endif %} <span>Metrics master</span>
{% if role <= 1 %} </a>
<a href="/app/viewlogs.py?viewlogs={{metrics_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View metrics master's logs" class="logs_link"> {% else %}
<span>Metrics master</span> <span>Metrics master</span>
</a> {% endif %}
{% else %} {% else %}
<span>Metrics master</span> {% if checker_master == 'inactive' or checker_master == 'failed' %}
<span title="Metrics is stopped"><span class="serverDown server-status"></span></span>
<a href="/app/users.py#services" title="Start Metrics - HAProxy-WI service" class="logs_link">
Checker master
</a>
{% else %}
<span title="Metrics is not installed"><span class="serverNone server-status"></span></span>
<a href="https://haproxy-wi.org/services.py?service=metrics#installation" title="Metrics installation" target="_blank" class="logs_link">
Checker master
</a>
{% endif %}
{% endif %} {% endif %}
</td> </td>
<td class="third-collumn-wi"> <td class="third-collumn-wi">