]> arthur.barton.de Git - netdata.git/commitdiff
Merge pull request #1070 from tperalta82/master
authorCosta Tsaousis <costa@tsaousis.gr>
Sun, 23 Oct 2016 19:21:08 +0000 (22:21 +0300)
committerGitHub <noreply@github.com>
Sun, 23 Oct 2016 19:21:08 +0000 (22:21 +0300)
Added pushbullet notifications support

1  2 
conf.d/health_alarm_notify.conf
plugins.d/Makefile.am
plugins.d/alarm-notify.sh

Simple merge
Simple merge
index acd44923f9d768f939b4ef0d51e7a5940cb116aa,ac9b29336e2bb2c4b40454e8790d65e31ebb5ffc..a41c55bc70c520896bb0e9e0c059da51d1f3c6df
@@@ -302,9 -284,10 +326,9 @@@ if [ "${SEND_EMAIL}" = "YES" -a -z "${s
  fi
  
  # check that we have at least a method enabled
- if [ "${SEND_EMAIL}" != "YES" -a "${SEND_PUSHOVER}" != "YES" -a "${SEND_TELEGRAM}" != "YES" -a "${SEND_SLACK}" != "YES" ]
+ if [ "${SEND_EMAIL}" != "YES" -a "${SEND_PUSHOVER}" != "YES" -a "${SEND_TELEGRAM}" != "YES" -a "${SEND_SLACK}" != "YES" -a "${SEND_PUSHBULLET}" != "YES" ]
      then
 -    echo >&2 "All notification methods are disabled. Not sending a notification."
 -    exit 1
 +    fatal "All notification methods are disabled. Not sending a notification."
  fi
  
  # -----------------------------------------------------------------------------