log error messages and clean up monitor when indexing doc level queries or metadata creation fails (opensearch-project#900)

eirsep · engechas · commit a5602f8b4eab · 2024-03-18T11:45:04.000-07:00
* log errors and clean up monitor when indexing doc level queries or metadata creation fails
* refactor delete monitor action to re-use delete methods
Signed-off-by: Surya Sashank Nistala &lt;snistala@amazon.com&gt;
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt
@@ -155,8 +155,8 @@ class TransportDeleteMonitorAction @Inject constructor(
             monitorId: String,
         ): DeleteResponse {
             val deleteResponse = deleteMonitorDocument(client, deleteRequest)
-            deleteDocLevelMonitorQueriesAndIndices(client, monitor, monitorId)
             deleteMetadata(client, monitor)
+            deleteDocLevelMonitorQueriesAndIndices(client, monitor, monitorId)
             return deleteResponse
         }
 

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ class TransportDeleteMonitorAction @Inject constructor(`
`155`	`155`	`monitorId: String,`
`156`	`156`	`): DeleteResponse {`
`157`	`157`	`val deleteResponse = deleteMonitorDocument(client, deleteRequest)`
`158`		`- deleteDocLevelMonitorQueriesAndIndices(client, monitor, monitorId)`
`159`	`158`	`deleteMetadata(client, monitor)`
	`159`	`+ deleteDocLevelMonitorQueriesAndIndices(client, monitor, monitorId)`
`160`	`160`	`return deleteResponse`
`161`	`161`	`}`
`162`	`162`