Merge pull request #1793 from l2isbad/web_log_plugin_improvements

[netdata.git] / plugins.d / alarm-notify.sh

diff --git a/plugins.d/alarm-notify.sh b/plugins.d/alarm-notify.sh
index 2bfe89e6ea722ad5f5060d9059336c8fc891407c..997ff96aa65f248d774f41513640fe31c38ba6c1 100755 (executable)
--- a/plugins.d/alarm-notify.sh
+++ b/plugins.d/alarm-notify.sh
@@ -885,8 +885,8 @@ send_hipchat() {
                     -H "Authorization: Bearer ${authtoken}" \
                     -d "{\"color\": \"${color}\", \"from\": \"${netdata}\", \"message_format\": \"${msg_format}\", \"message\": \"${message}\", \"notify\": \"${notify}\"}" \
                     "https://api.hipchat.com/v2/room/${room}/notification")
-
-            if [ "${httpcode}" == "200" ]
+ 
+            if [ "${httpcode}" == "204" ]
             then
                 info "sent HipChat notification for: ${host} ${chart}.${name} is ${status} to '${room}'"
                 sent=$((sent + 1))
@@ -1284,9 +1284,16 @@ SENT_PD=$?
 # -----------------------------------------------------------------------------
 # send hipchat message
 
-send_hipchat "${HIPCHAT_AUTH_TOKEN}" "${to_hipchat}" "<b>${alarm}</b> ${info_html}<br/>&nbsp;<br/><small><b>${chart}</b><br/>Chart<br/>&nbsp;</small><br/><small><b>${family}</b><br/>Family<br/>&nbsp;</small><br/><small><b>${severity}</b><br/>Severity<br/>&nbsp;</small><br/><small><b>${date}${raised_for_html}</b><br/>Time<br/>&nbsp;</small><br/><a href=\"${goto_url}\">View Netdata</a><br/>&nbsp;<br/><small><small>The source of this alarm is line ${src}</small></small>"
-SENT_HIPCHAT=$?
+send_hipchat "${HIPCHAT_AUTH_TOKEN}" "${to_hipchat}" " \
+${host} ${status_message}<br/> \
+<b>${alarm}</b> ${info_html}<br/> \
+<b>${chart}</b> (family <b>${family}</b>)<br/> \
+<b>${date}${raised_for_html}</b><br/> \
+<a href=\\\"${goto_url}\\\">View netdata dashboard</a> \
+(source of alarm ${src}) \
+"
 
+SENT_HIPCHAT=$?
 
 # -----------------------------------------------------------------------------
 # send the email