core&ui: fix print metrics

Author: pandadtdyy

packages/server/client/printer.ts

@@ -88,7 +88,7 @@ async function fetchTask(c) {
             logger.info(`Print task ${body.doc.tid}#${body.doc._id}...`);
             const printer = await printFile(body.doc);
             if (!printer) throw new Error('No Printer Configured');
-            await post(`${c.server}/client/${c.token}/doneprint/${body.doc._id}?printer=${printer}`);
+            await post(`${c.server}/client/${c.token}/doneprint/${body.doc._id}?printer=${JSON.stringify(printer)}`);
             logger.info(`Print task ${body.doc.tid}#${body.doc._id} completed.`);
         } else {
             logger.info('No print task, sleeping...');

packages/server/utils/metrics.ts

@@ -39,7 +39,7 @@ export function createMetricsRegistry(ctx: Context) {
     });
 
     const printTaskCounter = createMetric(Counter, 'xcpc_printcount', 'printcount', {
-        labelNames: ['status', 'client'],
+        labelNames: ['status', 'client', 'printer'],
     });
     ctx.on('print/newTask', () => printTaskCounter.inc({ status: 'new' }));
 

packages/ui/app/pages/Dashboard.tsx

@@ -48,20 +48,20 @@ export default function Dashboard() {
     if (!query.data) return;
     const machines: { online: number, offline: number } = { online: 0, offline: 0 };
     for (const metric of query.data.find((d) => d.name === 'xcpc_machinecount').values) {
-      machines[metric.labels.status] = metric.value;
+      machines[metric.labels.status] += metric.value;
     }
     setMachinesOnline(machines.online);
     setMachinesOffline(machines.offline);
     const printTasks: { new: number, sent: number, done: number } = { new: 0, sent: 0, done: 0 };
     for (const metric of query.data.find((d) => d.name === 'xcpc_printcount').values) {
-      printTasks[metric.labels.status] = metric.value;
+      printTasks[metric.labels.status] += metric.value;
     }
     setPrintTasksNew(printTasks.new);
     setPrintTasksSent(printTasks.sent);
     setPrintTasksDone(printTasks.done);
     const balloonTasks: { new: number, sent: number, done: number } = { new: 0, sent: 0, done: 0 };
     for (const metric of query.data.find((d) => d.name === 'xcpc_ballooncount').values) {
-      balloonTasks[metric.labels.status] = metric.value;
+      balloonTasks[metric.labels.status] += metric.value;
     }
     setBalloonTasksNew(balloonTasks.new);
     setBalloonTasksSent(balloonTasks.sent);