updating timestamp handling for improper subsecond precision

influxdata · Feb 10, 2018 · 1b21875 · 1b21875
1 parent 85f4ad6
commit 1b21875
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/services/pagerduty2/pagerduty2test/pagerduty2test.go b/services/pagerduty2/pagerduty2test/pagerduty2test.go
@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"sync"
-	"time"
 )
 
 type Server struct {
@@ -57,7 +56,7 @@ type PDCEF struct {
 	Summary       string                 `json:"summary"`
 	Source        string                 `json:"source"`
 	Severity      string                 `json:"severity"`
-	Timestamp     time.Time              `json:"timestamp"`
+	Timestamp     string                 `json:"timestamp"`
 	Class         string                 `json:"class"`
 	Component     string                 `json:"component"`
 	Group         string                 `json:"group"`

diff --git a/services/pagerduty2/service.go b/services/pagerduty2/service.go
@@ -63,7 +63,7 @@ type PDCEF struct {
 	Summary       string                 `json:"summary"`
 	Source        string                 `json:"source"`
 	Severity      string                 `json:"severity"`
-	Timestamp     time.Time              `json:"timestamp"`
+	Timestamp     string                 `json:"timestamp"`
 	Class         string                 `json:"class"`
 	Component     string                 `json:"component"`
 	Group         string                 `json:"group"`
@@ -229,6 +229,7 @@ func (s *Service) Alert(serviceKey, incidentKey, desc string, level alert.Level,
 	if resp.StatusCode != http.StatusAccepted {
 		body, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
+			fmt.Printf("error parsing error body\n")
 			return err
 		}
 		type response struct {
@@ -290,10 +291,8 @@ func (s *Service) preparePost(serviceKey, incidentKey, desc string, level alert.
 	case alert.Info:
 		severity = "info"
 	default:
-		eventType = "resolve"
-
+		// default is a 'resolve' function
 		return s.sendResolve(c, serviceKey, incidentKey)
-
 	}
 
 	// create a new AlertPayload for us to fire off
@@ -322,11 +321,16 @@ func (s *Service) preparePost(serviceKey, incidentKey, desc string, level alert.
 		}
 	}
 
+	m := timestamp.Format(time.RFC3339Nano)
+	if timestamp.Nanosecond() == 0 {
+		m = time.Unix(timestamp.Unix(), 1).Format(time.RFC3339Nano)
+	}
+
 	ap.Payload.Class = data.TaskName
 	ap.Payload.Severity = severity
 	ap.Payload.Source = "unknown"
 	ap.Payload.Summary = desc
-	ap.Payload.Timestamp = timestamp
+	ap.Payload.Timestamp = m
 
 	if _, ok := data.Tags["host"]; ok {
 		ap.Payload.Source = data.Tags["host"]