Merge pull request influxdata#1512 from influxdata/md-issue#743

Use details field from alert node in pagerduty
kprd · Aug 8, 2017 · 6dff1be · 6dff1be
2 parents 3b5512f + 363325a
commit 6dff1be
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/integrations/streamer_test.go b/integrations/streamer_test.go
@@ -7828,6 +7828,8 @@ func TestStream_AlertPagerDuty(t *testing.T) {
 	ts := pagerdutytest.NewServer()
 	defer ts.Close()
 
+	defaultDetails := "{&#34;Name&#34;:&#34;cpu&#34;,&#34;TaskName&#34;:&#34;TestStream_Alert&#34;,&#34;Group&#34;:&#34;host=serverA&#34;,&#34;Tags&#34;:{&#34;host&#34;:&#34;serverA&#34;},&#34;ServerInfo&#34;:{&#34;Hostname&#34;:&#34;&#34;,&#34;ClusterID&#34;:&#34;&#34;,&#34;ServerID&#34;:&#34;&#34;},&#34;ID&#34;:&#34;kapacitor/cpu/serverA&#34;,&#34;Fields&#34;:{&#34;count&#34;:10},&#34;Level&#34;:&#34;CRITICAL&#34;,&#34;Time&#34;:&#34;1971-01-01T00:00:10Z&#34;,&#34;Message&#34;:&#34;CRITICAL alert for kapacitor/cpu/serverA&#34;}\n"
+
 	var script = `
 stream
 	|from()
@@ -7872,7 +7874,7 @@ stream
 				Description: "CRITICAL alert for kapacitor/cpu/serverA",
 				Client:      "kapacitor",
 				ClientURL:   kapacitorURL,
-				Details:     `{"series":[{"name":"cpu","tags":{"host":"serverA"},"columns":["time","count"],"values":[["1971-01-01T00:00:10Z",10]]}]}`,
+				Details:     defaultDetails,
 			},
 		},
 		pagerdutytest.Request{
@@ -7883,7 +7885,7 @@ stream
 				Description: "CRITICAL alert for kapacitor/cpu/serverA",
 				Client:      "kapacitor",
 				ClientURL:   kapacitorURL,
-				Details:     `{"series":[{"name":"cpu","tags":{"host":"serverA"},"columns":["time","count"],"values":[["1971-01-01T00:00:10Z",10]]}]}`,
+				Details:     defaultDetails,
 			},
 		},
 	}

diff --git a/server/server_test.go b/server/server_test.go
@@ -7264,6 +7264,7 @@ func TestServer_ListServiceTests(t *testing.T) {
 					"incident-key": "testIncidentKey",
 					"description":  "test pagerduty message",
 					"level":        "CRITICAL",
+					"details":      "",
 				},
 			},
 			{
@@ -8082,7 +8083,7 @@ func TestServer_AlertHandlers(t *testing.T) {
 						Description: "message",
 						Client:      "kapacitor",
 						ClientURL:   kapacitorURL,
-						Details:     resultJSON,
+						Details:     "details",
 					},
 				}}
 				if !reflect.DeepEqual(exp, got) {

diff --git a/services/pagerduty/service.go b/services/pagerduty/service.go
@@ -12,7 +12,6 @@ import (
 	"sync/atomic"
 
 	"github.com/influxdata/kapacitor/alert"
-	"github.com/influxdata/kapacitor/models"
 )
 
 type Service struct {
@@ -64,6 +63,7 @@ func (s *Service) Global() bool {
 type testOptions struct {
 	IncidentKey string      `json:"incident-key"`
 	Description string      `json:"description"`
+	Details     string      `json:"details"`
 	Level       alert.Level `json:"level"`
 }
 
@@ -86,11 +86,11 @@ func (s *Service) Test(options interface{}) error {
 		o.IncidentKey,
 		o.Description,
 		o.Level,
-		models.Result{},
+		o.Details,
 	)
 }
 
-func (s *Service) Alert(serviceKey, incidentKey, desc string, level alert.Level, details models.Result) error {
+func (s *Service) Alert(serviceKey, incidentKey, desc string, level alert.Level, details string) error {
 	url, post, err := s.preparePost(serviceKey, incidentKey, desc, level, details)
 	if err != nil {
 		return err
@@ -118,7 +118,7 @@ func (s *Service) Alert(serviceKey, incidentKey, desc string, level alert.Level,
 	return nil
 }
 
-func (s *Service) preparePost(serviceKey, incidentKey, desc string, level alert.Level, details models.Result) (string, io.Reader, error) {
+func (s *Service) preparePost(serviceKey, incidentKey, desc string, level alert.Level, details string) (string, io.Reader, error) {
 
 	c := s.config()
 	if !c.Enabled {
@@ -147,16 +147,12 @@ func (s *Service) preparePost(serviceKey, incidentKey, desc string, level alert.
 	pData["client"] = "kapacitor"
 	pData["client_url"] = s.HTTPDService.URL()
 
-	b, err := json.Marshal(details)
-	if err != nil {
-		return "", nil, err
-	}
-	pData["details"] = string(b)
+	pData["details"] = details
 
 	// Post data to PagerDuty
 	var post bytes.Buffer
 	enc := json.NewEncoder(&post)
-	err = enc.Encode(pData)
+	err := enc.Encode(pData)
 	if err != nil {
 		return "", nil, err
 	}
@@ -190,7 +186,7 @@ func (h *handler) Handle(event alert.Event) {
 		event.State.ID,
 		event.State.Message,
 		event.State.Level,
-		event.Data.Result,
+		event.State.Details,
 	); err != nil {
 		h.logger.Println("E! failed to send event to PagerDuty", err)
 	}