Adding upstream version 1.12.0.upstream/1.12.0

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

1 files changed, 68 insertions, 11 deletions

diff --git a/health/notifications/health_alarm_notify.conf b/health/notifications/health_alarm_notify.conf
index a997765a6..b96cf5793 100755
--- a/health/notifications/health_alarm_notify.conf
+++ b/health/notifications/health_alarm_notify.conf
@@ -14,6 +14,7 @@
 # - sms messages to your cell phone or any sms enabled device (twilio.com)
 # - sms messages to your cell phone or any sms enabled device (messagebird.com)
 # - notifications to users on pagerduty.com
+# - push notifications to iOS devices (via prowlapp.com)
 # - notifications to Amazon SNS topics (aws.amazon.com)
 # - messages to your irc channel on your selected network
 # - messages to a local or remote syslog daemon
@@ -64,6 +65,24 @@ date_format=''
 
 
 #------------------------------------------------------------------------------
+# hostname handling
+#
+# By default, Netdata will use the simple hostname for the system (the
+# hostname with everything after the first `.` removed) when displaying
+# the hostname in alert notifications.  If you prefer, you can uncomment
+# the line below to have Netdata instead use the host's fully qualified
+# domain name.
+#
+# This does not report correct FQDN's for slave systems for which this
+# sytem is a master.
+#
+# Additionally, if the system host name is overridden in /etc/netdata.conf
+# with the `hostname` option, that name will be used unconditionally
+# instead of this.
+#use_fqdn='YES'
+
+
+#------------------------------------------------------------------------------
 # external commands
 
 # The full path to the sendmail command.
@@ -109,6 +128,14 @@ aws=""
 #logger_options=""
 
 #------------------------------------------------------------------------------
+# extra options
+
+# By default don't do anything if this is CLEAR, but it was not WARNING or CRITICAL.
+# You can send it always if your system makes deduplication for alarms.
+#clear_alarm_always='YES'
+
+#
+#------------------------------------------------------------------------------
 # NOTE ABOUT RECIPIENTS
 #
 # When you define recipients (all types):
@@ -268,7 +295,7 @@ SEND_MESSAGEBIRD="YES"
 # to get an access key, create a free account at https://www.messagebird.com
 # verify and activate the account (no CC info needed)
 # login to your account and enter your phonenumber to get some free credits
-# to get the API key, click on 'API' in the sidebar, then 'API Access (REST)' 
+# to get the API key, click on 'API' in the sidebar, then 'API Access (REST)'
 # click 'Add access key' and fill in data (you want a live key to send SMS)
 
 # Without an access key, netdata cannot send Messagebird text messages.
@@ -324,7 +351,7 @@ DEFAULT_RECIPIENT_TELEGRAM=""
 # slack (slack.com) global notification options
 
 # multiple recipients can be given like this:
-#                  "CHANNEL1 CHANNEL2 ..."
+#                  "RECIPIENT1 RECIPIENT2 ..."
 
 # enable/disable sending slack notifications
 SEND_SLACK="YES"
@@ -335,9 +362,11 @@ SEND_SLACK="YES"
 # Get yours from: https://api.slack.com/incoming-webhooks
 SLACK_WEBHOOK_URL=""
 
-# if a role's recipients are not configured, a notification will be send to
-# this slack channel (empty = do not send a notification for unconfigured
-# roles):
+# if a role's recipients are not configured, a notification will be send to:
+# - A slack channel (syntax: '#channel' or 'channel')  
+# - A slack user (syntax: '@user')
+# - The channel or user defined in slack for the webhook (syntax: '#')
+# empty = do not send a notification for unconfigured roles 
 DEFAULT_RECIPIENT_SLACK=""
 
 #------------------------------------------------------------------------------
@@ -405,7 +434,7 @@ DEFAULT_RECIPIENT_ROCKETCHAT=""
 SEND_ALERTA="YES"
 
 # here set your alerta server API url
-# this is the API url you defined when installed Alerta server, 
+# this is the API url you defined when installed Alerta server,
 # it is the same for all users. Do not include last slash.
 # ALERTA_WEBHOOK_URL="https://<server>/alerta/api"
 ALERTA_WEBHOOK_URL=""
@@ -493,9 +522,9 @@ KAFKA_SENDER_IP=""
 #------------------------------------------------------------------------------
 # pagerduty.com notification options
 #
-# pagerduty.com notifications require the pagerduty agent to be installed and 
-# a "Generic API" pagerduty service.
-# https://www.pagerduty.com/docs/guides/agent-install-guide/
+# pagerduty.com notifications require a "Generic API" (Events v1)
+# pagerduty service.
+# https://support.pagerduty.com/docs/services-and-integrations
 
 # multiple recipients can be given like this:
 #              "<pd_service_key_1> <pd_service_key_2> ..."
@@ -534,7 +563,7 @@ FLEEP_SENDER=""
 #------------------------------------------------------------------------------
 # irc notification options
 #
