Feat: add threading config for email receiver in Alertmanager secret config by nutmos · Pull Request #8388 · prometheus-operator/prometheus-operator

nutmos · 2026-02-18T14:41:44Z

Description

This PR adds threading support for email receiver in Alertmanager secret config.

Threading is supported from AM 0.30.0 onwards.

https://github.com/prometheus/alertmanager/releases/tag/v0.30.0

Type of change

What type of changes does your code introduce to the Prometheus operator? Put an x in the box that apply.

CHANGE (fix or feature that would cause existing functionality to not work as expected)
FEATURE (non-breaking change which adds functionality)
BUGFIX (non-breaking change which fixes an issue)
ENHANCEMENT (non-breaking change which improves existing functionality)
NONE (if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)

Verification

Unit Testing

Changelog entry

- Add threading support for email receiver in Alertmanager secret config

to cover more fields

heliapb · 2026-02-19T09:32:25Z

pkg/alertmanager/amcfg_test.go

+					},
+				},
+			},
+			golden: "test_threading_is_added_in_email_config_for_supported_versions.golden",


Hi @nutmos I was looking into the alertmanager change, could you add a test as well for the empty ThreadByDate as well since is the default. Thanks

to cover default value

nutmos · 2026-02-19T16:00:44Z

@heliapb Please check

simonpasquier

there are additional checks to be added to the configuration validation (for instance value should be none or daily)?

to ensure the correct value are placed

nutmos · 2026-02-23T14:23:49Z

@simonpasquier Updated. Please check again.

heliapb

lgtm

to cover the case of empty

nutmos · 2026-02-28T04:40:37Z

@heliapb @simonpasquier Please review again. Thanks!

simonpasquier · 2026-03-05T13:08:32Z

pkg/alertmanager/amcfg.go

