refact: fleet server

Author: simonwalz

fleet-server/server.js

@@ -98,6 +98,8 @@ app.get('/ui', requireAuth, (req, res) => {
     id: c.id,
     hostname: c.hostname || '-',
     connection: c.status,
+    state: (c.metrics?.app_state?.iac_state !== "idle" ? c.metrics?.app_state?.iac_state : c.metrics?.state?.state),
+    last_update: c.metrics?.app_state?.last_iac_update ?? c.metrics?.state?.last_update_date,
     metrics: c.metrics || { resources: {}, state: {} }
   }));
   res.render('clients', { clients: list });
@@ -194,10 +196,10 @@ wss.on('connection', (ws) => {
         saveClients(clients);
       }
     } else if (msg.type === 'metrics') {
-      const { uuid, state, resources } = msg;
+      const { uuid, state, resources, app_state } = msg;
       if (uuid && clients[uuid]) {
         clients[uuid].last_seen = new Date().toISOString();
-        clients[uuid].metrics = { state, resources, collected_at: new Date().toISOString() };
+        clients[uuid].metrics = { state, resources, app_state, collected_at: new Date().toISOString() };
       }
     }
   });

fleet-server/views/clients.handlebars

@@ -21,9 +21,9 @@
         <tr>
           <td title="{{id}}">{{hostname}}</td>
           <td class="status-{{connection}}">{{connection}}</td>
-          <td class="status-{{metrics.state.state}}">{{metrics.state.state}}</td>
+          <td class="status-{{state}}">{{state}}</td>
           <td class="version">{{metrics.state.version}}</td>
-          <td class="last_update">{{formatDate metrics.state.last_update_date}}</td>
+          <td class="last_update">{{formatDate last_update}}</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>