-# irc notifications require only the nc utility to be installed. 
+# irc notifications require only the nc utility to be installed.
 
 # multiple recipients can be given like this:
 #              "<irc_channel_1> <irc_channel_2> ..."
@@ -550,7 +579,7 @@ DEFAULT_RECIPIENT_IRC=""
 # e.g. "irc.freenode.net"
 IRC_NETWORK=""
 
-# The irc nickname which is required to send the notification. It must not be 
+# The irc nickname which is required to send the notification. It must not be
 # an already registered name as the connection's MODE is defined as a 'guest'.
 IRC_NICKNAME=""
 
@@ -626,6 +655,22 @@ SYSLOG_FACILITY=''
 DEFAULT_RECIPIENT_SYSLOG="netdata"
 
 #------------------------------------------------------------------------------
+# iOS Push Notifications
+
+# enable/disable sending iOS push notifications
+SEND_PROWL="YES"
+
+# If a role's recipients are not configured, use the following,
+# (empty = do not send a notiication for unconfigured roles)
+#
+# Recipients for iOS push notifications are Prowl API keys.
+#
+# A recipient may also consist of multiple Prowl API keys separated by
+# commas, in which case notifications will be simultaneously sent for all
+# of those API keys.
+DEFAULT_RECIPIENT_PROWL=""
+
+#------------------------------------------------------------------------------
 # Amazon SNS notifications
 #
 # This method requires potentially complex manual configuration.  See the
@@ -748,6 +793,8 @@ role_recipients_irc[sysadmin]="${DEFAULT_RECIPIENT_IRC}"
 
 role_recipients_syslog[sysadmin]="${DEFAULT_RECIPIENT_SYSLOG}"
 
+role_recipients_prowl[sysadming]="${DEFAULT_RECIPIENT_PROWL}"
+
 role_recipients_awssns[sysadmin]="${DEFAULT_RECIPIENT_AWSSNS}"
 
 role_recipients_custom[sysadmin]="${DEFAULT_RECIPIENT_CUSTOM}"
@@ -789,6 +836,8 @@ role_recipients_irc[domainadmin]="${DEFAULT_RECIPIENT_IRC}"
 
 role_recipients_syslog[domainadmin]="${DEFAULT_RECIPIENT_SYSLOG}"
 
+role_recipients_prowl[domainadmin]="${DEFAULT_RECIPIENT_PROWL}"
+
 role_recipients_awssns[domainadmin]="${DEFAULT_RECIPIENT_AWSSNS}"
 
 role_recipients_custom[domainadmin]="${DEFAULT_RECIPIENT_CUSTOM}"
@@ -831,6 +880,8 @@ role_recipients_irc[dba]="${DEFAULT_RECIPIENT_IRC}"
 
 role_recipients_syslog[dba]="${DEFAULT_RECIPIENT_SYSLOG}"
 
+role_recipients_prowl[dba]="${DEFAULT_RECIPIENT_PROWL}"
+
 role_recipients_awssns[dba]="${DEFAULT_RECIPIENT_AWSSNS}"
 
 role_recipients_custom[dba]="${DEFAULT_RECIPIENT_CUSTOM}"
@@ -873,6 +924,8 @@ role_recipients_irc[webmaster]="${DEFAULT_RECIPIENT_IRC}"
 
 role_recipients_syslog[webmaster]="${DEFAULT_RECIPIENT_SYSLOG}"
 
+role_recipients_prowl[webmaster]="${DEFAULT_RECIPIENT_PROWL}"
+
 role_recipients_awssns[webmaster]="${DEFAULT_RECIPIENT_AWSSNS}"
 
 role_recipients_custom[webmaster]="${DEFAULT_RECIPIENT_CUSTOM}"
@@ -915,6 +968,8 @@ role_recipients_irc[proxyadmin]="${DEFAULT_RECIPIENT_IRC}"
 
 role_recipients_syslog[proxyadmin]="${DEFAULT_RECIPIENT_SYSLOG}"
 
+role_recipients_prowl[proxyadmin]="${DEFAULT_RECIPIENT_PROWL}"
+
 role_recipients_awssns[porxyadmin]="${DEFAULT_RECIPIENT_AWSSNS}"
 
 role_recipients_custom[proxyadmin]="${DEFAULT_RECIPIENT_CUSTOM}"
@@ -955,6 +1010,8 @@ role_recipients_fleep[sitemgr]="${DEFAULT_RECIPIENT_FLEEP}"
 
 role_recipients_syslog[sitemgr]="${DEFAULT_RECIPIENT_SYSLOG}"
 
+role_recipients_prowl[sitemgr]="${DEFAULT_RECIPIENT_PROWL}"
+
 role_recipients_awssns[sitemgr]="${DEFAULT_RECIPIENT_AWSSNS}"
 
 role_recipients_custom[sitemgr]="${DEFAULT_RECIPIENT_CUSTOM}"