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

v3.5.2 

Mobile-readi design, bugs fix, improved logging
pull/161/head
Pavel Loginov 2019-10-07 20:07:28 +03:00
parent 5f8cd37f7c
commit 6b9f143bac
12 changed files with 103 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -44,6 +44,7 @@ Support the project
25. LDAP support
26. Keep active HAProxy service
27. Ability to hide parts of the config with tags for users with "guest" role: "HideBlockStart" and "HideBlockEnd"
28. Mobile-ready desing
![alt text](image/haproxy-wi-metrics.png "Merics")

4
app/funct.py
View File

@ -217,6 +217,7 @@ def get_config(serv, cfg, **kwargs):
ssh.close()
except Exception as e:
ssh = str(e)
logging('localhost', ssh, haproxywi=1)
return ssh
def diff_config(oldcfg, cfg):
@ -404,6 +405,7 @@ def upload(serv, path, file, **kwargs):
ssh = ssh_connect(serv)
except Exception as e:
error = e
logging('localhost', e, haproxywi=1)
pass
try:
sftp = ssh.open_sftp()
@ -412,6 +414,7 @@ def upload(serv, path, file, **kwargs):
ssh.close()
except Exception as e:
error = e
logging('localhost', e, haproxywi=1)
pass
return error
@ -451,6 +454,7 @@ def upload_and_restart(serv, cfg, **kwargs):
except Exception as e:
error += e
if error:
logging('localhost', error, haproxywi=1)
return error
def open_port_firewalld(cfg):

4
app/templates/admin.html
View File

@ -146,9 +146,9 @@
</td>
<td>
{% if group.2 != "None" %}
<input type="text" id="descript-{{ group.0 }}" value="{{ group.2 }}" class="form-control" size="100">
<input type="text" id="descript-{{ group.0 }}" value="{{ group.2 }}" class="form-control" size="60">
{% else %}
<input type="text" id="descript-{{ group.0 }}" value="" class="form-control" size="100">
<input type="text" id="descript-{{ group.0 }}" value="" class="form-control" size="60">
{% endif %}
</td>
<td>

28
app/templates/ajax/config_show.html
View File

@ -52,7 +52,7 @@
{% endif %}
{% set backend = line.split(' ') %}
<span class="accordion-link">
<a href="/app/viewsttats.py?serv={{serv}}#{{ backend[1]}}">Stats</a>
<a href="/app/viewsttats.py?serv={{serv}}#{{ backend[1]}}" target="_blank">Stats</a>
</span>
</span><div>
{% continue %}
@ -66,7 +66,7 @@
{% endif %}
{% set backend = line.split(' ') %}
<span class="accordion-link">
<a href="/app/viewsttats.py?serv={{serv}}#{{ backend[1]}}">Stats</a>
<a href="/app/viewsttats.py?serv={{serv}}#{{ backend[1]}}" target="_blank">Stats</a>
</span>
</span><div>
{% continue %}
@ -74,19 +74,35 @@
{% if line.startswith('backend') %}
</div><span class="param"> {{ line }}
{% if role %}
<span class="accordion-link">
<a href="/app/sections.py?serv={{serv}}&section={{ line }}">Edit</a>
<span class="accordion-link">
<a href="/app/sections.py?serv={{serv}}&section={{ line }}">Edit</a>
</span>
{% endif %}
{% set backend = line.split(' ') %}
<span class="accordion-link">
<a href="/app/viewsttats.py?serv={{serv}}#{{ backend[1]}}">Stats</a>
<a href="/app/viewsttats.py?serv={{serv}}#{{ backend[1]}}" target="_blank">Stats</a>
</span>
</span><div>
{% continue %}
{% endif %}
{% if line.startswith('cache') %}
</div><span class="param"> {{ line }} </span><div>
</div><span class="param"> {{ line }}
{% if role %}
<span class="accordion-link">
<a href="/app/sections.py?serv={{serv}}&section={{ line }}">Edit</a>
</span>
{% endif %}
</span><div>
{% continue %}
{% endif %}
{% if line.startswith('peers') %}
</div><span class="param"> {{ line }}
{% if role %}
<span class="accordion-link">
<a href="/app/sections.py?serv={{serv}}&section={{ line }}">Edit</a>
</span>
{% endif %}
</span><div>
{% continue %}
{% endif %}
{% if "acl" in line or "option" in line or "server" in line %}

4
app/templates/ajax/overivewWaf.html
View File

@ -13,10 +13,6 @@
{{ service.0 }}
</a>
</td>
{% if url == "waf.py" %}
<td>
</td>
{% endif %}
<td>
{% if role <= 1 %}
<a id="{{ service.1 }}" class="start-waf" title="Start WAF service">

8
app/templates/ajax/table_metrics.html
View File

@ -10,16 +10,16 @@
<th colspan=3>Peak connections</th>
</tr>
<tr class="overviewHead">
<th>60 minutes</th>
<th>1 hour</th>
<th>24 hours</th>
<th>3 days</th>
<th>60 minutes</th>
<th>1 hour</th>
<th>24 hours</th>
<th>3 days</th>
<th>60 minutes</th>
<th>1 hour</th>
<th>24 hours</th>
<th>3 days</th>
<th>60 minutes</th>
<th>1 hour</th>
<th>24 hours</th>
<th>3 days</th>
</tr>

4
app/templates/config.html
View File

@ -36,6 +36,10 @@
{% if role <= 2 %}
<a class="ui-button ui-widget ui-corner-all" title="Show versions" onclick="openVersions()">Versions</a>
{% endif %}
{% else %}
{% if role <= 2 %}
<button type="submit" value="open" name="open" class="btn btn-default" title="Edit running config">Edit</button>
{% endif %}
{% endif %}
</form>
</p>

