Adding upstream version 1.18.1.upstream/1.18.1

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

1 files changed, 38 insertions, 3 deletions

diff --git a/health/notifications/health_alarm_notify.conf b/health/notifications/health_alarm_notify.conf
index 60621df27..955dd25b5 100755
--- a/health/notifications/health_alarm_notify.conf
+++ b/health/notifications/health_alarm_notify.conf
@@ -21,6 +21,7 @@
 # - messages to a local or remote syslog daemon
 # - message to Microsoft Team (through webhook)
 # - message to Rocket.Chat (through webhook)
+# - message to Google Hangouts Chat (through webhook)
 #
 # The 'to' line given at netdata alarms defines a *role*, so that many
 # people can be notified for each role.
@@ -176,6 +177,7 @@ 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"
 #
 # If a recipient is set to empty string, the default recipient of the given
 # notification method (email, pushover, telegram, slack, alerta, etc) will be used.
@@ -228,6 +230,27 @@ DEFAULT_RECIPIENT_EMAIL="root"
 #EMAIL_PLAINTEXT_ONLY="YES"
 
 #------------------------------------------------------------------------------
+# 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:
@@ -375,10 +398,10 @@ SEND_SLACK="YES"
 SLACK_WEBHOOK_URL=""
 
 # if a role's recipients are not configured, a notification will be send to:
-# - A slack channel (syntax: '#channel' or 'channel')  
+# - 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 
+# empty = do not send a notification for unconfigured roles
 DEFAULT_RECIPIENT_SLACK=""
 
 #------------------------------------------------------------------------------
@@ -640,7 +663,7 @@ SEND_SYSLOG="NO"
 # configuration to change that needs to happen in the syslog daemon
 # configuration, not here.
 
-# This controls which facility is used by defalt for logging.  Defaults
+# This controls which facility is used by default for logging.  Defaults
 # to local6.
 SYSLOG_FACILITY=''
 
@@ -808,6 +831,8 @@ 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}"
@@ -853,6 +878,8 @@ role_recipients_rocketchat[sysadmin]="${DEFAULT_RECIPIENT_ROCKETCHAT}"
 
 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}"
@@ -901,6 +928,8 @@ role_recipients_sms[domainadmin]="${DEFAULT_RECIPIENT_SMS}"
 
 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}"
@@ -949,6 +978,8 @@ role_recipients_sms[dba]="${DEFAULT_RECIPIENT_SMS}"
 
 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}"
@@ -997,6 +1028,8 @@ role_recipients_sms[webmaster]="${DEFAULT_RECIPIENT_SMS}"
 
 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}"
@@ -1046,6 +1079,8 @@ role_recipients_sms[proxyadmin]="${DEFAULT_RECIPIENT_SMS}"
 
 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}"