Skip to content

Commit e535ade

Browse files
eirsepeirsep
committed
fix compilation issues
Signed-off-by: Surya Sashank Nistala <[email protected]>
1 parent 7d1096e commit e535ade

File tree

5 files changed

+16
-178
lines changed

5 files changed

+16
-178
lines changed

‎alerting/src/test/kotlin/org/opensearch/alerting/DocumentMonitorRunnerIT.kt

+13-161
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
4747

4848
val index = createTestIndex()
4949

50-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
50+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
5151
val docLevelInput = DocLevelMonitorInput("description", listOf(index), listOf(docQuery))
5252

5353
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
@@ -108,7 +108,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
108108
val index = createTestIndex()
109109

110110
val docQuery =
111-
DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf(), queryFieldNames = listOf("test_field"))
111+
DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", queryFieldNames = listOf("test_field"))
112112
val docLevelInput = DocLevelMonitorInput("description", listOf(index), listOf(docQuery))
113113

114114
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
@@ -154,7 +154,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
154154
val index = createTestIndex()
155155

156156
val docQuery =
157-
DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
157+
DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
158158
val docLevelInput = DocLevelMonitorInput("description", listOf(index), listOf(docQuery))
159159

160160
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
@@ -199,7 +199,6 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
199199
val docQuery = DocLevelQuery(
200200
query = "test_field:\"us-west-2\"",
201201
name = "3",
202-
fields = listOf(),
203202
queryFieldNames = listOf("wrong_field")
204203
)
205204
val docLevelInput = DocLevelMonitorInput("description", listOf(index), listOf(docQuery))
@@ -253,153 +252,6 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
253252
val docQuery = DocLevelQuery(
254253
query = "test_field:\"us-west-2\"",
255254
name = "3",
256-
fields = listOf(),
257-
queryFieldNames = listOf("wrong_field")
258-
)
259-
val docLevelInput = DocLevelMonitorInput("description", listOf(index), listOf(docQuery))
260-
261-
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
262-
val monitor = randomDocumentLevelMonitor(
263-
inputs = listOf(docLevelInput),
264-
triggers = listOf(randomDocumentLevelTrigger(condition = ALWAYS_RUN, actions = listOf(action)))
265-
)
266-
267-
indexDoc(index, "1", testDoc)
268-
269-
val response = executeMonitor(monitor, params = DRYRUN_MONITOR)
270-
271-
val output = entityAsMap(response)
272-
assertEquals(monitor.name, output["monitor_name"])
273-
274-
assertEquals(1, output.objectMap("trigger_results").values.size)
275-
276-
for (triggerResult in output.objectMap("trigger_results").values) {
277-
assertEquals(1, triggerResult.objectMap("action_results").values.size)
278-
for (alertActionResult in triggerResult.objectMap("action_results").values) {
279-
for (actionResult in alertActionResult.values) {
280-
@Suppress("UNCHECKED_CAST") val actionOutput = (actionResult as Map<String, Map<String, String>>)["output"]
281-
as Map<String, String>
282-
assertEquals("Hello ${monitor.name}", actionOutput["subject"])
283-
assertEquals("Hello ${monitor.name}", actionOutput["message"])
284-
}
285-
}
286-
}
287-
288-
val alerts = searchAlerts(monitor)
289-
assertEquals("Alert saved for test monitor", 0, alerts.size)
290-
}
291-
292-
fun `test dryrun execute monitor with queryFieldNames set up with correct field`() {
293-
294-
val testTime = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.now().truncatedTo(MILLIS))
295-
val testDoc = """{
296-
"message" : "This is an error from IAD region",
297-
"test_strict_date_time" : "$testTime",
298-
"test_field" : "us-west-2"
299-
}"""
300-
301-
val index = createTestIndex()
302-
303-
val docQuery =
304-
DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf(), queryFieldNames = listOf("test_field"))
305-
val docLevelInput = DocLevelMonitorInput("description", listOf(index), listOf(docQuery))
306-
307-
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
308-
val monitor = randomDocumentLevelMonitor(
309-
inputs = listOf(docLevelInput),
310-
triggers = listOf(randomDocumentLevelTrigger(condition = ALWAYS_RUN, actions = listOf(action)))
311-
)
312-
313-
indexDoc(index, "1", testDoc)
314-
315-
val response = executeMonitor(monitor, params = DRYRUN_MONITOR)
316-
317-
val output = entityAsMap(response)
318-
assertEquals(monitor.name, output["monitor_name"])
319-
320-
assertEquals(1, output.objectMap("trigger_results").values.size)
321-
322-
for (triggerResult in output.objectMap("trigger_results").values) {
323-
assertEquals(1, triggerResult.objectMap("action_results").values.size)
324-
for (alertActionResult in triggerResult.objectMap("action_results").values) {
325-
for (actionResult in alertActionResult.values) {
326-
@Suppress("UNCHECKED_CAST") val actionOutput = (actionResult as Map<String, Map<String, String>>)["output"]
327-
as Map<String, String>
328-
assertEquals("Hello ${monitor.name}", actionOutput["subject"])
329-
assertEquals("Hello ${monitor.name}", actionOutput["message"])
330-
}
331-
}
332-
}
333-
334-
val alerts = searchAlerts(monitor)
335-
assertEquals("Alert saved for test monitor", 0, alerts.size)
336-
}
337-
338-
fun `test dryrun execute monitor with queryFieldNames set up with wrong field`() {
339-
340-
val testTime = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.now().truncatedTo(MILLIS))
341-
val testDoc = """{
342-
"message" : "This is an error from IAD region",
343-
"test_strict_date_time" : "$testTime",
344-
"test_field" : "us-west-2"
345-
}"""
346-
347-
val index = createTestIndex()
348-
// using wrong field name
349-
val docQuery = DocLevelQuery(
350-
query = "test_field:\"us-west-2\"",
351-
name = "3",
352-
fields = listOf(),
353-
queryFieldNames = listOf("wrong_field")
354-
)
355-
val docLevelInput = DocLevelMonitorInput("description", listOf(index), listOf(docQuery))
356-
357-
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
358-
val monitor = randomDocumentLevelMonitor(
359-
inputs = listOf(docLevelInput),
360-
triggers = listOf(randomDocumentLevelTrigger(condition = ALWAYS_RUN, actions = listOf(action)))
361-
)
362-
363-
indexDoc(index, "1", testDoc)
364-
365-
val response = executeMonitor(monitor, params = DRYRUN_MONITOR)
366-
367-
val output = entityAsMap(response)
368-
assertEquals(monitor.name, output["monitor_name"])
369-
370-
assertEquals(1, output.objectMap("trigger_results").values.size)
371-
372-
for (triggerResult in output.objectMap("trigger_results").values) {
373-
assertEquals(0, triggerResult.objectMap("action_results").values.size)
374-
for (alertActionResult in triggerResult.objectMap("action_results").values) {
375-
for (actionResult in alertActionResult.values) {
376-
@Suppress("UNCHECKED_CAST") val actionOutput = (actionResult as Map<String, Map<String, String>>)["output"]
377-
as Map<String, String>
378-
assertEquals("Hello ${monitor.name}", actionOutput["subject"])
379-
assertEquals("Hello ${monitor.name}", actionOutput["message"])
380-
}
381-
}
382-
}
383-
384-
val alerts = searchAlerts(monitor)
385-
assertEquals("Alert saved for test monitor", 0, alerts.size)
386-
}
387-
388-
fun `test fetch_query_field_names setting is disabled by configuring queryFieldNames set up with wrong field still works`() {
389-
adminClient().updateSettings(AlertingSettings.DOC_LEVEL_MONITOR_FETCH_ONLY_QUERY_FIELDS_ENABLED.key, "false")
390-
val testTime = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.now().truncatedTo(MILLIS))
391-
val testDoc = """{
392-
"message" : "This is an error from IAD region",
393-
"test_strict_date_time" : "$testTime",
394-
"test_field" : "us-west-2"
395-
}"""
396-
397-
val index = createTestIndex()
398-
// using wrong field name
399-
val docQuery = DocLevelQuery(
400-
query = "test_field:\"us-west-2\"",
401-
name = "3",
402-
fields = listOf(),
403255
queryFieldNames = listOf("wrong_field")
404256
)
405257
val docLevelInput = DocLevelMonitorInput("description", listOf(index), listOf(docQuery))
@@ -491,7 +343,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
491343
"test_field" : "us-west-2"
492344
}"""
493345

494-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
346+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
495347
val docLevelInput = DocLevelMonitorInput("description", listOf(testIndex), listOf(docQuery))
496348

497349
val trigger = randomDocumentLevelTrigger(condition = ALWAYS_RUN)
@@ -537,7 +389,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
537389
"test_field" : "us-east-1"
538390
}"""
539391

