mirror of https://github.com/Aidaho12/haproxy-wi
parent
689a19aa28
commit
7e14145f79
|
@ -859,7 +859,7 @@ def update_db_v_5_3_2_2(**kwargs):
|
||||||
|
|
||||||
|
|
||||||
def update_ver():
|
def update_ver():
|
||||||
query = Version.update(version='5.3.2.0')
|
query = Version.update(version='5.3.3.0')
|
||||||
try:
|
try:
|
||||||
query.execute()
|
query.execute()
|
||||||
except:
|
except:
|
||||||
|
|
|
@ -2419,7 +2419,6 @@ def insert_port_scanner_history(serv, port, port_status, service_name):
|
||||||
try:
|
try:
|
||||||
PortScannerHistory.insert(serv=serv, port=port, status=port_status, service_name=service_name,
|
PortScannerHistory.insert(serv=serv, port=port, status=port_status, service_name=service_name,
|
||||||
date=funct.get_data('regular')).execute()
|
date=funct.get_data('regular')).execute()
|
||||||
cursor.execute(sql)
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
out_error(e)
|
out_error(e)
|
||||||
|
|
||||||
|
|
|
@ -12,10 +12,11 @@
|
||||||
<input type="hidden" value="{{service}}" name="service" id="service">
|
<input type="hidden" value="{{service}}" name="service" id="service">
|
||||||
{% include 'include/select.html' %}
|
{% include 'include/select.html' %}
|
||||||
<a class="ui-button ui-widget ui-corner-all" title="View stat" onclick="showListOfVersion(1)">Open</a>
|
<a class="ui-button ui-widget ui-corner-all" title="View stat" onclick="showListOfVersion(1)">Open</a>
|
||||||
|
<a href="config.py?service={{service}}" class="ui-button ui-widget ui-corner-all" title="Configs page">Configs</a>
|
||||||
{% if service != 'keepalived' %}
|
{% if service != 'keepalived' %}
|
||||||
<a href="config.py" class="ui-button ui-widget ui-corner-all" title="Configs page">Configs</a>
|
|
||||||
<a class="ui-button ui-widget ui-corner-all" title="View stat" onclick="openStats()">Stat</a>
|
<a class="ui-button ui-widget ui-corner-all" title="View stat" onclick="openStats()">Stat</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
<a class="ui-button ui-widget ui-corner-all" title="Change version" onclick="changeVersion()">Change version</a>
|
||||||
</form>
|
</form>
|
||||||
</p>
|
</p>
|
||||||
{% if aftersave %}
|
{% if aftersave %}
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
{% set section = namespace(section='') %}
|
{% set section = namespace(section='') %}
|
||||||
{% for set in settings %}
|
{% for set in settings %}
|
||||||
|
{% if page == "servers.py" and set.section == 'monitoring' %}
|
||||||
|
<!-- continue -->
|
||||||
|
{% else %}
|
||||||
{% if section.section|string() != set.section|string() %}
|
{% if section.section|string() != set.section|string() %}
|
||||||
<th colspan="3" title="Show {{ set.section }} section" id="{{set.section}}-section-head" style="cursor: pointer; padding-top: 10px;">
|
<th colspan="3" title="Show {{ set.section }} section" id="{{set.section}}-section-head" style="cursor: pointer; padding-top: 10px;">
|
||||||
<h3 class="plus-after" id="{{set.section}}-section-h3" style="font-size: 1em; padding-left: 15px;">
|
<h3 class="plus-after" id="{{set.section}}-section-h3" style="font-size: 1em; padding-left: 15px;">
|
||||||
|
@ -36,7 +39,8 @@
|
||||||
set.param == 'syslog_server_enable' or set.param == 'smon_check_interval' or
|
set.param == 'syslog_server_enable' or set.param == 'smon_check_interval' or
|
||||||
set.param == 'checker_check_interval' or set.param == 'port_scan_interval' or
|
set.param == 'checker_check_interval' or set.param == 'port_scan_interval' or
|
||||||
set.param == 'smon_keep_history_range' or set.param == 'checker_keep_history_range' or
|
set.param == 'smon_keep_history_range' or set.param == 'checker_keep_history_range' or
|
||||||
set.param == 'portscanner_keep_history_range' or set.param == 'haproxy_enterprise' %}
|
set.param == 'portscanner_keep_history_range' or set.param == 'haproxy_enterprise' or
|
||||||
|
set.param == 'checker_maxconn_threshold' %}
|
||||||
|
|
||||||
{{ input(set.param, value=set.value, style='width: 210px;', type='number') }}
|
{{ input(set.param, value=set.value, style='width: 210px;', type='number') }}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -51,6 +55,7 @@
|
||||||
{{set.desc}}
|
{{set.desc}}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
|
@ -529,6 +529,15 @@ function showListOfVersion(for_delver) {
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
function changeVersion(){
|
||||||
|
if (localStorage.getItem('version_style') == 'new') {
|
||||||
|
localStorage.setItem('version_style', 'old');
|
||||||
|
showListOfVersion(1);
|
||||||
|
} else {
|
||||||
|
localStorage.setItem('version_style', 'new');
|
||||||
|
showListOfVersion(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
function findGetParameter(parameterName) {
|
function findGetParameter(parameterName) {
|
||||||
var result = null,
|
var result = null,
|
||||||
tmp = [];
|
tmp = [];
|
||||||
|
|
Loading…
Reference in New Issue