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

v6.1.2.0 

Change log: https://roxy-wi.org/changelog.py#6_1_2
pull/334/head
Pavel Loginov 2022-07-25 11:48:11 +03:00
parent f8ffdb1ef6
commit c1c5daf11b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/options.py
View File

@ -1943,7 +1943,7 @@ if form.getvalue('new_http_metrics'):
serv = form.getvalue('server') serv = form.getvalue('server')
hostname = sql.get_hostname_by_server_ip(serv) hostname = sql.get_hostname_by_server_ip(serv)
time_range = form.getvalue('time_range') time_range = form.getvalue('time_range')
metric = sql.select_metrics_http(serv, time_range=time_range) metric = sql.select_metrics(serv, 'http_metrics', time_range=time_range)
metrics = {'chartData': {}} metrics = {'chartData': {}}
metrics['chartData']['labels'] = {} metrics['chartData']['labels'] = {}
labels = '' labels = ''
@ -1978,12 +1978,17 @@ if any((form.getvalue('new_nginx_metrics'), form.getvalue('new_apache_metrics'),
serv = form.getvalue('server') serv = form.getvalue('server')
hostname = sql.get_hostname_by_server_ip(serv) hostname = sql.get_hostname_by_server_ip(serv)
time_range = form.getvalue('time_range') time_range = form.getvalue('time_range')
service = ''
if form.getvalue('new_nginx_metrics'): if form.getvalue('new_nginx_metrics'):
metric = sql.select_nginx_metrics(serv, time_range=time_range) service = 'nginx'
elif form.getvalue('new_apache_metrics'): elif form.getvalue('new_apache_metrics'):
metric = sql.select_apache_metrics(serv, time_range=time_range) service = 'apache'
elif form.getvalue('new_waf_metrics'): elif form.getvalue('new_waf_metrics'):
metric = sql.select_waf_metrics(serv, time_range=time_range) service = 'waf'
metric = sql.select_metrics(serv, service, time_range=time_range)
metrics = {'chartData': {}} metrics = {'chartData': {}}
metrics['chartData']['labels'] = {} metrics['chartData']['labels'] = {}
labels = '' labels = ''