Lightweight server monitoring with historical data, docker stats, and alerts.
fix: remove network monitor from old agent when its system changes (#2739)
Sven van Ginkel55b61da00465
diff --git a/internal/hub/network_monitors.go b/internal/hub/network_monitors.goindex b6da50e8e..15eff1793 100644--- a/internal/hub/network_monitors.go+++ b/internal/hub/network_monitors.go@@ -104,7 +104,7 @@ func bindNetworkMonitorsEvents(hub *Hub) {// sync monitor to agent on deletehub.OnRecordAfterDeleteSuccess("network_monitors").BindFunc(func(e *core.RecordEvent) error {if err := hub.deleteNetworkMonitor(e.Record); err != nil {- hub.Logger().Warn("failed to delete monitor on agent", "system", e.Record.GetString("system"), "monitor", e.Record.Id, "err", err)+ hub.Logger().Warn("failed to delete monitor on agent", "system", e.Record.Original().GetString("system"), "monitor", e.Record.Id, "err", err)}return e.Next()})@@ -170,7 +170,9 @@ func (h *Hub) upsertNetworkMonitor(record *core.Record, runNow bool) error {// deleteNetworkMonitor removes the record's monitor from the target system.func (h *Hub) deleteNetworkMonitor(record *core.Record) error {- systemID := record.GetString("system")+ // Use the persisted system: a pending request may have changed the record's system,+ // but the agent that holds the monitor is the one it was last saved with.+ systemID := record.Original().GetString("system")system, err := h.sm.GetSystem(systemID)if err != nil {return errdiff --git a/internal/hub/systems/system.go b/internal/hub/systems/system.goindex 86b17cda2..58c9ca94a 100644--- a/internal/hub/systems/system.go+++ b/internal/hub/systems/system.go@@ -498,6 +498,10 @@ func (sys *System) updateNetworkMonitorsRecords(app core.App, monitorResults mapcase true:var record *core.Recordrecord, err = app.FindRecordById(monitorCollectionName, id)+ if errors.Is(err, sql.ErrNoRows) {+ // Monitor no longer exists (matches the zero-rows case below).+ continue+ }if err == nil {if record.GetString("system") != systemId {continue