diff --git a/src/main/java/org/opensearch/securityanalytics/alerts/AlertsService.java b/src/main/java/org/opensearch/securityanalytics/alerts/AlertsService.java index a61fe9d35..742c688b8 100644 --- a/src/main/java/org/opensearch/securityanalytics/alerts/AlertsService.java +++ b/src/main/java/org/opensearch/securityanalytics/alerts/AlertsService.java @@ -59,6 +59,7 @@ public AlertsService(Client client) { * @param table group of search related parameters * @param severityLevel alert severity level * @param alertState current alert state + * @param alertState workflowId * @param listener ActionListener to get notified on response or error */ public void getAlertsByDetectorId( @@ -66,6 +67,7 @@ public void getAlertsByDetectorId( Table table, String severityLevel, String alertState, + String workflowId, ActionListener listener ) { this.client.execute(GetDetectorAction.INSTANCE, new GetDetectorRequest(detectorId, -3L), new ActionListener<>() { @@ -88,6 +90,7 @@ public void onResponse(GetDetectorResponse getDetectorResponse) { table, severityLevel, alertState, + detector.getWorkflowIds() == null || detector.getWorkflowIds().isEmpty() ? "" : detector.getWorkflowIds().get(0), new ActionListener<>() { @Override public void onResponse(GetAlertsResponse getAlertsResponse) { @@ -129,6 +132,7 @@ public void getAlertsByMonitorIds( Table table, String severityLevel, String alertState, + String workflowId, ActionListener listener ) { @@ -140,7 +144,7 @@ public void getAlertsByMonitorIds( null, alertIndex, monitorIds, - null, + List.of(workflowId), null ); @@ -204,6 +208,7 @@ public void getAlerts( table, severityLevel, alertState, + "", new ActionListener<>() { @Override public void onResponse(GetAlertsResponse getAlertsResponse) {