From 7278908117e53b14a3048b0a239ad5b1ac0e1078 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Wed, 2 Sep 2020 11:49:42 +0600 Subject: [PATCH] v4.4.2.0 Changelog: https://haproxy-wi.org/changelog.py#4_4_2 --- app/overview.py | 2 +- app/templates/ovw.html | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/overview.py b/app/overview.py index a169dc41..90d491fe 100644 --- a/app/overview.py +++ b/app/overview.py @@ -70,7 +70,7 @@ try: prometheus, stderr = funct.subprocess_execute(cmd) 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) cmd = "systemctl status checker_haproxy |grep Act |awk '{print $2}'" checker_master, stderr = funct.subprocess_execute(cmd) diff --git a/app/templates/ovw.html b/app/templates/ovw.html index b92a0f1d..cf0623e7 100644 --- a/app/templates/ovw.html +++ b/app/templates/ovw.html @@ -87,17 +87,27 @@ - {% if metrics_master|int() >= 1 %} - - {% else %} - - {% endif %} - {% if role <= 1 %} - + {% if metrics_master == 'active' %} + + {% if role <= 1 %} + + Metrics master + + {% else %} Metrics master - + {% endif %} {% else %} - Metrics master + {% if checker_master == 'inactive' or checker_master == 'failed' %} + + + Checker master + + {% else %} + + + Checker master + + {% endif %} {% endif %}