Skip to content

Slack app support#4211

Merged
SuperQ merged 8 commits intoprometheus:mainfrom
pharaujo:slack_token_auth
Nov 19, 2025
Merged

Slack app support#4211
SuperQ merged 8 commits intoprometheus:mainfrom
pharaujo:slack_token_auth

Conversation

@pharaujo
Copy link
Contributor

While it's possible to configure Slack app bot tokens using a combination of http_configs authorization credentials and setting the Slack API URL to the a specific endpoint, doing so at a global level leaks the token to any other notification receiver configured, as http_configs are not specific to notifiers. Slack has also restricted webhook URLs to only be able to post to a single channel (with the legacy webhooks being marked as deprecated and not recommended), which reduces their usefulness when set at the global level.

This PR adds a way of easily setting Slack App bot tokens at the global level, as well as overriding at the individual receiver level, while keeping compatibility with existing configurations.

The decision to have a separate config field for the URL was to be able to provide a default API URL for Slack apps as well as differentiate when a webhook url is provided. Ideally we'd change the slack_api_url to be slack_webhook_url so as to avoid confusion, but that would be an unnecessary breaking change.

More context in issue #2513

@pharaujo pharaujo force-pushed the slack_token_auth branch 2 times, most recently from c9c52d3 to c32a184 Compare January 17, 2025 12:38
While it's possible to configure Slack app bot tokens using a
combination of http_configs authorization credentials and setting the
Slack API URL to the a specific endpoint, doing so at a global level
leaks the token to any other notification receiver configured, as
http_configs are not specific to notifiers. Slack has also restricted
webhook URLs to only be able to post to a single channel (with the
legacy webhooks being [marked as deprecated and not recommended][1]),
which reduces their usefulness when set at the global level.

This PR adds a way of easily setting Slack App bot tokens at the global
level, as well as overriding at the individual receiver level, while
keeping compatibility with existing configurations.

The decision to have a separate config field for the URL was to be able
to provide a default API URL for Slack apps as well as differentiate
when a webhook url is provided. Ideally we'd change the `slack_api_url`
to be `slack_webhook_url` so as to avoid confusion, but that would be an
unnecessary breaking change.

More context in issue prometheus#2513

[1]: https://api.slack.com/legacy/custom-integrations/messaging/webhooks

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
@pharaujo pharaujo marked this pull request as ready for review January 20, 2025 17:27
@grobinson-grafana
Copy link
Collaborator

So we do also need BlockKit support, and I think this feature, along with BlockKit, would be perfect for a Slack V2 integration, just like we did for Microsoft Teams.

@pharaujo
Copy link
Contributor Author

pharaujo commented Feb 3, 2025

So we do also need BlockKit support, and I think this feature, along with BlockKit, would be perfect for a Slack V2 integration, just like we did for Microsoft Teams.

I'm a bit confused. Is this feedback for me, or for other reviewers? Are you saying I should implement this under a new slack integration, or close this PR since someone else is implementing it together with Block Kit?

To be clear, I'm able to change the PR to kickstart the new slack integration and plug internals into the current integration, but I don't want to extend the scope of this PR to add such a large piece of work such as Block Kit.

What's the recommendation here?

The [Slack app support issue][1] suggested setting the slack API URL to
the `chat.PostMessage` endpoint instead of a webhook URL, and so people
migrating from this workaround to the the new configuration might
encounter a situation where they want to set the `slack_app_token` at
the global level while still retaining the `slack_api_url` while
dynamically configured receivers (such as those set by prometheus
operator) are migrated.

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>

[1]: prometheus#2513
Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
Copy link
Contributor

@Spaceman1701 Spaceman1701 left a comment

Choose a reason for hiding this comment

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

This seems like a great change to make to bridge us to a V2 slack integration in the future. Since webhook URLs don't really work anymore, I think something like this is necessary for the existing slack integration to remain useful.

