Merge pull request #55445 from bmcelvee/OSDOCS-3949-new

OSDOCS-3949: Describe data sent off-cluster in ROSA/OSD docs

Author: bmcelvee

.s2i/httpd-cfg/01-commercial.conf

@@ -238,9 +238,7 @@ AddType text/vtt                            vtt
 
     # RewriteRule rosa/logging/?(.*)$ rosa/rosa_cluster_admin/rosa_logging/$1 [NE,R=301]
 
-    RewriteRule rosa/monitoring/osd?(.*)$ rosa/rosa_cluster_admin/rosa_monitoring/rosa$1 [NE,R=301]
-
-    RewriteRule rosa/cloud_infrastructure_access/?(.*)$ rosa/rosa_cluster_admin/cloud_infrastructure_access/$1 [NE,R=301]
+     RewriteRule rosa/cloud_infrastructure_access/?(.*)$ rosa/rosa_cluster_admin/cloud_infrastructure_access/$1 [NE,R=301]
 
     RewriteRule rosa/nodes/nodes-machinepools-about.html rosa/rosa_cluster_admin/rosa_nodes/rosa-nodes-machinepools-about.html [NE,R=301]
     RewriteRule rosa/nodes/rosa-managing-worker-nodes.html rosa/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.html [NE,R=301]
@@ -589,8 +587,6 @@ AddType text/vtt                            vtt
 
     RewriteRule ^dedicated/osd_notifications/notifications.html /dedicated/osd_cluster_admin/osd_logging/osd-accessing-the-service-logs.html [NE,R=301]
 
-    RewriteRule ^dedicated/monitoring/?(.*)$ /dedicated/osd_cluster_admin/osd_monitoring/$1 [NE,R=301]
-
     RewriteRule ^dedicated/osd_policy/?(.*)$ /dedicated/osd_architecture/osd_policy/$1 [NE,R=301]
 
     RewriteRule ^dedicated/support/getting-support.html /dedicated/osd_architecture/osd-support.html [NE,R=301]

_topic_maps/_topic_map_osd.yml

@@ -130,28 +130,15 @@ Topics:
   Topics:
   - Name: Accessing the service logs
     File: osd-accessing-the-service-logs
-- Name: Monitoring user-defined projects
-  Dir: osd_monitoring
-  Distros: openshift-dedicated
-  Topics:
-    - Name: Understanding the monitoring stack
-      File: osd-understanding-the-monitoring-stack
-    - Name: Accessing monitoring for user-defined projects
-      File: osd-accessing-monitoring-for-user-defined-projects
-    - Name: Configuring the monitoring stack
-      File: osd-configuring-the-monitoring-stack
-    - Name: Enabling alert routing for user-defined projects
-      File: osd-enabling-alert-routing-for-user-defined-projects
-    - Name: Managing metrics
-      File: osd-managing-metrics
-    - Name: Managing alerts
-      File: osd-managing-alerts
-    - Name: Reviewing monitoring dashboards
-      File: osd-reviewing-monitoring-dashboards
-    - Name: Troubleshooting monitoring issues
-      File: osd-troubleshooting-monitoring-issues
 ---
-Name: Cluster security
+Name: Security and compliance
+Dir: security
+Distros: openshift-dedicated
+Topics:
+- Name: Viewing audit logs
+  File: audit-log-view
+---
+Name: Authentication and authorization
 Dir: authentication
 Distros: openshift-dedicated
 Topics:
@@ -346,6 +333,27 @@ Topics:
 - Name: Exported fields
   File: cluster-logging-exported-fields
 ---
+Name: Monitoring user-defined projects
+Dir: monitoring
+Distros: openshift-dedicated
+Topics:
+- Name: Understanding the monitoring stack
+  File: osd-understanding-the-monitoring-stack
+- Name: Accessing monitoring for user-defined projects
+  File: osd-accessing-monitoring-for-user-defined-projects
+- Name: Configuring the monitoring stack
+  File: osd-configuring-the-monitoring-stack
+- Name: Enabling alert routing for user-defined projects
+  File: osd-enabling-alert-routing-for-user-defined-projects
+- Name: Managing metrics
+  File: osd-managing-metrics
+- Name: Managing alerts
+  File: managing-alerts
+- Name: Reviewing monitoring dashboards
+  File: osd-reviewing-monitoring-dashboards
+- Name: Troubleshooting monitoring issues
+  File: osd-troubleshooting-monitoring-issues
+---
 Name: Serverless
 Dir: serverless
 Distros: openshift-dedicated

_topic_maps/_topic_map_rosa.yml

@@ -212,26 +212,17 @@ Topics:
     Distros: openshift-rosa
   - Name: About autoscaling nodes on a cluster
     File: rosa-nodes-about-autoscaling-nodes
-- Name: Monitoring user-defined projects
-  Dir: rosa_monitoring
-  Distros: openshift-rosa
-  Topics:
-  - Name: Understanding the monitoring stack
-    File: rosa-understanding-the-monitoring-stack
-  - Name: Accessing monitoring for user-defined projects
-    File: rosa-accessing-monitoring-for-user-defined-projects
-  - Name: Configuring the monitoring stack
-    File: rosa-configuring-the-monitoring-stack
-  - Name: Enabling alert routing for user-defined projects
-    File: rosa-enabling-alert-routing-for-user-defined-projects
-  - Name: Managing metrics
-    File: rosa-managing-metrics
-  - Name: Managing alerts
-    File: rosa-managing-alerts
-  - Name: Reviewing monitoring dashboards
-    File: rosa-reviewing-monitoring-dashboards
-  - Name: Troubleshooting monitoring issues
-    File: rosa-troubleshooting-monitoring-issues
+---
+Name: Security and compliance
+Dir: security
+Distros: openshift-rosa
+Topics:
+- Name: Viewing audit logs
+  File: audit-log-view
+# - Name: Security
+#   File: rosa-security
+# - Name: Application and cluster compliance
+#   File: rosa-app-security-compliance
 ---
 Name: Authentication and authorization
 Dir: authentication