540-
val docQuery2 = DocLevelQuery(query = "test_field:\"us-east-1\"", name = "3", fields = listOf())
392+
val docQuery2 = DocLevelQuery(query = "test_field:\"us-east-1\"", name = "3")
541393
val docLevelInput2 = DocLevelMonitorInput("description", listOf(testIndex2), listOf(docQuery2))
542394

543395
val trigger2 = randomDocumentLevelTrigger(condition = ALWAYS_RUN)
@@ -630,7 +482,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
630482
"test_field" : "us-west-2"
631483
}"""
632484

633-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
485+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
634486
val docLevelInput = DocLevelMonitorInput("description", listOf(testIndex), listOf(docQuery))
635487

636488
val trigger = randomDocumentLevelTrigger(condition = ALWAYS_RUN)
@@ -668,7 +520,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
668520
"test_field" : "us-west-2"
669521
}"""
670522

671-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
523+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
672524
val docLevelInput = DocLevelMonitorInput("description", listOf(testIndex), listOf(docQuery))
673525

674526
val trigger = randomDocumentLevelTrigger(condition = ALWAYS_RUN)
@@ -960,7 +812,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
960812
"test_field" : "us-west-2"
961813
}"""
962814

963-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = testQueryName, fields = listOf())
815+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = testQueryName)
964816
val docLevelInput = DocLevelMonitorInput("description", listOf("$testIndexPrefix*"), listOf(docQuery))
965817

966818
val trigger = randomDocumentLevelTrigger(condition = Script("query[name=$testQueryName]"))
@@ -1839,7 +1691,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
18391691
false
18401692
)
18411693

1842-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
1694+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
18431695
val docLevelInput = DocLevelMonitorInput("description", listOf(dataStreamName), listOf(docQuery))
18441696

18451697
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
@@ -1891,7 +1743,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
18911743
false
18921744
)
18931745

1894-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
1746+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
18951747
val docLevelInput = DocLevelMonitorInput("description", listOf(dataStreamName), listOf(docQuery))
18961748

18971749
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
@@ -1953,7 +1805,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
19531805
""".trimIndent()
19541806
)
19551807

