From 5b701aafc13a712c2900c787b2cea01432b5c037 Mon Sep 17 00:00:00 2001
From: The Dark <12370876+CheAle14@users.noreply.github.com>
Date: Mon, 8 May 2023 02:57:14 +0100
Subject: [PATCH] New: On Health Restored notification

(cherry picked from commit 5fdc8514da7c7ad98192f2ecb2415b3a7b5d0d05)

Closes #3631
Closes #3637
---
 .../Notifications/Notification.js             | 16 +++++++++++--
 .../Notifications/NotificationEventItems.js   | 15 +++++++++++-
 .../Notifications/NotificationResource.cs     |  6 +++++
 .../NotificationBaseFixture.cs                |  7 ++++++
 .../065_health_restored_notification.cs       | 14 +++++++++++
 src/NzbDrone.Core/Datastore/TableMapping.cs   |  1 +
 .../HealthCheck/HealthCheckRestoredEvent.cs   | 16 +++++++++++++
 .../HealthCheck/HealthCheckService.cs         |  7 ++++++
 src/NzbDrone.Core/Localization/Core/en.json   |  3 +++
 .../Notifications/Apprise/Apprise.cs          |  5 ++++
 .../Notifications/Boxcar/Boxcar.cs            |  5 ++++
 .../CustomScript/CustomScript.cs              | 15 ++++++++++++
 .../Notifications/Discord/Discord.cs          | 23 ++++++++++++++++++
 .../Notifications/Email/Email.cs              |  5 ++++
 .../Notifications/Gotify/Gotify.cs            |  5 ++++
 .../Notifications/INotification.cs            |  2 ++
 src/NzbDrone.Core/Notifications/Join/Join.cs  |  5 ++++
 .../Notifications/Mailgun/Mailgun.cs          |  5 ++++
 .../MediaBrowser/MediaBrowser.cs              |  8 +++++++
 .../Notifications/Notifiarr/Notifiarr.cs      |  5 ++++
 .../Notifications/NotificationBase.cs         |  7 ++++++
 .../Notifications/NotificationDefinition.cs   |  4 +++-
 .../Notifications/NotificationFactory.cs      |  7 ++++++
 .../Notifications/NotificationService.cs      | 24 +++++++++++++++++++
 src/NzbDrone.Core/Notifications/Ntfy/Ntfy.cs  |  5 ++++
 .../Notifications/Prowl/Prowl.cs              |  5 ++++
 .../Notifications/PushBullet/PushBullet.cs    |  5 ++++
 .../Notifications/Pushover/Pushover.cs        |  5 ++++
 .../Notifications/SendGrid/SendGrid.cs        |  5 ++++
 .../Notifications/Simplepush/Simplepush.cs    |  5 ++++
 .../Notifications/Slack/Slack.cs              | 17 +++++++++++++
 .../Notifications/Telegram/Telegram.cs        |  5 ++++
 .../Notifications/Twitter/Twitter.cs          |  5 ++++
 .../Notifications/Webhook/Webhook.cs          |  5 ++++
 .../Notifications/Webhook/WebhookBase.cs      | 13 ++++++++++
 .../Notifications/Webhook/WebhookEventType.cs |  1 +
 src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs  |  5 ++++
 37 files changed, 287 insertions(+), 4 deletions(-)
 create mode 100644 src/NzbDrone.Core/Datastore/Migration/065_health_restored_notification.cs
 create mode 100644 src/NzbDrone.Core/HealthCheck/HealthCheckRestoredEvent.cs

