Skip to content

Commit f6289ea

Browse files
authored
Merge pull request #88454 from eromanova97/monitoring-docs-restructure-integration
Monitoring docs restructure integration
2 parents 18c0809 + 64dd513 commit f6289ea

File tree

166 files changed

+2900
-1635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+2900
-1635
lines changed

_topic_maps/_topic_map.yml

Lines changed: 61 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2905,26 +2905,68 @@ Topics:
29052905
Dir: monitoring
29062906
Distros: openshift-enterprise,openshift-origin
29072907
Topics:
2908-
- Name: Monitoring overview
2909-
File: monitoring-overview
2910-
- Name: Common monitoring configuration scenarios
2911-
File: common-monitoring-configuration-scenarios
2912-
- Name: Configuring the monitoring stack
2913-
File: configuring-the-monitoring-stack
2914-
- Name: Enabling monitoring for user-defined projects
2915-
File: enabling-monitoring-for-user-defined-projects
2916-
- Name: Enabling alert routing for user-defined projects
2917-
File: enabling-alert-routing-for-user-defined-projects
2918-
- Name: Managing metrics
2919-
File: managing-metrics
2908+
- Name: About OpenShift Container Platform monitoring
2909+
Dir: about-ocp-monitoring
2910+
Topics:
2911+
- Name: About OpenShift Container Platform monitoring
2912+
File: about-ocp-monitoring
2913+
- Name: Monitoring stack architecture
2914+
File: monitoring-stack-architecture
2915+
- Name: Key concepts
2916+
File: key-concepts
2917+
- Name: Getting started
2918+
Dir: getting-started
2919+
Topics:
2920+
- Name: Maintenance and support for monitoring
2921+
File: maintenance-and-support-for-monitoring
2922+
- Name: Core platform monitoring first steps
2923+
File: core-platform-monitoring-first-steps
2924+
- Name: User workload monitoring first steps
2925+
File: user-workload-monitoring-first-steps
2926+
- Name: Developer and non-administrator steps
2927+
File: developer-and-non-administrator-steps
2928+
- Name: Configuring core platform monitoring
2929+
Dir: configuring-core-platform-monitoring
2930+
Topics:
2931+
- Name: Preparing to configure the monitoring stack
2932+
File: preparing-to-configure-the-monitoring-stack
2933+
- Name: Configuring performance and scalability
2934+
File: configuring-performance-and-scalability
2935+
- Name: Storing and recording data
2936+
File: storing-and-recording-data
2937+
- Name: Configuring metrics
2938+
File: configuring-metrics
2939+
- Name: Configuring alerts and notifications
2940+
File: configuring-alerts-and-notifications
2941+
- Name: Configuring user workload monitoring
2942+
Dir: configuring-user-workload-monitoring
2943+
Topics:
2944+
- Name: Preparing to configure the monitoring stack
2945+
File: preparing-to-configure-the-monitoring-stack-uwm
2946+
- Name: Configuring performance and scalability
2947+
File: configuring-performance-and-scalability-uwm
2948+
- Name: Storing and recording data
2949+
File: storing-and-recording-data-uwm
2950+
- Name: Configuring metrics
2951+
File: configuring-metrics-uwm
2952+
- Name: Configuring alerts and notifications
2953+
File: configuring-alerts-and-notifications-uwm
2954+
- Name: Accessing metrics
2955+
Dir: accessing-metrics
2956+
Topics:
2957+
- Name: Accessing metrics as an administrator
2958+
File: accessing-metrics-as-an-administrator
2959+
- Name: Accessing metrics as a developer
2960+
File: accessing-metrics-as-a-developer
2961+
- Name: Accessing monitoring APIs by using the CLI
2962+
File: accessing-monitoring-apis-by-using-the-cli
29202963
- Name: Managing alerts
2921-
File: managing-alerts
2922-
- Name: Reviewing monitoring dashboards
2923-
File: reviewing-monitoring-dashboards
2924-
- Name: Monitoring clusters that run on RHOSO
2925-
File: shiftstack-prometheus-configuration
2926-
- Name: Accessing monitoring APIs by using the CLI
2927-
File: accessing-third-party-monitoring-apis
2964+
Dir: managing-alerts
2965+
Topics:
2966+
- Name: Managing alerts as an administrator
2967+
File: managing-alerts-as-an-administrator
2968+
- Name: Managing alerts as a developer
2969+
File: managing-alerts-as-a-developer
29282970
- Name: Troubleshooting monitoring issues
29292971
File: troubleshooting-monitoring-issues
29302972
- Name: Config map reference for the Cluster Monitoring Operator

applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,9 @@ include::modules/odc-monitoring-your-app-vulnerabilities.adoc[leveloffset=+1]
3131
[role="_additional-resources"]
3232
[id="additional-resources-odc-monitoring-project-and-application-metrics-using-developer-perspective"]
3333
== Additional resources
34+
ifdef::openshift-rosa,openshift-dedicated[]
3435
* xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview]
36+
endif::openshift-rosa,openshift-dedicated[]
37+
ifndef::openshift-rosa,openshift-dedicated[]
38+
* xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
39+
endif::openshift-rosa,openshift-dedicated[]

backup_and_restore/application_backup_and_restore/troubleshooting.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ include::modules/migration-combining-must-gather.adoc[leveloffset=+2]
145145
include::modules/oadp-monitoring.adoc[leveloffset=+1]
146146
[role="_additional-resources"]
147147
.Additional resources
148-
* xref:../../observability/monitoring/monitoring-overview.adoc#about-openshift-monitoring[Monitoring stack]
148+
* xref:../../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
149149

150150
include::modules/oadp-monitoring-setup.adoc[leveloffset=+2]
151151
include::modules/oadp-creating-service-monitor.adoc[leveloffset=+2]
152152
include::modules/oadp-creating-alerting-rule.adoc[leveloffset=+2]
153153
[role="_additional-resources"]
154154
.Additional resources
155-
* xref:../../observability/monitoring/managing-alerts.adoc#managing-alerts[Managing alerts]
155+
* xref:../../observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc#managing-alerts-as-an-administrator[Managing alerts as an Administrator]
156156

157157
include::modules/oadp-list-of-metrics.adoc[leveloffset=+2]
158158
include::modules/oadp-viewing-metrics-ui.adoc[leveloffset=+2]

cicd/gitops/monitoring-argo-cd-custom-resource-workloads.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ You can enable and disable the setting for monitoring Argo CD custom resource wo
1919
* {gitops-title} is installed in your cluster.
2020
* The monitoring stack is configured in your cluster in the `openshift-monitoring` project. In addition, the Argo CD instance is in a namespace that you can monitor through Prometheus.
2121
* The `kube-state-metrics` service is running in your cluster.
22-
* Optional: If you are enabling monitoring for an Argo CD instance already present in a user-defined project, ensure that the monitoring is xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[enabled for user-defined projects] in your cluster.
22+
* Optional: If you are enabling monitoring for an Argo CD instance already present in a user-defined project, ensure that the monitoring is xref:../../observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#enabling-monitoring-for-user-defined-projects-uwm_preparing-to-configure-the-monitoring-stack-uwm[enabled for user-defined projects] in your cluster.
2323
+
2424
[NOTE]
2525
====
@@ -35,4 +35,4 @@ include::modules/gitops-disabling-monitoring-for-argo-cd-custom-resource-workloa
3535
[role="_additional-resources"]
3636
[id="additional-resources_monitoring-argo-cd-custom-resource-workloads"]
3737
== Additional resources
38-
* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects]
38+
* xref:../../observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#enabling-monitoring-for-user-defined-projects-uwm_preparing-to-configure-the-monitoring-stack-uwm[Enabling monitoring for user-defined projects]

cicd/pipelines/creating-applications-with-cicd-pipelines.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ include::modules/op-enabling-monitoring-of-event-listeners-for-triggers-for-user
6868
[role="_additional-resources"]
6969
.Additional resources
7070

71-
* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects]
71+
* xref:../../observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#enabling-monitoring-for-user-defined-projects-uwm_preparing-to-configure-the-monitoring-stack-uwm[Enabling monitoring for user-defined projects]
7272

7373
include::modules/op-configuring-pull-request-capabilities-in-GitHub-interceptor.adoc[leveloffset=+1]
7474