if sc.HTTPConfig == nil {
sc.HTTPConfig = c.Global.HTTPConfig
if sc.AppURL == nil {
if c.Global.SlackAppURL == nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this change cause existing configs to error unless they set the new app* fields?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for looking into this! No, it shouldn't, because we're setting the default SlackAppURL in line 781, so it just works out-of-the-box.

Copy link
Contributor

@Spaceman1701 Spaceman1701 left a comment

Choose a reason for hiding this comment

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

Thanks for your patience!

I Took some time to go through this a little more carefully. Overall, this seems good to me. It looks like there shouldn't be any behavior changes for anybody who's already using the slack integration (because they would've needed to set slack_api_url already), which is my biggest concern.

My second concern is whether the slack_app_url is necessary - is there a reason to create the new field rather than just set slack_api_url's default to https://slack.com/api/chat.postMessage? I don't think this would be a breaking change because existing users have already set this to something.

My final (and least important) concern is whether this actually works with slack. It looks like it does, but we just don't have any automated testing for that as far as I can tell. That being said, this is counter-intuitively the easiest part to fix if there's a problem 😆 .

@pharaujo
Copy link
Contributor Author

pharaujo commented Nov 5, 2025

Thanks for your patience!

Thank you for reviewing!

I Took some time to go through this a little more carefully. Overall, this seems good to me. It looks like there shouldn't be any behavior changes for anybody who's already using the slack integration (because they would've needed to set slack_api_url already), which is my biggest concern.

Yeah, the way it's configured, the slack app token logic is opt in, and everything keeps working for existing users that use the legacy webhook url. The logic that's a bit more complex is to guard against breaking users that set the slack app token through http_configs, as suggested here—given the amount of reactions for that comment, I think it might be fairly widespread.

My second concern is whether the slack_app_url is necessary - is there a reason to create the new field rather than just set slack_api_url's default to https://slack.com/api/chat.postMessage? I don't think this would be a breaking change because existing users have already set this to something.

I think I addressed this in my original PR description; the decision to have a separate config field for the Slack app URL was to be able to provide a default API URL for Slack apps as well as differentiate when a webhook url is provided. I originally tried reusing the field, but it became very hairy to know whether the URL was for use with app token or for legacy URL, and I thought the added complexity wasn't worth it.

My final (and least important) concern is whether this actually works with slack. It looks like it does, but we just don't have any automated testing for that as far as I can tell. That being said, this is counter-intuitively the easiest part to fix if there's a problem 😆 .

Well, I can say for certain that it works with Slack Apps, because we've been running an alertmanager fork with this patch for the last ~9 months with no issues 😄

Copy link
Contributor

@Spaceman1701 Spaceman1701 left a comment

Choose a reason for hiding this comment

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

I think I addressed this in my original PR description; the decision to have a separate config field for the Slack app URL was to be able to provide a default API URL for Slack apps as well as differentiate when a webhook url is provided. I originally tried reusing the field, but it became very hairy to know whether the URL was for use with app token or for legacy URL, and I thought the added complexity wasn't worth it.

Ah, yeah, I guess it becomes unclear what the behavior should be when there's a global http_config too. And there's a more clear distinction for users moving to the new mechanism. At some point we'll have to deprecate the old slack_api_url.

Given that slack receivers are extraordinarily ergonomic today, I think this is definitely worth merging.

cc @grobinson-grafana and @SuperQ for a sanity check on the config changes.

@Spaceman1701 Spaceman1701 self-assigned this Nov 14, 2025
@SuperQ
Copy link
Member

SuperQ commented Nov 18, 2025

A couple of linter errors to fix.

Fixed by running `make common-lint-fix`

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
@pharaujo
Copy link
Contributor Author

@SuperQ the linter errors should be fixed, please check again when you can 😃

@SuperQ SuperQ merged commit e2b746b into prometheus:main Nov 19, 2025
7 checks passed
@SoloJacobs SoloJacobs mentioned this pull request Nov 24, 2025
@Sapr0
Copy link

Sapr0 commented Dec 21, 2025

@pharaujo I wanted to thank you for this PR to improve the Slack integration.

We are deploying AlertManager as part of the kube-prometheus-stack helm chart.
It seems Prometheus Operator also does a config validation for the AlertManager.

I'm trying to use the kube-prometheus-helm chart v80.4.2, which includes AlertManager v0.30.0
Currently, the AlertManager is failing to reconcile:

status:
  availableReplicas: 2
  conditions:
    - lastTransitionTime: '2025-12-21T00:08:48Z'
      message: >-
        provision alertmanager configuration: failed to initialize from secret:
        yaml: unmarshal errors:
          line 4: field slack_app_token not found in type config.plain
      observedGeneration: 9
      reason: ReconciliationFailed
      status: 'False'
      type: Reconciled

I'm not sure where PrometheusOperator does the config validation, or if it's related to Prometheus CRDs
But something needs to be updated to support the new config value slack_app_token

@TheMeier
Copy link
Contributor

That is most likely an issue in prometheus-operator. To me it looks like they have there own copy of the config types
https://github.com/prometheus-operator/prometheus-operator/blob/main/pkg/alertmanager/types.go#L38

@pharaujo
Copy link
Contributor Author

pharaujo commented Dec 22, 2025

Yes, prometheus-operator imports alertmanager, so the next step is to contribute the slack app support to it. Since we use kube-prometheus internally as well, I've already done this here, and we've been running this fork since the beginning of the year. Now that this feature is released, I'll send a PR to prometheus-operator with it (and then, hopefully, to kube-prometheus if/when it's accepted 🙂)

EDIT: I don't recommend other people running my fork though, it's still using my alertmanager fork; I haven't updated it yet to use the newly-released 0.30.0.

pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Jan 6, 2026
Feature released in alertmanager
[v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
implemented in prometheus/alertmanager#4211

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Jan 6, 2026
Slack app support released in alertmanager
[v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
(implemented in prometheus/alertmanager#4211),
missing support in prometheus-operator.

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Jan 6, 2026
Slack app support released in alertmanager
[v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
(implemented in prometheus/alertmanager#4211),
missing support in prometheus-operator.

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Jan 6, 2026
Slack app support released in alertmanager
[v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
(implemented in prometheus/alertmanager#4211),
missing support in prometheus-operator.

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Jan 7, 2026
Slack app support released in alertmanager
[v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
(implemented in prometheus/alertmanager#4211).

Supporting the new fields in the Alertmanager config was done in prometheus-operator#8238,
and now this one adds support for them in the operator CRs.

Additionally added SlackConfig tests I had around.

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Jan 7, 2026
Slack app support released in alertmanager
[v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
(implemented in prometheus/alertmanager#4211).

Supporting the new fields in the Alertmanager config was done in prometheus-operator#8238,
and now this one adds support for them in the operator CRs.

Additionally added SlackConfig tests I had around.

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Jan 7, 2026
Slack app support released in alertmanager
[v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
(implemented in prometheus/alertmanager#4211).

Supporting the new fields in the Alertmanager config was done in prometheus-operator#8238,
and now this one adds support for them in the operator CRs.

Additionally added SlackConfig tests I had around.

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Jan 7, 2026
Slack app support released in alertmanager
[v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
(implemented in prometheus/alertmanager#4211).

Supporting the new fields in the Alertmanager config was done in prometheus-operator#8238,
and now this one adds support for them in the operator CRs.

Additionally added SlackConfig tests I had around.

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Jan 7, 2026
Slack app support released in alertmanager
[v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
(implemented in prometheus/alertmanager#4211).

Supporting the new fields in the Alertmanager config was done in prometheus-operator#8238,
and now this one adds support for them in the operator CRs.

Additionally added SlackConfig tests I had around.

Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
@TheMeier TheMeier mentioned this pull request Feb 20, 2026
pharaujo added a commit to pharaujo/prometheus-operator that referenced this pull request Mar 6, 2026
Squashed commit of the following:

commit 293f8ba
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Thu Mar 5 18:08:37 2026 +0000

    Fix build

    Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>

commit e333aed
Merge: d306259 4704949
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Thu Mar 5 16:46:35 2026 +0000

    Merge branch 'main' into alertmanager-0.30.0-slack_app

commit 4704949
Merge: 22bba7e ff23038
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Thu Mar 5 21:17:07 2026 +0530

    Merge pull request prometheus-operator#8422 from slashpai/scrapeconfig-v1beta1

commit 22bba7e
Merge: 89dc2d2 1fc9105
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Thu Mar 5 15:29:19 2026 +0100

    Merge pull request prometheus-operator#8430 from kubeservice-stack/add-importas-new

    chore: Add standardization of import as aliases

commit 89dc2d2
Merge: 959270a 1db1179
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Mar 5 14:20:45 2026 +0000

    Merge pull request prometheus-operator#8411 from prometheus-operator/dependabot/go_modules/github.com/prometheus/prometheus-0.310.0

    build(deps): bump github.com/prometheus/prometheus from 0.309.1 to 0.310.0

commit 1fc9105
Author: dongjiang1989 <dongjiang1989@126.com>
Date:   Thu Mar 5 21:38:29 2026 +0800

    add standardization of import as aliases

    Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

commit 1db1179
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Mar 5 13:31:28 2026 +0000

    build(deps): bump github.com/prometheus/prometheus

    Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.309.1 to 0.310.0.
    - [Release notes](https://github.com/prometheus/prometheus/releases)
    - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md)
    - [Commits](prometheus/prometheus@v0.309.1...v0.310.0)

    ---
    updated-dependencies:
    - dependency-name: github.com/prometheus/prometheus
      dependency-version: 0.310.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 959270a
Merge: c132351 d065058
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Mar 5 13:30:18 2026 +0000

    Merge pull request prometheus-operator#8414 from prometheus-operator/dependabot/go_modules/k8s-libs-8d40d41836

    build(deps): bump the k8s-libs group with 5 updates

commit d065058
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Mar 5 12:42:47 2026 +0000

    build(deps): bump the k8s-libs group with 5 updates

    Bumps the k8s-libs group with 5 updates:

    | Package | From | To |
    | --- | --- | --- |
    | [k8s.io/api](https://github.com/kubernetes/api) | `0.34.3` | `0.35.2` |
    | [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.34.3` | `0.35.2` |
    | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.34.3` | `0.35.2` |
    | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.34.3` | `0.35.2` |
    | [k8s.io/component-base](https://github.com/kubernetes/component-base) | `0.34.3` | `0.35.2` |

    Updates `k8s.io/api` from 0.34.3 to 0.35.2
    - [Commits](kubernetes/api@v0.34.3...v0.35.2)

    Updates `k8s.io/apiextensions-apiserver` from 0.34.3 to 0.35.2
    - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
    - [Commits](kubernetes/apiextensions-apiserver@v0.34.3...v0.35.2)

    Updates `k8s.io/apimachinery` from 0.34.3 to 0.35.2
    - [Commits](kubernetes/apimachinery@v0.34.3...v0.35.2)

    Updates `k8s.io/client-go` from 0.34.3 to 0.35.2
    - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
    - [Commits](kubernetes/client-go@v0.34.3...v0.35.2)

    Updates `k8s.io/component-base` from 0.34.3 to 0.35.2
    - [Commits](kubernetes/component-base@v0.34.3...v0.35.2)

    ---
    updated-dependencies:
    - dependency-name: k8s.io/api
      dependency-version: 0.35.2
      dependency-type: direct:production
      update-type: version-update:semver-minor
      dependency-group: k8s-libs
    - dependency-name: k8s.io/apiextensions-apiserver
      dependency-version: 0.35.2
      dependency-type: direct:production
      update-type: version-update:semver-minor
      dependency-group: k8s-libs
    - dependency-name: k8s.io/apimachinery
      dependency-version: 0.35.2
      dependency-type: direct:production
      update-type: version-update:semver-minor
      dependency-group: k8s-libs
    - dependency-name: k8s.io/client-go
      dependency-version: 0.35.2
      dependency-type: direct:production
      update-type: version-update:semver-minor
      dependency-group: k8s-libs
    - dependency-name: k8s.io/component-base
      dependency-version: 0.35.2
      dependency-type: direct:production
      update-type: version-update:semver-minor
      dependency-group: k8s-libs
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit c132351
Merge: b42636b 487bb19
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Thu Mar 5 15:49:38 2026 +0530

    Merge pull request prometheus-operator#8428 from slashpai/golangci-fix

    ci: use make check-golang in CI instead of golangci-lint action

commit 487bb19
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Thu Mar 5 13:58:14 2026 +0530

    ci: use make check-golang in CI instead of golangci-lint action

    Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>

commit d306259
Merge: 082bc3c b42636b
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Wed Mar 4 12:17:22 2026 +0000

    Merge branch 'main' into alertmanager-0.30.0-slack_app

commit ff23038
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Wed Mar 4 01:19:40 2026 +0530

    fix: use existing URL type for HTTP URL fields in ScrapeConfig

    Replace per-field `// +kubebuilder:validation:MinLength=1` and
    `// +kubebuilder:validation:Pattern="^http(s)?://.+$"` markers with
    the existing `URL` type from `alertmanager_config_types.go`, following
    the same pattern already used by `KumaSDConfig.Server`.

    Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>

commit b42636b
Author: dongjiang <dongjiang1989@126.com>
Date:   Tue Mar 3 21:59:08 2026 +0800

    feat: Add make help target with documentation for all targets (prometheus-operator#8418)

    * add make help target

    Signed-off-by: Dong Jiang <dongjiang1989@126.com>

    * fix bug

    Signed-off-by: Dong Jiang <dongjiang1989@126.com>

    * fix make build bug

    Signed-off-by: Dong Jiang <dongjiang1989@126.com>

    * fix make generate

    Signed-off-by: Dong Jiang <dongjiang1989@126.com>

    * fix makefile

    Signed-off-by: Dong Jiang <dongjiang1989@126.com>

    * fix buy code reviewer

    Signed-off-by: Dong Jiang <dongjiang1989@126.com>

    ---------

    Signed-off-by: Dong Jiang <dongjiang1989@126.com>

commit 72c9010
Merge: 69368ae 1ee3e5d
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Tue Mar 3 14:57:52 2026 +0100

    build(deps): bump actions/upload-artifact from 6 to 7 (prometheus-operator#8413)

    Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7.
    - [Release notes](https://github.com/actions/upload-artifact/releases)
    - [Commits](actions/upload-artifact@v6...v7)

    ---
    updated-dependencies:
    - dependency-name: actions/upload-artifact
      dependency-version: '7'
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit f867626
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Tue Mar 3 17:16:35 2026 +0530

    fix: normalize kubebuilder marker syntax in ScrapeConfig types

    Standardize all kubebuilder validation markers to use `=` delimiter
    instead of the mixed `:=` and `=` syntax for consistency ahead of
    v1beta1 graduation.

    Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>

commit 4e6f6e3
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Tue Mar 3 17:09:38 2026 +0530

    fix: improve ScrapeConfig API consistency and validation for v1beta1 graduation

    Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>

commit 69368ae
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Tue Mar 3 01:10:41 2026 +0800

    Merge pull request prometheus-operator#8386 from nutmos/feat/add-implicit_tls-in-emailconfig-cr

    Feat: add support of forceImplicitTLS field for email receiver in Alertmanager Config CR

commit e008e95
Merge: d72a0ca 381c76d
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Mon Mar 2 15:04:16 2026 +0530

    Merge pull request prometheus-operator#8417 from kubeservice-stack/update-golangci-linter-10

    chore: Update golangci-lint verison to v2.10.2

commit 381c76d
Author: Dong Jiang <dongjiang1989@126.com>
Date:   Mon Mar 2 10:40:40 2026 +0800

    Update golangci-lint verison to latest

    Signed-off-by: Dong Jiang <dongjiang1989@126.com>

commit 1ee3e5d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Feb 27 12:42:22 2026 +0000

    build(deps): bump actions/upload-artifact from 6 to 7

    Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7.
    - [Release notes](https://github.com/actions/upload-artifact/releases)
    - [Commits](actions/upload-artifact@v6...v7)

    ---
    updated-dependencies:
    - dependency-name: actions/upload-artifact
      dependency-version: '7'
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit d72a0ca
Merge: a5fe5b1 d6c320e
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Fri Feb 27 11:21:37 2026 +0100

    Merge pull request prometheus-operator#8385 from simonpasquier/support-tls-curves

    feat: support TLS curves configuration for server

commit d6c320e
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Wed Feb 18 10:40:56 2026 +0100

    feat: support TLS curves configuration for server

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

commit a5fe5b1
Merge: 092e560 3d7f0a3
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Thu Feb 26 19:07:05 2026 +0530

    Merge pull request prometheus-operator#8412 from heliapb/chore/bump_prom_latest

    chore: bump prometheus to v3.10.0

commit 092e560
Merge: 8b68409 900be93
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 26 13:30:00 2026 +0000

    Merge pull request prometheus-operator#8410 from prometheus-operator/dependabot/go_modules/golang.org/x/net-0.51.0

    build(deps): bump golang.org/x/net from 0.50.0 to 0.51.0

commit 3d7f0a3
Author: Hélia Barroso <helia_barroso@hotmail.com>
Date:   Thu Feb 26 13:16:31 2026 +0000

    chore: bump prometheus to v3.10.0

    Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>

commit 900be93
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Feb 26 12:42:38 2026 +0000

    build(deps): bump golang.org/x/net from 0.50.0 to 0.51.0

    Bumps [golang.org/x/net](https://github.com/golang/net) from 0.50.0 to 0.51.0.
    - [Commits](golang/net@v0.50.0...v0.51.0)

    ---
    updated-dependencies:
    - dependency-name: golang.org/x/net
      dependency-version: 0.51.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 8b68409
Merge: ca7c471 4d9d056
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Wed Feb 25 15:08:51 2026 +0100

    fix: reconcile resources with inconsistent status (prometheus-operator#8397)

    * test: add e2e test to simulate the race condition

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

    * fix: reconcile resources with inconsistent status

    It may happen that the updated and/or available replicas reported in the
    resource status don't reflect the current values (we've had reports of
    such situations which are caused by races in the operator logic). This
    commit updates `StatusPoller` to trigger a reconciliation of the
    resource's status when the updated and available replica numbers aren't
    equal to the number of expected replicas.

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

    ---------

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

commit ca7c471
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Wed Feb 25 18:52:02 2026 +0700

    Feat: add MessageText support for Slack receiver in AlertmanagerConfig CR (prometheus-operator#8374)

    * api: add support for messageText

    to support the new field

    * amcfg: add conversion for slack

    to cover CR to secret config

    * api: add conversion of api

    to cover the 2 api versions conversion

    * api: add linter validation

    to cover more validation cases

    * amcfg: update test cases in amcfg

    to cover more test case

    * amcfg: clean unused variables

    * amcfg: add version config for test case

    to parse correctly for the version

    * amcfg: fix literal error

    to make it compilable

    * amcfg: remove globalconfi

    as this is unintended config

    * amcfg: update test case

    to remove global config

    * amcfg: add global api url for slack

    to resolve an error

commit d48f9bc
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Wed Feb 25 18:32:16 2026 +0700

    Feat: Add forceImplicitTLS support for SMTP global config in Alertmanager CR (prometheus-operator#8406)

    * api: add new variable for smtp_force_implicit_tls

    to cover the new field

    * alertmanager: add logic to convert and check forceImplicitTLS

    to ensure conversion is correct

    * api: update description

    add the false case

    * alertmanager: update test cases

    to test the scenario

    * alertmanager: update test cases

    to test the scenario

    * ci: add STARTTLS as a known word

    to pass spelling check

    * alertmanager: update test case

    to reflect the change

commit 9d2da66
Author: dongjiang <dongjiang2010@gmail.com>
Date:   Wed Feb 25 19:26:27 2026 +0800

    chore: Update golangci-lint version to v2.9.0 (prometheus-operator#8366)

    * Update golangci-lint version to v2.9.0

    Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

    * revert controller-tools version to v0.19.0

    Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

    * 更新 metrics.go

    Co-authored-by: Simon Pasquier <spasquie@redhat.com>

    ---------

    Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
    Co-authored-by: Simon Pasquier <spasquie@redhat.com>

commit 11a0910
Merge: 249ebdc cf93618
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Feb 24 13:23:13 2026 +0000

    Merge pull request prometheus-operator#8409 from prometheus-operator/dependabot/github_actions/streetsidesoftware/cspell-action-8.3.0

    build(deps): bump streetsidesoftware/cspell-action from 8.2.0 to 8.3.0

commit cf93618
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Feb 24 12:42:38 2026 +0000

    build(deps): bump streetsidesoftware/cspell-action from 8.2.0 to 8.3.0

    Bumps [streetsidesoftware/cspell-action](https://github.com/streetsidesoftware/cspell-action) from 8.2.0 to 8.3.0.
    - [Release notes](https://github.com/streetsidesoftware/cspell-action/releases)
    - [Changelog](https://github.com/streetsidesoftware/cspell-action/blob/main/CHANGELOG.md)
    - [Commits](streetsidesoftware/cspell-action@d5d910b...9cd41bb)

    ---
    updated-dependencies:
    - dependency-name: streetsidesoftware/cspell-action
      dependency-version: 8.3.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 249ebdc
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Tue Feb 24 05:13:52 2026 +0700

    Feat: Add nested field support for Pagerduty description in Alertmanager secret config (prometheus-operator#8402)

    * amcfg: change type from string to any for pagerduty details field

    to align with alertmanager

    * amcfg: add sanitize config

    to prevent unintended config

    * amcfg: add version check logic

    to be applied to the correct version only

    * amcfg: move logic for version check

    for more effective check

    * amcfg: add test case

    to cover the case

    * amcfg: update test case

    add more test for unsupported version and update the golden file

commit d0f973c
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Mon Feb 23 20:24:56 2026 +0700

    Merge pull request prometheus-operator#8405 from nutmos/feat/add-smtp_force_implicit_tls-global-config

    Feat: add smtp_force_implicit_tls to the global config in Alertmanager secret config

commit 78f1a00
Merge: 0c3099b 6f9aa70
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Mon Feb 23 14:00:54 2026 +0100

    Merge pull request prometheus-operator#8404 from nutmos/fix/smtp-force-implicit-tls

    Fix: rename implicit_tls to force_implicit_tls for SMTP in Alertmanager secret config

commit 6f9aa70
Author: Nattapong Ekudomsuk <nuttapong_mos@hotmail.com>
Date:   Sat Feb 21 22:39:59 2026 +0700

    amcfg: change implicit_tls to force_implicit_tls

    per recommended in prometheus

commit 0c3099b
Merge: 2e3fc03 a5432be
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Fri Feb 20 16:16:06 2026 +0100

    Merge pull request prometheus-operator#8363 from guoard/mattermost_text

    fix: make mattermost text field optional in alertmanager config

commit 2e3fc03
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Thu Feb 19 23:47:36 2026 +0700

    amcfg: add auth_secret_file support (prometheus-operator#8394)

    to cover more fields

commit 4d9d056
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Thu Feb 19 16:53:43 2026 +0100

    fix: reconcile resources with inconsistent status

    It may happen that the updated and/or available replicas reported in the
    resource status don't reflect the current values (we've had reports of
    such situations which are caused by races in the operator logic). This
    commit updates `StatusPoller` to trigger a reconciliation of the
    resource's status when the updated and available replica numbers aren't
    equal to the number of expected replicas.

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

commit df3b0b6
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Thu Feb 19 15:45:08 2026 +0100

    test: add e2e test to simulate the race condition

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

commit 99037ed
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Thu Feb 19 23:46:19 2026 +0700

    Merge pull request prometheus-operator#8396 from nutmos/feat/add-email-secret-file-global-secret-config

    Feat: add smtp_auth_secret_file for Alertmanager global config secret config

commit 3bace33
Merge: b464f9f 6a360e9
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Thu Feb 19 14:57:26 2026 +0100

    Merge pull request prometheus-operator#8346 from Sanchit2662/fix/prometheus-status-conditions-lastTransitionTime

    fix: preserve LastTransitionTime in Prometheus status conditions

commit b464f9f
Author: Arpit Srivastava <arpitsrivastava529@gmail.com>
Date:   Thu Feb 19 19:21:50 2026 +0530

    Merge pull request prometheus-operator#8395 from Arpit529Srivastava/feat/remote-write-feature-gate

    feat: add RemoteWriteCustomResourceDefinition feature gate

commit 8c1e81a
Merge: a085bcc 10e0ba2
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Thu Feb 19 10:28:38 2026 +0100

    chore: add slashpai as release shepherd for v0.90 (prometheus-operator#8390)

    Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>

commit a5432be
Author: Ali Afsharzadeh <afsharzadeh8@gmail.com>
Date:   Sun Feb 8 18:00:49 2026 +0330

    fix: make mattermost text field optional in alertmanager config

    Alertmanager allows mattermost receivers without a text field, but
    prometheus-operator was always rendering an empty string when it was
    not set. This change avoids emitting text when it is not configured.

commit 10e0ba2
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Thu Feb 19 08:51:27 2026 +0530

    chore: add slashpai as release shepherd for v0.90

    Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>

commit 6a360e9
Author: Sanchit2662 <sanchit2662@gmail.com>
Date:   Wed Feb 18 21:24:18 2026 +0530

    fix: preserve LastTransitionTime in Prometheus status conditions

    Signed-off-by: Sanchit2662 <sanchit2662@gmail.com>

commit a085bcc
Author: TOM <billydevbusiness@gmail.com>
Date:   Wed Feb 18 19:04:29 2026 +0530

    Merge pull request prometheus-operator#8227 from tomlin7/feat/msteamsv2-url-validation

    pkg/alertmanager: add URL validation for MSTeamsV2 receiver

commit bcc948e
Merge: 9df3c3c 3e638fc
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Feb 18 13:22:45 2026 +0000

    Merge pull request prometheus-operator#8387 from prometheus-operator/dependabot/github_actions/helm/kind-action-1.14.0

    build(deps): bump helm/kind-action from 1.13.0 to 1.14.0

commit 3e638fc
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Feb 18 12:42:30 2026 +0000

    build(deps): bump helm/kind-action from 1.13.0 to 1.14.0

    Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.13.0 to 1.14.0.
    - [Release notes](https://github.com/helm/kind-action/releases)
    - [Commits](helm/kind-action@v1.13.0...v1.14.0)

    ---
    updated-dependencies:
    - dependency-name: helm/kind-action
      dependency-version: 1.14.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 9df3c3c
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Wed Feb 18 17:33:30 2026 +0700

    Merge pull request prometheus-operator#8384 from nutmos/feat/add-implicit_tls-emailconfig

    Feat: add implicit_tls for email config Alertmanager secret config

commit 00686f7
Merge: e5d4a4d 10a8d11
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Wed Feb 18 15:56:20 2026 +0530

    Merge pull request prometheus-operator#8383 from nutmos/chore/correct-test-case-name

    Chore: correct test case name for email config

commit e5d4a4d
Merge: 8677737 409eed6
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Wed Feb 18 10:54:59 2026 +0100

    Merge pull request prometheus-operator#8368 from ykrevnyi/configmap-selector

    Add field and label selectors for ConfigMap watches

commit 10a8d11
Author: Nattapong Ekudomsuk <nuttapong_mos@hotmail.com>
Date:   Wed Feb 18 16:42:57 2026 +0700

    amcfg: correct test case name

    change from slack to email

commit 8677737
Merge: 5507f3d 52ec696
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Tue Feb 17 16:36:35 2026 +0100

    Merge pull request prometheus-operator#8372 from guoard/alertmanager_global_telegram_bot_token

    feat: support global Telegram bot token

commit 52ec696
Author: Ali Afsharzadeh <afsharzadeh8@gmail.com>
Date:   Thu Feb 12 23:09:47 2026 +0330

    feat: support global Telegram bot token

    Signed-off-by: Ali Afsharzadeh <afsharzadeh8@gmail.com>

commit 5507f3d
Merge: 79a5260 ddf06e1
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Tue Feb 17 14:05:49 2026 +0100

    fix(thanos): update config resource status on initial StatefulSet creation (prometheus-operator#8358)

    Move updateConfigResourcesStatus call before the StatefulSet creation
    block to ensure PrometheusRule bindings are updated on first
    reconciliation. Previously, the early return after StatefulSet creation
    caused config resource status to be skipped until the next reconcile.

    Signed-off-by: Yashika0724 <ssyashika1311@gmail.com>

commit 79a5260
Merge: aeed892 0b398a1
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Tue Feb 17 12:08:33 2026 +0100

    Rename k8sutil pkg (prometheus-operator#8381)

    * chore: rename k8sutil package to k8s

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

    * chore: split pkg/k8s into smaller files

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

    * chore: split test files too

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

    * chore: remove IsResourceNotFoundError() function

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

    ---------

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

commit aeed892
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Tue Feb 17 17:41:01 2026 +0700

    Feat: add support for wechat_api_secret_file in Alertmanager global config (prometheus-operator#8377)

    * amcfg: add support for wechat_api_secret_file for global config

    to align with the new field introduced in AM 0.31.0

    * amcfg: update version test

    to ensure the correct of test data

    * amcfg: add dropping logic for the field

    to ensure it is not being populated for the unsupported version

commit ddaa155
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Tue Feb 17 17:40:52 2026 +0700

    Feat: Add Telegram receiver's chat_id_file support in Alertmanager secret config (prometheus-operator#8376)

    * amcfg: add chat_id_file support in secret config

    to align with new field introduction

    * amcfg: add chat_id_file support for alertmanager

    to support new field

    * amcfg: add more testdata

    to cover more test cases

    * amcfg: add bot token to test cases

    to fix errors

    * amcfg: update golden file

    to align with the correct result

commit 4674596
Author: SANCHIT KUMAR <sanchit2662@gmail.com>
Date:   Tue Feb 17 16:05:50 2026 +0530

    Merge pull request prometheus-operator#8373 from Sanchit2662/fix/query-max-concurrency-off-by-one

    fix: honor query.maxConcurrency=1 instead of silently ignoring it

commit 0b398a1
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Tue Feb 17 11:28:48 2026 +0100

    chore: remove IsResourceNotFoundError() function

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

commit 89daee9
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Tue Feb 17 10:21:32 2026 +0100

    chore: split test files too

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

commit 16d6445
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Mon Feb 16 15:32:52 2026 +0100

    chore: split pkg/k8s into smaller files

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

commit d8f2b25
Author: Simon Pasquier <spasquie@redhat.com>
Date:   Mon Feb 16 15:08:42 2026 +0100

    chore: rename k8sutil package to k8s

    Signed-off-by: Simon Pasquier <spasquie@redhat.com>

commit 02f4906
Merge: be9f7dd 3f3961e
Author: Jayapriya Pai <slashpai9@gmail.com>
Date:   Tue Feb 17 12:50:19 2026 +0530

    Merge pull request prometheus-operator#8379 from Sanchit2662/fix/v1alpha1-nil-error-wrap

    Fix/v1alpha1 nil error wrap

commit be9f7dd
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Tue Feb 17 05:43:25 2026 +0700

    Feat: add support for message_text for Slack receiver in Alertmanager secret config (prometheus-operator#8375)

    * alertmanager: add message text support in alertmanager secret config

    to support new field

    * amcfg: move message text version check

    to check before return

commit 82803d1
Merge: 094632c 2e6dcac
Author: Simon Pasquier <pasquier.simon@gmail.com>
Date:   Mon Feb 16 15:13:24 2026 +0100

    chore: update thanos to v0.40.0, AM minor (prometheus-operator#8369)

    Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>

commit 094632c
Author: Nutmos <nutmos@users.noreply.github.com>
Date:   Mon Feb 16 21:10:38 2026 +0700

    Merge pull request prometheus-operator#8378 from nutmos/feat/add-wechat-receiver-secret-file

    Feat: Add WeChat receiver's api_secret_file support in Alertmanager secret config

commit 541a10d
Merge: ca63fb5 211707a
Author: Hélia Barroso <66432275+heliapb@users.noreply.github.com>
Date:   Mon Feb 16 10:28:16 2026 +0000

    Merge pull request prometheus-operator#8380 from heliapb/chore/mv_to_maitainers

    chore: add myself to maintainers

commit 211707a
Author: Hélia Barroso <helia_barroso@hotmail.com>
Date:   Mon Feb 16 10:11:21 2026 +0000

    chore: add myself to maitainers

    Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>

commit 3f3961e
Author: Sanchit2662 <sanchit2662@gmail.com>
Date:   Mon Feb 16 13:14:26 2026 +0530

    fix: remove nil error wrapping in v1alpha1 duplicate receiver validation

    Signed-off-by: Sanchit2662 <sanchit2662@gmail.com>

commit ca63fb5
Merge: 9d574b5 e672651
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 12 13:29:02 2026 +0000

    Merge pull request prometheus-operator#8371 from prometheus-operator/dependabot/go_modules/github.com/prometheus/alertmanager-0.31.1

    build(deps): bump github.com/prometheus/alertmanager from 0.31.0 to 0.31.1

commit 9d574b5
Merge: 671aa44 d9d43f8
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Feb 12 13:27:39 2026 +0000

    Merge pull request prometheus-operator#8370 from prometheus-operator/dependabot/go_modules/github.com/thanos-io/thanos-0.41.0

    build(deps): bump github.com/thanos-io/thanos from 0.40.1 to 0.41.0

commit e672651
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Feb 12 12:42:42 2026 +0000

    build(deps): bump github.com/prometheus/alertmanager

    Bumps [github.com/prometheus/alertmanager](https://github.com/prometheus/alertmanager) from 0.31.0 to 0.31.1.
    - [Release notes](https://github.com/prometheus/alertmanager/releases)
    - [Changelog](https://github.com/prometheus/alertmanager/blob/main/CHANGELOG.md)
    - [Commits](prometheus/alertmanager@v0.31.0...v0.31.1)

    ---
    updated-dependencies:
    - dependency-name: github.com/prometheus/alertmanager
      dependency-version: 0.31.1
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit d9d43f8
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Feb 12 12:42:35 2026 +0000

    build(deps): bump github.com/thanos-io/thanos from 0.40.1 to 0.41.0

    Bumps [github.com/thanos-io/thanos](https://github.com/thanos-io/thanos) from 0.40.1 to 0.41.0.
    - [Release notes](https://github.com/thanos-io/thanos/releases)
    - [Changelog](https://github.com/thanos-io/thanos/blob/main/CHANGELOG.md)
    - [Commits](thanos-io/thanos@v0.40.1...v0.41.0)

    ---
    updated-dependencies:
    - dependency-name: github.com/thanos-io/thanos
      dependency-version: 0.41.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 2e6dcac
Author: Hélia Barroso <helia_barroso@hotmail.com>
Date:   Thu Feb 12 11:39:45 2026 +0000

    chore: update thanos to v0.40.0, AM minor

    Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>

commit 409eed6
Author: Yuri Krevny <yuriikrevnyi@gmail.com>
Date:   Wed Feb 11 11:48:37 2026 -0500

    Add field and label selectors for ConfigMap watches

commit 671aa44
Merge: e13fb15 7d02089
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Feb 10 13:25:03 2026 +0000

    Merge pull request prometheus-operator#8365 from prometheus-operator/dependabot/go_modules/golang.org/x/net-0.50.0

    build(deps): bump golang.org/x/net from 0.49.0 to 0.50.0

commit 7d02089
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Feb 10 12:42:46 2026 +0000

    build(deps): bump golang.org/x/net from 0.49.0 to 0.50.0

    Bumps [golang.org/x/net](https://github.com/golang/net) from 0.49.0 to 0.50.0.
    - [Commits](golang/net@v0.49.0...v0.50.0)

    ---
    updated-dependencies:
    - dependency-name: golang.org/x/net
      dependency-version: 0.50.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 13c1cd8
Author: Sanchit2662 <sanchit2662@gmail.com>
Date:   Thu Feb 5 00:27:55 2026 +0530

    test: e2e for LastTransitionTime preservation

    Signed-off-by: Sanchit2662 <sanchit2662@gmail.com>

commit ddf06e1
Author: Yashika0724 <ssyashika1311@gmail.com>
Date:   Thu Feb 5 16:21:43 2026 +0530

    fix(thanos): update config resource status on initial StatefulSet creation

    Move updateConfigResourcesStatus call before the StatefulSet creation
    block to ensure PrometheusRule bindings are updated on first
    reconciliation. Previously, the early return after StatefulSet creation
    caused config resource status to be skipped until the next reconcile.

    Signed-off-by: Yashika0724 <ssyashika1311@gmail.com>

commit 082bc3c
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Thu Jan 29 15:14:38 2026 +0000

    Fix build

    Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>

commit d5e64cc
Merge: 2aedd86 8220561
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Thu Jan 29 15:12:28 2026 +0000

    Merge branch 'main' into alertmanager-0.30.0-slack_app

commit 2aedd86
Merge: abc7bef 8337cf4
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Wed Jan 28 18:00:22 2026 +0000

    Merge branch 'main' into alertmanager-0.30.0-slack_app

commit abc7bef
Merge: 1257c89 31adea6
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Thu Jan 15 15:57:20 2026 +0000

    Merge branch 'main' into alertmanager-0.30.0-slack_app

commit 1257c89
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Thu Jan 15 15:50:27 2026 +0000

    Check for unsupported AM in CRs with slack app fields

    Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>

commit 8228565
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Thu Jan 15 15:16:45 2026 +0000

    Revert: Reject slack app fields with unsupported alertmanagers

    Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>

commit 5837a12
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Wed Jan 14 12:42:08 2026 +0000

    Reject slack app fields with unsupported alertmanagers

    Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>

commit 685b7a2
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Thu Jan 8 11:46:20 2026 +0000

    Add support for SlackAppURL, AppURL in CRs

    Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>

commit 4e77425
Author: Pedro Araujo <pedro.araujo@teya.com>
Date:   Tue Jan 6 14:23:38 2026 +0000

    alertmanager: add Slack app token support in CRs

    Slack app support released in alertmanager
    [v0.30.0](https://github.com/prometheus/alertmanager/releases/tag/v0.30.0),
    (implemented in prometheus/alertmanager#4211).

    Supporting the new fields in the Alertmanager config was done in prometheus-operator#8238,
    and now this one adds support for them in the operator CRs.

    Additionally added SlackConfig tests I had around.

    Signed-off-by: Pedro Araujo <pedro.araujo@teya.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants