Skip to content

[Backport 2.19] Preserve user when stashing thread context when sending alert notification messages. #2027 #2030

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
AWSHurneyt merged 5 commits into from
Mar 3, 2026
Merged

[Backport 2.19] Preserve user when stashing thread context when sending alert notification messages. #2027 #2030

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ddaa74
Add user to stashed context when sending alert notification messages.…
AWSHurneyt Mar 3, 2026
0f0306e
Increase wait for cluster to start.
AWSHurneyt Mar 3, 2026
3734dd8
Troubleshooting github workflow failure.
AWSHurneyt Mar 3, 2026
bee6e0e
Revert "Troubleshooting github workflow failure."
AWSHurneyt Mar 3, 2026
0f3f59e
Revert "Increase wait for cluster to start."
AWSHurneyt Mar 3, 2026
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
6 changes: 5 additions & 1 deletion alerting/src/main/kotlin/org/opensearch/alerting/MonitorRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.opensearch.alerting.util.destinationmigration.sendNotification
import org.opensearch.alerting.util.isAllowed
import org.opensearch.alerting.util.isTestAction
import org.opensearch.client.node.NodeClient
import org.opensearch.commons.ConfigConstants
import org.opensearch.commons.alerting.model.ActionRunResult
import org.opensearch.commons.alerting.model.Monitor
import org.opensearch.commons.alerting.model.MonitorRunResult
Expand Down Expand Up @@ -68,7 +69,10 @@ abstract class MonitorRunner {
}
if (!dryrun) {
val client = monitorCtx.client
client!!.threadPool().threadContext.stashContext().use {
val userStr = client!!.threadPool().threadContext
.getTransient<String>(ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT)
client.threadPool().threadContext.stashContext().use {
client.threadPool().threadContext.putTransient(ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT, userStr)
withClosableContext(
InjectorContextElement(
monitor.id,
Expand Down
Loading