Merged option

Author: eromanova97

modules/monitoring-setting-log-levels-for-monitoring-components.adoc

@@ -25,25 +25,21 @@
 :component-name: Thanos Ruler
 // end::UWM[]
 
+// tag::CPM[]
+You can configure the log level for Alertmanager, Prometheus Operator, Prometheus, and {component-name} and log verbosity for Metrics Server.
+// end::CPM[]
+// tag::UWM[]
 You can configure the log level for Alertmanager, Prometheus Operator, Prometheus, and {component-name}.
-
+// end::UWM[]
+You can use these settings for troubleshooting and to gain better insight into how the components are functioning.
 
 The following log levels can be applied to the relevant component in the `{configmap-name}` `ConfigMap` object:
 
 * `debug`. Log debug, informational, warning, and error messages.
-* `info`. Log informational, warning, and error messages.
+* `info` (default). Log informational, warning, and error messages.
 * `warn`. Log warning and error messages only.
 * `error`. Log error messages only.
 
-The default log level is `info`.
-
-// tag::CPM[]
-[NOTE]
-====
-The Metrics Server component uses a different logging configuration method. For more information, see "Setting log verbosity for Metrics Server".
-====
-// end::CPM[]
-
 .Prerequisites
 
 // tag::CPM[]
@@ -85,30 +81,57 @@ data:
   config.yaml: |
     <component>: # <1>
       logLevel: <log_level> # <2>
+# tag::CPM[]
+    metricsServer:
+      verbosity: <value> # <3>
+# end::CPM[]
+    # ...
 ----
-<1> The monitoring stack component for which you are setting a log level.
+<1> Specify the monitoring stack component for which you are setting a log level.
 Available component values are `{prometheus}`, `{alertmanager}`, `prometheusOperator`, and `{thanos}`.
-<2> The log level to set for the component.
+<2> Specify the log level for the component.
 The available values are `error`, `warn`, `info`, and `debug`.
 The default value is `info`.
+// tag::CPM[]
+<3> Specify the verbosity for the Metrics Server.
+Valid values are positive integers.
+Increasing the number increases the amount of logged events, values over `10` are usually unnecessary.
+The default value is `0`.
+// end::CPM[]
 
 . Save the file to apply the changes. The pods affected by the new configuration are automatically redeployed.
 
-. Confirm that the log level has been applied by reviewing the deployment or pod configuration in the related project. 
-The following example checks the log level for the `prometheus-operator` deployment:
+. Verify that the log configuration is applied by reviewing the deployment or pod configuration in the related project. 
+
+** The following example checks the log level for the `prometheus-operator` deployment:
 +
 [source,terminal,subs="attributes+"]
 ----
 $ oc -n {namespace-name} get deploy prometheus-operator -o yaml | grep "log-level"
 ----
 +
 .Example output
-[source,terminal,subs="attributes+"]
+[source,terminal]
 ----
         - --log-level=debug
 ----
 
-. Check that the pods for the component are running. The following example lists the status of pods:
+// tag::CPM[]
+** The following example checks the log verbosity for the `metrics-server` deployment:
++
+[source,terminal]
+----
+$ oc -n openshift-monitoring get deploy metrics-server -o yaml | grep -- --v=
+----
++
+.Example output
+[source,terminal]
+----
+        - --v=3
+----
+// end::CPM[]
+
+. Verify that the pods for the component are running:
 +
 [source,terminal,subs="attributes+"]
 ----

modules/monitoring-setting-log-verbosity-for-metrics-server.adoc

@@ -44,9 +44,6 @@ include::modules/monitoring-modifying-retention-time-and-size-for-prometheus-met
 // Configuring audit logs for Metrics Server
 include::modules/monitoring-configuring-audit-logs-for-metrics-server.adoc[leveloffset=+1]
 
-// Setting log verbosity for Metrics Server
-include::modules/monitoring-setting-log-verbosity-for-metrics-server.adoc[leveloffset=+1]
-
 // Setting log levels for monitoring components
 include::modules/monitoring-setting-log-levels-for-monitoring-components.adoc[leveloffset=+1,tags=**;CPM;!UWM]