Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aeb4eaa6b6 | ||
|
|
4675c6062e | ||
|
|
25bc9c3673 | ||
|
|
a54d367c24 | ||
|
|
6149670375 | ||
|
|
1b13df4032 |
@@ -25,8 +25,15 @@ type Store struct {
|
|||||||
|
|
||||||
func NewStore(pool *pgxpool.Pool) *Store { return &Store{Pool: pool} }
|
func NewStore(pool *pgxpool.Pool) *Store { return &Store{Pool: pool} }
|
||||||
|
|
||||||
|
// baseSelect MUSS spaltenweise zu scanNode passen. pg_role fehlte hier
|
||||||
|
// urspruenglich (Befund 2026-09-11): HANode.PGRole kam dadurch ueberall als
|
||||||
|
// leerer String an, wo Store.List/Get benutzt wird — /cluster/nodes,
|
||||||
|
// /cluster/status und damit auch die pg_role-Spalte der Cluster-Seite.
|
||||||
|
// UpsertSelf schreibt pg_role bewusst NICHT (ON CONFLICT laesst die Spalte
|
||||||
|
// unangetastet), liest sie aber im RETURNING mit — sonst passt die
|
||||||
|
// Scan-Reihenfolge nicht.
|
||||||
const baseSelect = `
|
const baseSelect = `
|
||||||
SELECT id, name, fqdn, api_url, public_ip, internal_ip, mgmt_ip, role,
|
SELECT id, name, fqdn, api_url, public_ip, internal_ip, mgmt_ip, role, pg_role,
|
||||||
version, config_hash, status,
|
version, config_hash, status,
|
||||||
last_seen, joined_at, created_at, updated_at
|
last_seen, joined_at, created_at, updated_at
|
||||||
FROM ha_nodes
|
FROM ha_nodes
|
||||||
@@ -90,7 +97,7 @@ ON CONFLICT (id) DO UPDATE SET
|
|||||||
last_seen = EXCLUDED.last_seen,
|
last_seen = EXCLUDED.last_seen,
|
||||||
updated_at = NOW()
|
updated_at = NOW()
|
||||||
RETURNING id, name, fqdn, api_url, public_ip, internal_ip, mgmt_ip,
|
RETURNING id, name, fqdn, api_url, public_ip, internal_ip, mgmt_ip,
|
||||||
role, version, config_hash, status,
|
role, pg_role, version, config_hash, status,
|
||||||
last_seen, joined_at, created_at, updated_at`,
|
last_seen, joined_at, created_at, updated_at`,
|
||||||
n.ID, n.Name, n.FQDN, n.APIURL,
|
n.ID, n.Name, n.FQDN, n.APIURL,
|
||||||
n.PublicIP, n.InternalIP, n.MgmtIP,
|
n.PublicIP, n.InternalIP, n.MgmtIP,
|
||||||
@@ -181,7 +188,7 @@ func scanNode(row interface{ Scan(...any) error }) (*models.HANode, error) {
|
|||||||
if err := row.Scan(
|
if err := row.Scan(
|
||||||
&n.ID, &n.Name, &n.FQDN, &n.APIURL,
|
&n.ID, &n.Name, &n.FQDN, &n.APIURL,
|
||||||
&n.PublicIP, &n.InternalIP, &n.MgmtIP,
|
&n.PublicIP, &n.InternalIP, &n.MgmtIP,
|
||||||
&n.Role, &n.Version, &n.ConfigHash, &n.Status,
|
&n.Role, &n.PGRole, &n.Version, &n.ConfigHash, &n.Status,
|
||||||
&n.LastSeen, &n.JoinedAt,
|
&n.LastSeen, &n.JoinedAt,
|
||||||
&n.CreatedAt, &n.UpdatedAt,
|
&n.CreatedAt, &n.UpdatedAt,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import (
|
|||||||
// POST /api/v1/alerts/events/acknowledge — Bulk-Quittieren {ids:[…]}
|
// POST /api/v1/alerts/events/acknowledge — Bulk-Quittieren {ids:[…]}
|
||||||
// POST /api/v1/alerts/events/acknowledge-all — alle offenen quittieren
|
// POST /api/v1/alerts/events/acknowledge-all — alle offenen quittieren
|
||||||
// POST /api/v1/alerts/events/delete — Bulk-Löschen {ids:[…]}
|
// POST /api/v1/alerts/events/delete — Bulk-Löschen {ids:[…]}
|
||||||
|
// POST /api/v1/alerts/events/delete-acknowledged — alle quittierten löschen
|
||||||
type AlertsHandler struct {
|
type AlertsHandler struct {
|
||||||
Service *alerts.Service
|
Service *alerts.Service
|
||||||
Audit *audit.Repo
|
Audit *audit.Repo
|
||||||
@@ -43,6 +44,7 @@ func (h *AlertsHandler) Register(rg *gin.RouterGroup) {
|
|||||||
g.POST("/events/acknowledge", h.AcknowledgeEvents)
|
g.POST("/events/acknowledge", h.AcknowledgeEvents)
|
||||||
g.POST("/events/acknowledge-all", h.AcknowledgeAllEvents)
|
g.POST("/events/acknowledge-all", h.AcknowledgeAllEvents)
|
||||||
g.POST("/events/delete", h.DeleteEvents)
|
g.POST("/events/delete", h.DeleteEvents)
|
||||||
|
g.POST("/events/delete-acknowledged", h.DeleteAcknowledgedEvents)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *AlertsHandler) ListChannels(c *gin.Context) {
|
func (h *AlertsHandler) ListChannels(c *gin.Context) {
|
||||||
@@ -192,3 +194,18 @@ func (h *AlertsHandler) DeleteEvents(c *gin.Context) {
|
|||||||
strconv.Itoa(len(req.IDs)), gin.H{"ids": req.IDs, "deleted": n}, h.NodeID)
|
strconv.Itoa(len(req.IDs)), gin.H{"ids": req.IDs, "deleted": n}, h.NodeID)
|
||||||
response.OK(c, gin.H{"deleted": n})
|
response.OK(c, gin.H{"deleted": n})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteAcknowledgedEvents löscht alle quittierten Events auf einmal.
|
||||||
|
// Gegenstück zu AcknowledgeAllEvents — ohne das kam man an einen
|
||||||
|
// groesseren Backlog nur seitenweise heran (die Kopf-Checkbox der
|
||||||
|
// Tabelle markiert nur die aktuelle Seite).
|
||||||
|
func (h *AlertsHandler) DeleteAcknowledgedEvents(c *gin.Context) {
|
||||||
|
n, err := h.Service.DeleteAcknowledged(c.Request.Context())
|
||||||
|
if err != nil {
|
||||||
|
response.Internal(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_ = h.Audit.Log(c.Request.Context(), actorOf(c), "alert.events.delete_acknowledged",
|
||||||
|
"acknowledged", gin.H{"deleted": n}, h.NodeID)
|
||||||
|
response.OK(c, gin.H{"deleted": n})
|
||||||
|
}
|
||||||
|
|||||||
@@ -253,22 +253,46 @@ func (h *SetupHandler) preRegisterPrimary(primaryFQDN string) {
|
|||||||
}
|
}
|
||||||
ip := addrs[0]
|
ip := addrs[0]
|
||||||
|
|
||||||
// Stable ID so repeated calls (join + startup) don't accumulate rows.
|
// Sobald der Primary sich selbst gemeldet hat (Heartbeat-Push), steht
|
||||||
nodeID := fmt.Sprintf("prenode-%s", strings.ReplaceAll(primaryFQDN, ".", "-"))
|
// hier bereits eine Zeile mit seiner ECHTEN Node-ID. Dann ist nur die
|
||||||
n := models.HANode{
|
// IP frisch zu halten — mehr will diese Funktion gar nicht.
|
||||||
ID: nodeID,
|
//
|
||||||
Name: primaryFQDN,
|
// Vorher lief in dem Fall unbedingt der Platzhalter-Upsert unten, der
|
||||||
FQDN: primaryFQDN,
|
// am fqdn-Unique-Index scheiterte: UpsertSelf nutzt ON CONFLICT (id),
|
||||||
APIURL: "https://" + primaryFQDN + ":3443",
|
// und die Synthetik-ID "prenode-<fqdn>" trifft die echte Zeile nicht.
|
||||||
Role: "primary",
|
// Ergebnis war ein "duplicate key value violates unique constraint
|
||||||
Status: "online",
|
// ha_nodes_fqdn_unique" bei JEDEM API-Start auf dem Standby — folgenlos
|
||||||
}
|
// (die echte Zeile stimmt ja), aber es sah nach einem Defekt aus und
|
||||||
n.PublicIP = &ip
|
// verdeckte echte Warnungen.
|
||||||
|
tag, err := h.ClusterStore.Pool.Exec(ctx,
|
||||||
if _, err := h.ClusterStore.UpsertSelf(ctx, n); err != nil {
|
`UPDATE ha_nodes SET public_ip = $1, updated_at = NOW() WHERE fqdn = $2`,
|
||||||
slog.Warn("setup: pre-register primary in ha_nodes failed", "fqdn", primaryFQDN, "error", err)
|
ip, primaryFQDN)
|
||||||
|
if err != nil {
|
||||||
|
slog.Warn("setup: refreshing primary IP in ha_nodes failed",
|
||||||
|
"fqdn", primaryFQDN, "error", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if tag.RowsAffected() == 0 {
|
||||||
|
// Noch keine Zeile: Platzhalter anlegen, damit @peer_ipv4 den
|
||||||
|
// Primary schon kennt, bevor er sich das erste Mal meldet.
|
||||||
|
// Stabile ID, damit wiederholte Aufrufe (Join + Start) keine
|
||||||
|
// Zeilen anhaeufen.
|
||||||
|
nodeID := fmt.Sprintf("prenode-%s", strings.ReplaceAll(primaryFQDN, ".", "-"))
|
||||||
|
n := models.HANode{
|
||||||
|
ID: nodeID,
|
||||||
|
Name: primaryFQDN,
|
||||||
|
FQDN: primaryFQDN,
|
||||||
|
APIURL: "https://" + primaryFQDN + ":3443",
|
||||||
|
Role: "primary",
|
||||||
|
Status: "online",
|
||||||
|
}
|
||||||
|
n.PublicIP = &ip
|
||||||
|
if _, err := h.ClusterStore.UpsertSelf(ctx, n); err != nil {
|
||||||
|
slog.Warn("setup: pre-register primary in ha_nodes failed",
|
||||||
|
"fqdn", primaryFQDN, "error", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
if err := h.PeerReloader(ctx); err != nil {
|
if err := h.PeerReloader(ctx); err != nil {
|
||||||
slog.Warn("setup: PeerReloader failed after primary pre-register", "error", err)
|
slog.Warn("setup: PeerReloader failed after primary pre-register", "error", err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -240,6 +240,26 @@ func (s *Service) DeleteEvents(ctx context.Context, ids []int64) (int64, error)
|
|||||||
return tag.RowsAffected(), nil
|
return tag.RowsAffected(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteAcknowledged löscht alle bereits quittierten Events und liefert
|
||||||
|
// die Anzahl. Backing für "Alle quittierten löschen".
|
||||||
|
//
|
||||||
|
// Warum das gebraucht wird (Befund 2026-09-11): Bulk-Löschen ging nur über
|
||||||
|
// die Tabellen-Auswahl, und deren Kopf-Checkbox markiert nur die AKTUELLE
|
||||||
|
// Seite. Bei einem Backlog von ~950 Alt-Alarmen loescht ein Klick also 25
|
||||||
|
// Zeilen, woraufhin die naechsten 25 — optisch identischen — nachruecken.
|
||||||
|
// Es sah aus, als passiere nichts, obwohl korrekt geloescht wurde.
|
||||||
|
//
|
||||||
|
// Bewusst nur die quittierten: was noch niemand gesehen hat, soll nicht
|
||||||
|
// per Sammelaktion verschwinden.
|
||||||
|
func (s *Service) DeleteAcknowledged(ctx context.Context) (int64, error) {
|
||||||
|
tag, err := s.Pool.Exec(ctx,
|
||||||
|
`DELETE FROM alert_events WHERE acknowledged_at IS NOT NULL`)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return tag.RowsAffected(), nil
|
||||||
|
}
|
||||||
|
|
||||||
// Cleanup löscht alert_events älter als keepDays und liefert die Anzahl
|
// Cleanup löscht alert_events älter als keepDays und liefert die Anzahl
|
||||||
// gelöschter Rows. make_interval(days => $1) nimmt $1 sauber als int —
|
// gelöschter Rows. make_interval(days => $1) nimmt $1 sauber als int —
|
||||||
// der frühere ($1 || ' days')::interval-Ansatz erzwang text und scheiterte
|
// der frühere ($1 || ' days')::interval-Ansatz erzwang text und scheiterte
|
||||||
@@ -316,7 +336,7 @@ func (s *Service) sendWebhook(ctx context.Context, c Channel, kind string,
|
|||||||
"severity": string(sev),
|
"severity": string(sev),
|
||||||
"subject": subject,
|
"subject": subject,
|
||||||
"message": message,
|
"message": message,
|
||||||
"content": fmt.Sprintf("[%s] %s: %s\n%s",
|
"content": fmt.Sprintf("[%s] %s: %s\n%s",
|
||||||
strings.ToUpper(string(sev)), kind, subject, message),
|
strings.ToUpper(string(sev)), kind, subject, message),
|
||||||
"text": fmt.Sprintf("*[%s]* %s — %s\n%s",
|
"text": fmt.Sprintf("*[%s]* %s — %s\n%s",
|
||||||
strings.ToUpper(string(sev)), kind, subject, message),
|
strings.ToUpper(string(sev)), kind, subject, message),
|
||||||
|
|||||||
@@ -1558,7 +1558,10 @@
|
|||||||
"subject": "Betreff",
|
"subject": "Betreff",
|
||||||
"delivered": "Gesendet",
|
"delivered": "Gesendet",
|
||||||
"status": "Status"
|
"status": "Status"
|
||||||
}
|
},
|
||||||
|
"deleteAcknowledged": "Quittierte löschen",
|
||||||
|
"confirmDeleteAcked": "{{n}} quittierte Alarme endgültig löschen? Offene Alarme bleiben erhalten.",
|
||||||
|
"eventsDeleted": "{{n}} Alarme gelöscht."
|
||||||
},
|
},
|
||||||
"remotes": {
|
"remotes": {
|
||||||
"scopeTitle": "Off-Site-Backup-Ziele",
|
"scopeTitle": "Off-Site-Backup-Ziele",
|
||||||
|
|||||||
@@ -1558,7 +1558,10 @@
|
|||||||
"subject": "Subject",
|
"subject": "Subject",
|
||||||
"delivered": "Delivered",
|
"delivered": "Delivered",
|
||||||
"status": "Status"
|
"status": "Status"
|
||||||
}
|
},
|
||||||
|
"deleteAcknowledged": "Delete acknowledged",
|
||||||
|
"confirmDeleteAcked": "Permanently delete {{n}} acknowledged alerts? Open alerts are kept.",
|
||||||
|
"eventsDeleted": "{{n}} alerts deleted."
|
||||||
},
|
},
|
||||||
"remotes": {
|
"remotes": {
|
||||||
"scopeTitle": "Off-site backup targets",
|
"scopeTitle": "Off-site backup targets",
|
||||||
|
|||||||
@@ -120,9 +120,34 @@ export default function AlertsPage() {
|
|||||||
})
|
})
|
||||||
const delEventsMut = useMutation({
|
const delEventsMut = useMutation({
|
||||||
mutationFn: (ids: number[]) => apiClient.post('/alerts/events/delete', { ids }),
|
mutationFn: (ids: number[]) => apiClient.post('/alerts/events/delete', { ids }),
|
||||||
onSuccess: () => { message.success(t('common.delete')); refreshEvents() },
|
onSuccess: (_d, ids) => {
|
||||||
|
// Anzahl mitsagen: die Kopf-Checkbox markiert nur die AKTUELLE Seite,
|
||||||
|
// und bei einem groesseren Backlog ruecken sofort optisch identische
|
||||||
|
// Eintraege nach. Ohne diese Rueckmeldung sieht es aus, als sei nichts
|
||||||
|
// passiert (Befund 2026-09-11).
|
||||||
|
message.success(t('alerts.eventsDeleted', { n: ids.length }))
|
||||||
|
setSelectedIds([])
|
||||||
|
refreshEvents()
|
||||||
|
},
|
||||||
onError: (e: Error) => message.error(e.message),
|
onError: (e: Error) => message.error(e.message),
|
||||||
})
|
})
|
||||||
|
const delAckedMut = useMutation({
|
||||||
|
mutationFn: () => apiClient.post('/alerts/events/delete-acknowledged'),
|
||||||
|
onSuccess: (r) => {
|
||||||
|
const n = (r?.data as { data?: { deleted?: number } })?.data?.deleted ?? 0
|
||||||
|
message.success(t('alerts.eventsDeleted', { n }))
|
||||||
|
setSelectedIds([])
|
||||||
|
refreshEvents()
|
||||||
|
},
|
||||||
|
onError: (e: Error) => message.error(e.message),
|
||||||
|
})
|
||||||
|
|
||||||
|
// Anzahl quittierter Events ueber den GESAMTEN Datensatz, nicht nur die
|
||||||
|
// sichtbare Seite — der Button soll zeigen, was er wirklich raeumt.
|
||||||
|
const ackedCount = useMemo(
|
||||||
|
() => (events.data ?? []).filter(e => e.acknowledged_at).length,
|
||||||
|
[events.data],
|
||||||
|
)
|
||||||
|
|
||||||
const kindOptions = useMemo(() => {
|
const kindOptions = useMemo(() => {
|
||||||
const kinds = [...new Set((events.data ?? []).map(e => e.kind))].sort()
|
const kinds = [...new Set((events.data ?? []).map(e => e.kind))].sort()
|
||||||
@@ -429,6 +454,18 @@ export default function AlertsPage() {
|
|||||||
{t('alerts.acknowledgeAll')}
|
{t('alerts.acknowledgeAll')}
|
||||||
</Button>
|
</Button>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
{/* Gegenstueck zu "Alle quittieren": ohne das kommt man an
|
||||||
|
einen groesseren Backlog nur seitenweise heran, weil die
|
||||||
|
Kopf-Checkbox der Tabelle nur die aktuelle Seite markiert. */}
|
||||||
|
<Popconfirm title={t('alerts.confirmDeleteAcked', { n: ackedCount })}
|
||||||
|
onConfirm={() => delAckedMut.mutate()}
|
||||||
|
disabled={isViewer || ackedCount === 0}>
|
||||||
|
<Button size="small" danger ghost
|
||||||
|
disabled={isViewer || ackedCount === 0}
|
||||||
|
loading={delAckedMut.isPending}>
|
||||||
|
{t('alerts.deleteAcknowledged')}{ackedCount > 0 ? ` (${ackedCount})` : ''}
|
||||||
|
</Button>
|
||||||
|
</Popconfirm>
|
||||||
</Space>
|
</Space>
|
||||||
</div>
|
</div>
|
||||||
<Table size="small" rowKey="id" loading={events.isFetching}
|
<Table size="small" rowKey="id" loading={events.isFetching}
|
||||||
|
|||||||
Reference in New Issue
Block a user