diff --git a/lib/plugins.js b/lib/plugins.js index 82bfc3bc..f273c240 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -290,19 +290,9 @@ function plugins (settings, deviceId) { } function pruneMachinesHeartbeat () { - const sql = `DELETE - FROM - machine_network_heartbeat h - USING (SELECT - device_id, - max(created) as lastEntry - FROM - machine_network_heartbeat - GROUP BY - device_id) d - WHERE - d.device_id = h.device_id - AND h.created < d.lastEntry` + const sql = `DELETE FROM machine_network_heartbeat h + USING (SELECT device_id, max(created) as lastEntry FROM machine_network_heartbeat GROUP BY device_id) d + WHERE d.device_id = h.device_id AND h.created < d.lastEntry` db.none(sql) } diff --git a/migrations/1626275844773-add-machine-network-performance.js b/migrations/1626275844773-add-machine-network-performance.js index 344714ac..6651d2f4 100644 --- a/migrations/1626275844773-add-machine-network-performance.js +++ b/migrations/1626275844773-add-machine-network-performance.js @@ -2,14 +2,14 @@ const db = require('./db') exports.up = function (next) { var sql = [ - 'drop table if exists machine_network_heartbeat', - 'drop table if exists machine_network_performance', - `create table machine_network_performance ( + 'DROP TABLE IF EXISTS machine_network_heartbeat', + 'DROP TABLE IF EXISTS machine_network_performance', + `CREATE TABLE machine_network_performance ( device_id text PRIMARY KEY, download_speed numeric NOT NULL, created timestamptz NOT NULL default now() )`, - `create table machine_network_heartbeat ( + `CREATE TABLE machine_network_heartbeat ( id uuid PRIMARY KEY, device_id text not null, average_response_time numeric NOT NULL, diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js index 66f2076e..173a824f 100644 --- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js +++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js @@ -112,7 +112,7 @@ const Overview = ({ data, onActionSuccess }) => {
{data.packetLoss ? new BigNumber(data.packetLoss).toFixed(3).toString() + ' %' diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js index adefc9c3..8a150dd5 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js +++ b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js @@ -113,7 +113,7 @@ const MachineStatus = () => { : 'unavailable' }, { - header: 'Loss', + header: 'Packet Loss', width: 125, size: 'sm', textAlign: 'left',