chore: add instance ID to SQS events descriptions

Roger Torrentsgeneros · Roger Torrentsgeneros · commit 59d021d2fb7f · 2021-04-27T12:11:39.000+02:00
diff --git a/pkg/monitor/sqsevent/ec2-state-change-event.go b/pkg/monitor/sqsevent/ec2-state-change-event.go
@@ -73,7 +73,7 @@ func (m SQSMonitor) ec2StateChangeToInterruptionEvent(event EventBridgeEvent, me
 		NodeName:             nodeName,
 		AutoScalingGroupName: asgName,
 		InstanceID:           ec2StateChangeDetail.InstanceID,
-		Description:          fmt.Sprintf("EC2 State Change event received. Instance went into %s at %s \n", ec2StateChangeDetail.State, event.getTime()),
+		Description:          fmt.Sprintf("EC2 State Change event received. Instance %s went into %s at %s \n", ec2StateChangeDetail.InstanceID, ec2StateChangeDetail.State, event.getTime()),
 	}
 
 	interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, n node.Node) error {
diff --git a/pkg/monitor/sqsevent/rebalance-recommendation-event.go b/pkg/monitor/sqsevent/rebalance-recommendation-event.go
@@ -65,7 +65,7 @@ func (m SQSMonitor) rebalanceRecommendationToInterruptionEvent(event EventBridge
 		StartTime:            event.getTime(),
 		NodeName:             nodeName,
 		InstanceID:           rebalanceRecDetail.InstanceID,
-		Description:          fmt.Sprintf("Rebalance recommendation event received. Instance will be cordoned at %s \n", event.getTime()),
+		Description:          fmt.Sprintf("Rebalance recommendation event received. Instance %s will be cordoned at %s \n", rebalanceRecDetail.InstanceID, event.getTime()),
 	}
 	interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, n node.Node) error {
 		errs := m.deleteMessages([]*sqs.Message{message})
diff --git a/pkg/monitor/sqsevent/spot-itn-event.go b/pkg/monitor/sqsevent/spot-itn-event.go
@@ -67,7 +67,7 @@ func (m SQSMonitor) spotITNTerminationToInterruptionEvent(event EventBridgeEvent
 		StartTime:            event.getTime(),
 		NodeName:             nodeName,
 		InstanceID:           spotInterruptionDetail.InstanceID,
-		Description:          fmt.Sprintf("Spot Interruption event received. Instance will be interrupted at %s \n", event.getTime()),
+		Description:          fmt.Sprintf("Spot Interruption event received. Instance %s will be interrupted at %s \n", spotInterruptionDetail.InstanceID, event.getTime()),
 	}
 	interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, n node.Node) error {
 		errs := m.deleteMessages([]*sqs.Message{message})

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func (m SQSMonitor) ec2StateChangeToInterruptionEvent(event EventBridgeEvent, me`
`73`	`73`	`NodeName: nodeName,`
`74`	`74`	`AutoScalingGroupName: asgName,`
`75`	`75`	`InstanceID: ec2StateChangeDetail.InstanceID,`
`76`		`- Description: fmt.Sprintf("EC2 State Change event received. Instance went into %s at %s \n", ec2StateChangeDetail.State, event.getTime()),`
	`76`	`+ Description: fmt.Sprintf("EC2 State Change event received. Instance %s went into %s at %s \n", ec2StateChangeDetail.InstanceID, ec2StateChangeDetail.State, event.getTime()),`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, n node.Node) error {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func (m SQSMonitor) rebalanceRecommendationToInterruptionEvent(event EventBridge`
`65`	`65`	`StartTime: event.getTime(),`
`66`	`66`	`NodeName: nodeName,`
`67`	`67`	`InstanceID: rebalanceRecDetail.InstanceID,`
`68`		`- Description: fmt.Sprintf("Rebalance recommendation event received. Instance will be cordoned at %s \n", event.getTime()),`
	`68`	`+ Description: fmt.Sprintf("Rebalance recommendation event received. Instance %s will be cordoned at %s \n", rebalanceRecDetail.InstanceID, event.getTime()),`
`69`	`69`	`}`
`70`	`70`	`interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, n node.Node) error {`
`71`	`71`	`errs := m.deleteMessages([]*sqs.Message{message})`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func (m SQSMonitor) spotITNTerminationToInterruptionEvent(event EventBridgeEvent`
`67`	`67`	`StartTime: event.getTime(),`
`68`	`68`	`NodeName: nodeName,`
`69`	`69`	`InstanceID: spotInterruptionDetail.InstanceID,`
`70`		`- Description: fmt.Sprintf("Spot Interruption event received. Instance will be interrupted at %s \n", event.getTime()),`
	`70`	`+ Description: fmt.Sprintf("Spot Interruption event received. Instance %s will be interrupted at %s \n", spotInterruptionDetail.InstanceID, event.getTime()),`
`71`	`71`	`}`
`72`	`72`	`interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, n node.Node) error {`
`73`	`73`	`errs := m.deleteMessages([]*sqs.Message{message})`