Skip to content

Commit cfe9c48

Browse files
authored
Merge pull request #75844 from eromanova97/OBSDOCS-1052
OBSDOCS-1051: Add a table listing supported monitoring component vers…
2 parents c7bc538 + aa3c478 commit cfe9c48

File tree

3 files changed

+33
-2
lines changed

3 files changed

+33
-2
lines changed

modules/monitoring-unmanaged-monitoring-operators.adoc renamed to modules/monitoring-support-policy-for-monitoring-operators.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * observability/monitoring/configuring-the-monitoring-stack.adoc
44

55
:_mod-docs-content-type: CONCEPT
6-
[id="unmanaged-monitoring-operators_{context}"]
6+
[id="support-policy-for-monitoring-operators_{context}"]
77
= Support policy for monitoring Operators
88

99
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.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * observability/monitoring/configuring-the-monitoring-stack.adoc
4+
5+
:_mod-docs-content-type: REFERENCE
6+
[id="support-version-matrix-for-monitoring-components_{context}"]
7+
= Support version matrix for monitoring components
8+
9+
The following matrix contains information about versions of monitoring components for {product-title} 4.12 and later releases:
10+
11+
.{product-title} and component versions
12+
|===
13+
|{product-title} |Prometheus Operator |Prometheus |Prometheus Adapter |Metrics Server (Technology Preview) |Alertmanager |kube-state-metrics agent |monitoring-plugin |node-exporter agent |Thanos
14+
15+
|4.16 |0.73.2 |2.51.2 |0.11.2 |0.7.1 |0.26.0 |2.12.0 |1.0.0 |1.8.0 |0.35.0
16+
17+
|4.15 |0.70.0 |2.48.0 |0.11.2 |0.6.4 |0.26.0 |2.10.1 |1.0.0 |1.7.0 |0.32.5
18+
19+
|4.14 |0.67.1 |2.46.0 |0.10.0 |N/A |0.25.0 |2.9.2 |1.0.0 |1.6.1 |0.30.2
20+
21+
|4.13 |0.63.0 |2.42.0 |0.10.0 |N/A |0.25.0 |2.8.1 |N/A |1.5.0 |0.30.2
22+
23+
|4.12 |0.60.1 |2.39.1 |0.10.0 |N/A |0.24.0 |2.6.0 |N/A |1.4.0 |0.28.1
24+
|===
25+
26+
[NOTE]
27+
====
28+
The openshift-state-metrics agent and Telemeter Client are OpenShift-specific components. Therefore, their versions correspond with the versions of {product-title}.
29+
====

observability/monitoring/configuring-the-monitoring-stack.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ endif::openshift-dedicated,openshift-rosa[]
5353

5454
include::modules/monitoring-support-considerations.adoc[leveloffset=+2]
5555
ifndef::openshift-dedicated,openshift-rosa[]
56-
include::modules/monitoring-unmanaged-monitoring-operators.adoc[leveloffset=+2]
56+
include::modules/monitoring-support-policy-for-monitoring-operators.adoc[leveloffset=+2]
5757
endif::openshift-dedicated,openshift-rosa[]
5858

59+
include::modules/monitoring-support-version-matrix-for-monitoring-components.adoc[leveloffset=+2]
60+
5961
ifndef::openshift-dedicated,openshift-rosa[]
6062
// Preparing to configure the monitoring stack
6163
[id="preparing-to-configure-the-monitoring-stack"]

0 commit comments

Comments
 (0)