Merging upstream version 1.17.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 0 insertions, 34 deletions

diff --git a/health/notifications/prowl/Makefile.inc b/health/notifications/prowl/Makefile.inc
deleted file mode 100644
index 08e4c2e54..000000000
--- a/health/notifications/prowl/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# install these files
-dist_noinst_DATA += \
-	prowl/README.md \
-	prowl/Makefile.inc \
-	$(NULL)
-
diff --git a/health/notifications/prowl/README.md b/health/notifications/prowl/README.md
deleted file mode 100644
index 1f060edcf..000000000
--- a/health/notifications/prowl/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# prowl
-
-(Prowl)[1] is a push notification service for iOS devices.  Netdata
-supprots delivering notifications to iOS devices through Prowl.
-
-Because of how Netdata integrates with Prowl, there is a hard limit of
-at most 1000 notifications per hour (starting from the first notification
-sent).  Any alerts beyond the first thousand in an hour will be dropped.
-
-Warning messages will be sent with the 'High' priority, critical messages
-will be sent with the 'Emergency' priority, and all other messages will
-be sent with the normal priority.  Opening the notification's associated
-URL will take you to the Netdata dashboard of the system that issued
-the alert, directly to the chart that it triggered on.
-
-## configuration
-
-To use this, you will need a Prowl API key, which can be rquested through
-the Prowl website after registering.
-
-Once you have an API key, simply specify that as a recipient for Prowl
-notifications.