changes to add start_time and end_time filters to getalertsrequest (#…

…1551) Signed-off-by: Subhobrata Dey <[email protected]> (cherry picked from commit 8597561) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · May 21, 2024 · a1b4508 · a1b4508
1 parent da2da29
commit a1b4508
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetAlertsAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetAlertsAction.kt
@@ -37,6 +37,7 @@ import org.opensearch.commons.alerting.model.ScheduledJob
 import org.opensearch.commons.authuser.User
 import org.opensearch.commons.utils.recreateObject
 import org.opensearch.core.action.ActionListener
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.core.xcontent.XContentParserUtils
@@ -60,6 +61,7 @@ class TransportGetAlertsAction @Inject constructor(
     actionFilters: ActionFilters,
     val settings: Settings,
     val xContentRegistry: NamedXContentRegistry,
+    val namedWriteableRegistry: NamedWriteableRegistry
 ) : HandledTransportAction<ActionRequest, GetAlertsResponse>(
     AlertingActions.GET_ALERTS_ACTION_NAME,
     transportService,
@@ -81,7 +83,7 @@ class TransportGetAlertsAction @Inject constructor(
         actionListener: ActionListener<GetAlertsResponse>,
     ) {
         val getAlertsRequest = request as? GetAlertsRequest
-            ?: recreateObject(request) { GetAlertsRequest(it) }
+            ?: recreateObject(request, namedWriteableRegistry) { GetAlertsRequest(it) }
         val user = readUserFromThreadContext(client)
 
         val tableProp = getAlertsRequest.table
@@ -92,7 +94,7 @@ class TransportGetAlertsAction @Inject constructor(
             sortBuilder.missing(tableProp.missing)
         }
 
-        val queryBuilder = QueryBuilders.boolQuery()
+        val queryBuilder = getAlertsRequest.boolQueryBuilder ?: QueryBuilders.boolQuery()
 
         if (getAlertsRequest.severityLevel != "ALL") {
             queryBuilder.filter(QueryBuilders.termQuery("severity", getAlertsRequest.severityLevel))