MON-4359: Add Monitoring Capability #2468
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -278,7 +278,7 @@ const ( | |
| ) | ||
|
|
||
| // ClusterVersionCapability enumerates optional, core cluster components. | ||
| // +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning;MachineAPI;Build;DeploymentConfig;ImageRegistry;OperatorLifecycleManager;CloudCredential;Ingress;CloudControllerManager;OperatorLifecycleManagerV1;OptionalMonitoring | ||
| type ClusterVersionCapability string | ||
|
|
||
| const ( | ||
|
|
@@ -399,6 +399,20 @@ const ( | |
| // Managers deployed on top of OpenShift. They help you to work with cloud | ||
| // provider API and embeds cloud-specific control logic. | ||
| ClusterVersionCapabilityCloudControllerManager ClusterVersionCapability = "CloudControllerManager" | ||
|
|
||
| // ClusterVersionCapabilityOptionalMonitoring manages the enablement of the optional components of the in-cluster monitoring stack. | ||
| // The optional components are: | ||
| // * Alertmanager | ||
| // * Alermanager User Workload Monitoring | ||
| // * Prometheus User Workload Monitoring | ||
| // * PrometheusOperator User Workload Monitoring | ||
| // * ThanosRuler User Workload Monitoring | ||
| // | ||
| // NOTE: The only supported use-case for this capability is to reduce the monitoring stack's resource usage by only | ||
| // supporting telemetry (see https://rhobs-handbook.netlify.app/products/openshiftmonitoring/telemetry.md). Turning | ||
|
There was a problem hiding this comment. I would rather link to the official docs: https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/support/remote-health-monitoring-with-connected-clusters |
||
| // this capability off will trigger CMO to not deploy the optional components, as well as any related manifests. | ||
| // However, all CRDs will persist as these are needed by the operator regardless of this capability's state. | ||
| ClusterVersionCapabilityOptionalMonitoring ClusterVersionCapability = "OptionalMonitoring" | ||
| ) | ||
|
|
||
| // KnownClusterVersionCapabilities includes all known optional, core cluster components. | ||
|
|
@@ -420,10 +434,11 @@ var KnownClusterVersionCapabilities = []ClusterVersionCapability{ | |
| ClusterVersionCapabilityCloudCredential, | ||
| ClusterVersionCapabilityIngress, | ||
| ClusterVersionCapabilityCloudControllerManager, | ||
| ClusterVersionCapabilityOptionalMonitoring, | ||
| } | ||
|
|
||
| // ClusterVersionCapabilitySet defines sets of cluster version capabilities. | ||
| // +kubebuilder:validation:Enum=None;v4.11;v4.12;v4.13;v4.14;v4.15;v4.16;v4.17;v4.18;v4.19;v4.20;vCurrent | ||
| type ClusterVersionCapabilitySet string | ||
|
|
||
| const ( | ||
|
|
@@ -479,6 +494,18 @@ const ( | |
| // version of OpenShift is installed. | ||
| ClusterVersionCapabilitySet4_18 ClusterVersionCapabilitySet = "v4.18" | ||
|
|
||
| // ClusterVersionCapabilitySet4_19 is the recommended set of | ||
| // optional capabilities to enable for the 4.19 version of | ||
| // OpenShift. This list will remain the same no matter which | ||
| // version of OpenShift is installed. | ||
| ClusterVersionCapabilitySet4_19 ClusterVersionCapabilitySet = "v4.19" | ||
|
|
||
| // ClusterVersionCapabilitySet4_20 is the recommended set of | ||
| // optional capabilities to enable for the 4.20 version of | ||
| // OpenShift. This list will remain the same no matter which | ||
| // version of OpenShift is installed. | ||
| ClusterVersionCapabilitySet4_20 ClusterVersionCapabilitySet = "v4.20" | ||
|
|
||
| // ClusterVersionCapabilitySetCurrent is the recommended set | ||
| // of optional capabilities to enable for the cluster's | ||
| // current version of OpenShift. | ||
|
|
@@ -600,6 +627,44 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers | |
| ClusterVersionCapabilityIngress, | ||
| ClusterVersionCapabilityCloudControllerManager, | ||
| }, | ||
| ClusterVersionCapabilitySet4_19: { | ||
| ClusterVersionCapabilityBaremetal, | ||
| ClusterVersionCapabilityConsole, | ||
| ClusterVersionCapabilityInsights, | ||
| ClusterVersionCapabilityMarketplace, | ||
| ClusterVersionCapabilityStorage, | ||
| ClusterVersionCapabilityOpenShiftSamples, | ||
| ClusterVersionCapabilityCSISnapshot, | ||
| ClusterVersionCapabilityNodeTuning, | ||
| ClusterVersionCapabilityMachineAPI, | ||
| ClusterVersionCapabilityBuild, | ||
| ClusterVersionCapabilityDeploymentConfig, | ||
| ClusterVersionCapabilityImageRegistry, | ||
| ClusterVersionCapabilityOperatorLifecycleManager, | ||
| ClusterVersionCapabilityOperatorLifecycleManagerV1, | ||
| ClusterVersionCapabilityCloudCredential, | ||
| ClusterVersionCapabilityIngress, | ||
| ClusterVersionCapabilityCloudControllerManager, | ||
| }, | ||
| ClusterVersionCapabilitySet4_20: { | ||
| ClusterVersionCapabilityBaremetal, | ||
| ClusterVersionCapabilityConsole, | ||
| ClusterVersionCapabilityInsights, | ||
| ClusterVersionCapabilityMarketplace, | ||
| ClusterVersionCapabilityStorage, | ||
| ClusterVersionCapabilityOpenShiftSamples, | ||
| ClusterVersionCapabilityCSISnapshot, | ||
| ClusterVersionCapabilityNodeTuning, | ||
| ClusterVersionCapabilityMachineAPI, | ||
| ClusterVersionCapabilityBuild, | ||
| ClusterVersionCapabilityDeploymentConfig, | ||
| ClusterVersionCapabilityImageRegistry, | ||
| ClusterVersionCapabilityOperatorLifecycleManager, | ||
| ClusterVersionCapabilityOperatorLifecycleManagerV1, | ||
| ClusterVersionCapabilityCloudCredential, | ||
| ClusterVersionCapabilityIngress, | ||
| ClusterVersionCapabilityCloudControllerManager, | ||
| }, | ||
| ClusterVersionCapabilitySetCurrent: { | ||
| ClusterVersionCapabilityBaremetal, | ||
| ClusterVersionCapabilityConsole, | ||
|
|
@@ -618,6 +683,7 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers | |
| ClusterVersionCapabilityCloudCredential, | ||
| ClusterVersionCapabilityIngress, | ||
| ClusterVersionCapabilityCloudControllerManager, | ||
| ClusterVersionCapabilityOptionalMonitoring, | ||
| }, | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we say "All user-defined monitoring components"?