1
app/templates/metrics.html
View File

@ -25,7 +25,6 @@ th, tr, td {
</div>
{% endfor %}
<div id="metrics_iframe"></div>
<script>
function showMetrics() {
{% for s in servers %}

4
app/templates/waf.html
View File

@ -5,9 +5,6 @@
<td class="padding10 first-collumn">
Server
</td>
<td>
<!-- WAF status -->
</td>
<td class="padding10">
Action
</td>
@ -23,7 +20,6 @@
</tr>
<tbody id="ajaxwafstatus"></tbody>
</table>
<div id="ajax"></div>
<link href="/inc/chart.min.css" rel="stylesheet">
<script src="/inc/metrics.js"></script>

23
inc/add.js
View File

@ -354,12 +354,13 @@ $( function() {
});
$( "#saved-options" ).autocomplete({
dataType: "json",
source: "sql.py?getoption="+$('#newoptiongroup').val(),
source: "sql.py?getoption="+$('#newoptiongroup').val()+'&token='+$('#token').val(),
autoFocus: true,
minLength: -1,
minLength: 1,
select: function( event, ui ) {
$("#optionsInput").append(ui.item.value + " \n");
$( "#saved-options" ).reset();
$("#optionsInput").append(ui.item.value + " \n");
$(this).val('');
$(this).autocomplete( "close" );
}
});
$( "#options1" ).autocomplete({
@ -372,12 +373,13 @@ $( function() {
});
$( "#saved-options1" ).autocomplete({
dataType: "json",
source: "sql.py?getoption="+$('#newoptiongroup').val(),
source: "sql.py?getoption="+$('#newoptiongroup').val()+'&token='+$('#token').val(),
autoFocus: true,
minLength: -1,
minLength: 1,
select: function( event, ui ) {
$("#optionsInput1").append(ui.item.value + " \n");
$( "#options1" ).reset();
$(this).val('');
$(this).autocomplete( "close" );
}
});
$( "#options2" ).autocomplete({
@ -390,12 +392,13 @@ $( function() {
});
$( "#saved-options2" ).autocomplete({
dataType: "json",
source: "sql.py?getoption="+$('#newoptiongroup').val(),
source: "sql.py?getoption="+$('#newoptiongroup').val()+'&token='+$('#token').val(),
autoFocus: true,
minLength: -1,
minLength: 1,
select: function( event, ui ) {
$("#optionsInput2").append(ui.item.value + " \n");
$( "#saved-options2" ).reset();
$(this).val('');
$(this).autocomplete( "close" );
}
});
$('#add-option-button').click(function() {

2
inc/script.js
View File

@ -265,6 +265,8 @@ function showOverviewWaf() {
$.getScript('/inc/waf.js');
$( "input[type=submit], button" ).button();
$( "input[type=checkbox]" ).checkboxradio();
} else {
$('.first-collumn-wi').css('padding', '15px');
}
}
} );

70
inc/style.css
View File

@ -21,7 +21,7 @@ h2 {
color: #fff;
margin-top: 0px;
margin-bottom: 0px;
width: 99%
width: 98.9%;
}
h3 {
margin-top: -0;
@ -30,6 +30,7 @@ h3 {
padding: 0.3em;
font-size: 1.6em;
border-bottom: 1px solid #ddd;
width: 100.43%;
}
form {
margin: 0;
@ -78,7 +79,7 @@ pre {
.container {
min-height: calc(99vh - 50px);
height: auto;
max-width: 91%;
max-width: 100%;
min-width: 40%;
background-color: #fff;
margin-left: 207px;
@ -328,24 +329,14 @@ pre {
padding-left: 10px;
font-style: italic;
}
/* .tooltip { */
/* font-size: 12px; */
/* padding-bottom: 10px; */
/* } */
/* .tooltipTop { */
/* margin-bottom: -20px; */
/* padding-top: 10px; */
/* } */
.overview {
width: 100%;
/* margin-top: 1.5em; */
}
.overview-wi {
width: 46%;
min-width: 600px;
min-width: 566px ;
max-width: 50%;
/* border: 1px solid #A4C7F5; */
height: 160px;
min-height: 160px;
float: left;
margin: 20px;
}
@ -629,8 +620,8 @@ a:focus {
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
.logs_link {
color: #23527c;
.logs_link, .accordion-link {
color: #23527c !important;
}
table {
border-spacing: 0;
@ -809,7 +800,7 @@ label {
}
.chart-container {
position: relative;
height: 310px;
height: 400px;
width: 49%;
float: left;
margin-top: 20px;
@ -818,11 +809,34 @@ label {
@media (max-width: 1920px) {
#logo_span {
margin-left: 17%;
}
}
@media (max-width: 1080px) {
#logo_span {
margin-left: -5%;
}
.chart-container {
position: relative;
height: 410px;
width: 95%;
}
.overview-wi {
width: 95%;
max-width: 95%;
}
}
@media (max-width: 1024px) {
#logo_span {
margin-left: -5%;
#logo_span {
margin-left: -5%;
}
.chart-container {
position: relative;
height: 410px;
width: 95%;
}
.overview-wi {
width: 95%;
max-width: 95%;
}
}
@media (max-width: 667px) {
@ -830,10 +844,28 @@ label {
margin-left: -12%;
border: none;
}
.chart-container {
position: relative;
height: 410px;
width: 95%;
}
.overview-wi {
width: 95%;
max-width: 95%;
}
}
@media (max-width: 768px) {
#logo_span {
margin-left: -12%;
border: none;
}
.chart-container {
position: relative;
height: 410px;
width: 95%;
}
.overview-wi {
width: 95%;
max-width: 95%;
}
}