Skip to content

[Backport 2.x] now publishes a list of findings instead of an individual one #1862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
opensearch-trigger-bot wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

[Backport 2.x] now publishes a list of findings instead of an individual one #1862

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions ...src/main/kotlin/org/opensearch/alerting/transport/TransportDocLevelMonitorFanOutAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ import org.opensearch.commons.alerting.AlertingPluginInterface
import org.opensearch.commons.alerting.action.DocLevelMonitorFanOutAction
import org.opensearch.commons.alerting.action.DocLevelMonitorFanOutRequest
import org.opensearch.commons.alerting.action.DocLevelMonitorFanOutResponse
import org.opensearch.commons.alerting.action.PublishBatchFindingsRequest
import org.opensearch.commons.alerting.action.PublishFindingsRequest
import org.opensearch.commons.alerting.action.SubscribeFindingsResponse
import org.opensearch.commons.alerting.model.ActionExecutionResult
Expand Down Expand Up @@ -613,9 +614,7 @@ class TransportDocLevelMonitorFanOutAction

if (monitor.shouldCreateSingleAlertForFindings == null || monitor.shouldCreateSingleAlertForFindings == false) {
try {
findings.forEach { finding ->
publishFinding(monitor, finding)
}
publishBatchFindings(monitor, findings)
} catch (e: Exception) {
// suppress exception
log.error("Optional finding callback failed", e)
Expand Down Expand Up @@ -663,6 +662,27 @@ class TransportDocLevelMonitorFanOutAction
)
}

private fun publishBatchFindings(
monitor: Monitor,
findings: List<Finding>
) {
val publishBatchFindingsRequest = PublishBatchFindingsRequest(monitor.id, findings)
log.debug("publishing {} findings from node {}", findings.size, clusterService.localNode().id)
AlertingPluginInterface.publishBatchFindings(
client as NodeClient,
publishBatchFindingsRequest,
object : ActionListener<SubscribeFindingsResponse> {
override fun onResponse(response: SubscribeFindingsResponse) {
log.debug("findings published successfully")
}

override fun onFailure(e: Exception) {
log.error("publishing findings failed", e)
}
}
)
}

suspend fun runAction(
action: Action,
ctx: TriggerExecutionContext,
Expand Down
Loading