From bfa85691b258ffb64b66f5402788974ca1194a5a Mon Sep 17 00:00:00 2001 From: Georgy Okrokvertskhov Date: Wed, 16 Apr 2014 20:59:22 -0700 Subject: [PATCH] Fix floating number appearence on stats page Added floating number formatting on stats page to limit floating number to three digits after point. Change-Id: I1728dc06483dc2ca2d4457d7a91f7360cf74dc6e --- muranodashboard/stats/models.py | 2 ++ muranodashboard/templates/stats/_srv_instance.html | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/muranodashboard/stats/models.py b/muranodashboard/stats/models.py index b00525321..28e222685 100644 --- a/muranodashboard/stats/models.py +++ b/muranodashboard/stats/models.py @@ -18,6 +18,8 @@ from muranodashboard.environments import api class StatsModel(object): def get_api_stats(self, request): st_list = api.muranoclient(request).request_statistics.list() + for srv in st_list: + srv.max_cpu = srv.cpu_count * 100 return st_list diff --git a/muranodashboard/templates/stats/_srv_instance.html b/muranodashboard/templates/stats/_srv_instance.html index 8652c87a5..451cffc5d 100644 --- a/muranodashboard/templates/stats/_srv_instance.html +++ b/muranodashboard/templates/stats/_srv_instance.html @@ -1,4 +1,5 @@ {% load static %} +{% load humanize %}
@@ -8,12 +9,12 @@

API server: {{ server.host }}

CPU Load: - {{ server.cpu_percent }}% + {{ server.cpu_percent }}% Requests: {{ server.request_count }} Errors: {{ server.error_count }} - Ave.Resp.Time: {{ server.average_response_time }} - Req\sec: {{ server.requests_per_second }} - Err\sec: {{ server.errors_per_second }} + Ave.Resp.Time: {{ server.average_response_time|floatformat:3}} + Req\sec: {{ server.requests_per_second|floatformat:3 }} + Err\sec: {{ server.errors_per_second|floatformat:3 }}
\ No newline at end of file