mirror of https://github.com/Aidaho12/haproxy-wi
parent
1c040f6a22
commit
797a13fa83
|
@ -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,
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}]
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue