Skip to content

MON-4565: Add enableUserAlertmanagerConfig to ClusterMonitoring API #2855

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

Open
marioferh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

MON-4565: Add enableUserAlertmanagerConfig to ClusterMonitoring API #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83c1357
Add userAlertmanagerConfigSelection to ClusterMonitoring API
marioferh May 21, 2026
f9a89e1
Move userAlertmanagerConfigSelection under alertmanager customConfig
marioferh May 27, 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
33 changes: 33 additions & 0 deletions config/v1alpha1/tests/clustermonitorings.config.openshift.io/ClusterMonitoringConfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,39 @@ tests:
spec:
userDefined:
mode: "Disabled"
- name: Should accept userAlertmanagerConfigSelection on alertmanagerConfig customConfig
initial: |
apiVersion: config.openshift.io/v1alpha1
kind: ClusterMonitoring
spec:
userDefined:
mode: "Disabled"
alertmanagerConfig:
deploymentMode: "CustomConfig"
customConfig:
userAlertmanagerConfigSelection: Selectable
expected: |
apiVersion: config.openshift.io/v1alpha1
kind: ClusterMonitoring
spec:
userDefined:
mode: "Disabled"
alertmanagerConfig:
deploymentMode: "CustomConfig"
customConfig:
userAlertmanagerConfigSelection: Selectable
- name: Should reject invalid userAlertmanagerConfigSelection on alertmanagerConfig customConfig
initial: |
apiVersion: config.openshift.io/v1alpha1
kind: ClusterMonitoring
spec:
userDefined:
mode: "Disabled"
alertmanagerConfig:
deploymentMode: "CustomConfig"
customConfig:
userAlertmanagerConfigSelection: Enabled
expectedError: 'spec.alertmanagerConfig.customConfig.userAlertmanagerConfigSelection: Unsupported value: "Enabled": supported values: "Selectable", "None"'
- name: Should reject ContainerResource with duplicate names
initial: |
apiVersion: config.openshift.io/v1alpha1
Expand Down
33 changes: 32 additions & 1 deletion config/v1alpha1/types_cluster_monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,12 +796,43 @@ type AlertmanagerConfig struct {
CustomConfig AlertmanagerCustomConfig `json:"customConfig,omitempty,omitzero"`
}

// UserAlertmanagerConfigSelection controls whether the platform Alertmanager selects
// AlertmanagerConfig resources from user-defined namespaces.
// +enum
type UserAlertmanagerConfigSelection string

const (
// UserAlertmanagerConfigSelectionSelectable enables user-defined namespaces to be selected
// for AlertmanagerConfig lookups on the platform Alertmanager.
UserAlertmanagerConfigSelectionSelectable UserAlertmanagerConfigSelection = "Selectable"
// UserAlertmanagerConfigSelectionNone disables user-defined namespaces from being selected
// for AlertmanagerConfig lookups on the platform Alertmanager.
UserAlertmanagerConfigSelectionNone UserAlertmanagerConfigSelection = "None"
)

// AlertmanagerCustomConfig represents the configuration for a custom Alertmanager deployment.
// alertmanagerCustomConfig provides configuration options for the default Alertmanager instance
// that runs in the `openshift-monitoring` namespace. Use this configuration to control
// whether the default Alertmanager is deployed, how it logs, and how its pods are scheduled.
// whether user-defined namespaces are selected for AlertmanagerConfig lookups, how it logs,
// and how its pods are scheduled.
// +kubebuilder:validation:MinProperties=1
type AlertmanagerCustomConfig struct {
// userAlertmanagerConfigSelection is an optional field that controls whether user-defined
// namespaces can be selected for AlertmanagerConfig lookups on the platform Alertmanager
// instance in the `openshift-monitoring` namespace.
// Valid values are Selectable and None.
// When set to Selectable, the platform Alertmanager discovers AlertmanagerConfig resources
// in user-defined namespaces. This is equivalent to `enableUserAlertmanagerConfig: true` in
// the cluster-monitoring-config ConfigMap.
// When set to None, user-defined namespaces are not selected for AlertmanagerConfig lookups
// on the platform Alertmanager. This is equivalent to `enableUserAlertmanagerConfig: false`
// in the cluster-monitoring-config ConfigMap.
// This setting only applies when the user-workload monitoring Alertmanager is not enabled.
// When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.
// The current default value is `None`.
// +optional
// +kubebuilder:validation:Enum=Selectable;None
UserAlertmanagerConfigSelection UserAlertmanagerConfigSelection `json:"userAlertmanagerConfigSelection,omitempty"`
// logLevel defines the verbosity of logs emitted by Alertmanager.
// This field allows users to control the amount and severity of logs generated, which can be useful
// for debugging issues or reducing noise in production environments.
Expand Down
19 changes: 19 additions & 0 deletions ...1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitorings.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,25 @@ spec:
- topologyKey
- whenUnsatisfiable
x-kubernetes-list-type: map
userAlertmanagerConfigSelection:
description: |-
userAlertmanagerConfigSelection is an optional field that controls whether user-defined
namespaces can be selected for AlertmanagerConfig lookups on the platform Alertmanager
instance in the `openshift-monitoring` namespace.
Valid values are Selectable and None.
When set to Selectable, the platform Alertmanager discovers AlertmanagerConfig resources
in user-defined namespaces. This is equivalent to `enableUserAlertmanagerConfig: true` in
the cluster-monitoring-config ConfigMap.
When set to None, user-defined namespaces are not selected for AlertmanagerConfig lookups
on the platform Alertmanager. This is equivalent to `enableUserAlertmanagerConfig: false`
in the cluster-monitoring-config ConfigMap.
This setting only applies when the user-workload monitoring Alertmanager is not enabled.
When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.
The current default value is `None`.
enum:
- Selectable
- None
type: string
volumeClaimTemplate:
description: |-
volumeClaimTemplate defines persistent storage for Alertmanager. Use this setting to
Expand Down
19 changes: 19 additions & 0 deletions ...regated-crd-manifests/clustermonitorings.config.openshift.io/ClusterMonitoringConfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,25 @@ spec:
- topologyKey
- whenUnsatisfiable
x-kubernetes-list-type: map
userAlertmanagerConfigSelection:
description: |-
userAlertmanagerConfigSelection is an optional field that controls whether user-defined
namespaces can be selected for AlertmanagerConfig lookups on the platform Alertmanager
instance in the `openshift-monitoring` namespace.
Valid values are Selectable and None.
When set to Selectable, the platform Alertmanager discovers AlertmanagerConfig resources
in user-defined namespaces. This is equivalent to `enableUserAlertmanagerConfig: true` in
the cluster-monitoring-config ConfigMap.
When set to None, user-defined namespaces are not selected for AlertmanagerConfig lookups
on the platform Alertmanager. This is equivalent to `enableUserAlertmanagerConfig: false`
in the cluster-monitoring-config ConfigMap.
This setting only applies when the user-workload monitoring Alertmanager is not enabled.
When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.
The current default value is `None`.
enum:
- Selectable
- None
type: string
volumeClaimTemplate:
description: |-
volumeClaimTemplate defines persistent storage for Alertmanager. Use this setting to
Expand Down
17 changes: 9 additions & 8 deletions config/v1alpha1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading