fireinfo: Drop old virtualization stats

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 5345f1471c0d537321f5596143064df3210e647b..b81d7187c983ce5304011d930aa34777cc4e4118 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,7 +150,6 @@ templates_fireinfo_DATA = \
        src/templates/fireinfo/stats-memory.html \
        src/templates/fireinfo/stats-network.html \
        src/templates/fireinfo/stats-oses.html \
-       src/templates/fireinfo/stats-virtual.html \
        src/templates/fireinfo/vendor.html \
        src/templates/fireinfo/vendors.html
 

diff --git a/src/templates/fireinfo/stats-virtual.html b/src/templates/fireinfo/stats-virtual.html
deleted file mode 100644 (file)
index beb15d4..0000000
--- a/src/templates/fireinfo/stats-virtual.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Virtualization") }}{% end block %}
-
-{% block body %}
-       <div class="page-header">
-               <h1>{{ _("Virtualization support") }}</h1>
-       </div>
-
-       {% if virtual %}
-               <div class="row">
-                       <div class="col-lg-12 col-md-12">
-                               <p>
-                                       IPFire is running very well in a virtual environment.
-                               </p>
-                               <p>
-                                       See this chart to get a clue about how many machines are running
-                                       virtually.
-                               </p>
-
-                               <dl class="dl-horizontal">
-                                       <dt>{{ _("Virtualised systems") }}</dt>
-                                       <dd>
-                                               <div class="progress">
-                                                       <div class="progress-bar progress-bar-warning" role="progressbar"
-                                                               aria-valuenow="{{ "%.0f" % (virtual * 100) }}" aria-valuemin="0"
-                                                               aria-valuemax="100" style="width: {{ "%.2f" % (virtual * 100) }}%; min-width: 4em;">
-                                                               {{ "%.2f" % (virtual * 100) }}%
-                                                       </div>
-                                               </div>
-                                       </dd>
-                               </dl>
-                       </div>
-               </div>
-       {% end %}
-
-       <div class="row">
-               <div class="col-lg-12 col-md-12">
-                       <h2>{{ _("Hypervisors") }}</h2>
-                       <p>
-                               This is a list of all hypervisor vendors that IPFire is running on.
-                       </p>
-
-                       <dl class="dl-horizontal">
-                               {% for name, percentage in hypervisors %}
-                                       <dt>
-                                               {% if name == "unknown" %}
-                                                       <span class="text-muted">{{ _("Unknown") }}</span>
-                                               {% elif name == "VMWare" %}
-                                                       VMware
-                                               {% else %}
-                                                       {{ name }}
-                                               {% end %}
-                                       </dt>
-                                       <dd>
-                                               <div class="progress">
-                                                       <div class="progress-bar" role="progressbar"
-                                                               aria-valuenow="{{ "%.0f" % (percentage * 100) }}" aria-valuemin="0"
-                                                               aria-valuemax="100" style="width: {{ "%.2f" % (percentage * 100) }}%; min-width: 4em;">
-                                                               {{ "%.2f" % (percentage * 100) }}%
-                                                       </div>
-                                               </div>
-                                       </dd>
-                               {% end %}
-                       </dl>
-               </div>
-       </div>
-{% end block %}

diff --git a/src/templates/fireinfo/stats.html b/src/templates/fireinfo/stats.html
index c755df9cf9b073d0f160b49fb6d4c7457c627504..4f703858162050a4bd43938c5c6cff19cfaa8a66 100644 (file)
--- a/src/templates/fireinfo/stats.html
+++ b/src/templates/fireinfo/stats.html
@@ -33,10 +33,6 @@
                                <h4>
                                        <a href="/statistics/memory">{{ _("Memory") }}</a>
                                </h4>
-
-                               <h4>
-                                       <a href="/statistics/virtualization">{{ _("Virtualization") }}</a>
-                               </h4>
                        </div>
 
                        <div class="thumbnail ac">

diff --git a/src/web/__init__.py b/src/web/__init__.py
index bcb3b9c35620b96a50a9c63f994bb0b89208d56b..a34f281fcf42ac238d577df6f231a18631c2e561 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -209,7 +209,6 @@ class Application(tornado.web.Application):
                        (r"/statistics/memory", fireinfo.StatsMemoryHandler),
                        (r"/statistics/networking", fireinfo.StatsNetworkingHandler),
                        (r"/statistics/releases", fireinfo.StatsReleasesHandler),
-                       (r"/statistics/virtualization", fireinfo.StatsVirtualHandler),
                ])
 
                # i-use.ipfire.org

diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py
index 03cc15ca940b2aa6b63e2425936d90bf19cc1408..03b28a61e41b73a58160122104f628b029e2a554 100644 (file)
--- a/src/web/fireinfo.py
+++ b/src/web/fireinfo.py
@@ -253,16 +253,6 @@ class StatsReleasesHandler(BaseHandler):
                return self.render("fireinfo/stats-oses.html", **data)
 
 
-class StatsVirtualHandler(BaseHandler):
-       def get(self):
-               data = {
-                       "hypervisors" : self.fireinfo.get_hypervisor_map(when=self.when),
-                       "virtual"     : self.fireinfo.get_virtual_ratio(when=self.when),
-               }
-
-               return self.render("fireinfo/stats-virtual.html", **data)
-
-
 class StatsGeoHandler(BaseHandler):
        def get(self):
                return self.render("fireinfo/stats-geo.html",