From 2aa6b53e80d2e880b5915fdf0efa238400b7756a Mon Sep 17 00:00:00 2001 From: Eliska Romanova Date: Tue, 14 May 2024 10:27:31 +0200 Subject: [PATCH] OBSDOCS-1055: Add a table listing supported monitoring component versions for OCP 4.13 --- ...port-policy-for-monitoring-operators.adoc} | 2 +- ...sion-matrix-for-monitoring-components.adoc | 25 +++++++++++++++++++ .../configuring-the-monitoring-stack.adoc | 4 ++- 3 files changed, 29 insertions(+), 2 deletions(-) rename modules/{monitoring-unmanaged-monitoring-operators.adoc => monitoring-support-policy-for-monitoring-operators.adoc} (96%) create mode 100644 modules/monitoring-support-version-matrix-for-monitoring-components.adoc diff --git a/modules/monitoring-unmanaged-monitoring-operators.adoc b/modules/monitoring-support-policy-for-monitoring-operators.adoc similarity index 96% rename from modules/monitoring-unmanaged-monitoring-operators.adoc rename to modules/monitoring-support-policy-for-monitoring-operators.adoc index 0b8b7216c60d..f7fa05e2194f 100644 --- a/modules/monitoring-unmanaged-monitoring-operators.adoc +++ b/modules/monitoring-support-policy-for-monitoring-operators.adoc @@ -3,7 +3,7 @@ // * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT -[id="unmanaged-monitoring-operators_{context}"] +[id="support-policy-for-monitoring-operators_{context}"] = Support policy for monitoring Operators Monitoring Operators ensure that {product-title} monitoring resources function as designed and tested. If Cluster Version Operator (CVO) control of an Operator is overridden, the Operator does not respond to configuration changes, reconcile the intended state of cluster objects, or receive updates. diff --git a/modules/monitoring-support-version-matrix-for-monitoring-components.adoc b/modules/monitoring-support-version-matrix-for-monitoring-components.adoc new file mode 100644 index 000000000000..af163b235db0 --- /dev/null +++ b/modules/monitoring-support-version-matrix-for-monitoring-components.adoc @@ -0,0 +1,25 @@ +// Module included in the following assemblies: +// +// * observability/monitoring/configuring-the-monitoring-stack.adoc + +:_mod-docs-content-type: REFERENCE +[id="support-version-matrix-for-monitoring-components_{context}"] += Support version matrix for monitoring components + +The following matrix contains information about versions of monitoring components for {product-title} 4.11 and later releases: + +.{product-title} and component versions +|=== +|{product-title} |Prometheus Operator |Prometheus |Prometheus Adapter |Alertmanager |kube-state-metrics agent |node-exporter agent |Thanos + +|4.13 |0.63.0 |2.42.0 |0.10.0 |0.25.0 |2.8.1 |1.5.0 |0.30.2 + +|4.12 |0.60.1 |2.39.1 |0.10.0 |0.24.0 |2.6.0 |1.4.0 |0.28.1 + +|4.11 |0.57.0 |2.36.2 |0.9.1 |0.24.0 |2.5.0 |1.3.1 |0.26.0 +|=== + +[NOTE] +==== +The openshift-state-metrics agent and Telemeter Client are OpenShift-specific components. Therefore, their versions correspond with the versions of {product-title}. +==== diff --git a/observability/monitoring/configuring-the-monitoring-stack.adoc b/observability/monitoring/configuring-the-monitoring-stack.adoc index 278eb317b5c7..d3516e02fd80 100644 --- a/observability/monitoring/configuring-the-monitoring-stack.adoc +++ b/observability/monitoring/configuring-the-monitoring-stack.adoc @@ -53,9 +53,11 @@ endif::openshift-dedicated,openshift-rosa[] include::modules/monitoring-support-considerations.adoc[leveloffset=+2] ifndef::openshift-dedicated,openshift-rosa[] -include::modules/monitoring-unmanaged-monitoring-operators.adoc[leveloffset=+2] +include::modules/monitoring-support-policy-for-monitoring-operators.adoc[leveloffset=+2] endif::openshift-dedicated,openshift-rosa[] +include::modules/monitoring-support-version-matrix-for-monitoring-components.adoc[leveloffset=+2] + ifndef::openshift-dedicated,openshift-rosa[] // Preparing to configure the monitoring stack [id="preparing-to-configure-the-monitoring-stack"]