edge_computing/day_2_core_cnf_clusters/observability/telco-observability.adoc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ include::modules/telco-observability-monitoring-stack.adoc[leveloffset=+1]
1818
[role="_additional-resources"]
1919
.Additional resources
2020

21-
* xref:../../../observability/monitoring/monitoring-overview.adoc#understanding-the-monitoring-stack_monitoring-overview[Understanding the monitoring stack]
21+
* xref:../../../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
2222
23-
* xref:../../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Configuring the monitoring stack]
23+
* xref:../../../observability/monitoring/getting-started/core-platform-monitoring-first-steps.adoc#core-platform-monitoring-first-steps[Core platform monitoring first steps]
2424
2525
include::modules/telco-observability-key-performance-metrics.adoc[leveloffset=+1]
2626

2727
[role="_additional-resources"]
2828
.Additional resources
2929

30-
* xref:../../../observability/monitoring/managing-metrics.adoc#managing-metrics[Managing metrics]
30+
* xref:../../../observability/monitoring/accessing-metrics/accessing-metrics-as-an-administrator.adoc#accessing-metrics-as-an-administrator[Accessing metrics as an administrator]
3131
* xref:../../../storage/persistent_storage/persistent_storage_local/persistent-storage-local.adoc#local-storage-install_persistent-storage-local[Persistent storage using local volumes]
3232
* xref:../../../scalability_and_performance/telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#cluster-tuning-crs_ran-ref-design-crs[Cluster tuning reference CRs]
3333
@@ -38,7 +38,7 @@ include::modules/telco-observability-alerting.adoc[leveloffset=+1]
3838
[role="_additional-resources"]
3939
.Additional resources
4040

41-
* xref:../../../observability/monitoring/managing-alerts.adoc#managing-alerts[Managing alerts]
41+
* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#about-managing-alerts_key-concepts[Managing alerts]
4242
4343
include::modules/telco-observability-workload-monitoring.adoc[leveloffset=+1]
4444

@@ -47,6 +47,7 @@ include::modules/telco-observability-workload-monitoring.adoc[leveloffset=+1]
4747

4848
* xref:../../../rest_api/monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc#servicemonitor-monitoring-coreos-com-v1[ServiceMonitor[monitoring.coreos.com/v1]]
4949
50-
* xref:../../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects]
50+
* xref:../../../observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#enabling-monitoring-for-user-defined-projects-uwm_preparing-to-configure-the-monitoring-stack-uwm[Enabling monitoring for user-defined projects]
51+
52+
* xref:../../../observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc#managing-alerting-rules-for-user-defined-projects_managing-alerts-as-an-administrator[Managing alerting rules for user-defined projects]
5153
52-
* xref:../../../observability/monitoring/managing-alerts.adoc#managing-alerting-rules-for-user-defined-projects_managing-alerts[Managing alerting rules for user-defined projects]

getting_started/openshift-overview.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ be reviewed by cluster administrators and xref:../operators/admin/olm-adding-ope
106106

107107
* **xref:../scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc#scaling-cluster-monitoring-operator[Scale] and xref:../scalability_and_performance/using-node-tuning-operator.adoc#using-node-tuning-operator[tune] clusters**: Set cluster limits, tune nodes, scale cluster monitoring, and optimize networking, storage, and routes for your environment.
108108

109-
* **xref:../disconnected/updating/disconnected-update-osus.adoc#update-service-overview_updating-disconnected-cluster-osus[Using the OpenShift Update Service in a disconnected environement]**: Learn about installing and managing a local OpenShift Update Service for recommending {product-title} updates in disconnected environments.
109+
* **xref:../disconnected/updating/disconnected-update-osus.adoc#update-service-overview_updating-disconnected-cluster-osus[Using the OpenShift Update Service in a disconnected environment]**: Learn about installing and managing a local OpenShift Update Service for recommending {product-title} updates in disconnected environments.
110110