@@ -241,10 +232,6 @@ Topics:
   File: assuming-an-aws-iam-role-for-a-service-account
 - Name: Managing security context constraints
   File: managing-security-context-constraints
-# - Name: Security
-#   File: rosa-security
-# - Name: Application and cluster compliance
-#   File: rosa-app-security-compliance
 ---
 Name: Upgrading
 Dir: upgrading
@@ -447,6 +434,27 @@ Topics:
 - Name: Exported fields
   File: cluster-logging-exported-fields
 ---
+Name: Monitoring user-defined projects
+Dir: monitoring
+Distros: openshift-rosa
+Topics:
+- Name: Understanding the monitoring stack
+  File: rosa-understanding-the-monitoring-stack
+- Name: Accessing monitoring for user-defined projects
+  File: rosa-accessing-monitoring-for-user-defined-projects
+- Name: Configuring the monitoring stack
+  File: rosa-configuring-the-monitoring-stack
+- Name: Enabling alert routing for user-defined projects
+  File: rosa-enabling-alert-routing-for-user-defined-projects
+- Name: Managing metrics
+  File: rosa-managing-metrics
+- Name: Managing alerts
+  File: managing-alerts
+- Name: Reviewing monitoring dashboards
+  File: rosa-reviewing-monitoring-dashboards
+- Name: Troubleshooting monitoring issues
+  File: rosa-troubleshooting-monitoring-issues
+---
 Name: Service Mesh
 Dir: service_mesh
 Distros: openshift-rosa
@@ -932,6 +940,11 @@ Name: Troubleshooting
 Dir: rosa_support
 Distros: openshift-rosa
 Topics:
+- Name: Remote health monitoring with connected clusters
+  Dir: remote_health_monitoring
+  Topics:
+  - Name: Showing data collected by remote health monitoring
+    File: showing-data-collected-by-remote-health-monitoring
 - Name: Troubleshooting expired offline access tokens
   File: rosa-troubleshooting-expired-tokens
 - Name: Troubleshooting installations

modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc

@@ -1,9 +1,6 @@
 // Module included in the following assemblies:
 //
 // * monitoring/managing-alerts.adoc
-// * monitoring/osd-managing-alerts.adoc
-// * osd_cluster_admin/osd_monitoring/osd-managing-alerts.adoc
-// * rosa_cluster_admin/rosa_monitoring/rosa-managing-alerts.adoc
 
 :_content-type: PROCEDURE
 [id="applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing_{context}"]

modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc

@@ -2,8 +2,8 @@
 //
 // * monitoring/enabling-alert-routing-for-user-defined-projects.adoc
 // * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc
-// * osd_cluster_admin/osd_monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc
-// * rosa_cluster_admin/rosa_monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc
+// * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc
+// * monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc
 
 :_content-type: PROCEDURE
 [id="enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing_{context}"]

modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc

@@ -2,8 +2,8 @@
 //
 // * monitoring/enabling-alert-routing-for-user-defined-projects.adoc
 // * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc
-// * osd_cluster_admin/osd_monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc
-// * rosa_cluster_admin/rosa_monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc
+// * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc
+// * monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc
 
 :_content-type: PROCEDURE
 [id="granting-users-permission-to-configure-alert-routing-for-user-defined-projects_{context}"]

modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc

@@ -1,9 +1,6 @@
 // Module included in the following assemblies:
 //
 // * monitoring/managing-alerts.adoc
-// * monitoring/osd-managing-alerts.adoc
-// * osd_cluster_admin/osd_monitoring/osd-managing-alerts.adoc
-// * rosa_cluster_admin/rosa_monitoring/rosa-managing-alerts.adoc
 
 :_content-type: PROCEDURE
 [id="listing-alerting-rules-for-all-projects-in-a-single-view_{context}"]

modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc

@@ -14,7 +14,7 @@ In {product-title} {product-version}, you can create, view, edit, and remove ale
 ifdef::openshift-rosa,openshift-dedicated[]
 [IMPORTANT]
 ====
-Managing alerting rules for user-defined projects is only available in {product-title} version 4.11 and up. 
+Managing alerting rules for user-defined projects is only available in {product-title} version 4.11 and later. 
 ====
 endif::[]
 

modules/osd-monitoring-understanding-alert-routing-for-user-defined-projects.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
 // * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc
-// * osd_cluster_admin/osd_monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc
-// * rosa_cluster_admin/rosa_monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc
+// * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc
+// * monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc
 
 :_content-type: CONCEPT
 [id="osd-understanding-alert-routing-for-user-defined-projects_{context}"]

modules/telemetry-showing-data-collected-from-the-cluster.adoc

@@ -10,7 +10,14 @@ You can view the cluster and components time series data captured by Telemetry.
 
 .Prerequisites
 
-* You have installed the {product-title} CLI (`oc`).
+* You have installed the 
+ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
+{product-title} 
+endif::openshift-enterprise,openshift-webscale,openshift-origin[]
+ifndef::openshift-enterprise,openshift-webscale,openshift-origin[]
+OpenShift Container Platform
+endif::openshift-enterprise,openshift-webscale,openshift-origin[]
+CLI (`oc`).
 * You have access to the cluster as a user with the `cluster-admin` role or the `cluster-monitoring-view` role.
 
 .Procedure