From 797a13fa831ef05521b9ccf38a4072f253f8b82a Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Mon, 1 Mar 2021 21:03:51 +0600
Subject: [PATCH] v5.0.0.0

Changelog: https://haproxy-wi.org/changelog.py#5_0_0
---
 app/options.py         |  5 ++---
 app/templates/ovw.html |  6 +++++-
 inc/metrics.js         | 16 ++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/options.py b/app/options.py
index 6ddd96b7..ce815e99 100644
--- a/app/options.py
+++ b/app/options.py
@@ -1265,10 +1265,10 @@ if form.getvalue('metrics_hapwi_ram'):
     rams = ''
 
     if ip == '1':
-        cmd = "free -m |grep Mem |awk '{print $3,$4,$5,$6,$7}'"
+        cmd = "free -m |grep Mem |awk '{print $2,$3,$4,$5,$6,$7}'"
         metric, error = funct.subprocess_execute(cmd)
     else:
-        commands = ["free -m |grep Mem |awk '{print $3,$4,$5,$6,$7}'"]
+        commands = ["free -m |grep Mem |awk '{print $2,$3,$4,$5,$6,$7}'"]
         metric, error = funct.subprocess_execute(commands[0])
 
     for i in metric:
@@ -2811,7 +2811,6 @@ if form.getvalue('load_update_hapwi'):
     smon_ver = funct.check_new_version(service='smon')
     metrics_ver = funct.check_new_version(service='metrics')
     keep_ver = funct.check_new_version(service='keep')
-
     services = funct.get_services_status()
 
     template = template.render(services=services,
diff --git a/app/templates/ovw.html b/app/templates/ovw.html
index 998c7599..63623e03 100644
--- a/app/templates/ovw.html
+++ b/app/templates/ovw.html
@@ -21,7 +21,11 @@
 <table class="overview-wi">
 	<tr class="overviewHead">
 		<td class="padding10 first-collumn-wi">
-			Server
+			{% if role <= 2 %}
+				<a href="servers.py#servers" title="Manage servers">Servers</a>
+			{% else %}
+				Server
+			{% endif %}
 		</td>
 		<td class="padding10  third-collumn-wi" style="width: 20%;">
 			<a href="/app/hapservers.py" title="HAProxy servers overview" class="logs_link">			
diff --git a/inc/metrics.js b/inc/metrics.js
index 70c75bef..d6c643fb 100644
--- a/inc/metrics.js
+++ b/inc/metrics.js
@@ -217,15 +217,16 @@ function renderChartHapWiRam(data) {
     var myChart = new Chart(ctx, {
         type: 'horizontalBar',
         data: {
-            labels: ['used','free','shared','buff/cache','avaliable'],
+            labels: ['total','used','free','shared','buff/cache','avaliable'],
             datasets: [
                 {
                     parsing: false,
                     normalized: true,
                     data: data[0].split(' '),
-                    backgroundColor: [						
+                    backgroundColor: [
+                        '#36a2eb',
 						'#ff6384',
-						'#36a2eb',
+						'#33ff26',
 						'#ff9f40',
 						'#ffcd56',
 						'#4bc0c0',
@@ -321,7 +322,14 @@ function renderChartHapWiCpu(data) {
 					boxWidth: 13,
 					padding: 5
 				},
-			}
+			},
+            scales: {
+                xAxes: [{
+                    ticks: {
+                        suggestedMax: 100
+                    }
+                }]
+            },
         }
     });
 }