From 57f193fca7103b6c49cabfb097196d257f479111 Mon Sep 17 00:00:00 2001 From: Likitha Vemulapalli Date: Fri, 27 Jan 2023 13:51:21 -0600 Subject: [PATCH 1/2] Modified Spot ITN message --- pkg/monitor/sqsevent/spot-itn-event.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/monitor/sqsevent/spot-itn-event.go b/pkg/monitor/sqsevent/spot-itn-event.go index 25aac324..8b782ee8 100644 --- a/pkg/monitor/sqsevent/spot-itn-event.go +++ b/pkg/monitor/sqsevent/spot-itn-event.go @@ -29,7 +29,7 @@ import ( "id": "1e5527d7-bb36-4607-3370-4164db56a40e", "detail-type": "EC2 Spot Instance Interruption Warning", "source": "aws.ec2", - "account": "123456789012", + "account": "", "time": "1970-01-01T00:00:00Z", "region": "us-east-1", "resources": [ @@ -69,7 +69,7 @@ func (m SQSMonitor) spotITNTerminationToInterruptionEvent(event *EventBridgeEven IsManaged: nodeInfo.IsManaged, InstanceID: spotInterruptionDetail.InstanceID, ProviderID: nodeInfo.ProviderID, - Description: fmt.Sprintf("Spot Interruption event received. Instance %s will be interrupted at %s \n", spotInterruptionDetail.InstanceID, event.getTime()), + Description: fmt.Sprintf("Spot Interruption event received. Instance %s received interruption at %s \n", spotInterruptionDetail.InstanceID, event.getTime()), } interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, n node.Node) error { errs := m.deleteMessages([]*sqs.Message{message}) From 50908a666f625fb48fe7a3cb34e33974db517077 Mon Sep 17 00:00:00 2001 From: Likitha Vemulapalli Date: Fri, 27 Jan 2023 14:53:49 -0600 Subject: [PATCH 2/2] modified as per suggestion --- pkg/monitor/sqsevent/spot-itn-event.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/monitor/sqsevent/spot-itn-event.go b/pkg/monitor/sqsevent/spot-itn-event.go index 8b782ee8..d8acdeba 100644 --- a/pkg/monitor/sqsevent/spot-itn-event.go +++ b/pkg/monitor/sqsevent/spot-itn-event.go @@ -69,7 +69,7 @@ func (m SQSMonitor) spotITNTerminationToInterruptionEvent(event *EventBridgeEven IsManaged: nodeInfo.IsManaged, InstanceID: spotInterruptionDetail.InstanceID, ProviderID: nodeInfo.ProviderID, - Description: fmt.Sprintf("Spot Interruption event received. Instance %s received interruption at %s \n", spotInterruptionDetail.InstanceID, event.getTime()), + Description: fmt.Sprintf("Spot Interruption notice for instance %s was sent at %s \n", spotInterruptionDetail.InstanceID, event.getTime()), } interruptionEvent.PostDrainTask = func(interruptionEvent monitor.InterruptionEvent, n node.Node) error { errs := m.deleteMessages([]*sqs.Message{message})