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

v8.2.0: fix metrics display

master
Aidaho 2025-05-21 14:49:12 +03:00
parent 1cabf7fff9
commit 18bba8faba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/routes/metric/routes.py
View File

@ -71,13 +71,13 @@ def metrics(service):
@get_user_params() @get_user_params()
@validate() @validate()
def metrics_cpu(body: IpRequest): def metrics_cpu(body: IpRequest):
return jsonify(metric.show_cpu_metrics(body.ip)) return jsonify(metric.show_cpu_metrics(str(body.ip)))
@bp.route('/ram', methods=['POST']) @bp.route('/ram', methods=['POST'])
@validate() @validate()
def metrics_ram(body: IpRequest): def metrics_ram(body: IpRequest):
return jsonify(metric.show_ram_metrics(body.ip)) return jsonify(metric.show_ram_metrics(str(body.ip)))
@bp.route('/<service>/table-metrics') @bp.route('/<service>/table-metrics')
@ -100,7 +100,7 @@ def table_metrics(service):
def show_metric(service: str, server_ip: Union[IPvAnyAddress, DomainName]): def show_metric(service: str, server_ip: Union[IPvAnyAddress, DomainName]):
server_ip = str(server_ip) server_ip = str(server_ip)
server = server_sql.get_server_by_ip(server_ip) server = server_sql.get_server_by_ip(server_ip)
time_range = int(request.form.get('time_range')) time_range = int(request.form.get('time_range', 30))
if service in ('nginx', 'apache', 'waf'): if service in ('nginx', 'apache', 'waf'):
return jsonify(metric.service_metrics(server_ip, server.hostname, service, time_range)) return jsonify(metric.service_metrics(server_ip, server.hostname, service, time_range))