From: Michael Tremer Date: Tue, 30 Oct 2018 12:32:35 +0000 (+0000) Subject: fireinfo: Show virtualization stats on index page X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c40994344d1ae381906ea3d24486d052104057a8;p=ipfire.org.git fireinfo: Show virtualization stats on index page Signed-off-by: Michael Tremer --- diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index 8a1eabfc..fadbb150 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -54,6 +54,8 @@ $font-size-base: 1.125rem; $lead-font-size: 1.5rem; $small-font-size: 87.5%; +$line-height-base: 1.5; + // Headings $headings-font-weight: 500; $headings-line-height: 1.15; @@ -85,3 +87,6 @@ $input-btn-padding-y: .5rem; // Buttons $btn-border-width: 3px; + +// Progress +$progress-height: 1rem * $line-height-base; diff --git a/src/scss/style.scss b/src/scss/style.scss index 59380259..6dd93340 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -237,10 +237,6 @@ hr.divider { margin-bottom: 3rem; } -.progress { - background-color: rgba(255, 255, 255, .2); -} - .circle { position: relative; p.fireinfo_per { diff --git a/src/templates/fireinfo/index.html b/src/templates/fireinfo/index.html index 86376d9a..45247aa6 100644 --- a/src/templates/fireinfo/index.html +++ b/src/templates/fireinfo/index.html @@ -19,7 +19,7 @@
-
+
{{ _("Show a Random Profile") }} @@ -27,4 +27,43 @@
+ +
+
+
+
+

+ {{ "%.2f%%" % (virtual_ratio * 100) }} +

+ +
{{ _("of all IPFire systems are running in a virtual environment") }}
+
+ +
+

+ {{ _("The top vendors of hypervisors are") }} +

+ +
+ {% for name, percentage in hypervisors %} + {% if percentage >= 0.1 %} +
+ {% if name == "unknown" %} + {{ _("Unknown") }} + {% elif name == "VMWare" %} + VMware + {% else %} + {{ name }} + {% end %} +
+
+ {% module ProgressBar(percentage, "primary") %} +
+ {% end %} + {% end %} +
+
+
+
+
{% end block %} diff --git a/src/templates/modules/progress-bar.html b/src/templates/modules/progress-bar.html index cc121635..4be7f6dd 100644 --- a/src/templates/modules/progress-bar.html +++ b/src/templates/modules/progress-bar.html @@ -1,7 +1,14 @@ -
-
+
+
{{ "%.2f" % value }}%
+ +
+
+
+
+
+
diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py index 02156e42..03cc15ca 100644 --- a/src/web/fireinfo.py +++ b/src/web/fireinfo.py @@ -154,10 +154,15 @@ class ProfileSendHandler(BaseHandler): class IndexHandler(BaseHandler): def get(self): + data = { + "hypervisors" : self.fireinfo.get_hypervisor_map(when=self.when), + "virtual_ratio" : self.fireinfo.get_virtual_ratio(when=self.when), + } + # Cache for 1h self.set_expires(3600) - self.render("fireinfo/index.html") + self.render("fireinfo/index.html", **data) class DriverDetail(BaseHandler):