diff --git a/frontend/src/Settings/Notifications/Notifications/Notification.js b/frontend/src/Settings/Notifications/Notifications/Notification.js
index d7cfa81d3..9e2e881c4 100644
--- a/frontend/src/Settings/Notifications/Notifications/Notification.js
+++ b/frontend/src/Settings/Notifications/Notifications/Notification.js
@@ -62,6 +62,7 @@ class Notification extends Component {
       onAlbumDelete,
       onArtistDelete,
       onHealthIssue,
+      onHealthRestored,
       onDownloadFailure,
       onImportFailure,
       onTrackRetag,
@@ -73,6 +74,7 @@ class Notification extends Component {
       supportsOnAlbumDelete,
       supportsOnArtistDelete,
       supportsOnHealthIssue,
+      supportsOnHealthRestored,
       supportsOnDownloadFailure,
       supportsOnImportFailure,
       supportsOnTrackRetag,
@@ -145,6 +147,14 @@ class Notification extends Component {
             </Label>
         }
 
+        {
+          supportsOnHealthRestored && onHealthRestored ?
+            <Label kind={kinds.SUCCESS}>
+              {translate('OnHealthRestored')}
+            </Label> :
+            null
+        }
+
         {
           supportsOnDownloadFailure && onDownloadFailure &&
             <Label kind={kinds.SUCCESS} >
@@ -168,12 +178,12 @@ class Notification extends Component {
 
         {
           !onGrab && !onReleaseImport && !onRename && !onTrackRetag && !onAlbumDelete && !onArtistDelete &&
-            !onHealthIssue && !onDownloadFailure && !onImportFailure && !onApplicationUpdate &&
+            !onHealthIssue && !onHealthRestored && !onDownloadFailure && !onImportFailure && !onApplicationUpdate &&
               <Label
                 kind={kinds.DISABLED}
                 outline={true}
               >
-                Disabled
+                {translate('Disabled')}
               </Label>
         }
 
@@ -208,6 +218,7 @@ Notification.propTypes = {
   onAlbumDelete: PropTypes.bool.isRequired,
   onArtistDelete: PropTypes.bool.isRequired,
   onHealthIssue: PropTypes.bool.isRequired,
+  onHealthRestored: PropTypes.bool.isRequired,
   onDownloadFailure: PropTypes.bool.isRequired,
   onImportFailure: PropTypes.bool.isRequired,
   onTrackRetag: PropTypes.bool.isRequired,
@@ -219,6 +230,7 @@ Notification.propTypes = {
   supportsOnAlbumDelete: PropTypes.bool.isRequired,
   supportsOnArtistDelete: PropTypes.bool.isRequired,
   supportsOnHealthIssue: PropTypes.bool.isRequired,
+  supportsOnHealthRestored: PropTypes.bool.isRequired,
   supportsOnDownloadFailure: PropTypes.bool.isRequired,
   supportsOnImportFailure: PropTypes.bool.isRequired,
   supportsOnTrackRetag: PropTypes.bool.isRequired,
diff --git a/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js b/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js
index a451936a0..6159f6b63 100644
--- a/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js
+++ b/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js
@@ -22,6 +22,7 @@ function NotificationEventItems(props) {
     onAlbumDelete,
     onArtistDelete,
     onHealthIssue,
+    onHealthRestored,
     onDownloadFailure,
     onImportFailure,
     onTrackRetag,
@@ -33,6 +34,7 @@ function NotificationEventItems(props) {
     supportsOnAlbumDelete,
     supportsOnArtistDelete,
     supportsOnHealthIssue,
+    supportsOnHealthRestored,
     includeHealthWarnings,
     supportsOnDownloadFailure,
     supportsOnImportFailure,
@@ -175,8 +177,19 @@ function NotificationEventItems(props) {
             />
           </div>
 
+          <div>
+            <FormInputGroup
+              type={inputTypes.CHECK}
+              name="onHealthRestored"
+              helpText={translate('OnHealthRestoredHelpText')}
+              isDisabled={!supportsOnHealthRestored.value}
+              {...onHealthRestored}
+              onChange={onInputChange}
+            />
+          </div>
+
           {
-            onHealthIssue.value &&
+            (onHealthIssue.value || onHealthRestored.value) &&
               <div>
                 <FormInputGroup
                   type={inputTypes.CHECK}
diff --git a/src/Lidarr.Api.V1/Notifications/NotificationResource.cs b/src/Lidarr.Api.V1/Notifications/NotificationResource.cs
index 8c4b220b4..df705d42d 100644
--- a/src/Lidarr.Api.V1/Notifications/NotificationResource.cs
+++ b/src/Lidarr.Api.V1/Notifications/NotificationResource.cs
@@ -12,6 +12,7 @@ namespace Lidarr.Api.V1.Notifications
         public bool OnAlbumDelete { get; set; }
         public bool OnArtistDelete { get; set; }
         public bool OnHealthIssue { get; set; }
+        public bool OnHealthRestored { get; set; }
         public bool OnDownloadFailure { get; set; }
         public bool OnImportFailure { get; set; }
         public bool OnTrackRetag { get; set; }
@@ -23,6 +24,7 @@ namespace Lidarr.Api.V1.Notifications
         public bool SupportsOnAlbumDelete { get; set; }
         public bool SupportsOnArtistDelete { get; set; }
         public bool SupportsOnHealthIssue { get; set; }
+        public bool SupportsOnHealthRestored { get; set; }
         public bool IncludeHealthWarnings { get; set; }
         public bool SupportsOnDownloadFailure { get; set; }
         public bool SupportsOnImportFailure { get; set; }
@@ -49,6 +51,7 @@ namespace Lidarr.Api.V1.Notifications
             resource.OnAlbumDelete = definition.OnAlbumDelete;
             resource.OnArtistDelete = definition.OnArtistDelete;
             resource.OnHealthIssue = definition.OnHealthIssue;
+            resource.OnHealthRestored = definition.OnHealthRestored;
             resource.OnDownloadFailure = definition.OnDownloadFailure;
             resource.OnImportFailure = definition.OnImportFailure;
             resource.OnTrackRetag = definition.OnTrackRetag;
@@ -60,6 +63,7 @@ namespace Lidarr.Api.V1.Notifications
             resource.SupportsOnAlbumDelete = definition.SupportsOnAlbumDelete;
             resource.SupportsOnArtistDelete = definition.SupportsOnArtistDelete;
             resource.SupportsOnHealthIssue = definition.SupportsOnHealthIssue;
+            resource.SupportsOnHealthRestored = definition.SupportsOnHealthRestored;
             resource.IncludeHealthWarnings = definition.IncludeHealthWarnings;
             resource.SupportsOnDownloadFailure = definition.SupportsOnDownloadFailure;
             resource.SupportsOnImportFailure = definition.SupportsOnImportFailure;
@@ -85,6 +89,7 @@ namespace Lidarr.Api.V1.Notifications
             definition.OnAlbumDelete = resource.OnAlbumDelete;
             definition.OnArtistDelete = resource.OnArtistDelete;
             definition.OnHealthIssue = resource.OnHealthIssue;
+            definition.OnHealthRestored = resource.OnHealthRestored;
             definition.OnDownloadFailure = resource.OnDownloadFailure;
             definition.OnImportFailure = resource.OnImportFailure;
             definition.OnTrackRetag = resource.OnTrackRetag;
@@ -96,6 +101,7 @@ namespace Lidarr.Api.V1.Notifications
             definition.SupportsOnAlbumDelete = resource.SupportsOnAlbumDelete;
             definition.SupportsOnArtistDelete = resource.SupportsOnArtistDelete;
             definition.SupportsOnHealthIssue = resource.SupportsOnHealthIssue;
+            definition.SupportsOnHealthRestored = resource.SupportsOnHealthRestored;
             definition.IncludeHealthWarnings = resource.IncludeHealthWarnings;
             definition.SupportsOnDownloadFailure = resource.SupportsOnDownloadFailure;
             definition.SupportsOnImportFailure = resource.SupportsOnImportFailure;
diff --git a/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
index 34ffc179f..7e7f0647c 100644
--- a/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
@@ -79,6 +79,11 @@ namespace NzbDrone.Core.Test.NotificationTests
                 TestLogger.Info("OnHealthIssue was called");
             }
 
+            public override void OnHealthRestored(Core.HealthCheck.HealthCheck healthCheck)
+            {
+                TestLogger.Info("OnHealthRestored was called");
+            }
+
             public override void OnDownloadFailure(DownloadFailedMessage message)
             {
                 TestLogger.Info("OnDownloadFailure was called");
@@ -133,6 +138,7 @@ namespace NzbDrone.Core.Test.NotificationTests
             notification.SupportsOnUpgrade.Should().BeTrue();
             notification.SupportsOnRename.Should().BeTrue();
             notification.SupportsOnHealthIssue.Should().BeTrue();
+            notification.SupportsOnHealthRestored.Should().BeTrue();
             notification.SupportsOnDownloadFailure.Should().BeTrue();
             notification.SupportsOnImportFailure.Should().BeTrue();
             notification.SupportsOnTrackRetag.Should().BeTrue();
@@ -151,6 +157,7 @@ namespace NzbDrone.Core.Test.NotificationTests
             notification.SupportsOnUpgrade.Should().BeFalse();
             notification.SupportsOnRename.Should().BeFalse();
             notification.SupportsOnHealthIssue.Should().BeFalse();
+            notification.SupportsOnHealthRestored.Should().BeFalse();
             notification.SupportsOnDownloadFailure.Should().BeFalse();
             notification.SupportsOnImportFailure.Should().BeFalse();
             notification.SupportsOnTrackRetag.Should().BeFalse();
diff --git a/src/NzbDrone.Core/Datastore/Migration/065_health_restored_notification.cs b/src/NzbDrone.Core/Datastore/Migration/065_health_restored_notification.cs
new file mode 100644
index 000000000..0cb997442
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/065_health_restored_notification.cs
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(065)]
+    public class health_restored_notification : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Notifications").AddColumn("OnHealthRestored").AsBoolean().WithDefaultValue(false);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs
index b437e5994..ca9052f58 100644
--- a/src/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/src/NzbDrone.Core/Datastore/TableMapping.cs
@@ -87,6 +87,7 @@ namespace NzbDrone.Core.Datastore
                   .Ignore(i => i.SupportsOnAlbumDelete)
                   .Ignore(i => i.SupportsOnArtistDelete)
                   .Ignore(i => i.SupportsOnHealthIssue)
+                  .Ignore(i => i.SupportsOnHealthRestored)
                   .Ignore(i => i.SupportsOnDownloadFailure)
                   .Ignore(i => i.SupportsOnImportFailure)
                   .Ignore(i => i.SupportsOnTrackRetag)
diff --git a/src/NzbDrone.Core/HealthCheck/HealthCheckRestoredEvent.cs b/src/NzbDrone.Core/HealthCheck/HealthCheckRestoredEvent.cs
new file mode 100644
index 000000000..a31b63cc4
--- /dev/null
+++ b/src/NzbDrone.Core/HealthCheck/HealthCheckRestoredEvent.cs
@@ -0,0 +1,16 @@
+using NzbDrone.Common.Messaging;
+
+namespace NzbDrone.Core.HealthCheck
+{
+    public class HealthCheckRestoredEvent : IEvent
+    {
+        public HealthCheck PreviousCheck { get; private set; }
+        public bool IsInStartupGracePeriod { get; private set; }
+
+        public HealthCheckRestoredEvent(HealthCheck previousCheck, bool isInStartupGracePeriod)
+        {
+            PreviousCheck = previousCheck;
+            IsInStartupGracePeriod = isInStartupGracePeriod;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/HealthCheck/HealthCheckService.cs b/src/NzbDrone.Core/HealthCheck/HealthCheckService.cs
index 1957ce276..0cdc0517e 100644
--- a/src/NzbDrone.Core/HealthCheck/HealthCheckService.cs
+++ b/src/NzbDrone.Core/HealthCheck/HealthCheckService.cs
@@ -102,6 +102,13 @@ namespace NzbDrone.Core.HealthCheck
             {
                 if (result.Type == HealthCheckResult.Ok)
                 {
+                    var previous = _healthCheckResults.Find(result.Source.Name);
+
+                    if (previous != null)
+                    {
+                        _eventAggregator.PublishEvent(new HealthCheckRestoredEvent(previous, !_hasRunHealthChecksAfterGracePeriod));
+                    }
+
                     _healthCheckResults.Remove(result.Source.Name);
                 }
                 else
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 82ef5b1df..09b3bfee5 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -230,6 +230,7 @@
   "DetailedProgressBar": "Detailed Progress Bar",
   "DetailedProgressBarHelpText": "Show text on progess bar",
   "Details": "Details",
+  "Disabled": "Disabled",
   "Disambiguation": "Disambiguation",
   "DiscCount": "Disc Count",
   "DiscNumber": "Disc Number",
@@ -568,6 +569,8 @@
   "OnGrabHelpText": "On Grab",
   "OnHealthIssue": "On Health Issue",
   "OnHealthIssueHelpText": "On Health Issue",
+  "OnHealthRestored": "On Health Restored",
+  "OnHealthRestoredHelpText": "On Health Restored",
   "OnImportFailure": "On Import Failure",
   "OnImportFailureHelpText": "On Import Failure",
   "OnReleaseImport": "On Release Import",
diff --git a/src/NzbDrone.Core/Notifications/Apprise/Apprise.cs b/src/NzbDrone.Core/Notifications/Apprise/Apprise.cs
index a1437bb78..59dc96f4f 100644
--- a/src/NzbDrone.Core/Notifications/Apprise/Apprise.cs
+++ b/src/NzbDrone.Core/Notifications/Apprise/Apprise.cs
@@ -42,6 +42,11 @@ namespace NzbDrone.Core.Notifications.Apprise
             _proxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE, $"The following issue is now resolved: {previousCheck.Message}", Settings);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _proxy.SendNotification(DOWNLOAD_FAILURE_TITLE, message.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs b/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs
index f14ffffa0..9607ce326 100644
--- a/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs
+++ b/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs
@@ -41,6 +41,11 @@ namespace NzbDrone.Core.Notifications.Boxcar
             _proxy.SendNotification(HEALTH_ISSUE_TITLE, message.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE, $"The following issue is now resolved: {previousCheck.Message}", Settings);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _proxy.SendNotification(DOWNLOAD_FAILURE_TITLE, message.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
index a240b3437..83aac352c 100644
--- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
+++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
@@ -229,6 +229,21 @@ namespace NzbDrone.Core.Notifications.CustomScript
             ExecuteScript(environmentVariables);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            var environmentVariables = new StringDictionary();
+
+            environmentVariables.Add("Lidarr_EventType", "HealthRestored");
+            environmentVariables.Add("Lidarr_InstanceName", _configFileProvider.InstanceName);
+            environmentVariables.Add("Lidarr_ApplicationUrl", _configService.ApplicationUrl);
+            environmentVariables.Add("Lidarr_Health_Restored_Level", Enum.GetName(typeof(HealthCheckResult), previousCheck.Type));
+            environmentVariables.Add("Lidarr_Health_Restored_Message", previousCheck.Message);
+            environmentVariables.Add("Lidarr_Health_Restored_Type", previousCheck.Source.Name);
+            environmentVariables.Add("Lidarr_Health_Restored_Wiki", previousCheck.WikiUrl.ToString() ?? string.Empty);
+
+            ExecuteScript(environmentVariables);
+        }
+
         public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
         {
             var environmentVariables = new StringDictionary();
diff --git a/src/NzbDrone.Core/Notifications/Discord/Discord.cs b/src/NzbDrone.Core/Notifications/Discord/Discord.cs
index 5f97f4e95..865951f6b 100644
--- a/src/NzbDrone.Core/Notifications/Discord/Discord.cs
+++ b/src/NzbDrone.Core/Notifications/Discord/Discord.cs
@@ -285,6 +285,29 @@ namespace NzbDrone.Core.Notifications.Discord
             _proxy.SendPayload(payload, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            var attachments = new List<Embed>
+            {
+                new Embed
+                {
+                    Author = new DiscordAuthor
+                    {
+                        Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author,
+                        IconUrl = "https://raw.githubusercontent.com/Lidarr/Lidarr/develop/Logo/256.png"
+                    },
+                    Title = "Health Issue Resolved: " + previousCheck.Source.Name,
+                    Description = $"The following issue is now resolved: {previousCheck.Message}",
+                    Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
+                    Color = (int)DiscordColors.Success
+                }
+            };
+
+            var payload = CreatePayload(null, attachments);
+
+            _proxy.SendPayload(payload, Settings);
+        }
+
         public override void OnTrackRetag(TrackRetagMessage message)
         {
             var attachments = new List<Embed>
diff --git a/src/NzbDrone.Core/Notifications/Email/Email.cs b/src/NzbDrone.Core/Notifications/Email/Email.cs
index 4314e2116..b013c71bb 100644
--- a/src/NzbDrone.Core/Notifications/Email/Email.cs
+++ b/src/NzbDrone.Core/Notifications/Email/Email.cs
@@ -60,6 +60,11 @@ namespace NzbDrone.Core.Notifications.Email
             SendEmail(Settings, HEALTH_ISSUE_TITLE_BRANDED, message.Message);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousMessage)
+        {
+            SendEmail(Settings, HEALTH_RESTORED_TITLE_BRANDED, $"The following issue is now resolved: {previousMessage.Message}");
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             SendEmail(Settings, DOWNLOAD_FAILURE_TITLE_BRANDED, message.Message);
diff --git a/src/NzbDrone.Core/Notifications/Gotify/Gotify.cs b/src/NzbDrone.Core/Notifications/Gotify/Gotify.cs
index 465ea4ea3..ad3a0cf20 100644
--- a/src/NzbDrone.Core/Notifications/Gotify/Gotify.cs
+++ b/src/NzbDrone.Core/Notifications/Gotify/Gotify.cs
@@ -44,6 +44,11 @@ namespace NzbDrone.Core.Notifications.Gotify
             _proxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE, $"The following issue is now resolved: {previousCheck.Message}", null);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _proxy.SendNotification(DOWNLOAD_FAILURE_TITLE, message.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/INotification.cs b/src/NzbDrone.Core/Notifications/INotification.cs
index fed97585c..4ede325c2 100644
--- a/src/NzbDrone.Core/Notifications/INotification.cs
+++ b/src/NzbDrone.Core/Notifications/INotification.cs
@@ -15,6 +15,7 @@ namespace NzbDrone.Core.Notifications
         void OnAlbumDelete(AlbumDeleteMessage deleteMessage);
         void OnArtistDelete(ArtistDeleteMessage deleteMessage);
         void OnHealthIssue(HealthCheck.HealthCheck healthCheck);
+        void OnHealthRestored(HealthCheck.HealthCheck previousCheck);
         void OnApplicationUpdate(ApplicationUpdateMessage updateMessage);
         void OnDownloadFailure(DownloadFailedMessage message);
         void OnImportFailure(AlbumDownloadMessage message);
@@ -27,6 +28,7 @@ namespace NzbDrone.Core.Notifications
         bool SupportsOnAlbumDelete { get; }
         bool SupportsOnArtistDelete { get; }
         bool SupportsOnHealthIssue { get; }
+        bool SupportsOnHealthRestored { get; }
         bool SupportsOnApplicationUpdate { get; }
         bool SupportsOnDownloadFailure { get; }
         bool SupportsOnImportFailure { get; }
diff --git a/src/NzbDrone.Core/Notifications/Join/Join.cs b/src/NzbDrone.Core/Notifications/Join/Join.cs
index 235b09614..ff1102d4b 100644
--- a/src/NzbDrone.Core/Notifications/Join/Join.cs
+++ b/src/NzbDrone.Core/Notifications/Join/Join.cs
@@ -42,6 +42,11 @@ namespace NzbDrone.Core.Notifications.Join
             _proxy.SendNotification(HEALTH_ISSUE_TITLE_BRANDED, message.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousMessage)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE_BRANDED, $"The following issue is now resolved: {previousMessage.Message}", Settings);
+        }
+
         public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
         {
             _proxy.SendNotification(APPLICATION_UPDATE_TITLE_BRANDED, updateMessage.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/Mailgun/Mailgun.cs b/src/NzbDrone.Core/Notifications/Mailgun/Mailgun.cs
index bb1b0da26..f68fef06f 100644
--- a/src/NzbDrone.Core/Notifications/Mailgun/Mailgun.cs
+++ b/src/NzbDrone.Core/Notifications/Mailgun/Mailgun.cs
@@ -44,6 +44,11 @@ namespace NzbDrone.Core.Notifications.Mailgun
             _proxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheckMessage.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheckMessage)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE_BRANDED, $"The following issue is now resolved: {previousCheckMessage.Message}", Settings);
+        }
+
         public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
         {
             _proxy.SendNotification(APPLICATION_UPDATE_TITLE, updateMessage.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs
index 9285061c0..daa4230f6 100644
--- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs
+++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs
@@ -81,6 +81,14 @@ namespace NzbDrone.Core.Notifications.Emby
             }
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousMessage)
+        {
+            if (Settings.Notify)
+            {
+                _mediaBrowserService.Notify(Settings, HEALTH_RESTORED_TITLE_BRANDED, $"The following issue is now resolved: {previousMessage.Message}");
+            }
+        }
+
         public override void OnTrackRetag(TrackRetagMessage message)
         {
             if (Settings.Notify)
diff --git a/src/NzbDrone.Core/Notifications/Notifiarr/Notifiarr.cs b/src/NzbDrone.Core/Notifications/Notifiarr/Notifiarr.cs
index be7046377..041d8fdc9 100644
--- a/src/NzbDrone.Core/Notifications/Notifiarr/Notifiarr.cs
+++ b/src/NzbDrone.Core/Notifications/Notifiarr/Notifiarr.cs
@@ -67,6 +67,11 @@ namespace NzbDrone.Core.Notifications.Notifiarr
             _proxy.SendNotification(BuildHealthPayload(healthCheck), Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(BuildHealthRestoredPayload(previousCheck), Settings);
+        }
+
         public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
         {
             _proxy.SendNotification(BuildApplicationUpdatePayload(updateMessage), Settings);
diff --git a/src/NzbDrone.Core/Notifications/NotificationBase.cs b/src/NzbDrone.Core/Notifications/NotificationBase.cs
index 2fd4bdd48..7b5da7f1d 100644
--- a/src/NzbDrone.Core/Notifications/NotificationBase.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationBase.cs
@@ -15,6 +15,7 @@ namespace NzbDrone.Core.Notifications
         protected const string ALBUM_DELETED_TITLE = "Album Deleted";
         protected const string ARTIST_DELETED_TITLE = "Artist Deleted";
         protected const string HEALTH_ISSUE_TITLE = "Health Check Failure";
+        protected const string HEALTH_RESTORED_TITLE = "Health Check Restored";
         protected const string DOWNLOAD_FAILURE_TITLE = "Download Failed";
         protected const string IMPORT_FAILURE_TITLE = "Import Failed";
         protected const string TRACK_RETAGGED_TITLE = "Track File Tags Updated";
@@ -25,6 +26,7 @@ namespace NzbDrone.Core.Notifications
         protected const string ALBUM_DELETED_TITLE_BRANDED = "Lidarr - " + ALBUM_DELETED_TITLE;
         protected const string ARTIST_DELETED_TITLE_BRANDED = "Lidarr - " + ARTIST_DELETED_TITLE;
         protected const string HEALTH_ISSUE_TITLE_BRANDED = "Lidarr - " + HEALTH_ISSUE_TITLE;
+        protected const string HEALTH_RESTORED_TITLE_BRANDED = "Lidarr - " + HEALTH_RESTORED_TITLE;
         protected const string DOWNLOAD_FAILURE_TITLE_BRANDED = "Lidarr - " + DOWNLOAD_FAILURE_TITLE;
         protected const string IMPORT_FAILURE_TITLE_BRANDED = "Lidarr - " + IMPORT_FAILURE_TITLE;
         protected const string TRACK_RETAGGED_TITLE_BRANDED = "Lidarr - " + TRACK_RETAGGED_TITLE;
@@ -67,6 +69,10 @@ namespace NzbDrone.Core.Notifications
         {
         }
 
+        public virtual void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+        }
+
         public virtual void OnDownloadFailure(DownloadFailedMessage message)
         {
         }
@@ -94,6 +100,7 @@ namespace NzbDrone.Core.Notifications
         public bool SupportsOnAlbumDelete => HasConcreteImplementation("OnAlbumDelete");
         public bool SupportsOnArtistDelete => HasConcreteImplementation("OnArtistDelete");
         public bool SupportsOnHealthIssue => HasConcreteImplementation("OnHealthIssue");
+        public bool SupportsOnHealthRestored => HasConcreteImplementation("OnHealthRestored");
         public bool SupportsOnDownloadFailure => HasConcreteImplementation("OnDownloadFailure");
         public bool SupportsOnImportFailure => HasConcreteImplementation("OnImportFailure");
         public bool SupportsOnTrackRetag => HasConcreteImplementation("OnTrackRetag");
diff --git a/src/NzbDrone.Core/Notifications/NotificationDefinition.cs b/src/NzbDrone.Core/Notifications/NotificationDefinition.cs
index 89fd63509..1dc9d8026 100644
--- a/src/NzbDrone.Core/Notifications/NotificationDefinition.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationDefinition.cs
@@ -11,6 +11,7 @@ namespace NzbDrone.Core.Notifications
         public bool OnAlbumDelete { get; set; }
         public bool OnArtistDelete { get; set; }
         public bool OnHealthIssue { get; set; }
+        public bool OnHealthRestored { get; set; }
         public bool OnDownloadFailure { get; set; }
         public bool OnImportFailure { get; set; }
         public bool OnTrackRetag { get; set; }
@@ -22,12 +23,13 @@ namespace NzbDrone.Core.Notifications
         public bool SupportsOnAlbumDelete { get; set; }
         public bool SupportsOnArtistDelete { get; set; }
         public bool SupportsOnHealthIssue { get; set; }
+        public bool SupportsOnHealthRestored { get; set; }
         public bool IncludeHealthWarnings { get; set; }
         public bool SupportsOnDownloadFailure { get; set; }
         public bool SupportsOnImportFailure { get; set; }
         public bool SupportsOnTrackRetag { get; set; }
         public bool SupportsOnApplicationUpdate { get; set; }
 
-        public override bool Enable => OnGrab || OnReleaseImport || (OnReleaseImport && OnUpgrade) || OnAlbumDelete || OnArtistDelete || OnHealthIssue || OnDownloadFailure || OnImportFailure || OnTrackRetag || OnApplicationUpdate;
+        public override bool Enable => OnGrab || OnReleaseImport || (OnReleaseImport && OnUpgrade) || OnAlbumDelete || OnArtistDelete || OnHealthIssue || OnHealthRestored || OnDownloadFailure || OnImportFailure || OnTrackRetag || OnApplicationUpdate;
     }
 }
diff --git a/src/NzbDrone.Core/Notifications/NotificationFactory.cs b/src/NzbDrone.Core/Notifications/NotificationFactory.cs
index de7f6fcd4..c9df71ca5 100644
--- a/src/NzbDrone.Core/Notifications/NotificationFactory.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationFactory.cs
@@ -17,6 +17,7 @@ namespace NzbDrone.Core.Notifications
         List<INotification> OnAlbumDeleteEnabled();
         List<INotification> OnArtistDeleteEnabled();
         List<INotification> OnHealthIssueEnabled();
+        List<INotification> OnHealthRestoredEnabled();
         List<INotification> OnDownloadFailureEnabled();
         List<INotification> OnImportFailureEnabled();
         List<INotification> OnTrackRetagEnabled();
@@ -65,6 +66,11 @@ namespace NzbDrone.Core.Notifications
             return GetAvailableProviders().Where(n => ((NotificationDefinition)n.Definition).OnHealthIssue).ToList();
         }
 
+        public List<INotification> OnHealthRestoredEnabled()
+        {
+            return GetAvailableProviders().Where(n => ((NotificationDefinition)n.Definition).OnHealthRestored).ToList();
+        }
+
         public List<INotification> OnDownloadFailureEnabled()
         {
             return GetAvailableProviders().Where(n => ((NotificationDefinition)n.Definition).OnDownloadFailure).ToList();
@@ -96,6 +102,7 @@ namespace NzbDrone.Core.Notifications
             definition.SupportsOnAlbumDelete = provider.SupportsOnAlbumDelete;
             definition.SupportsOnArtistDelete = provider.SupportsOnArtistDelete;
             definition.SupportsOnHealthIssue = provider.SupportsOnHealthIssue;
+            definition.SupportsOnHealthRestored = provider.SupportsOnHealthRestored;
             definition.SupportsOnDownloadFailure = provider.SupportsOnDownloadFailure;
             definition.SupportsOnImportFailure = provider.SupportsOnImportFailure;
             definition.SupportsOnTrackRetag = provider.SupportsOnTrackRetag;
diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs
index 988396763..18b1e0b75 100644
--- a/src/NzbDrone.Core/Notifications/NotificationService.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationService.cs
@@ -23,6 +23,7 @@ namespace NzbDrone.Core.Notifications
           IHandle<AlbumDeletedEvent>,
           IHandle<ArtistsDeletedEvent>,
           IHandle<HealthCheckFailedEvent>,
+          IHandle<HealthCheckRestoredEvent>,
           IHandle<DownloadFailedEvent>,
           IHandle<AlbumImportIncompleteEvent>,
           IHandle<TrackFileRetaggedEvent>,
@@ -273,6 +274,29 @@ namespace NzbDrone.Core.Notifications
             }
         }
 
+        public void Handle(HealthCheckRestoredEvent message)
+        {
+            if (message.IsInStartupGracePeriod)
+            {
+                return;
+            }
+
+            foreach (var notification in _notificationFactory.OnHealthRestoredEnabled())
+            {
+                try
+                {
+                    if (ShouldHandleHealthFailure(message.PreviousCheck, ((NotificationDefinition)notification.Definition).IncludeHealthWarnings))
+                    {
+                        notification.OnHealthRestored(message.PreviousCheck);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.Warn(ex, "Unable to send OnHealthRestored notification to: " + notification.Definition.Name);
+                }
+            }
+        }
+
         public void Handle(DownloadFailedEvent message)
         {
             var downloadFailedMessage = new DownloadFailedMessage
diff --git a/src/NzbDrone.Core/Notifications/Ntfy/Ntfy.cs b/src/NzbDrone.Core/Notifications/Ntfy/Ntfy.cs
index d146bb9e4..680338b49 100644
--- a/src/NzbDrone.Core/Notifications/Ntfy/Ntfy.cs
+++ b/src/NzbDrone.Core/Notifications/Ntfy/Ntfy.cs
@@ -43,6 +43,11 @@ namespace NzbDrone.Core.Notifications.Ntfy
             _proxy.SendNotification(HEALTH_ISSUE_TITLE_BRANDED, healthCheck.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE_BRANDED, $"The following issue is now resolved: {previousCheck.Message}", Settings);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _proxy.SendNotification(DOWNLOAD_FAILURE_TITLE_BRANDED, message.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs
index f3dd15e6d..5560fa27a 100644
--- a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs
+++ b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs
@@ -41,6 +41,11 @@ namespace NzbDrone.Core.Notifications.Prowl
             _prowlProxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousMessage)
+        {
+            _prowlProxy.SendNotification(HEALTH_RESTORED_TITLE, $"The following issue is now resolved: {previousMessage.Message}", Settings);
+        }
+
         public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
         {
             _prowlProxy.SendNotification(APPLICATION_UPDATE_TITLE, updateMessage.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs b/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs
index 7f51cdabb..b12cf6a95 100644
--- a/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs
+++ b/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs
@@ -44,6 +44,11 @@ namespace NzbDrone.Core.Notifications.PushBullet
             _proxy.SendNotification(HEALTH_ISSUE_TITLE_BRANDED, healthCheck.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE_BRANDED, $"The following issue is now resolved: {previousCheck.Message}", Settings);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _proxy.SendNotification(DOWNLOAD_FAILURE_TITLE_BRANDED, message.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs b/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs
index 46cdd3551..a2e296b23 100644
--- a/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs
+++ b/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs
@@ -41,6 +41,11 @@ namespace NzbDrone.Core.Notifications.Pushover
             _proxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE, $"The following issue is now resolved: {previousCheck.Message}", Settings);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _proxy.SendNotification(DOWNLOAD_FAILURE_TITLE, message.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/SendGrid/SendGrid.cs b/src/NzbDrone.Core/Notifications/SendGrid/SendGrid.cs
index 57f00f829..c1149b411 100644
--- a/src/NzbDrone.Core/Notifications/SendGrid/SendGrid.cs
+++ b/src/NzbDrone.Core/Notifications/SendGrid/SendGrid.cs
@@ -44,6 +44,11 @@ namespace NzbDrone.Core.Notifications.SendGrid
             _proxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE, $"The following issue is now resolved: {previousCheck.Message}", Settings);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _proxy.SendNotification(DOWNLOAD_FAILURE_TITLE, message.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/Simplepush/Simplepush.cs b/src/NzbDrone.Core/Notifications/Simplepush/Simplepush.cs
index b33c2d6c5..06ca177d1 100644
--- a/src/NzbDrone.Core/Notifications/Simplepush/Simplepush.cs
+++ b/src/NzbDrone.Core/Notifications/Simplepush/Simplepush.cs
@@ -41,6 +41,11 @@ namespace NzbDrone.Core.Notifications.Simplepush
             _proxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE, $"The following issue is now resolved: {previousCheck.Message}", Settings);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _proxy.SendNotification(DOWNLOAD_FAILURE_TITLE, message.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/Slack/Slack.cs b/src/NzbDrone.Core/Notifications/Slack/Slack.cs
index 286d853f7..019195710 100644
--- a/src/NzbDrone.Core/Notifications/Slack/Slack.cs
+++ b/src/NzbDrone.Core/Notifications/Slack/Slack.cs
@@ -119,6 +119,23 @@ namespace NzbDrone.Core.Notifications.Slack
             _proxy.SendPayload(payload, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            var attachments = new List<Attachment>
+            {
+                new Attachment
+                {
+                    Title = previousCheck.Source.Name,
+                    Text = $"The following issue is now resolved: {previousCheck.Message}",
+                    Color = "good"
+                }
+            };
+
+            var payload = CreatePayload("Health Issue Resolved", attachments);
+
+            _proxy.SendPayload(payload, Settings);
+        }
+
         public override void OnTrackRetag(TrackRetagMessage message)
         {
             var attachments = new List<Attachment>
diff --git a/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs b/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs
index 4be142d99..f95de3338 100644
--- a/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs
+++ b/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs
@@ -41,6 +41,11 @@ namespace NzbDrone.Core.Notifications.Telegram
             _proxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendNotification(HEALTH_RESTORED_TITLE, $"The following issue is now resolved: {previousCheck.Message}", Settings);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _proxy.SendNotification(DOWNLOAD_FAILURE_TITLE, message.Message, Settings);
diff --git a/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs b/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs
index 71f1b1e10..ef423b316 100644
--- a/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs
+++ b/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs
@@ -43,6 +43,11 @@ namespace NzbDrone.Core.Notifications.Twitter
             _twitterService.SendNotification($"Health Issue: {healthCheck.Message}", Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _twitterService.SendNotification($"Health Issue Resolved: {previousCheck.Message}", Settings);
+        }
+
         public override void OnDownloadFailure(DownloadFailedMessage message)
         {
             _twitterService.SendNotification($"Download Failed: {message.Message}", Settings);
diff --git a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs
index 9dc481d4d..3bce52990 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs
@@ -65,6 +65,11 @@ namespace NzbDrone.Core.Notifications.Webhook
             _proxy.SendWebhook(BuildHealthPayload(healthCheck), Settings);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            _proxy.SendWebhook(BuildHealthRestoredPayload(previousCheck), Settings);
+        }
+
         public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
         {
             _proxy.SendWebhook(BuildApplicationUpdatePayload(updateMessage), Settings);
diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs
index 5987adcd8..f4450612f 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs
@@ -168,6 +168,19 @@ namespace NzbDrone.Core.Notifications.Webhook
             };
         }
 
+        protected WebhookHealthPayload BuildHealthRestoredPayload(HealthCheck.HealthCheck healthCheck)
+        {
+            return new WebhookHealthPayload
+            {
+                EventType = WebhookEventType.HealthRestored,
+                InstanceName = _configFileProvider.InstanceName,
+                Level = healthCheck.Type,
+                Message = healthCheck.Message,
+                Type = healthCheck.Source.Name,
+                WikiUrl = healthCheck.WikiUrl?.ToString()
+            };
+        }
+
         protected WebhookApplicationUpdatePayload BuildApplicationUpdatePayload(ApplicationUpdateMessage updateMessage)
         {
             return new WebhookApplicationUpdatePayload
diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookEventType.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookEventType.cs
index e862f7000..f598d554c 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/WebhookEventType.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookEventType.cs
@@ -19,5 +19,6 @@ namespace NzbDrone.Core.Notifications.Webhook
         Health,
         Retag,
         ApplicationUpdate,
+        HealthRestored
     }
 }
diff --git a/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs b/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
index ee8c549fa..e08ec1b28 100644
--- a/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
+++ b/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
@@ -47,6 +47,11 @@ namespace NzbDrone.Core.Notifications.Xbmc
             Notify(Settings, HEALTH_ISSUE_TITLE_BRANDED, healthCheck.Message);
         }
 
+        public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
+        {
+            Notify(Settings, HEALTH_RESTORED_TITLE_BRANDED, $"The following issue is now resolved: {previousCheck.Message}");
+        }
+
         public override void OnTrackRetag(TrackRetagMessage message)
         {
             UpdateAndClean(message.Artist);