OBSDOCS-1098-remove-prometheus-adapter-refs-for-4.16

Author: bburt-rh

images/monitoring-architecture.png

@@ -57,7 +57,7 @@ data:
       - key: node-role.kubernetes.io/infra
         value: reserved
         effect: NoExecute
-    k8sPrometheusAdapter:
+    metricsServer:
       nodeSelector:
         node-role.kubernetes.io/infra: ""
       tolerations:

modules/infrastructure-moving-monitoring.adoc

@@ -14,7 +14,7 @@ You can configure resource limits and request settings for core platform monitor
 * node-exporter
 * openshift-state-metrics
 * Prometheus (for core platform monitoring and for user-defined projects)
-* Prometheus Adapter
+* Metrics Server
 * Prometheus Operator and its admission webhook service
 * Telemeter Client
 * Thanos Querier

modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc

@@ -54,6 +54,9 @@ Kubernetes scheduler allocates pods to nodes.
 labels::
 Labels are key-value pairs that you can use to organize and select subsets of objects such as a pod.
 
+Metrics Server::
+The Metrics Server monitoring component collects resource metrics and exposes them in the `metrics.k8s.io` Metrics API service for use by other tools and APIs, which frees the core platform Prometheus stack from handling this functionality.
+
 node::
 A worker machine in the {product-title} cluster. A node is either a virtual machine (VM) or a physical machine.
 
@@ -75,9 +78,6 @@ The pod is the smallest logical unit in Kubernetes. A pod is comprised of one or
 Prometheus::
 Prometheus is the monitoring system on which the {product-title} monitoring stack is based. Prometheus is a time-series database and a rule evaluation engine for metrics. Prometheus sends alerts to Alertmanager for processing.
 
-Prometheus adapter::
-The Prometheus Adapter translates Kubernetes node and pod queries for use in Prometheus. The resource metrics that are translated include CPU and memory utilization. The Prometheus Adapter exposes the cluster resource metrics API for horizontal pod autoscaling.
-
 Prometheus Operator::
 The Prometheus Operator (PO) in the `openshift-monitoring` project creates, configures, and manages platform Prometheus and Alertmanager instances. It also automatically generates monitoring target configurations based on Kubernetes label queries.
 

modules/monitoring-common-terms.adoc

@@ -5,9 +5,9 @@
 [id="configurable-monitoring-components_{context}"]
 = Configurable monitoring components
 
-This table shows the monitoring components you can configure and the keys used to specify the components in the 
+This table shows the monitoring components you can configure and the keys used to specify the components in the
 ifndef::openshift-dedicated,openshift-rosa[]
-`cluster-monitoring-config` and 
+`cluster-monitoring-config` and
 endif::openshift-dedicated,openshift-rosa[]
 `user-workload-monitoring-config` `ConfigMap` objects.
 
@@ -30,7 +30,7 @@ ifndef::openshift-dedicated,openshift-rosa[]
 |monitoring-plugin | `monitoringPlugin` |
 |openshift-state-metrics |`openshiftStateMetrics` |
 |Telemeter Client |`telemeterClient` |
-|Prometheus Adapter |`k8sPrometheusAdapter` |
+|Metrics Server |`metricsServer` |
 |Thanos Querier |`thanosQuerier` |
 |Thanos Ruler | |`thanosRuler`
 |====

modules/monitoring-configurable-monitoring-components.adoc

@@ -23,14 +23,8 @@ By default, the {product-title} {product-version} monitoring stack includes thes
 |Prometheus
 |Prometheus is the monitoring system on which the {product-title} monitoring stack is based. Prometheus is a time-series database and a rule evaluation engine for metrics. Prometheus sends alerts to Alertmanager for processing.
 
-|Prometheus Adapter
-|The Prometheus Adapter (PA in the preceding diagram) translates Kubernetes node and pod queries for use in Prometheus. The resource metrics that are translated include CPU and memory utilization metrics. The Prometheus Adapter exposes the cluster resource metrics API for horizontal pod autoscaling. The Prometheus Adapter is also used by the `oc adm top nodes` and `oc adm top pods` commands.
-
-|Metrics Server (Technology Preview)
-|If enabled, the Metrics Server component collects resource metrics and exposes them in the `metrics.k8s.io` Metrics API service for use by other tools and APIs, which frees the core platform Prometheus stack from handling this functionality.
-
-The Technology Preview of the Metrics Server component is automatically installed instead of Prometheus Adapter if you configure the `FeatureGate` custom resource with the `TechPreviewNoUpgrade` option.
-For more information about the support scope of Red{nbsp}Hat Technology Preview features, see link:https://access.redhat.com/support/offerings/techpreview/[Technology Preview Features Support Scope].
+|Metrics Server
+|The Metrics Server component (MS in the preceding diagram) collects resource metrics and exposes them in the `metrics.k8s.io` Metrics API service for use by other tools and APIs, which frees the core platform Prometheus stack from handling this functionality. Note that with the {product-title} 4.16 release, Metrics Server replaces Prometheus Adapter.
 
 |Alertmanager
 |The Alertmanager service handles alerts received from Prometheus. Alertmanager is also responsible for sending the alerts to external notification systems.
@@ -39,7 +33,7 @@ For more information about the support scope of Red{nbsp}Hat Technology Preview
 |The kube-state-metrics exporter agent (KSM in the preceding diagram) converts Kubernetes objects to metrics that Prometheus can use.
 
 |monitoring-plugin
-|The monitoring-plugin dynamic plugin component deploys the monitoring pages in the *Observe* section of the {product-title} web console. 
+|The monitoring-plugin dynamic plugin component deploys the monitoring pages in the *Observe* section of the {product-title} web console.
 You can use Cluster Monitoring Operator (CMO) config map settings to manage monitoring-plugin resources for the web console pages.
 
 |openshift-state-metrics agent

modules/monitoring-default-monitoring-components.adoc

@@ -4,7 +4,7 @@
 
 :_mod-docs-content-type: PROCEDURE
 [id="specifying-limits-and-resource-requests-for-monitoring-components_{context}"]
-= Specifying limits and requests for monitoring components 
+= Specifying limits and requests for monitoring components
 
 To configure CPU and memory resources, specify values for resource limits and requests in the appropriate `ConfigMap` object for the namespace in which the monitoring component is located:
 
@@ -72,13 +72,13 @@ data:
         requests:
           cpu: 200m
           memory: 500Mi
-    k8sPrometheusAdapter:
+    metricsServer:
       resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
         requests:
-          cpu: 200m
+          cpu: 10m
+          memory: 50Mi
+        limits:
+          cpu: 50m
           memory: 500Mi
     kubeStateMetrics:
       resources:

modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc

@@ -301,13 +301,10 @@ include::modules/monitoring-enabling-query-logging-for-thanos-querier.adoc[level
 * See xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#preparing-to-configure-the-monitoring-stack[Preparing to configure the monitoring stack] for steps to create monitoring config maps.
 endif::openshift-dedicated,openshift-rosa[]
 
-// Setting audit log levels for the Prometheus Adapter
-ifndef::openshift-dedicated,openshift-rosa[]
-include::modules/monitoring-setting-audit-log-levels-for-the-prometheus-adapter.adoc[leveloffset=+1]
-
 [role="_additional-resources"]
 .Additional resources
 
+ifndef::openshift-dedicated,openshift-rosa[]
 * See xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#preparing-to-configure-the-monitoring-stack[Preparing to configure the monitoring stack] for steps to create monitoring config maps.
 endif::openshift-dedicated,openshift-rosa[]