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

acknowledge api unresponsive when plugins.alerting.filter_by_backend_roles is enabled #1332

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

acknowledge api unresponsive when plugins.alerting.filter_by_backend_roles is enabled #1332

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
22 changes: 17 additions & 5 deletions ...ting/src/main/kotlin/org/opensearch/alerting/transport/TransportAcknowledgeAlertAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ import org.opensearch.action.search.SearchResponse
import org.opensearch.action.support.ActionFilters
import org.opensearch.action.support.HandledTransportAction
import org.opensearch.action.update.UpdateRequest
import org.opensearch.alerting.opensearchapi.InjectorContextElement
import org.opensearch.alerting.opensearchapi.suspendUntil
import org.opensearch.alerting.opensearchapi.withClosableContext
import org.opensearch.alerting.settings.AlertingSettings
import org.opensearch.alerting.util.use
import org.opensearch.client.Client
Expand Down Expand Up @@ -66,12 +68,19 @@ class TransportAcknowledgeAlertAction @Inject constructor(
val xContentRegistry: NamedXContentRegistry,
val transportGetMonitorAction: TransportGetMonitorAction
) : HandledTransportAction<ActionRequest, AcknowledgeAlertResponse>(
AlertingActions.ACKNOWLEDGE_ALERTS_ACTION_NAME, transportService, actionFilters, ::AcknowledgeAlertRequest
) {
AlertingActions.ACKNOWLEDGE_ALERTS_ACTION_NAME,
transportService,
actionFilters,
::AcknowledgeAlertRequest
),
SecureTransportAction {

@Volatile
private var isAlertHistoryEnabled = AlertingSettings.ALERT_HISTORY_ENABLED.get(settings)

@Volatile
override var filterByEnabled = AlertingSettings.FILTER_BY_BACKEND_ROLES.get(settings)

init {
clusterService.clusterSettings.addSettingsUpdateConsumer(AlertingSettings.ALERT_HISTORY_ENABLED) { isAlertHistoryEnabled = it }
}
Expand All @@ -83,8 +92,9 @@ class TransportAcknowledgeAlertAction @Inject constructor(
) {
val request = acknowledgeAlertRequest as? AcknowledgeAlertRequest
?: recreateObject(acknowledgeAlertRequest) { AcknowledgeAlertRequest(it) }
client.threadPool().threadContext.stashContext().use {
scope.launch {
val user = readUserFromThreadContext(client)
scope.launch {
withClosableContext(InjectorContextElement(request.monitorId, settings, client.threadPool().threadContext, user?.roles)) {
val getMonitorResponse: GetMonitorResponse =
transportGetMonitorAction.client.suspendUntil {
val getMonitorRequest = GetMonitorRequest(
Expand All @@ -108,7 +118,9 @@ class TransportAcknowledgeAlertAction @Inject constructor(
)
)
} else {
AcknowledgeHandler(client, actionListener, request).start(getMonitorResponse.monitor!!)
client.threadPool().threadContext.stashContext().use {
AcknowledgeHandler(client, actionListener, request).start(getMonitorResponse.monitor!!)
}
}
}
}
Expand Down
18 changes: 18 additions & 0 deletions alerting/src/test/kotlin/org/opensearch/alerting/resthandler/SecureMonitorRestApiIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,24 @@ class SecureMonitorRestApiIT : AlertingRestTestCase() {
}
}

fun `test ack alert with enabled filter by`() {
enableFilterBy()
putAlertMappings()
val adminUser = User(ADMIN, listOf(ADMIN), listOf(ALL_ACCESS_ROLE), listOf())
val monitor = createRandomMonitor(refresh = true).copy(user = adminUser)
val alert = createAlert(randomAlert(monitor).copy(state = Alert.State.ACTIVE))

val inputMap = HashMap<String, Any>()
inputMap["missing"] = "_last"
inputMap["monitorId"] = monitor.id

// search as "admin" - must get 4 docs
val adminResponseMap = getAlerts(client(), inputMap).asMap()
assertEquals(1, adminResponseMap["totalAlerts"])

acknowledgeAlerts(monitor, alert)
}

fun `test get alerts with an user with get alerts role`() {

putAlertMappings()
Expand Down
Loading