Skip to content
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

Jump to bottom

[Backport 2.x] Fixing DataSources Parsing Errors (#678) #681

Merged
merged 2 commits into from
Jun 12, 2024
Merged

[Backport 2.x] Fixing DataSources Parsing Errors (#678) #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
989df44
Fixing DataSources Parsing Errors (#678)
toepkerd Jun 11, 2024
b17c130
Merge branch '2.x' into backport-678-to-2.x
toepkerd Jun 12, 2024
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
12 changes: 8 additions & 4 deletions src/main/kotlin/org/opensearch/commons/alerting/model/DataSources.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ data class DataSources(
val alertsHistoryIndexPattern: String? = "<.opendistro-alerting-alert-history-{now/d}-1>", // AlertIndices.ALERT_HISTORY_INDEX_PATTERN

/** Configures a custom index alias to store comments associated with alerts.*/
val commentsIndex: String? = ".opensearch-alerting-comments-history-write", // CommentsIndices.COMMENTS_HISTORY_WRITE_INDEX

val commentsIndex: String? = DEFAULT_COMMENTS_INDEX, // CommentsIndices.COMMENTS_HISTORY_WRITE_INDEX

/** Configures a custom index pattern for commentsIndex alias.*/
val commentsIndexPattern: String? = "<.opensearch-alerting-comments-history-{now/d}-1>", // CommentsIndices.COMMENTS_HISTORY_INDEX_PATTERN
val commentsIndexPattern: String? = DEFAULT_COMMENTS_INDEX_PATTERN, // CommentsIndices.COMMENTS_HISTORY_INDEX_PATTERN

/** Configures custom mappings by field type for query index.
* Custom query index mappings are configurable, only if a custom query index is configured too. */
Expand Down Expand Up @@ -102,8 +103,8 @@ data class DataSources(
alertsIndex = alertsIndex,
alertsHistoryIndex = alertsHistoryIndex,
alertsHistoryIndexPattern = alertsHistoryIndexPattern,
commentsIndex = null,
commentsIndexPattern = null,
commentsIndex = DEFAULT_COMMENTS_INDEX,
commentsIndexPattern = DEFAULT_COMMENTS_INDEX_PATTERN,
queryIndexMappingsByType = queryIndexMappingsByType,
findingsEnabled = findingsEnabled
)
Expand Down Expand Up @@ -152,6 +153,9 @@ data class DataSources(
const val QUERY_INDEX_MAPPINGS_BY_TYPE = "query_index_mappings_by_type"
const val FINDINGS_ENABLED_FIELD = "findings_enabled"

const val DEFAULT_COMMENTS_INDEX = ".opensearch-alerting-comments-history-write"
const val DEFAULT_COMMENTS_INDEX_PATTERN = "<.opensearch-alerting-comments-history-{now/d}-1>"

@JvmStatic
@Throws(IOException::class)
@Suppress("UNCHECKED_CAST")
Expand Down
19 changes: 19 additions & 0 deletions src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,4 +506,23 @@ class XContentTests {

assertEquals("Round tripping alert doesn't work", actionExecutionResult, parsedActionExecutionResultString)
}

@Test
fun `test DataSources parsing`() {
val dataSources = DataSources(
ScheduledJob.DOC_LEVEL_QUERIES_INDEX,
".opensearch-alerting-finding-history-write",
"<.opensearch-alerting-finding-history-{now/d}-1>",
".opendistro-alerting-alerts",
".opendistro-alerting-alert-history-write",
"<.opendistro-alerting-alert-history-{now/d}-1>",
mapOf(),
false
)
Assertions.assertNotNull(dataSources)

val dataSourcesString = dataSources.toXContent(builder(), ToXContent.EMPTY_PARAMS).string()
val parsedDataSources = DataSources.parse(parser(dataSourcesString))
Assertions.assertEquals(dataSources, parsedDataSources, "Round tripping DataSources doesn't work")
}
}
Loading