refact: fleet server

Author: simonwalz

fleet-server/server.js

@@ -97,8 +97,8 @@ app.get('/ui', requireAuth, (req, res) => {
   const list = Object.values(clients).map(c => ({
     id: c.id,
     hostname: c.hostname || '-',
-    status: c.status,
-    metrics: c.metrics || { resources: {} }
+    connection: c.status,
+    metrics: c.metrics || { resources: {}, state: {} }
   }));
   res.render('clients', { clients: list });
 });

fleet-server/views/clients.handlebars

@@ -1,11 +1,13 @@
+<button onClick="location.reload()" style="float: right;">refresh</button>
 <h1>CuOS Fleet</h1>
 <table>
   <thead>
     <tr>
       <th>Hostname</th>
-      <th>UUID</th>
       <th>Connection</th>
       <th>Status</th>
+      <th>CuOS Version</th>
+      <th>Last Update</th>
       <th>CPU%</th>
       <th>RAM%</th>
       <th>Disk%</th>
@@ -17,10 +19,11 @@
     {{#if clients.length}}
       {{#each clients}}
         <tr>
-          <td>{{hostname}}</td>
-          <td><small>{{id}}</small></td>
-          <td class="status-{{status}}">{{status}}</td>
-          <td class="status-{{state?.status}}">{{state?.status}}</td>
+          <td title="{{id}}">{{hostname}}</td>
+          <td class="status-{{connection}}">{{connection}}</td>
+          <td class="status-{{metrics.state.state}}">{{metrics.state.state}}</td>
+          <td class="version">{{metrics.state.version}}</td>
+          <td class="last_update">{{formatDate metrics.state.last_update_date}}</td>
           <td class="metrics-cell">{{metrics.resources.cpu_usage}}{{#if metrics.resources.cpu_usage}}%{{/if}}</td>
           <td class="metrics-cell">{{metrics.resources.ram_percent}}{{#if metrics.resources.ram_percent}}%{{/if}}</td>
           <td class="metrics-cell">{{metrics.resources.disk_percent}}{{#if metrics.resources.disk_percent}}%{{/if}}</td>

fleet-server/views/layouts/main.handlebars

@@ -14,6 +14,7 @@
     .status-offline { color: #999; }
     .status-updating { color: #e67e22; }
     .status-error { color: #c00; }
+    .status-running { color: #0a0; }
     .metrics-cell { font-variant-numeric: tabular-nums; }
     form.inline { display:inline; }
     button { cursor:pointer; }