Skip to content

[Backport 3.3] Update number of search hits to return for percolate queries in doc level monitor #2069

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: 3.3
Choose a base branch
from
+33 −2
Open

[Backport 3.3] Update number of search hits to return for percolate queries in doc level monitor #2069

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 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 @@ -52,6 +52,7 @@ import org.opensearch.alerting.settings.AlertingSettings.Companion.MAX_ACTIONABL
import org.opensearch.alerting.settings.AlertingSettings.Companion.PERCOLATE_QUERY_DOCS_SIZE_MEMORY_PERCENTAGE_LIMIT
import org.opensearch.alerting.settings.AlertingSettings.Companion.PERCOLATE_QUERY_MAX_NUM_DOCS_IN_MEMORY
import org.opensearch.alerting.settings.DestinationSettings
import org.opensearch.alerting.util.MAX_SEARCH_SIZE
import org.opensearch.alerting.util.defaultToPerExecutionAction
import org.opensearch.alerting.util.destinationmigration.NotificationActionConfigs
import org.opensearch.alerting.util.destinationmigration.NotificationApiUtils
Expand Down Expand Up @@ -1013,6 +1014,7 @@ class TransportDocLevelMonitorFanOutAction
SearchRequest().indices(*queryIndices.toTypedArray()).preference(Preference.PRIMARY_FIRST.type())
val searchSourceBuilder = SearchSourceBuilder()
searchSourceBuilder.query(boolQueryBuilder)
searchSourceBuilder.size(MAX_SEARCH_SIZE)
searchRequest.source(searchSourceBuilder)
log.debug(
"Monitor ${monitor.id}: " +
Expand Down
33 changes: 31 additions & 2 deletions alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,37 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
fields = listOf(),
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1")
)
val docQuery8 = DocLevelQuery(
query = "message:error",
name = "10",
fields = listOf()
)
val docQuery9 = DocLevelQuery(
query = "message:IAD",
name = "11",
fields = listOf()
)
val docQuery10 = DocLevelQuery(
query = "source.ip.v6.v1:[10000 TO 20000]",
name = "12",
fields = listOf()
)
val docQuery11 = DocLevelQuery(
query = "type.subtype:some",
name = "13",
fields = listOf()
)
val docQuery12 = DocLevelQuery(
query = "supertype.type:some",
name = "14",
fields = listOf()
)
val docLevelInput = DocLevelMonitorInput(
"description", listOf(index), listOf(docQuery1, docQuery2, docQuery3, docQuery4, docQuery5, docQuery6, docQuery7)
"description", listOf(index),
listOf(
docQuery1, docQuery2, docQuery3, docQuery4, docQuery5, docQuery6, docQuery7,
docQuery8, docQuery9, docQuery10, docQuery11, docQuery12
)
)
val trigger = randomDocumentLevelTrigger(condition = ALWAYS_RUN)
val customFindingsIndex = "custom_findings_index"
Expand Down Expand Up @@ -464,7 +493,7 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
val findings = searchFindings(id, customFindingsIndex)
assertEquals("Findings saved for test monitor", 1, findings.size)
assertTrue("Findings saved for test monitor", findings[0].relatedDocIds.contains("1"))
assertEquals("Didn't match all 7 queries", 7, findings[0].docLevelQueries.size)
assertEquals("Didn't match all 12 queries", 12, findings[0].docLevelQueries.size)
}

fun `test percolate query failure when queryFieldNames has alias`() {
Expand Down
Loading