diff --git a/src/main/java/com/kingsrook/qbits/backups/sla/SlaChecker.java b/src/main/java/com/kingsrook/qbits/backups/sla/SlaChecker.java index 94b9978..b8a5b41 100644 --- a/src/main/java/com/kingsrook/qbits/backups/sla/SlaChecker.java +++ b/src/main/java/com/kingsrook/qbits/backups/sla/SlaChecker.java @@ -262,7 +262,7 @@ public class SlaChecker if(missing) { - BackupAlerts.raise(BackupAlerts.RUN_MISSING, planKey, BackupAlertSink.Severity.CRITICAL, "The latest backup is missing from storage", + BackupAlerts.raise(BackupAlerts.RUN_MISSING, planKey, BackupAlertSink.Severity.CRITICAL, "The latest backup of \"" + name + "\" is missing from storage", "plan", planKey, "planName", name); } else @@ -273,7 +273,7 @@ public class SlaChecker if(late) { BackupAlerts.raise(BackupAlerts.PLAN_MISSED, planKey, critical ? BackupAlertSink.Severity.CRITICAL : BackupAlertSink.Severity.ERROR, - "A backup did not run in time", "plan", planKey, "planName", name, "slaHours", String.valueOf(slaHours(plan))); + "Backup \"" + name + "\" did not run in time", "plan", planKey, "planName", name, "slaHours", String.valueOf(slaHours(plan))); } else { @@ -283,7 +283,7 @@ public class SlaChecker if(latestFailed || abandoned) { BackupAlerts.raise(BackupAlerts.RUN_FAILED, planKey, failing ? BackupAlertSink.Severity.ERROR : BackupAlertSink.Severity.WARNING, - failing ? "Backups have failed twice in a row" : "A backup run failed", "plan", planKey, "planName", name); + failing ? "Backup \"" + name + "\" has failed twice in a row" : "Backup \"" + name + "\" run failed", "plan", planKey, "planName", name); } else if(latestFinished != null) { @@ -292,7 +292,7 @@ public class SlaChecker if(ownerBad) { - BackupAlerts.raise(BackupAlerts.PLAN_OWNER_INVALID, planKey, BackupAlertSink.Severity.WARNING, "The backup plan owner is not valid", + BackupAlerts.raise(BackupAlerts.PLAN_OWNER_INVALID, planKey, BackupAlertSink.Severity.WARNING, "The owner of backup plan \"" + name + "\" is not valid", "plan", planKey, "planName", name); } else @@ -302,7 +302,7 @@ public class SlaChecker if(unverified) { - BackupAlerts.raise(BackupAlerts.VERIFY_OVERDUE, planKey, BackupAlertSink.Severity.WARNING, "No backup has been verified recently", + BackupAlerts.raise(BackupAlerts.VERIFY_OVERDUE, planKey, BackupAlertSink.Severity.WARNING, "No backup of \"" + name + "\" has been verified recently", "plan", planKey, "planName", name, "verifySlaDays", String.valueOf(plan.getValueInteger("verifySlaDays"))); } else @@ -507,7 +507,7 @@ public class SlaChecker LAST_AUDIT_AT.put(auditKey, now); if(orphans + debris > 0) { - BackupAlerts.raise(BackupAlerts.STORAGE_DEBRIS, planKey, BackupAlertSink.Severity.INFO, "Backup storage has orphans or debris", + BackupAlerts.raise(BackupAlerts.STORAGE_DEBRIS, planKey, BackupAlertSink.Severity.INFO, "Backup storage of \"" + planKey + "\" has orphans or debris", "plan", planKey, "orphans", String.valueOf(orphans), "debris", String.valueOf(debris)); } else diff --git a/src/main/java/com/kingsrook/qbits/backups/verify/BackupVerifier.java b/src/main/java/com/kingsrook/qbits/backups/verify/BackupVerifier.java index 6cef352..2830560 100644 --- a/src/main/java/com/kingsrook/qbits/backups/verify/BackupVerifier.java +++ b/src/main/java/com/kingsrook/qbits/backups/verify/BackupVerifier.java @@ -639,7 +639,7 @@ public class BackupVerifier detail.put("level", outcome.level()); detail.put("mismatches", String.valueOf(outcome.mismatches())); BackupAlerts.raiseWithKey(BackupAlerts.VERIFY_FAILED, BackupAlerts.verifyKey(planKey, outcome.level()), BackupAlertSink.Severity.ERROR, - "Backup verification failed (" + outcome.level() + ")", detail); + "Verification of backup \"" + (plan.getValueString("name") == null ? planKey : plan.getValueString("name")) + "\" failed (" + outcome.level() + ")", detail); } } } diff --git a/src/test/java/com/kingsrook/qbits/backups/sla/SlaCheckerTest.java b/src/test/java/com/kingsrook/qbits/backups/sla/SlaCheckerTest.java index 9763668..d28f883 100644 --- a/src/test/java/com/kingsrook/qbits/backups/sla/SlaCheckerTest.java +++ b/src/test/java/com/kingsrook/qbits/backups/sla/SlaCheckerTest.java @@ -87,6 +87,7 @@ class SlaCheckerTest assertThat(late.previousStatus()).isEqualTo(SlaChecker.UNKNOWN); assertThat(reload(plan).getValueString("slaStatus")).isEqualTo("LATE"); BackupAlertsAssert.assertOpen("backups.plan.missed:nightly", BackupAlertSink.Severity.CRITICAL); + assertThat(sink.open.get("backups.plan.missed:nightly").title()).isEqualTo("Backup \"Nightly\" did not run in time"); }