111-
* **xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitor clusters]**:
112-
Learn to xref:../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[configure the monitoring stack].
113-
After configuring monitoring, use the web console to access xref:../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[monitoring dashboards]. In addition to infrastructure metrics, you can also scrape and view metrics for your own services.
111+
* **xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[Monitor clusters]**:
112+
Learn to xref:../observability/monitoring/getting-started/core-platform-monitoring-first-steps.adoc#core-platform-monitoring-first-steps[configure the monitoring stack].
113+
After configuring monitoring, use the web console to access xref:../observability/monitoring/accessing-metrics/accessing-metrics-as-an-administrator.adoc#reviewing-monitoring-dashboards-admin_accessing-metrics-as-an-administrator[monitoring dashboards]. In addition to infrastructure metrics, you can also scrape and view metrics for your own services.
114114

115115
* **xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring_about-remote-health-monitoring[Remote health monitoring]**: {product-title} collects anonymized aggregated information about your cluster. Using Telemetry and the Insights Operator, this data is received by Red Hat and used to improve {product-title}. You can view the xref:../support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc#showing-data-collected-by-remote-health-monitoring_showing-data-collected-by-remote-health-monitoring[data collected by remote health monitoring].

installing/installing_vsphere/using-vsphere-problem-detector-operator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ include::modules/vsphere-problem-detector-metrics.adoc[leveloffset=+1]
3030
[role="_additional-resources"]
3131
== Additional resources
3232

33-
* xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview]
33+
* xref:../../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]

installing/overview/installing-preparing.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ For a production cluster, you must configure the following integrations:
110110

111111
* xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Persistent storage]
112112
* xref:../../authentication/understanding-identity-provider.adoc#understanding-identity-provider[An identity provider]
113-
* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Monitoring core OpenShift Container Platform components]
113+
* xref:../../observability/monitoring/getting-started/core-platform-monitoring-first-steps.adoc#core-platform-monitoring-first-steps[Monitoring core {product-title} components]
114114

115115
[id="installing-preparing-cluster-for-workloads"]
116116
== Preparing your cluster for workloads
117117

118-
Depending on your workload needs, you might need to take extra steps before you begin deploying applications. For example, after you prepare infrastructure to support your application xref:../../cicd/builds/build-strategies.adoc#build-strategies[build strategy], you might need to make provisions for xref:../../scalability_and_performance/cnf-tuning-low-latency-nodes-with-perf-profile.adoc#cnf-low-latency-perf-profile[low-latency] workloads or to xref:../../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets[protect sensitive workloads]. You can also configure xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[monitoring] for application workloads.
118+
Depending on your workload needs, you might need to take extra steps before you begin deploying applications. For example, after you prepare infrastructure to support your application xref:../../cicd/builds/build-strategies.adoc#build-strategies[build strategy], you might need to make provisions for xref:../../scalability_and_performance/cnf-tuning-low-latency-nodes-with-perf-profile.adoc#cnf-low-latency-perf-profile[low-latency] workloads or to xref:../../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets[protect sensitive workloads]. You can also configure xref:../../observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#enabling-monitoring-for-user-defined-projects-uwm_preparing-to-configure-the-monitoring-stack-uwm[monitoring] for application workloads.
119119
If you plan to run xref:../../windows_containers/enabling-windows-container-workloads.adoc#enabling-windows-container-workloads[Windows workloads], you must enable xref:../../networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc#configuring-hybrid-networking[hybrid networking with OVN-Kubernetes] during the installation process; hybrid networking cannot be enabled after your cluster is installed.
120120

121121
[id="supported-installation-methods-for-different-platforms"]

installing/validation_and_troubleshooting/validating-an-installation.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ include::modules/checking-cluster-resource-availability-and-utilization.adoc[lev
5656
[role="_additional-resources"]
5757
.Additional resources
5858

59-
* See xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for more information about the {product-title} monitoring stack.
59+
* See xref:../../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring] for more information about the {product-title} monitoring stack.
6060
6161
//Listing alerts that are firing
6262
include::modules/listing-alerts-that-are-firing.adoc[leveloffset=+1]
6363

6464
[role="_additional-resources"]
6565
.Additional resources
6666

67-
* See xref:../../observability/monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] for further details about alerting in {product-title}.
67+
* See xref:../../observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc#managing-alerts-as-an-administrator[Managing alerts as an Administrator] for further details about alerting in {product-title}.
6868
6969
[id="validating-an-installation-next-steps"]
7070
== Next steps

0 commit comments

Comments
 (0)