1956-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
1808+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
19571809
val docLevelInput = DocLevelMonitorInput("description", listOf("$aliasName"), listOf(docQuery))
19581810

19591811
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
@@ -2028,7 +1880,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
20281880
rolloverDatastream(dataStreamName2)
20291881
indexDoc(dataStreamName2, "0", testDoc)
20301882

2031-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
1883+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
20321884
val docLevelInput = DocLevelMonitorInput("description", listOf("test-datastream*"), listOf(docQuery))
20331885

20341886
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)
@@ -2102,7 +1954,7 @@ class DocumentMonitorRunnerIT : AlertingRestTestCase() {
21021954
rolloverDatastream(dataStreamName)
21031955
indexDoc(dataStreamName, "0", testDoc)
21041956

2105-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
1957+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
21061958
val docLevelInput = DocLevelMonitorInput("description", listOf(dataStreamName), listOf(docQuery))
21071959

21081960
val action = randomAction(template = randomTemplateScript("Hello {{ctx.monitor.name}}"), destinationId = createDestination().id)

‎alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt

-14
Original file line numberDiff line numberDiff line change
@@ -370,45 +370,38 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
370370
val docQuery1 = DocLevelQuery(
371371
query = "source.ip.v6.v1:12345",
372372
name = "3",
373-
fields = listOf()
374373
)
375374
val docQuery2 = DocLevelQuery(
376375
query = "source.ip.v6.v2:16645",
377376
name = "4",
378-
fields = listOf(),
379377
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1")
380378
)
381379
val docQuery3 = DocLevelQuery(
382380
query = "source.ip.v4.v0:120",
383381
name = "5",
384-
fields = listOf(),
385382
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1")
386383
)
387384
val docQuery4 =
388385
DocLevelQuery(
389386
query = "alias.some.fff:\"us-west-2\"",
390387
name = "6",
391-
fields = listOf(),
392388
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1")
393389
)
394390
val docQuery5 = DocLevelQuery(
395391
query = "message:\"This is an error from IAD region\"",
396392
name = "7",
397393
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1"),
398-
fields = listOf()
399394
)
400395
val docQuery6 =
401396
DocLevelQuery(
402397
query = "type.subtype:\"some subtype\"",
403398
name = "8",
404-
fields = listOf(),
405399
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1")
406400
)
407401
val docQuery7 =
408402
DocLevelQuery(
409403
query = "supertype.type:\"some type\"",
410404
name = "9",
411-
fields = listOf(),
412405
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1")
413406
)
414407
val docLevelInput = DocLevelMonitorInput(
@@ -469,46 +462,39 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
469462
val docQuery1 = DocLevelQuery(
470463
query = "source.ip.v6.v1:12345",
471464
name = "3",
472-
fields = listOf(),
473465
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1")
474466
)
475467
val docQuery2 = DocLevelQuery(
476468
query = "source.ip.v6.v2:16645",
477469
name = "4",
478-
fields = listOf(),
479470
queryFieldNames = listOf("source.ip.v6.v2")
480471
)
481472
val docQuery3 = DocLevelQuery(
482473
query = "source.ip.v4.v0:120",
483474
name = "5",
484-
fields = listOf(),
485475
queryFieldNames = listOf("source.ip.v6.v4")
486476
)
487477
val docQuery4 =
488478
DocLevelQuery(
489479
query = "alias.some.fff:\"us-west-2\"",
490480
name = "6",
491-
fields = listOf(),
492481
queryFieldNames = listOf("alias.some.fff")
493482
)
494483
val docQuery5 = DocLevelQuery(
495484
query = "message:\"This is an error from IAD region\"",
496485
name = "7",
497486
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1"),
498-
fields = listOf()
499487
)
500488
val docQuery6 =
501489
DocLevelQuery(
502490
query = "type.subtype:\"some subtype\"",
503491
name = "8",
504-
fields = listOf(),
505492
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1")
506493
)
507494
val docQuery7 =
508495
DocLevelQuery(
509496
query = "supertype.type:\"some type\"",
510497
name = "9",
511-
fields = listOf(),
512498
queryFieldNames = listOf("alias.some.fff", "source.ip.v6.v1")
513499
)
514500
val docLevelInput = DocLevelMonitorInput(

‎alerting/src/test/kotlin/org/opensearch/alerting/resthandler/WorkflowRestApiIT.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ class WorkflowRestApiIT : AlertingRestTestCase() {
11971197
"test_field" : "us-west-2"
11981198
}"""
11991199

1200-
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3", fields = listOf())
1200+
val docQuery = DocLevelQuery(query = "test_field:\"us-west-2\"", name = "3")
12011201
val docLevelInput = DocLevelMonitorInput("description", listOf(testIndex), listOf(docQuery))
12021202

12031203
val trigger = randomDocumentLevelTrigger(condition = ALWAYS_RUN)

‎core/src/main/kotlin/org/opensearch/alerting/core/lock/LockModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
package org.opensearch.alerting.core.lock
77

8+
import org.opensearch.common.xcontent.XContentParserUtils
89
import org.opensearch.core.xcontent.ToXContent
910
import org.opensearch.core.xcontent.ToXContentObject
1011
import org.opensearch.core.xcontent.XContentBuilder
1112
import org.opensearch.core.xcontent.XContentParser
12-
import org.opensearch.core.xcontent.XContentParserUtils
1313
import org.opensearch.index.seqno.SequenceNumbers
1414
import java.io.IOException
1515
import java.time.Instant

0 commit comments

Comments
 (0)