Implement workaround for incident id

see PagerDuty/go-pagerduty#218 see #8 Signed-off-by: Markus Blaschke <[email protected]>
webdevops · Apr 22, 2020 · 870ba07 · 870ba07
1 parent 0fc6eb5
commit 870ba07
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/metrics_incident.go b/metrics_incident.go
@@ -87,11 +87,17 @@ func (m *MetricsCollectorIncident) Collect(ctx context.Context, callback chan<-
 		}
 
 		for _, incident := range list.Incidents {
+			// workaround for https://github.com/PagerDuty/go-pagerduty/issues/218
+			incidentId := incident.ID
+			if incidentId == "" && incident.Id != "" {
+				incidentId = incident.Id
+			}
+
 			// info
 			createdAt, _ := time.Parse(time.RFC3339, incident.CreatedAt)
 
 			incidentMetricList.AddTime(prometheus.Labels{
-				"incidentID":     incident.Id,
+				"incidentID":     incidentId,
 				"serviceID":      incident.Service.ID,
 				"incidentUrl":    incident.HTMLURL,
 				"incidentNumber": uintToString(incident.IncidentNumber),
@@ -108,7 +114,7 @@ func (m *MetricsCollectorIncident) Collect(ctx context.Context, callback chan<-
 			for _, acknowledgement := range incident.Acknowledgements {
 				createdAt, _ := time.Parse(time.RFC3339, acknowledgement.At)
 				incidentStatusMetricList.AddTime(prometheus.Labels{
-					"incidentID": incident.Id,
+					"incidentID": incidentId,
 					"userID":     acknowledgement.Acknowledger.ID,
 					"time":       createdAt.Format(opts.PagerDutyIncidentTimeFormat),
 					"type":       "acknowledgement",
@@ -119,7 +125,7 @@ func (m *MetricsCollectorIncident) Collect(ctx context.Context, callback chan<-
 			for _, assignment := range incident.Assignments {
 				createdAt, _ := time.Parse(time.RFC3339, assignment.At)
 				incidentStatusMetricList.AddTime(prometheus.Labels{
-					"incidentID": incident.Id,
+					"incidentID": incidentId,
 					"userID":     assignment.Assignee.ID,
 					"time":       createdAt.Format(opts.PagerDutyIncidentTimeFormat),
 					"type":       "assignment",
@@ -129,7 +135,7 @@ func (m *MetricsCollectorIncident) Collect(ctx context.Context, callback chan<-
 			// lastChange
 			changedAt, _ := time.Parse(time.RFC3339, incident.LastStatusChangeAt)
 			incidentStatusMetricList.AddTime(prometheus.Labels{
-				"incidentID": incident.Id,
+				"incidentID": incidentId,
 				"userID":     incident.LastStatusChangeBy.ID,
 				"time":       changedAt.Format(opts.PagerDutyIncidentTimeFormat),
 				"type":       "lastChange",