refactor: sql formatting and label rename
This commit is contained in:
parent
1a166bc279
commit
00875f06e8
4 changed files with 9 additions and 19 deletions
|
|
@ -290,19 +290,9 @@ function plugins (settings, deviceId) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function pruneMachinesHeartbeat () {
|
function pruneMachinesHeartbeat () {
|
||||||
const sql = `DELETE
|
const sql = `DELETE FROM machine_network_heartbeat h
|
||||||
FROM
|
USING (SELECT device_id, max(created) as lastEntry FROM machine_network_heartbeat GROUP BY device_id) d
|
||||||
machine_network_heartbeat h
|
WHERE d.device_id = h.device_id AND h.created < d.lastEntry`
|
||||||
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)
|
db.none(sql)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,14 @@ const db = require('./db')
|
||||||
|
|
||||||
exports.up = function (next) {
|
exports.up = function (next) {
|
||||||
var sql = [
|
var sql = [
|
||||||
'drop table if exists machine_network_heartbeat',
|
'DROP TABLE IF EXISTS machine_network_heartbeat',
|
||||||
'drop table if exists machine_network_performance',
|
'DROP TABLE IF EXISTS machine_network_performance',
|
||||||
`create table machine_network_performance (
|
`CREATE TABLE machine_network_performance (
|
||||||
device_id text PRIMARY KEY,
|
device_id text PRIMARY KEY,
|
||||||
download_speed numeric NOT NULL,
|
download_speed numeric NOT NULL,
|
||||||
created timestamptz NOT NULL default now()
|
created timestamptz NOT NULL default now()
|
||||||
)`,
|
)`,
|
||||||
`create table machine_network_heartbeat (
|
`CREATE TABLE machine_network_heartbeat (
|
||||||
id uuid PRIMARY KEY,
|
id uuid PRIMARY KEY,
|
||||||
device_id text not null,
|
device_id text not null,
|
||||||
average_response_time numeric NOT NULL,
|
average_response_time numeric NOT NULL,
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ const Overview = ({ data, onActionSuccess }) => {
|
||||||
</div>
|
</div>
|
||||||
<div className={classes.row}>
|
<div className={classes.row}>
|
||||||
<div className={classes.rowItem}>
|
<div className={classes.rowItem}>
|
||||||
<Label3 className={classes.label3}>Loss</Label3>
|
<Label3 className={classes.label3}>Packet Loss</Label3>
|
||||||
<P>
|
<P>
|
||||||
{data.packetLoss
|
{data.packetLoss
|
||||||
? new BigNumber(data.packetLoss).toFixed(3).toString() + ' %'
|
? new BigNumber(data.packetLoss).toFixed(3).toString() + ' %'
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,7 @@ const MachineStatus = () => {
|
||||||
: 'unavailable'
|
: 'unavailable'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
header: 'Loss',
|
header: 'Packet Loss',
|
||||||
width: 125,
|
width: 125,
|
||||||
size: 'sm',
|
size: 'sm',
|
||||||
textAlign: 'left',
|
textAlign: 'left',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue