Merge pull request #94574 from eromanova97/OBSDOCS-1983

OBSDOCS-1983: Modify monitoring docs to allign with unified admin/dev perspective

Author: bscott-rh

images/monitoring-dashboard-administrator.png

@@ -3,10 +3,14 @@
 // * observability/monitoring/reviewing-monitoring-dashboards.adoc
 
 :_mod-docs-content-type: CONCEPT
-[id="mon-dashboards-adm-perspective_{context}"]
-= Monitoring dashboards in the Administrator perspective
+[id="about-monitoring-dashboards_{context}"]
+= About monitoring dashboards
 
-Use the *Administrator* perspective to access dashboards for the core {product-title} components, including the following items:
+{product-title} provides a set of monitoring dashboards that help you understand the state of cluster components and user-defined workloads.
+
+include::snippets/unified-perspective-web-console.adoc[]
+
+As an administrator, you can access dashboards for the core {product-title} components, including the following items:
 
 * API performance
 * etcd
@@ -16,13 +20,4 @@ Use the *Administrator* perspective to access dashboards for the core {product-t
 * USE method dashboards relating to cluster and node performance
 * Node performance metrics
 
-.Example dashboard in the Administrator perspective
-image::monitoring-dashboard-administrator.png[]
-
-[id="mon-dashboards-dev-perspective_{context}"]
-= Monitoring dashboards in the Developer perspective
-
-In the *Developer* perspective, you can access only the Kubernetes compute resources dashboards:
-
-.Example dashboard in the Developer perspective
-image::observe-dashboard-developer.png[]
+// to do: add a new image

images/observe-dashboard-developer.png

@@ -5,45 +5,9 @@
 
 :_mod-docs-content-type: PROCEDURE
 
-// The ultimate solution DOES NOT NEED separate IDs and titles, it is just needed for now so that the tests will not break
+[id="monitoring-accessing-the-alerting-ui_{context}"]
+= Accessing the Alerting UI
 
-// tag::ADM[]
-[id="monitoring-accessing-the-alerting-ui-adm_{context}"]
-= Accessing the Alerting UI from the Administrator perspective
-// end::ADM[]
+The Alerting UI is accessible in the {product-title} web console.
 
-// tag::DEV[]
-[id="monitoring-accessing-the-alerting-ui-dev_{context}"]
-= Accessing the Alerting UI from the Developer perspective
-// end::DEV[]
-
-// Set attributes to distinguish between cluster monitoring example (core platform monitoring - CPM) and user workload monitoring (UWM) examples
-
-// tag::ADM[]
-:perspective: Administrator
-// end::ADM[]
-
-// tag::DEV[]
-:perspective: Developer
-// end::DEV[]
-
-The Alerting UI is accessible through the *{perspective}* perspective of the {product-title} web console.
-
-// tag::ADM[]
-* From the *Administrator* perspective, go to *Observe* -> *Alerting*. The three main pages in the Alerting UI in this perspective are the *Alerts*, *Silences*, and *Alerting rules* pages.
-// end::ADM[]
-
-// tag::DEV[]
-* From the *Developer* perspective, go to *Observe* and go to the *Alerts* tab.
-* Select the project that you want to manage alerts for from the *Project:* list. 
-
-In this perspective, alerts, silences, and alerting rules are all managed from the *Alerts* tab. The results shown in the *Alerts* tab are specific to the selected project.
-
-[NOTE]
-====
-In the *Developer* perspective, you can select from core {product-title} and user-defined projects that you have access to in the *Project: <project_name>* list. However, alerts, silences, and alerting rules relating to core {product-title} projects are not displayed if you are not logged in as a cluster administrator.
-====
-// end::DEV[]
-
-// Unset the source code block attributes just to be safe.
-:!perspective:
+* In the {product-title} web console, go to *Observe* -> *Alerting*. The three main pages in the Alerting UI in this perspective are the *Alerts*, *Silences*, and *Alerting rules* pages.

modules/monitoring-about-monitoring-dashboards.adoc

@@ -20,7 +20,7 @@ The {product-title} web console provides fewer settings to configure alert routi
 
 .Procedure
 
-. In the *Administrator* perspective, go to *Administration* -> *Cluster Settings* -> *Configuration* -> *Alertmanager*.
+. In the {product-title} web console, go to *Administration* -> *Cluster Settings* -> *Configuration* -> *Alertmanager*.
 +
 [NOTE]
 ====

modules/monitoring-accessing-the-alerting-ui.adoc

@@ -74,6 +74,6 @@ $ oc apply -f monitoring-stack-alerts.yaml
 
 . Additionally, you can check if a target has hit the configured limit:
 
-.. In the *Administrator* perspective of the web console, go to *Observe* -> *Targets* and select an endpoint with a `Down` status that you want to check.
+.. In the {product-title} web console, go to *Observe* -> *Targets* and select an endpoint with a `Down` status that you want to check.
 +
 The *Scrape failed: sample limit exceeded* message is displayed if the endpoint failed because of an exceeded sample limit.

modules/monitoring-configuring-alert-routing-console.adoc

@@ -38,7 +38,7 @@ endif::openshift-dedicated,openshift-rosa-hcp,openshift-rosa[]
 
 .Procedure
 
-. In the *Administrator* perspective, navigate to *Observe* -> *Metrics*.
+. In the {product-title} web console, go to *Observe* -> *Metrics*.
 
 . Enter a Prometheus Query Language (PromQL) query in the *Expression* field.
 The following example queries help to identify high cardinality metrics that might result in high disk space consumption:

modules/monitoring-creating-scrape-sample-alerts.adoc

@@ -4,17 +4,8 @@
 
 :_mod-docs-content-type: PROCEDURE
 
-// The ultimate solution DOES NOT NEED separate IDs and titles, it is just needed for now so that the tests will not break
-
-// tag::ADM[]
-[id="editing-silences-adm_{context}"]
-= Editing silences from the Administrator perspective
-// end::ADM[]
-
-// tag::DEV[]
-[id="editing-silences-dev_{context}"]
-= Editing silences from the Developer perspective
-// end::DEV[]
+[id="editing-silences_{context}"]
+= Editing silences 
 
 You can edit a silence, which expires the existing silence and creates a new one with the changed configuration.
 
@@ -28,23 +19,11 @@ ifdef::openshift-dedicated,openshift-rosa[]
 endif::openshift-dedicated,openshift-rosa[]
 * If you are a non-administrator user, you have access to the cluster as a user with the following user roles:
 ** The `cluster-monitoring-view` cluster role, which allows you to access Alertmanager.
-// tag::ADM[]
-** The `monitoring-alertmanager-edit` role, which permits you to create and silence alerts in the *Administrator* perspective in the web console.
-// end::ADM[]
-// tag::DEV[]
-** The `monitoring-rules-edit` cluster role, which permits you to create and silence alerts in the *Developer* perspective in the web console.
-// end::DEV[]
+** The `monitoring-alertmanager-edit` role, which permits you to create and silence alerts.
 
 .Procedure
 
-// tag::ADM[]
-. From the *Administrator* perspective of the {product-title} web console, go to *Observe* -> *Alerting* -> *Silences*.
-// end::ADM[]
-
-// tag::DEV[]
-. From the *Developer* perspective of the {product-title} web console, go to *Observe* and go to the *Silences* tab.
-. Select the project that you want to edit silences for from the *Project:* list. 
-// end::DEV[]
+. In the {product-title} web console, go to *Observe* -> *Alerting* -> *Silences*.
 
 . For the silence you want to modify, click {kebab} and select *Edit silence*.
 +

modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc

@@ -4,17 +4,8 @@
 
 :_mod-docs-content-type: PROCEDURE
 
-// The ultimate solution DOES NOT NEED separate IDs and titles, it is just needed for now so that the tests will not break
-
-// tag::ADM[]
-[id="expiring-silences-adm_{context}"]
-= Expiring silences from the Administrator perspective
-// end::ADM[]
-
-// tag::DEV[]
-[id="expiring-silences-dev_{context}"]
-= Expiring silences from the Developer perspective
-// end::DEV[]
+[id="expiring-silences_{context}"]
+= Expiring silences
 
 You can expire a single silence or multiple silences. Expiring a silence deactivates it permanently.
 
@@ -34,24 +25,11 @@ ifdef::openshift-dedicated,openshift-rosa[]
 endif::openshift-dedicated,openshift-rosa[]
 * If you are a non-administrator user, you have access to the cluster as a user with the following user roles:
 ** The `cluster-monitoring-view` cluster role, which allows you to access Alertmanager.
-// tag::ADM[]
-** The `monitoring-alertmanager-edit` role, which permits you to create and silence alerts in the *Administrator* perspective in the web console.
-// end::ADM[]
-// tag::DEV[]
-** The `monitoring-rules-edit` cluster role, which permits you to create and silence alerts in the *Developer* perspective in the web console.
-// end::DEV[]
+** The `monitoring-alertmanager-edit` role, which permits you to create and silence alerts.
 
 .Procedure
 
-// tag::ADM[]
 . Go to *Observe* -> *Alerting* -> *Silences*.
-// end::ADM[]
-
-// tag::DEV[]
-. From the *Developer* perspective of the {product-title} web console, go to *Observe* and go to the *Silences* tab.
-
-. Select the project that you want to expire a silence for from the *Project:* list. 
-// end::DEV[]
 
 . For the silence or silences you want to expire, select the checkbox in the corresponding row.
 

modules/monitoring-editing-silences.adoc

@@ -10,8 +10,6 @@ After running the queries, the metrics are displayed on an interactive plot. The
 
 .Procedure
 
-In the *Administrator* perspective:
-
 * Initially, all metrics from all enabled queries are shown on the plot. You can select which metrics are shown.
 +
 [NOTE]
@@ -33,16 +31,4 @@ By default, the query table shows an expanded view that lists every metric and i
 
 * To display outputs for all queries at a specific point in time, hold the mouse cursor on the plot at that point. The query outputs will appear in a pop-up box.
 
-. To hide the plot, select *Hide Graph*.
-
-In the *Developer* perspective:
-
-* To zoom into the plot and change the time range, do one of the following:
-
-** Visually select the time range by clicking and dragging on the plot horizontally.
-
-** Use the menu in the left upper corner to select the time range.
-
-* To reset the time range, select *Reset Zoom*.
-
-* To display outputs for all queries at a specific point in time, hold the mouse cursor on the plot at that point. The query outputs will appear in a pop-up box.
+. To hide the plot, select *Hide Graph*.