+	}
+
+	if t := ec.Threading; t != nil {
+		if t.ThreadByDate != "" && t.ThreadByDate != "daily" && t.ThreadByDate != "none" {


empty thread_by_date would trigger a config error

to be error when thread_by_date is empty

nutmos · 2026-03-14T09:09:13Z

@simonpasquier Could you please have a look?

simonpasquier

LGTM but it needs a rebase.

simonpasquier

Thanks!

…r to v0.90.0 (#4885) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [prometheus-operator/prometheus-operator](https://github.com/prometheus-operator/prometheus-operator) | minor | `v0.89.0` → `v0.90.0` | --- > ⚠️ **Warning** > > Some dependencies could not be looked up. Check the [Dependency Dashboard](issues/2) for more information. --- ### Release Notes <details> <summary>prometheus-operator/prometheus-operator (prometheus-operator/prometheus-operator)</summary> ### [`v0.90.0`](https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.90.0): 0.90.0 / 2026-03-19 [Compare Source](prometheus-operator/prometheus-operator@v0.89.0...v0.90.0) - \[CHANGE/BUGFIX] Validate that the remote-write URL scheme is either `http` or `https`. [#8455](prometheus-operator/prometheus-operator#8455) - \[FEATURE] Add `--repair-policy-for-statefulsets` CLI argument to the operator. It defines how the operator manages StatefulSet's pods stuck at an incorrect revision. Users running Kubernetes v1.35+ are encouraged to enable this feature (see [troubleshooting guide](https://prometheus-operator.dev/docs/platform/troubleshooting/#statefulset-rollout-stuck-after-a-bad-update)). [#8443](prometheus-operator/prometheus-operator#8443) - \[FEATURE] Add `schedulerName` support to the `Prometheus`, `PrometheusAgent`, `Alertmanager` and `ThanosRuler` CRDs. [#8451](prometheus-operator/prometheus-operator#8451) - \[ENHANCEMENT] Add `--web.tls-curves` CLI argument to the operator and admission-webhook binaries. [#8385](prometheus-operator/prometheus-operator#8385) - \[ENHANCEMENT] Support minimum TLS version for Thanos gRPC servers. [#8438](prometheus-operator/prometheus-operator#8438) - \[ENHANCEMENT] Add version label to `ThanosRuler` pods. [#8441](prometheus-operator/prometheus-operator#8441) - \[ENHANCEMENT] Add `messageText` support for Slack receiver in `AlertmanagerConfig` CRD. [#8374](prometheus-operator/prometheus-operator#8374) - \[ENHANCEMENT] Add `messageText` support for Slack receiver in Alertmanager secret config. [#8375](prometheus-operator/prometheus-operator#8375) - \[ENHANCEMENT] Add `forceImplicitTLS` support for SMTP email config in Alertmanager secret config. [#8384](prometheus-operator/prometheus-operator#8384) [#8404](prometheus-operator/prometheus-operator#8404) - \[ENHANCEMENT] Add `forceImplicitTLS` support for SMTP email config in `AlertmanagerConfig` CRD. [#8386](prometheus-operator/prometheus-operator#8386) - \[ENHANCEMENT] Add `forceImplicitTLS` support for SMTP global config in Alertmanager secret config. [#8405](prometheus-operator/prometheus-operator#8405) - \[ENHANCEMENT] Add `forceImplicitTLS` support for SMTP global config in `Alertmanager` CRD. [#8406](prometheus-operator/prometheus-operator#8406) - \[ENHANCEMENT] Add support for global Telegram bot token in `Alertmanager` CRD. [#8372](prometheus-operator/prometheus-operator#8372) - \[ENHANCEMENT] Add `chatIDFile` support for Telegram receiver in Alertmanager secret config. [#8376](prometheus-operator/prometheus-operator#8376) - \[ENHANCEMENT] Add `wechatAPISecretFile` support in Alertmanager global config. [#8377](prometheus-operator/prometheus-operator#8377) - \[ENHANCEMENT] Add `authSecretFile` support for email config in Alertmanager secret config. [#8396](prometheus-operator/prometheus-operator#8396) - \[ENHANCEMENT] Add nested field support for PagerDuty description in Alertmanager secret config. [#8402](prometheus-operator/prometheus-operator#8402) - \[ENHANCEMENT] Add email threading support in Alertmanager secret config. [#8388](prometheus-operator/prometheus-operator#8388) - \[ENHANCEMENT] Add field and label selectors for ConfigMap watches. [#8368](prometheus-operator/prometheus-operator#8368) - \[ENHANCEMENT] Improve ScrapeConfig API consistency and validation. [#8422](prometheus-operator/prometheus-operator#8422) - \[BUGFIX] Fix `ThanosRuler` config resource status not being updated on initial StatefulSet creation. [#8358](prometheus-operator/prometheus-operator#8358) - \[BUGFIX] Preserve `LastTransitionTime` in Prometheus status conditions. [#8346](prometheus-operator/prometheus-operator#8346) - \[BUGFIX] Make Mattermost `text` field optional in `AlertmanagerConfig` CRD. [#8363](prometheus-operator/prometheus-operator#8363) - \[BUGFIX] Remove nil error wrapping in v1alpha1 duplicate receiver validation. [#8379](prometheus-operator/prometheus-operator#8379) - \[BUGFIX] Aggregate `Available` condition across Prometheus shards. [#8434](prometheus-operator/prometheus-operator#8434) - \[BUGFIX] Reconcile resources with inconsistent status. [#8397](prometheus-operator/prometheus-operator#8397) - \[BUGFIX] Fix namespace lister/watcher compatibility with Kubernetes v1.35 client-go. [#8431](prometheus-operator/prometheus-operator#8431) - \[BUGFIX] Fix missing OAuth2 field in IonosSDConfig generation. [#8433](prometheus-operator/prometheus-operator#8433) - \[BUGFIX] Fix missing fields in AzureSDConfig. [#8444](prometheus-operator/prometheus-operator#8444) - \[BUGFIX] Validate Microsoft Teams V2 URL in `AlertmanagerConfig` CRD. [#8227](prometheus-operator/prometheus-operator#8227) - \[BUGFIX] Fix `labelmap` relabel action rejecting valid replacement values with template variables for Prometheus 2.x. [#8337](prometheus-operator/prometheus-operator#8337) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://gitea.alexlebens.dev/alexlebens/infrastructure/pulls/4885 Co-authored-by: Renovate Bot <renovate-bot@alexlebens.net> Co-committed-by: Renovate Bot <renovate-bot@alexlebens.net>

amcfg: add threading config for email in alertmanager secret config

5293141

to cover more fields

nutmos requested a review from a team as a code owner February 18, 2026 14:41

pull-request-size bot added the size/M label Feb 18, 2026

heliapb reviewed Feb 19, 2026

View reviewed changes

amcfg: add test case for empty thread_by_date

e7a4ee0

to cover default value

pull-request-size bot added size/L and removed size/M labels Feb 19, 2026

amcfg: add test case for empty thread_by_date

11ad355

to cover default value

nutmos mentioned this pull request Feb 19, 2026

Feat: Add threading config for email receiver in Alertmanager Config CR #8400

Open

5 tasks

nutmos requested a review from heliapb February 19, 2026 16:00

amcfg: resolve merge conflict

9ccdd29

simonpasquier reviewed Feb 23, 2026

View reviewed changes

nutmos added 2 commits February 23, 2026 21:22

alertmanager: add logic to check the value

012f6c3

to ensure the correct value are placed

merge main

1f56bde

heliapb previously approved these changes Feb 23, 2026

View reviewed changes

nutmos requested a review from simonpasquier February 24, 2026 00:51

alertmanager: update thread by date acceptable value

6f47a55

to cover the case of empty

nutmos dismissed heliapb’s stale review via 6f47a55 February 24, 2026 00:57

nutmos requested a review from heliapb February 24, 2026 00:57

simonpasquier reviewed Mar 5, 2026

View reviewed changes

nutmos added 3 commits March 5, 2026 21:57

Merge branch 'main' into feat/email-threading-am-secret-config

9ab66e2

alertmanager: change email config sanitize

069af00

to be error when thread_by_date is empty

trigger ci

9351a5e

nutmos requested a review from simonpasquier March 6, 2026 13:49

Merge branch 'main' into feat/email-threading-am-secret-config

e49701c

simonpasquier reviewed Mar 16, 2026

View reviewed changes

resolve merge conflict

dc32dde

simonpasquier approved these changes Mar 17, 2026

View reviewed changes

simonpasquier merged commit 3da5886 into prometheus-operator:main Mar 17, 2026
22 checks passed

nutmos deleted the feat/email-threading-am-secret-config branch March 17, 2026 13:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: add threading config for email receiver in Alertmanager secret config#8388

Feat: add threading config for email receiver in Alertmanager secret config#8388
simonpasquier merged 12 commits intoprometheus-operator:mainfrom
nutmos:feat/email-threading-am-secret-config

nutmos commented Feb 18, 2026

Uh oh!

heliapb Feb 19, 2026

Uh oh!

nutmos commented Feb 19, 2026

Uh oh!

simonpasquier left a comment

Uh oh!

nutmos commented Feb 23, 2026

Uh oh!

heliapb left a comment

Uh oh!

nutmos commented Feb 28, 2026

Uh oh!

simonpasquier Mar 5, 2026

Uh oh!

nutmos commented Mar 14, 2026

Uh oh!

simonpasquier left a comment

Uh oh!

simonpasquier left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

nutmos commented Feb 18, 2026

Description

Type of change

Verification

Changelog entry

Uh oh!

heliapb Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

nutmos commented Feb 19, 2026

Uh oh!

simonpasquier left a comment

Choose a reason for hiding this comment

Uh oh!

nutmos commented Feb 23, 2026

Uh oh!

heliapb left a comment

Choose a reason for hiding this comment

Uh oh!

nutmos commented Feb 28, 2026

Uh oh!

simonpasquier Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

nutmos commented Mar 14, 2026

Uh oh!

simonpasquier left a comment

Choose a reason for hiding this comment

Uh oh!

simonpasquier left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants