Skip to content

RFE-9585: Enable enableUserAlertmanagerConfig in cluster-monitoring-config baseline - #2818

Open
kiranrpatil12 wants to merge 2 commits into
openshift:masterfrom
kiranrpatil12:rfe-9585-enable-user-alertmanager-config
Open

RFE-9585: Enable enableUserAlertmanagerConfig in cluster-monitoring-config baseline#2818
kiranrpatil12 wants to merge 2 commits into
openshift:masterfrom
kiranrpatil12:rfe-9585-enable-user-alertmanager-config

Conversation

@kiranrpatil12

@kiranrpatil12 kiranrpatil12 commented Jul 20, 2026

Copy link
Copy Markdown

What type of PR is this?

feature

What this PR does / why we need it?

Adds alertmanagerMain.enableUserAlertmanagerConfig: true to the Hive-managed cluster-monitoring-config baseline so ROSA/OSD customers can durably route platform kube_* / Kube* alerts to customer email/webhook receivers via AlertmanagerConfig CRs.

Today the setting is valid and supported by CMO, but the fleet template omits it. Manual edits to cluster-monitoring-config are removed on Hive SyncSet reconcile (~2h).

Customer impact: After fleet rollout, customers can keep using platform Alertmanager for platform alert routing without the config being overwritten.

Important usage note (CMO): enableUserAlertmanagerConfig only applies when the dedicated UWM Alertmanager is disabled (alertmanager.enabled: false / omitted in user-workload-monitoring-config). If UWM Alertmanager is enabled, CMO does not merge user AlertmanagerConfig into platform Alertmanager (verified on OCP 4.21).

Which Jira/Github issue(s) this PR fixes?

Fixes https://redhat.atlassian.net/browse/RFE-9585

Special notes for your reviewer:

  • Source change: resources/cluster-monitoring-config/config.yaml
  • Regenerated via python3 scripts/generate-cmo-config.py (all UWM / non-UWM / FedRAMP variants)
  • Does not edit alertmanager-main secret or SRE configure-alertmanager-operator routes
  • No alert routing changes until a customer creates an AlertmanagerConfig CR
  • Recommended customer path: disable UWM Alertmanager, enable this flag (now fleet-durable), create AlertmanagerConfig for email/webhook

Make the supported alertmanagerMain.enableUserAlertmanagerConfig setting
durable on ROSA/OSD so Hive SyncSet reconcile no longer strips customer
platform AlertmanagerConfig routing for kube_* alerts.

Co-authored-by: Cursor <cursoragent@cursor.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 20, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 20, 2026

Copy link
Copy Markdown

@kiranrpatil12: This pull request references RFE-9585 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the feature request to target the "5.0.0" version, but no target version was set.

Details

In response to this:

What type of PR is this?

feature

What this PR does / why we need it?

Adds alertmanagerMain.enableUserAlertmanagerConfig: true to the Hive-managed cluster-monitoring-config baseline so ROSA/OSD customers can durably route platform kube_* / Kube* alerts to customer email/webhook receivers via AlertmanagerConfig CRs.

Today the setting is valid and supported by CMO, but the fleet template omits it. Manual edits to cluster-monitoring-config are removed on Hive SyncSet reconcile (~2h).

Customer impact: After fleet rollout, customers can keep using platform Alertmanager for platform alert routing without the config being overwritten.

Important usage note (CMO): enableUserAlertmanagerConfig only applies when the dedicated UWM Alertmanager is disabled (alertmanager.enabled: false / omitted in user-workload-monitoring-config). If UWM Alertmanager is enabled, CMO does not merge user AlertmanagerConfig into platform Alertmanager (verified on OCP 4.21).

Which Jira/Github issue(s) this PR fixes?

Fixes https://redhat.atlassian.net/browse/RFE-9585

Special notes for your reviewer:

  • Source change: resources/cluster-monitoring-config/config.yaml
  • Regenerated via python3 scripts/generate-cmo-config.py (all UWM / non-UWM / FedRAMP variants)
  • Does not edit alertmanager-main secret or SRE configure-alertmanager-operator routes
  • No alert routing changes until a customer creates an AlertmanagerConfig CR
  • Recommended customer path: disable UWM Alertmanager, enable this flag (now fleet-durable), create AlertmanagerConfig for email/webhook

