Merging upstream version 1.43.0.

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

1 files changed, 9 insertions, 58 deletions

diff --git a/health/notifications/health_alarm_notify.conf b/health/notifications/health_alarm_notify.conf
index ddbb8ab59..7a896cc92 100755
--- a/health/notifications/health_alarm_notify.conf
+++ b/health/notifications/health_alarm_notify.conf
@@ -21,7 +21,6 @@
 # - messages to a local or remote syslog daemon
 # - message to Microsoft Teams (through webhook)
 # - message to Rocket.Chat (through webhook)
-# - message to Google Hangouts Chat (through webhook)
 # - push notifications to your mobile phone or desktop (ntfy.sh)
 #
 # The 'to' line given at netdata alarms defines a *role*, so that many
@@ -185,7 +184,6 @@ sendsms=""
 #  kavenegar  : "09155555555 09177777777|critical"
 #  pd         : "<pd_service_key_1> <pd_service_key_2>|critical"
 #  irc        : "<irc_channel_1> <irc_channel_2>|critical"
-#  hangouts   : "alarms disasters|critical"
 #
 # You can append multiple modifiers. In this example, recipient receives
 # notifications for critical alarms and following status changes except clear
@@ -280,15 +278,6 @@ DYNATRACE_EVENT="CUSTOM_INFO"
 DEFAULT_RECIPIENT_DYNATRACE=""
 
 #------------------------------------------------------------------------------
-# Stackpulse global notification options
-SEND_STACKPULSE="YES"
-
-# Webhook
-STACKPULSE_WEBHOOK=""
-
-DEFAULT_RECIPIENT_STACKPULSE=""
-
-#------------------------------------------------------------------------------
 # gotify global notification options
 SEND_GOTIFY="YES"
 
@@ -309,27 +298,6 @@ OPSGENIE_API_URL=""
 DEFAULT_RECIPIENT_OPSGENIE=""
 
 #------------------------------------------------------------------------------
-# hangouts (google hangouts chat) global notification options
-
-# enable/disable sending hangouts notifications
-SEND_HANGOUTS="YES"
-
-# On Hangouts, in the room you choose, create an incoming webhook,
-# copy the link and paste it below and also give it a room name.
-# Without it, netdata cannot send hangouts notifications to that room.
-# You will then use the same room name in your recipients list. For each URI, you need
-# HANGOUTS_WEBHOOK_URI[room_name]="WEBHOOK_URI"
-# e.g. to define systems and development rooms/recipients:
-# HANGOUTS_WEBHOOK_URI[systems]="URLforroom1"
-# HANGOUTS_WEBHOOK_URI[development]="URLforroom2"
-
-# if a DEFAULT_RECIPIENT_HANGOUTS is not configured,
-# notifications won't be send to hangouts rooms. For the example above,
-# a valid recipients list is the following
-# DEFAULT_RECIPIENT_HANGOUTS="systems development|critical"
-DEFAULT_RECIPIENT_HANGOUTS=""
-
-#------------------------------------------------------------------------------
 # pushover (pushover.net) global notification options
 
 # multiple recipients can be given like this:
@@ -860,6 +828,15 @@ DEFAULT_RECIPIENT_MATRIX=""
 # enable/disable sending ntfy notifications
 SEND_NTFY="YES"
 
+# optional NTFY username
+NTFY_USERNAME=""
+
+# optional NTFY password
+NTFY_PASSWORD=""
+
+# optional NTFY access token
+NTFY_ACCESS_TOKEN=""
+
 # if a role's recipients are not configured, a notification will be sent to
 # this ntfy server / topic combination (empty = do not send a notification for 
 # unconfigured roles). 
@@ -890,8 +867,6 @@ custom_sender() {
     # ${url_name}           same as ${name} but URL encoded
     # ${chart}              the name of the chart (type.id)
     # ${url_chart}          same as ${chart} but URL encoded
-    # ${family}             the family of the chart
-    # ${url_family}         same as ${family} but URL encoded
     # ${status}             the current status : REMOVED, UNINITIALIZED, UNDEFINED, CLEAR, WARNING, CRITICAL
     # ${old_status}         the previous status: REMOVED, UNINITIALIZED, UNDEFINED, CLEAR, WARNING, CRITICAL
     # ${value}              the current value of the alarm
@@ -958,8 +933,6 @@ custom_sender() {
 
 # role_recipients_email[sysadmin]="${DEFAULT_RECIPIENT_EMAIL}"
 
-# role_recipients_hangouts[sysadmin]="${DEFAULT_RECIPIENT_HANGOUTS}"
-
 # role_recipients_pushover[sysadmin]="${DEFAULT_RECIPIENT_PUSHOVER}"
 
 # role_recipients_pushbullet[sysadmin]="${DEFAULT_RECIPIENT_PUSHBULLET}"
@@ -1006,8 +979,6 @@ custom_sender() {
 
 # role_recipients_matrix[sysadmin]="${DEFAULT_RECIPIENT_MATRIX}"
 
-# role_recipients_stackpulse[sysadmin]="${DEFAULT_RECIPIENT_STACKPULSE}"
-
 # role_recipients_gotify[sysadmin]="${DEFAULT_RECIPIENT_GOTIFY}"
 
 # role_recipients_ntfy[sysadmin]="${DEFAULT_RECIPIENT_NTFY}"
@@ -1017,8 +988,6 @@ custom_sender() {
 
 # role_recipients_email[domainadmin]="${DEFAULT_RECIPIENT_EMAIL}"
 
-# role_recipients_hangouts[domainadmin]="${DEFAULT_RECIPIENT_HANGOUTS}"
-
 # role_recipients_pushover[domainadmin]="${DEFAULT_RECIPIENT_PUSHOVER}"
 
 # role_recipients_pushbullet[domainadmin]="${DEFAULT_RECIPIENT_PUSHBULLET}"
@@ -1067,8 +1036,6 @@ custom_sender() {
 
 # role_recipients_matrix[domainadmin]="${DEFAULT_RECIPIENT_MATRIX}"
 
-# role_recipients_stackpulse[domainadmin]="${DEFAULT_RECIPIENT_STACKPULSE}"
-
 # role_recipients_gotify[domainadmin]="${DEFAULT_RECIPIENT_GOTIFY}"
 
 # role_recipients_ntfy[domainadmin]="${DEFAULT_RECIPIENT_NTFY}"
@@ -1079,8 +1046,6 @@ custom_sender() {
 
 # role_recipients_email[dba]="${DEFAULT_RECIPIENT_EMAIL}"
 
-# role_recipients_hangouts[dba]="${DEFAULT_RECIPIENT_HANGOUTS}"
-
 # role_recipients_pushover[dba]="${DEFAULT_RECIPIENT_PUSHOVER}"
 
 # role_recipients_pushbullet[dba]="${DEFAULT_RECIPIENT_PUSHBULLET}"
@@ -1129,8 +1094,6 @@ custom_sender() {
 
 # role_recipients_matrix[dba]="${DEFAULT_RECIPIENT_MATRIX}"
 
-# role_recipients_stackpulse[dba]="${DEFAULT_RECIPIENT_STACKPULSE}"
-
 # role_recipients_gotify[dba]="${DEFAULT_RECIPIENT_GOTIFY}"
 
 # role_recipients_ntfy[dba]="${DEFAULT_RECIPIENT_NTFY}"
@@ -1141,8 +1104,6 @@ custom_sender() {
 
 # role_recipients_email[webmaster]="${DEFAULT_RECIPIENT_EMAIL}"
 
-# role_recipients_hangouts[webmaster]="${DEFAULT_RECIPIENT_HANGOUTS}"
-
 # role_recipients_pushover[webmaster]="${DEFAULT_RECIPIENT_PUSHOVER}"
 
 # role_recipients_pushbullet[webmaster]="${DEFAULT_RECIPIENT_PUSHBULLET}"
@@ -1191,8 +1152,6 @@ custom_sender() {
 
 # role_recipients_matrix[webmaster]="${DEFAULT_RECIPIENT_MATRIX}"
 
-# role_recipients_stackpulse[webmaster]="${DEFAULT_RECIPIENT_STACKPULSE}"
-
 # role_recipients_gotify[webmaster]="${DEFAULT_RECIPIENT_GOTIFY}"
 
 # role_recipients_ntfy[webmaster]="${DEFAULT_RECIPIENT_NTFY}"
@@ -1203,8 +1162,6 @@ custom_sender() {
 
 # role_recipients_email[proxyadmin]="${DEFAULT_RECIPIENT_EMAIL}"
 
-# role_recipients_hangouts[proxyadmin]="${DEFAULT_RECIPIENT_HANGOUTS}"
-
 # role_recipients_pushover[proxyadmin]="${DEFAULT_RECIPIENT_PUSHOVER}"
 
 # role_recipients_pushbullet[proxyadmin]="${DEFAULT_RECIPIENT_PUSHBULLET}"
@@ -1253,8 +1210,6 @@ custom_sender() {
 
 # role_recipients_matrix[proxyadmin]="${DEFAULT_RECIPIENT_MATRIX}"
 
-# role_recipients_stackpulse[proxyadmin]="${DEFAULT_RECIPIENT_STACKPULSE}"
-
 # role_recipients_gotify[proxyadmin]="${DEFAULT_RECIPIENT_GOTIFY}"
 
 # role_recipients_ntfy[proxyadmin]="${DEFAULT_RECIPIENT_NTFY}"
@@ -1265,8 +1220,6 @@ custom_sender() {
 
 # role_recipients_email[sitemgr]="${DEFAULT_RECIPIENT_EMAIL}"
 
-# role_recipients_hangouts[sitemgr]="${DEFAULT_RECIPIENT_HANGOUTS}"
-
 # role_recipients_pushover[sitemgr]="${DEFAULT_RECIPIENT_PUSHOVER}"
 
 # role_recipients_pushbullet[sitemgr]="${DEFAULT_RECIPIENT_PUSHBULLET}"
@@ -1313,8 +1266,6 @@ custom_sender() {
 
 # role_recipients_matrix[sitemgr]="${DEFAULT_RECIPIENT_MATRIX}"
 
-# role_recipients_stackpulse[sitemgr]="${DEFAULT_RECIPIENT_STACKPULSE}"
-
 # role_recipients_gotify[sitemgr]="${DEFAULT_RECIPIENT_GOTIFY}"
 
 # role_recipients_ntfy[sitemgr]="${DEFAULT_RECIPIENT_NTFY}"