This commit is contained in:
henrygd
2026-04-26 19:24:12 -04:00
parent 788483ac56
commit df249b24f6
7 changed files with 40 additions and 26 deletions

View File

@@ -44,7 +44,9 @@ type SyncResponse struct {
//
// 3: max response over the last hour in microseconds
//
// 4: packet loss percentage over the last hour (0-100)
// 4: packet loss percentage (0-100)
//
// 5: packet loss percentage over the last hour (0-100)
type Result []float64
// Get returns the value at the specified index or 0 if the index is out of range.

View File

@@ -117,7 +117,8 @@ func setProbeResultFields(record *core.Record, result probe.Result) {
record.Set("resAvg1h", result.Get(1))
record.Set("resMin1h", result.Get(2))
record.Set("resMax1h", result.Get(3))
record.Set("loss1h", result.Get(4))
record.Set("loss", result.Get(4))
record.Set("loss1h", result.Get(5))
record.Set("updated", nowString)
}

View File

@@ -334,7 +334,7 @@ func updateNetworkProbesRecords(app core.App, data map[string]probe.Result, syst
var updateQuery *dbx.Query
if !realtimeActive {
db = app.DB()
sql := fmt.Sprintf("UPDATE %s SET res={:res}, resMin1h={:resMin1h}, resMax1h={:resMax1h}, resAvg1h={:resAvg1h}, loss1h={:loss1h}, updated={:updated} WHERE id={:id}", collectionName)
sql := fmt.Sprintf("UPDATE %s SET res={:res}, resMin1h={:resMin1h}, resMax1h={:resMax1h}, resAvg1h={:resAvg1h}, loss={:loss}, loss1h={:loss1h}, updated={:updated} WHERE id={:id}", collectionName)
updateQuery = db.NewQuery(sql)
}
@@ -349,7 +349,8 @@ func updateNetworkProbesRecords(app core.App, data map[string]probe.Result, syst
record.Set("resAvg1h", values.Get(1))
record.Set("resMin1h", values.Get(2))
record.Set("resMax1h", values.Get(3))
record.Set("loss1h", values.Get(4))
record.Set("loss", values.Get(4))
record.Set("loss1h", values.Get(5))
record.Set("updated", nowString)
err = app.SaveNoValidate(record)
}
@@ -360,7 +361,8 @@ func updateNetworkProbesRecords(app core.App, data map[string]probe.Result, syst
"resAvg1h": values.Get(1),
"resMin1h": values.Get(2),
"resMax1h": values.Get(3),
"loss1h": values.Get(4),
"loss": values.Get(4),
"loss1h": values.Get(5),
"updated": nowString,
}).Execute()
}

View File

@@ -248,7 +248,7 @@ export function useNetworkProbesData(props: UseNetworkProbesProps) {
// const stats: NetworkProbeStatsRecord["stats"] = {}
// for (const probe of probes) {
// // TODO: include only if probe.updated < charttime
// stats[probe.id] = [probe.res, probe.resAvg1h, probe.resMin1h, probe.resMax1h, probe.loss1h]
// stats[probe.id] = [probe.res, probe.resAvg1h, probe.resMin1h, probe.resMax1h, probe.loss, probe.loss1h]
// }
// return stats
// }

View File

@@ -556,6 +556,7 @@ export interface NetworkProbeRecord {
resMin1h: number
resMax1h: number
resAvg1h: number
loss: number
loss1h: number
interval: number
enabled: boolean
@@ -571,7 +572,9 @@ export interface NetworkProbeRecord {
*
* 3: max response over the last hour in microseconds
*
* 4: packet loss over 1 hour in %
* 4: packet loss %
*
* 5: packet loss over the last hour in %
*/
type ProbeResult = number[]