Pre-checks (if applicable):

  • Tested latest changes against a cluster (CMO behavior validated on self-managed OCP: with UWM AM on, platform selectors stay empty; with UWM AM off, platform path is the supported model)

  • Included documentation changes with PR

  • If this is a new object that is not intended for the FedRAMP environment (if unsure, please reach out to team FedRAMP), please exclude it with:

    matchExpressions:
    - key: api.openshift.com/fedramp
      operator: NotIn
      values: ["true"]

FedRAMP generated config is updated consistently with other CMO variants from the shared source template.

Made with Cursor

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jul 20, 2026

Copy link
Copy Markdown

Important

Review skipped

Review was skipped due to path filters

⛔ Files ignored due to path filters (3)
  • hack/00-osd-managed-cluster-config-integration.yaml.tmpl is excluded by !hack/**
  • hack/00-osd-managed-cluster-config-production.yaml.tmpl is excluded by !hack/**
  • hack/00-osd-managed-cluster-config-stage.yaml.tmpl is excluded by !hack/**

CodeRabbit blocks several paths by default. You can override this behavior by explicitly including those paths in the path filters. For example, including **/dist/** will override the default block on the dist directory, by removing the pattern from both the lists.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 4100defb-cf5d-4f3e-81ff-41442d952a66

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Walkthrough

The monitoring configuration and generated ConfigMaps now set enableUserAlertmanagerConfig: true under alertmanagerMain, with source comments describing applicability when UWM Alertmanager is disabled.

Changes

Alertmanager configuration enablement

Layer / File(s) Summary
Source configuration
resources/cluster-monitoring-config/config.yaml
Adds enableUserAlertmanagerConfig: true and comments describing its CMO-only applicability.
Generated ConfigMap propagation
deploy/cluster-monitoring-config*/**/50-GENERATED-cluster-monitoring-config.yaml, deploy/osd-fedramp-cluster-monitoring-config/50-GENERATED-cluster-monitoring-config.yaml
Adds enableUserAlertmanagerConfig: true to generated monitoring ConfigMaps across deployment variants.

Estimated code review effort: 2 (Simple) | ~5 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR only changes generated YAML/config; no test files or Ginkgo titles were added or modified.
Test Structure And Quality ✅ Passed PR only changes generated YAML configs; no Ginkgo test code or test patterns were modified.
Microshift Test Compatibility ✅ Passed The PR only changes cluster-monitoring YAML configs; no Go/Ginkgo e2e tests were added or modified.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The diff only touches generated YAML config files; no Ginkgo e2e tests or SNO-sensitive test code were added.
Topology-Aware Scheduling Compatibility ✅ Passed PASS: The diff only adds enableUserAlertmanagerConfig to cluster-monitoring-config variants; no new anti-affinity, spread, replica, or topology/nodeSelector logic was introduced.
Ote Binary Stdout Contract ✅ Passed Only YAML config files changed; no process-level code or stdout writes were added, so the OTE stdout contract isn’t affected.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No test files or Ginkgo specs were changed; the PR only updates monitoring config YAML, so the IPv6/disconnected test check is not applicable.
No-Weak-Crypto ✅ Passed The PR only adds enableUserAlertmanagerConfig to monitoring YAML; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or secret-comparison code appears in the diff.
Container-Privileges ✅ Passed Diff only adds enableUserAlertmanagerConfig in ConfigMaps; no privileged/host* or securityContext settings were introduced.
No-Sensitive-Data-In-Logs ✅ Passed Only YAML config changes were made; no new logging or sensitive-value emission was added.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly matches the main change: enabling enableUserAlertmanagerConfig in the cluster-monitoring-config baseline.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@openshift-ci
openshift-ci Bot requested review from robotmaxtron and tiwillia July 20, 2026 13:12
@openshift-ci

openshift-ci Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: kiranrpatil12
Once this PR has been reviewed and has the lgtm label, please assign ajpantuso for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Commit make-generated SelectorSyncSet templates so pr-check no longer
fails on uncommitted hack/*.tmpl churn from the CMO baseline change.

Co-authored-by: Cursor <cursoragent@cursor.com>
@openshift-ci

openshift-ci Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

@kiranrpatil12: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@kiranrpatil12

Copy link
Copy Markdown
Author

Hi @robotmaxtron and @tiwillia,

Could you please review this PR and make any necessary changes? It's currently pending approval.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants