better error messages from external alerting services

zambro · Feb 3, 2016 · d1bd416 · d1bd416
1 parent f575d3a
commit d1bd416
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 16 deletions.
diff --git a/services/alerta/service.go b/services/alerta/service.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -83,11 +84,16 @@ func (s *Service) Alert(token, resource, event, environment, severity, status, g
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
 		type response struct {
 			Error string `json:"error"`
 		}
-		r := &response{Error: "failed to understand Alerta response"}
-		dec := json.NewDecoder(resp.Body)
+		r := &response{Error: "failed to understand Alerta response: " + string(body)}
+		b := bytes.NewReader(body)
+		dec := json.NewDecoder(b)
 		dec.Decode(r)
 		return errors.New(r.Error)
 	}

diff --git a/services/hipchat/service.go b/services/hipchat/service.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -86,11 +87,16 @@ func (s *Service) Alert(room, token, message string, level kapacitor.AlertLevel)
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
 		type response struct {
 			Error string `json:"error"`
 		}
-		r := &response{Error: "failed to understand HipChat response"}
-		dec := json.NewDecoder(resp.Body)
+		r := &response{Error: "failed to understand HipChat response: " + string(body)}
+		b := bytes.NewReader(body)
+		dec := json.NewDecoder(b)
 		dec.Decode(r)
 		return errors.New(r.Error)
 	}

diff --git a/services/opsgenie/service.go b/services/opsgenie/service.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"time"
@@ -107,11 +108,16 @@ func (s *Service) Alert(teams []string, recipients []string, messageType, messag
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
 		type response struct {
 			Message string `json:"message"`
 		}
-		r := &response{Message: "failed to understand OpsGenie response"}
-		dec := json.NewDecoder(resp.Body)
+		r := &response{Message: "failed to understand OpsGenie response: " + string(body)}
+		b := bytes.NewReader(body)
+		dec := json.NewDecoder(b)
 		dec.Decode(r)
 		return errors.New(r.Message)
 	}

diff --git a/services/pagerduty/service.go b/services/pagerduty/service.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"io/ioutil"
 	"log"
 	"net/http"
 
@@ -72,11 +73,16 @@ func (s *Service) Alert(incidentKey, desc string, details interface{}) error {
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
 		type response struct {
 			Message string `json:"message"`
 		}
-		r := &response{Message: "failed to understand PagerDuty response"}
-		dec := json.NewDecoder(resp.Body)
+		r := &response{Message: "failed to understand PagerDuty response: " + string(body)}
+		b := bytes.NewReader(body)
+		dec := json.NewDecoder(b)
 		dec.Decode(r)
 		return errors.New(r.Message)
 	}

diff --git a/services/sensu/service.go b/services/sensu/service.go
@@ -4,9 +4,11 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"github.com/influxdata/kapacitor"
+	"io/ioutil"
 	"log"
 	"net/http"
+
+	"github.com/influxdata/kapacitor"
 )
 
 type Service struct {
@@ -65,11 +67,16 @@ func (s *Service) Alert(name, output string, level kapacitor.AlertLevel) error {
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
 		type response struct {
 			Error string `json:"error"`
 		}
-		r := &response{Error: "failed to understand Sensu response"}
-		dec := json.NewDecoder(resp.Body)
+		r := &response{Error: "failed to understand Sensu response: " + string(body)}
+		b := bytes.NewReader(body)
+		dec := json.NewDecoder(b)
 		dec.Decode(r)
 		return errors.New(r.Error)
 	}

diff --git a/services/slack/service.go b/services/slack/service.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"fmt"
+	"io/ioutil"
 	"log"
 	"net/http"
 
@@ -83,11 +83,16 @@ func (s *Service) Alert(channel, message string, level kapacitor.AlertLevel) err
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
 		type response struct {
 			Error string `json:"error"`
 		}
-		r := &response{Error: fmt.Sprintf("failed to understand Slack response %s", err)}
-		dec := json.NewDecoder(resp.Body)
+		r := &response{Error: "failed to understand Slack response: " + string(body)}
+		b := bytes.NewReader(body)
+		dec := json.NewDecoder(b)
 		dec.Decode(r)
 		return errors.New(r.Error)
 	}

diff --git a/services/victorops/service.go b/services/victorops/service.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"time"
@@ -72,11 +73,16 @@ func (s *Service) Alert(routingKey, messageType, message, entityID string, t tim
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
 		type response struct {
 			Message string `json:"message"`
 		}
-		r := &response{Message: "failed to understand VictorOps response"}
-		dec := json.NewDecoder(resp.Body)
+		r := &response{Message: "failed to understand VictorOps response: " + string(body)}
+		b := bytes.NewReader(body)
+		dec := json.NewDecoder(b)
 		dec.Decode(r)
 		return errors.New(r.Message)
 	}