Skip to content

[Backport 2.19] Fix isDocLevelMonitor check to account for threat intel monitor #837

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

Merged
eirsep merged 1 commit into from
Jun 12, 2025
Merged

[Backport 2.19] Fix isDocLevelMonitor check to account for threat intel monitor #837

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
7 changes: 6 additions & 1 deletion src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ class IndexMonitorRequest : ActionRequest {
private fun hasDocLeveMonitorInput() = monitor.inputs.isNotEmpty() && monitor.inputs[0] is DocLevelMonitorInput

private fun isDocLevelMonitor() =
monitor.monitorType.isNotBlank() && Monitor.MonitorType.valueOf(this.monitor.monitorType.uppercase(Locale.ROOT)) == Monitor.MonitorType.DOC_LEVEL_MONITOR
monitor.monitorType.isNotBlank() && isMonitorOfStandardType(monitor.monitorType) && Monitor.MonitorType.valueOf(this.monitor.monitorType.uppercase(Locale.ROOT)) == Monitor.MonitorType.DOC_LEVEL_MONITOR

private fun isMonitorOfStandardType(monitorType: String): Boolean {
val standardMonitorTypes = Monitor.MonitorType.values().map { it.value.uppercase(Locale.ROOT) }.toSet()
return standardMonitorTypes.contains(monitorType.uppercase(Locale.ROOT))
}

@Throws(IOException::class)
override fun writeTo(out: StreamOutput) {
Expand Down
19 changes: 19 additions & 0 deletions src/test/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequestTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,25 @@ class IndexMonitorRequestTests {
)
}

@Test
fun `test remote monitor with wildcard index pattern`() {
val monitor = randomDocumentLevelMonitor().copy(
monitorType = "ti_doc_level_monitor",
inputs = listOf(DocLevelMonitorInput(indices = listOf("valid, test*", "test*"), queries = emptyList()))
)
val req = IndexMonitorRequest(
"1234",
1L,
2L,
WriteRequest.RefreshPolicy.IMMEDIATE,
RestRequest.Method.POST,
monitor
)

val validationException = req.validate()
Assertions.assertNull(validationException)
}

@Test
fun `test doc level monitor with regex index pattern`() {
val monitor = randomDocumentLevelMonitor().copy(
Expand Down
Loading