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

fix fieldLimit exception in docLevelMonitor #1368

Merged
merged 2 commits into from
Apr 9, 2024
+10 −2
Merged

fix fieldLimit exception in docLevelMonitor #1368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc6d5b3
fix fieldLimit exception in docLevelMonitor
riysaxen-amzn Jan 6, 2024
897ebbd
bug fixes from prev pr
riysaxen-amzn Jan 10, 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: 10 additions & 2 deletions alerting/src/main/kotlin/org/opensearch/alerting/DocumentLevelMonitorRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,16 @@ object DocumentLevelMonitorRunner : MonitorRunner() {
monitorCtx.alertIndices!!.createOrUpdateInitialFindingHistoryIndex(monitor.dataSources)
} catch (e: Exception) {
val id = if (monitor.id.trim().isEmpty()) "_na_" else monitor.id
logger.error("Error setting up alerts and findings indices for monitor: $id", e)
monitorResult = monitorResult.copy(error = AlertingException.wrap(e))
val unwrappedException = ExceptionsHelper.unwrapCause(e)
if (unwrappedException is IllegalArgumentException && unwrappedException.message?.contains("Limit of total fields") == true) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you unwrap and cast to generic Exception how will this check unwrappedException is IllegalArgumentException be true ever?

val errorMessage =
"Monitor [$id] can't process index [$monitor.dataSources] due to field mapping limit"
logger.error("Exception: ${unwrappedException.message}")
monitorResult = monitorResult.copy(error = AlertingException(errorMessage, RestStatus.INTERNAL_SERVER_ERROR, e))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A 4XX (maybe 400) would be more appropriate here than a 500 imo since the field limit getting hit is from user behavior rather than an internal server error

} else {
logger.error("Error setting up alerts and findings indices for monitor: $id", e)
monitorResult = monitorResult.copy(error = AlertingException.wrap(e))
}
}

try {
Expand Down
Loading