builders: Show status on detail page

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

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index 08f0cae671e6e2c86f338803c212ea5514965798..104a9ba2d58ec536238064b2e2d4647d90c6a08a 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -321,6 +321,7 @@ class Builder(base.DataObject):
                                cpu_model = %s,
                                cpu_count = %s,
                                cpu_arch = %s,
+                               mem_total = %s,
                                pakfire_version = %s,
                                os_name = %s
                        WHERE
@@ -328,6 +329,7 @@ class Builder(base.DataObject):
                        cpu_model,
                        cpu_count,
                        cpu_arch,
+                       mem_total,
                        pakfire_version,
                        os_name,
                        self.id,
@@ -535,6 +537,10 @@ class Builder(base.DataObject):
        def cpu_arch(self):
                return self.data.cpu_arch
 
+       @property
+       def mem_total(self):
+               return self.data.mem_total
+
        @property
        def host_key_id(self):
                return self.data.host_key_id

diff --git a/src/database.sql b/src/database.sql
index b19ccf95327450480b2d83cf15b0c520088ca543..69cb4c5f6b6585bf01ecf95f6296a1e4e806721f 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -351,7 +351,8 @@ CREATE TABLE public.builders (
     online_until timestamp without time zone,
     cpu_arch text,
     instance_id text,
-    instance_type text
+    instance_type text,
+    mem_total bigint
 );
 
 

diff --git a/src/templates/builders/show.html b/src/templates/builders/show.html
index aee7dd86bb3dc306df5281869321fe8ad109a2ed..f0764607e3e1c5c6488e25fdab4db223aea3c712 100644 (file)
--- a/src/templates/builders/show.html
+++ b/src/templates/builders/show.html
@@ -19,20 +19,55 @@
 
                                <h1 class="title is-1">{{ builder }}</h1>
 
-                               {% if builder.cpu_model %}
-                                       <h4 class="subtitle is-4">
-                                               {{ builder.cpu_model or _("Unknown CPU Model") }}
-                                               {% if builder.cpu_count > 1 %}
-                                                       &times; {{ builder.cpu_count }}
-                                               {% end %}
-
-                                               <span class="tag">
-                                                       {{ builder.arch }}
-                                               </span>
-                                       </h4>
-                               {% end %}
+                               <div class="tags">
+                                       {% if builder.maintenance %}
+                                               <span class="tag is-info">{{ _("Maintenance") }}</span>
+                                       {% end %}
+
+                                       {% if builder.is_online() %}
+                                               <span class="tag is-success">{{ _("Online") }}</span>
+                                       {% else %}
+                                               <span class="tag is-dark">{{ _("Offline") }}</span>
+                                       {% end %}
+                               </div>
 
                                <div class="level">
+                                       {% if builder.cpu_model %}
+                                               <div class="level-item has-text-centered">
+                                                       <div>
+                                                               <p class="heading">{{ _("Processor") }}</p>
+                                                               <p>
+                                                                       {{ builder.cpu_model or _("Unknown CPU Model") }}
+                                                                       {% if builder.cpu_count > 1 %}
+                                                                               &times; {{ builder.cpu_count }}
+                                                                       {% end %}
+                                                               </p>
+                                                       </div>
+                                               </div>
+                                       {% end %}
+
+                                       {% if builder.mem_total %}
+                                               <div class="level-item has-text-centered">
+                                                       <div>
+                                                               <p class="heading">{{ _("Memory") }}</p>
+                                                               <p>
+                                                                       {{ format_size(builder.mem_total) }}
+                                                               </p>
+                                                       </div>
+                                               </div>
+                                       {% end %}
+
+                                       {% if builder.arch %}
+                                               <div class="level-item has-text-centered">
+                                                       <div>
+                                                               <p class="heading">{{ _("Architecture") }}</p>
+                                                               <p>
+                                                                       {{ builder.arch }}
+                                                               </p>
+                                                       </div>
+                                               </div>
+                                       {% end %}
+
                                        {% if builder.os_name %}
                                                <div class="level-item has-text-centered">
                                                        <div>