From b6ba077348b09c1951b8f591558f9d36b19ca40a Mon Sep 17 00:00:00 2001 From: Eliska Romanova Date: Wed, 3 Apr 2024 08:38:27 +0200 Subject: [PATCH] OBSDOCS-692: Update Monitoring doc links and topic map position --- _topic_maps/_topic_map.yml | 71 ++++++++------- _topic_maps/_topic_map_osd.yml | 52 ++++++----- _topic_maps/_topic_map_rosa.yml | 52 ++++++----- ...n-metrics-using-developer-perspective.adoc | 2 +- .../troubleshooting.adoc | 4 +- ...ing-argo-cd-custom-resource-workloads.adoc | 4 +- ...ting-applications-with-cicd-pipelines.adoc | 2 +- getting_started/openshift-overview.adoc | 6 +- installing/installing-preparing.adoc | 4 +- ...ing-vsphere-problem-detector-operator.adoc | 2 +- installing/validating-an-installation.adoc | 4 +- .../logging_alerts/custom-logging-alerts.adoc | 4 +- .../default-logging-alerts.adoc | 2 +- .../troubleshooting-logging-alerts.adoc | 2 +- .../creating-infrastructure-machinesets.adoc | 2 +- migrating_from_ocp_3_to_4/index.adoc | 2 +- .../planning-migration-3-4.adoc | 2 +- .../accessing-metrics-outside-cluster.adoc | 4 +- .../creating-cluster-with-aws-kms-key.adoc | 2 +- ...accessing-monitoring-web-service-apis.adoc | 2 +- .../monitoring-about-cluster-monitoring.adoc | 2 +- ...rting-rules-for-user-defined-projects.adoc | 2 +- .../monitoring-about-querying-metrics.adoc | 2 +- ...nd-requests-for-monitoring-components.adoc | 2 +- ...ssing-alerting-rules-for-your-project.adoc | 2 +- .../monitoring-accessing-the-alerting-ui.adoc | 2 +- ...ird-party-monitoring-web-service-apis.adoc | 2 +- ...ret-to-the-alertmanager-configuration.adoc | 2 +- ...g-adding-cluster-id-labels-to-metrics.adoc | 2 +- ...anager-for-user-defined-alert-routing.adoc | 2 +- ...ing-custom-alertmanager-configuration.adoc | 2 +- ...-tolerations-to-monitoring-components.adoc | 2 +- ...labels-to-your-time-series-and-alerts.adoc | 2 +- ...choosing-a-metrics-collection-profile.adoc | 2 +- modules/monitoring-common-terms.adoc | 2 +- ...-for-monitoring-user-defined-projects.adoc | 2 +- ...ng-configurable-monitoring-components.adoc | 2 +- ...uring-a-local-persistent-volume-claim.adoc | 2 +- ...onitoring-configuring-alert-receivers.adoc | 2 +- ...ng-cluster-for-application-monitoring.adoc | 2 +- ...ng-configuring-external-alertmanagers.adoc | 2 +- ...nfiguring-metrics-collection-profiles.adoc | 2 +- ...iguring-monitoring-for-an-application.adoc | 2 +- ...toring-configuring-persistent-storage.adoc | 2 +- ...ogy-spread-constraints-for-monitoring.adoc | 2 +- ...ring-configuring-remote-write-storage.adoc | 2 +- ...-configuring-secrets-for-alertmanager.adoc | 2 +- ...ring-configuring-the-monitoring-stack.adoc | 2 +- ...monitoring-contents-of-the-metrics-ui.adoc | 2 +- ...ct-for-cluster-observability-operator.adoc | 2 +- ...ole-for-setting-up-metrics-collection.adoc | 2 +- ...ert-routing-for-user-defined-projects.adoc | 2 +- ...rting-rules-for-user-defined-projects.adoc | 2 +- .../monitoring-creating-alerting-rules.adoc | 2 +- ...reating-cluster-id-labels-for-metrics.adoc | 2 +- ...creating-cluster-monitoring-configmap.adoc | 2 +- ...onitoring-creating-new-alerting-rules.adoc | 2 +- ...itoring-creating-scrape-sample-alerts.adoc | 2 +- ...defined-workload-monitoring-configmap.adoc | 2 +- ...itoring-default-monitoring-components.adoc | 2 +- ...monitoring-default-monitoring-targets.adoc | 2 +- ...ce-for-cluster-observability-operator.adoc | 2 +- ...monitoring-deploying-a-sample-service.adoc | 2 +- ...hy-prometheus-is-consuming-disk-space.adoc | 2 +- ...-monitoring-for-user-defined-projects.adoc | 2 +- ...ring-disabling-the-local-alertmanager.adoc | 2 +- modules/monitoring-editing-silences.adoc | 2 +- ...stance-for-user-defined-alert-routing.adoc | 2 +- ...-monitoring-for-user-defined-projects.adoc | 2 +- ...ling-query-logging-for-thanos-querier.adoc | 2 +- ...stance-for-user-defined-alert-routing.adoc | 2 +- ...-remote-write-authentication-settings.adoc | 2 +- ...-user-defined-project-from-monitoring.adoc | 4 +- modules/monitoring-expiring-silences.adoc | 2 +- ...ring-exploring-the-visualized-metrics.adoc | 2 +- ...etrics-for-horizontal-pod-autoscaling.adoc | 2 +- ...g-detailed-information-about-a-target.adoc | 2 +- ...ut-alerts-silences-and-alerting-rules.adoc | 2 +- ...anting-user-permissions-using-the-cli.adoc | 2 +- ...ser-permissions-using-the-web-console.adoc | 2 +- ...ert-routing-for-user-defined-projects.adoc | 2 +- ...-monitoring-for-user-defined-projects.adoc | 2 +- ...sion-to-monitor-user-defined-projects.adoc | 2 +- ...-user-defined-metrics-are-unavailable.adoc | 2 +- ...rape-samples-in-user-defined-projects.adoc | 2 +- ...les-for-all-projects-in-a-single-view.adoc | 2 +- .../monitoring-maintenance-and-support.adoc | 2 +- ...rting-rules-for-user-defined-projects.adoc | 2 +- ...managing-core-platform-alerting-rules.adoc | 2 +- modules/monitoring-managing-silences.adoc | 2 +- ...odifying-core-platform-alerting-rules.adoc | 2 +- ...-and-size-for-prometheus-metrics-data.adoc | 2 +- ...on-time-for-thanos-ruler-metrics-data.adoc | 2 +- ...itoring-components-to-different-nodes.adoc | 2 +- ...ng-alerting-for-user-defined-projects.adoc | 2 +- ...he-federation-endpoint-for-prometheus.adoc | 2 +- ...-for-all-projects-as-an-administrator.adoc | 2 +- ...-user-defined-projects-as-a-developer.adoc | 2 +- ...rting-rules-for-user-defined-projects.adoc | 2 +- ...-resizing-a-persistent-storage-volume.adoc | 2 +- ...reviewing-monitoring-dashboards-admin.adoc | 2 +- ...ewing-monitoring-dashboards-developer.adoc | 2 +- .../monitoring-running-metrics-queries.adoc | 2 +- ...ng-alerts-silences-and-alerting-rules.adoc | 2 +- ...ing-notifications-to-external-systems.adoc | 2 +- ...log-levels-for-the-prometheus-adapter.adoc | 2 +- ...-log-levels-for-monitoring-components.adoc | 2 +- ...setting-query-log-file-for-prometheus.adoc | 2 +- ...abel-limits-for-user-defined-projects.adoc | 2 +- ...-body-size-limit-for-metrics-scraping.adoc | 2 +- ...-collection-for-user-defined-projects.adoc | 2 +- ...y-spread-constraints-for-alertmanager.adoc | 2 +- ...ogy-spread-constraints-for-prometheus.adoc | 2 +- ...y-spread-constraints-for-thanos-ruler.adoc | 2 +- modules/monitoring-silencing-alerts.adoc | 2 +- ...red-by-cluster-observability-operator.adoc | 2 +- ...specifying-how-a-service-is-monitored.adoc | 2 +- ...nd-requests-for-monitoring-components.adoc | 2 +- .../monitoring-support-considerations.adoc | 2 +- ...-remote-write-authentication-settings.adoc | 2 +- ...ing-targets-for-user-defined-projects.adoc | 2 +- ...ng-rules-for-core-platform-monitoring.adoc | 2 +- ...ert-routing-for-user-defined-projects.adoc | 2 +- modules/monitoring-understanding-metrics.adoc | 2 +- ...ng-the-cluster-observability-operator.adoc | 2 +- ...ng-understanding-the-monitoring-stack.adoc | 2 +- ...bility-operator-using-the-web-console.adoc | 2 +- ...toring-unmanaged-monitoring-operators.adoc | 2 +- ...lectors-to-move-monitoring-components.adoc | 2 +- ...g-viewing-a-list-of-available-metrics.adoc | 2 +- modules/ocm-settings-tab.adoc | 2 +- ...-monitoring-for-user-defined-projects.adoc | 2 +- .../sd-monitoring-troubleshooting-issues.adoc | 2 +- networking/ingress-operator.adoc | 2 +- .../metallb/metallb-troubleshoot-support.adoc | 2 +- networking/ptp/using-ptp-events.adoc | 2 +- ...s-nodes-machine-config-daemon-metrics.adoc | 4 +- .../distr-tracing-tempo-configuring.adoc | 2 +- observability/index.adoc | 3 +- .../monitoring}/_attributes | 0 ...accessing-third-party-monitoring-apis.adoc | 10 +-- .../monitoring}/application-monitoring.adoc | 2 +- .../_attributes | 0 ...uster-observability-operator-overview.adoc | 0 ...-observability-operator-release-notes.adoc | 0 ...ability-operator-to-monitor-a-service.adoc | 0 .../cluster_observability_operator/images | 0 ...ng-the-cluster-observability-operator.adoc | 2 +- .../cluster_observability_operator/modules | 0 .../cluster_observability_operator/snippets | 0 ...e-for-the-cluster-monitoring-operator.adoc | 0 .../configuring-hpa-for-an-application.adoc | 6 +- .../configuring-the-monitoring-stack.adoc | 90 +++++++++---------- ...ert-routing-for-user-defined-projects.adoc | 6 +- ...-monitoring-for-user-defined-projects.adoc | 10 +-- .../monitoring}/images | 0 .../monitoring}/managing-alerts.adoc | 10 +-- .../monitoring}/managing-metrics.adoc | 6 +- .../monitoring}/modules | 0 .../monitoring}/monitoring-overview.adoc | 20 ++--- .../reviewing-monitoring-dashboards.adoc | 4 +- ...-monitoring-for-user-defined-projects.adoc | 2 +- ...-monitoring-for-user-defined-projects.adoc | 0 .../monitoring}/snippets | 0 .../troubleshooting-monitoring-issues.adoc | 12 +-- .../metrics-alerts-dashboards.adoc | 2 +- ...ork-observability-operator-monitoring.adoc | 2 +- .../otel-configuring-otelcol-metrics.adoc | 2 +- .../visualizing-power-monitoring-metrics.adoc | 2 +- .../osdk-monitoring-prometheus.adoc | 2 +- osd_getting_started/osd-getting-started.adoc | 2 +- .../cluster-tasks.adoc | 2 +- .../configuring-alert-notifications.adoc | 4 +- .../rosa-getting-started.adoc | 2 +- .../rosa-quickstart-guide-ui.adoc | 2 +- rosa_release_notes/rosa-release-notes.adoc | 2 +- .../cert-manager-monitoring.adoc | 2 +- .../serverless-admin-metrics.adoc | 4 +- .../serverless-developer-metrics.adoc | 8 +- service_mesh/v2x/ossm-observability.adoc | 2 +- .../persistent-storage-local.adoc | 2 +- .../about-remote-health-monitoring.adoc | 2 +- .../investigating-monitoring-issues.adoc | 8 +- .../virt-exposing-custom-metrics-for-vms.adoc | 8 +- virt/monitoring/virt-monitoring-overview.adoc | 2 +- virt/monitoring/virt-prometheus-queries.adoc | 2 +- virt/monitoring/virt-runbooks.adoc | 2 +- virt/support/virt-collecting-virt-data.adoc | 10 +-- welcome/about-hcp.adoc | 2 +- welcome/index.adoc | 6 +- welcome/learn_more_about_openshift.adoc | 4 +- 191 files changed, 371 insertions(+), 365 deletions(-) rename {monitoring => observability/monitoring}/_attributes (100%) rename {monitoring => observability/monitoring}/accessing-third-party-monitoring-apis.adoc (71%) rename {monitoring => observability/monitoring}/application-monitoring.adoc (84%) rename {monitoring => observability/monitoring}/cluster_observability_operator/_attributes (100%) rename {monitoring => observability/monitoring}/cluster_observability_operator/cluster-observability-operator-overview.adoc (100%) rename {monitoring => observability/monitoring}/cluster_observability_operator/cluster-observability-operator-release-notes.adoc (100%) rename {monitoring => observability/monitoring}/cluster_observability_operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc (100%) rename {monitoring => observability/monitoring}/cluster_observability_operator/images (100%) rename {monitoring => observability/monitoring}/cluster_observability_operator/installing-the-cluster-observability-operator.adoc (84%) rename {monitoring => observability/monitoring}/cluster_observability_operator/modules (100%) rename {monitoring => observability/monitoring}/cluster_observability_operator/snippets (100%) rename {monitoring => observability/monitoring}/config-map-reference-for-the-cluster-monitoring-operator.adoc (100%) rename {monitoring => observability/monitoring}/configuring-hpa-for-an-application.adoc (70%) rename {monitoring => observability/monitoring}/configuring-the-monitoring-stack.adoc (62%) rename {monitoring => observability/monitoring}/enabling-alert-routing-for-user-defined-projects.adoc (84%) rename {monitoring => observability/monitoring}/enabling-monitoring-for-user-defined-projects.adoc (66%) rename {monitoring => observability/monitoring}/images (100%) rename {monitoring => observability/monitoring}/managing-alerts.adoc (87%) rename {monitoring => observability/monitoring}/managing-metrics.adoc (87%) rename {monitoring => observability/monitoring}/modules (100%) rename {monitoring => observability/monitoring}/monitoring-overview.adoc (52%) rename {monitoring => observability/monitoring}/reviewing-monitoring-dashboards.adoc (83%) rename {monitoring => observability/monitoring}/sd-accessing-monitoring-for-user-defined-projects.adoc (87%) rename {monitoring => observability/monitoring}/sd-disabling-monitoring-for-user-defined-projects.adoc (100%) rename {monitoring => observability/monitoring}/snippets (100%) rename {monitoring => observability/monitoring}/troubleshooting-monitoring-issues.adoc (53%) diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 3e3674ac44..e2b01fb20d 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -2594,6 +2594,41 @@ Distros: openshift-enterprise,openshift-origin Topics: - Name: Observability overview File: index +- Name: Monitoring + Dir: monitoring + Distros: openshift-enterprise,openshift-origin + Topics: + - Name: Monitoring overview + File: monitoring-overview + - Name: Configuring the monitoring stack + File: configuring-the-monitoring-stack + - Name: Enabling monitoring for user-defined projects + File: enabling-monitoring-for-user-defined-projects + - Name: Enabling alert routing for user-defined projects + File: enabling-alert-routing-for-user-defined-projects + - Name: Managing metrics + File: managing-metrics + - Name: Managing alerts + File: managing-alerts + - Name: Reviewing monitoring dashboards + File: reviewing-monitoring-dashboards + - Name: Accessing monitoring APIs by using the CLI + File: accessing-third-party-monitoring-apis + - Name: Troubleshooting monitoring issues + File: troubleshooting-monitoring-issues + - Name: Config map reference for the Cluster Monitoring Operator + File: config-map-reference-for-the-cluster-monitoring-operator + - Name: Cluster Observability Operator + Dir: cluster_observability_operator + Topics: + - Name: Cluster Observability Operator release notes + File: cluster-observability-operator-release-notes + - Name: Cluster Observability Operator overview + File: cluster-observability-operator-overview + - Name: Installing the Cluster Observability Operator + File: installing-the-cluster-observability-operator + - Name: Configuring the Cluster Observability Operator to monitor a service + File: configuring-the-cluster-observability-operator-to-monitor-a-service - Name: Distributed tracing Dir: distr_tracing Distros: openshift-enterprise @@ -2830,42 +2865,6 @@ Topics: - Name: Glossary File: logging-common-terms --- -Name: Monitoring -Dir: monitoring -Distros: openshift-enterprise,openshift-origin -Topics: -- Name: Monitoring overview - File: monitoring-overview -- Name: Configuring the monitoring stack - File: configuring-the-monitoring-stack -- Name: Enabling monitoring for user-defined projects - File: enabling-monitoring-for-user-defined-projects -- Name: Enabling alert routing for user-defined projects - File: enabling-alert-routing-for-user-defined-projects -- Name: Managing metrics - File: managing-metrics -- Name: Managing alerts - File: managing-alerts -- Name: Reviewing monitoring dashboards - File: reviewing-monitoring-dashboards -- Name: Accessing monitoring APIs by using the CLI - File: accessing-third-party-monitoring-apis -- Name: Troubleshooting monitoring issues - File: troubleshooting-monitoring-issues -- Name: Config map reference for the Cluster Monitoring Operator - File: config-map-reference-for-the-cluster-monitoring-operator -- Name: Cluster Observability Operator - Dir: cluster_observability_operator - Topics: - - Name: Cluster Observability Operator release notes - File: cluster-observability-operator-release-notes - - Name: Cluster Observability Operator overview - File: cluster-observability-operator-overview - - Name: Installing the Cluster Observability Operator - File: installing-the-cluster-observability-operator - - Name: Configuring the Cluster Observability Operator to monitor a service - File: configuring-the-cluster-observability-operator-to-monitor-a-service ---- Name: Scalability and performance Dir: scalability_and_performance Distros: openshift-origin,openshift-enterprise,openshift-webscale,openshift-dpu diff --git a/_topic_maps/_topic_map_osd.yml b/_topic_maps/_topic_map_osd.yml index 42bee02a20..c675aafd82 100644 --- a/_topic_maps/_topic_map_osd.yml +++ b/_topic_maps/_topic_map_osd.yml @@ -1254,32 +1254,36 @@ Topics: - Name: Glossary File: logging-common-terms --- -Name: Monitoring -Dir: monitoring +Name: Observability +Dir: observability Distros: openshift-dedicated Topics: -- Name: Monitoring overview - File: monitoring-overview -- Name: Accessing monitoring for user-defined projects - File: sd-accessing-monitoring-for-user-defined-projects -- Name: Configuring the monitoring stack - File: configuring-the-monitoring-stack -- Name: Disabling monitoring for user-defined projects - File: sd-disabling-monitoring-for-user-defined-projects -- Name: Enabling alert routing for user-defined projects - File: enabling-alert-routing-for-user-defined-projects -- Name: Managing metrics - File: managing-metrics -- Name: Managing alerts - File: managing-alerts -- Name: Reviewing monitoring dashboards - File: reviewing-monitoring-dashboards -- Name: Accessing third-party monitoring APIs - File: accessing-third-party-monitoring-apis -- Name: Troubleshooting monitoring issues - File: troubleshooting-monitoring-issues -- Name: Config map reference for the Cluster Monitoring Operator - File: config-map-reference-for-the-cluster-monitoring-operator +- Name: Monitoring + Dir: monitoring + Distros: openshift-dedicated + Topics: + - Name: Monitoring overview + File: monitoring-overview + - Name: Accessing monitoring for user-defined projects + File: sd-accessing-monitoring-for-user-defined-projects + - Name: Configuring the monitoring stack + File: configuring-the-monitoring-stack + - Name: Disabling monitoring for user-defined projects + File: sd-disabling-monitoring-for-user-defined-projects + - Name: Enabling alert routing for user-defined projects + File: enabling-alert-routing-for-user-defined-projects + - Name: Managing metrics + File: managing-metrics + - Name: Managing alerts + File: managing-alerts + - Name: Reviewing monitoring dashboards + File: reviewing-monitoring-dashboards + - Name: Accessing third-party monitoring APIs + File: accessing-third-party-monitoring-apis + - Name: Troubleshooting monitoring issues + File: troubleshooting-monitoring-issues + - Name: Config map reference for the Cluster Monitoring Operator + File: config-map-reference-for-the-cluster-monitoring-operator --- Name: Service Mesh Dir: service_mesh diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml index c418f7638c..9ccd07c877 100644 --- a/_topic_maps/_topic_map_rosa.yml +++ b/_topic_maps/_topic_map_rosa.yml @@ -1497,32 +1497,36 @@ Topics: - Name: Glossary File: logging-common-terms --- -Name: Monitoring -Dir: monitoring +Name: Observability +Dir: observability Distros: openshift-rosa Topics: -- Name: Monitoring overview - File: monitoring-overview -- Name: Accessing monitoring for user-defined projects - File: sd-accessing-monitoring-for-user-defined-projects -- Name: Configuring the monitoring stack - File: configuring-the-monitoring-stack -- Name: Disabling monitoring for user-defined projects - File: sd-disabling-monitoring-for-user-defined-projects -- Name: Enabling alert routing for user-defined projects - File: enabling-alert-routing-for-user-defined-projects -- Name: Managing metrics - File: managing-metrics -- Name: Managing alerts - File: managing-alerts -- Name: Reviewing monitoring dashboards - File: reviewing-monitoring-dashboards -- Name: Accessing third-party monitoring APIs - File: accessing-third-party-monitoring-apis -- Name: Troubleshooting monitoring issues - File: troubleshooting-monitoring-issues -- Name: Config map reference for the Cluster Monitoring Operator - File: config-map-reference-for-the-cluster-monitoring-operator +- Name: Monitoring + Dir: monitoring + Distros: openshift-rosa + Topics: + - Name: Monitoring overview + File: monitoring-overview + - Name: Accessing monitoring for user-defined projects + File: sd-accessing-monitoring-for-user-defined-projects + - Name: Configuring the monitoring stack + File: configuring-the-monitoring-stack + - Name: Disabling monitoring for user-defined projects + File: sd-disabling-monitoring-for-user-defined-projects + - Name: Enabling alert routing for user-defined projects + File: enabling-alert-routing-for-user-defined-projects + - Name: Managing metrics + File: managing-metrics + - Name: Managing alerts + File: managing-alerts + - Name: Reviewing monitoring dashboards + File: reviewing-monitoring-dashboards + - Name: Accessing third-party monitoring APIs + File: accessing-third-party-monitoring-apis + - Name: Troubleshooting monitoring issues + File: troubleshooting-monitoring-issues + - Name: Config map reference for the Cluster Monitoring Operator + File: config-map-reference-for-the-cluster-monitoring-operator --- Name: Service Mesh Dir: service_mesh diff --git a/applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc b/applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc index fca51005b7..b6a72d2720 100644 --- a/applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc +++ b/applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc @@ -31,4 +31,4 @@ include::modules/odc-monitoring-your-app-vulnerabilities.adoc[leveloffset=+1] [role="_additional-resources"] [id="additional-resources-odc-monitoring-project-and-application-metrics-using-developer-perspective"] == Additional resources -* xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] +* xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] diff --git a/backup_and_restore/application_backup_and_restore/troubleshooting.adoc b/backup_and_restore/application_backup_and_restore/troubleshooting.adoc index 123dd82d5c..30ba9bae2f 100644 --- a/backup_and_restore/application_backup_and_restore/troubleshooting.adoc +++ b/backup_and_restore/application_backup_and_restore/troubleshooting.adoc @@ -99,14 +99,14 @@ include::modules/migration-combining-must-gather.adoc[leveloffset=+2] include::modules/oadp-monitoring.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../monitoring/monitoring-overview.adoc#about-openshift-monitoring[Monitoring stack] +* xref:../../observability/monitoring/monitoring-overview.adoc#about-openshift-monitoring[Monitoring stack] include::modules/oadp-monitoring-setup.adoc[leveloffset=+2] include::modules/oadp-creating-service-monitor.adoc[leveloffset=+2] include::modules/oadp-creating-alerting-rule.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../../monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] +* xref:../../observability/monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] include::modules/oadp-list-of-metrics.adoc[leveloffset=+2] include::modules/oadp-viewing-metrics-ui.adoc[leveloffset=+2] diff --git a/cicd/gitops/monitoring-argo-cd-custom-resource-workloads.adoc b/cicd/gitops/monitoring-argo-cd-custom-resource-workloads.adoc index 71f7432157..0e2f7bf946 100644 --- a/cicd/gitops/monitoring-argo-cd-custom-resource-workloads.adoc +++ b/cicd/gitops/monitoring-argo-cd-custom-resource-workloads.adoc @@ -19,7 +19,7 @@ You can enable and disable the setting for monitoring Argo CD custom resource wo * {gitops-title} is installed in your cluster. * 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. * The `kube-state-metrics` service is running in your cluster. -* Optional: If you are enabling monitoring for an Argo CD instance already present in a user-defined project, ensure that the monitoring is xref:../../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. +* 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. + [NOTE] ==== @@ -35,4 +35,4 @@ include::modules/gitops-disabling-monitoring-for-argo-cd-custom-resource-workloa [role="_additional-resources"] [id="additional-resources_monitoring-argo-cd-custom-resource-workloads"] == Additional resources -* xref:../../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] diff --git a/cicd/pipelines/creating-applications-with-cicd-pipelines.adoc b/cicd/pipelines/creating-applications-with-cicd-pipelines.adoc index 211013bd6e..3a3eef7702 100644 --- a/cicd/pipelines/creating-applications-with-cicd-pipelines.adoc +++ b/cicd/pipelines/creating-applications-with-cicd-pipelines.adoc @@ -68,7 +68,7 @@ include::modules/op-enabling-monitoring-of-event-listeners-for-triggers-for-user [role="_additional-resources"] .Additional resources -* xref:../../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] include::modules/op-configuring-pull-request-capabilities-in-GitHub-interceptor.adoc[leveloffset=+1] diff --git a/getting_started/openshift-overview.adoc b/getting_started/openshift-overview.adoc index 4daa5fd7fa..c0459142a2 100644 --- a/getting_started/openshift-overview.adoc +++ b/getting_started/openshift-overview.adoc @@ -108,8 +108,8 @@ be reviewed by cluster administrators and xref:../operators/admin/olm-adding-ope * **xref:../updating/updating_a_cluster/updating_disconnected_cluster/disconnected-update-osus.adoc#update-service-overview_updating-restricted-network-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. -* **xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitor clusters]**: -Learn to xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[configure the monitoring stack]. -After configuring monitoring, use the web console to access xref:../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. +* **xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitor clusters]**: +Learn to xref:../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[configure the monitoring stack]. +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. * **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]. diff --git a/installing/installing-preparing.adoc b/installing/installing-preparing.adoc index 40eb85c049..f49b081cda 100644 --- a/installing/installing-preparing.adoc +++ b/installing/installing-preparing.adoc @@ -109,12 +109,12 @@ For a production cluster, you must configure the following integrations: * xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Persistent storage] * xref:../authentication/understanding-identity-provider.adoc#understanding-identity-provider[An identity provider] -* xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Monitoring core OpenShift Container Platform components] +* xref:../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Monitoring core OpenShift Container Platform components] [id="installing-preparing-cluster-for-workloads"] == Preparing your cluster for workloads -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-low-latency-tuning.adoc#cnf-low-latency-tuning[low-latency] workloads or to xref:../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets[protect sensitive workloads]. You can also configure xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[monitoring] for application workloads. +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-low-latency-tuning.adoc#cnf-low-latency-tuning[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. 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. [id="supported-installation-methods-for-different-platforms"] diff --git a/installing/installing_vsphere/using-vsphere-problem-detector-operator.adoc b/installing/installing_vsphere/using-vsphere-problem-detector-operator.adoc index 4785571c77..0fe7525dfc 100644 --- a/installing/installing_vsphere/using-vsphere-problem-detector-operator.adoc +++ b/installing/installing_vsphere/using-vsphere-problem-detector-operator.adoc @@ -30,4 +30,4 @@ include::modules/vsphere-problem-detector-metrics.adoc[leveloffset=+1] [role="_additional-resources"] == Additional resources -* xref:../../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] +* xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] diff --git a/installing/validating-an-installation.adoc b/installing/validating-an-installation.adoc index adfca6747a..f34acca8c7 100644 --- a/installing/validating-an-installation.adoc +++ b/installing/validating-an-installation.adoc @@ -56,7 +56,7 @@ include::modules/checking-cluster-resource-availability-and-utilization.adoc[lev [role="_additional-resources"] .Additional resources -* See xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for more information about the {product-title} monitoring stack. +* See xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for more information about the {product-title} monitoring stack. //Listing alerts that are firing include::modules/listing-alerts-that-are-firing.adoc[leveloffset=+1] @@ -64,7 +64,7 @@ include::modules/listing-alerts-that-are-firing.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* See xref:../monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] for further details about alerting in {product-title}. +* See xref:../observability/monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] for further details about alerting in {product-title}. [id="validating-an-installation-next-steps"] == Next steps diff --git a/logging/logging_alerts/custom-logging-alerts.adoc b/logging/logging_alerts/custom-logging-alerts.adoc index 9373a65b4d..7a050d4b5b 100644 --- a/logging/logging_alerts/custom-logging-alerts.adoc +++ b/logging/logging_alerts/custom-logging-alerts.adoc @@ -30,8 +30,8 @@ include::modules/logging-enabling-loki-alerts.adoc[leveloffset=+1] [role="_additional-resources"] [id="additional-resources_custom-logging-alerts"] == Additional resources -* xref:../../monitoring/monitoring-overview.adoc#about-openshift-monitoring_monitoring-overview[About {product-title} monitoring] +* xref:../../observability/monitoring/monitoring-overview.adoc#about-openshift-monitoring_monitoring-overview[About {product-title} monitoring] ifdef::openshift-enterprise[] * xref:../../post_installation_configuration/configuring-alert-notifications.adoc#configuring-alert-notifications[Configuring alert notifications] endif::[] -// maybe need an update to https://docs.openshift.com/container-platform/4.13/monitoring/monitoring-overview.html#default-monitoring-targets_monitoring-overview to talk about Loki and Vector now? Are these part of default monitoring? +// maybe need an update to https://docs.openshift.com/container-platform/4.13/observability/monitoring/monitoring-overview.html#default-monitoring-targets_monitoring-overview to talk about Loki and Vector now? Are these part of default monitoring? diff --git a/logging/logging_alerts/default-logging-alerts.adoc b/logging/logging_alerts/default-logging-alerts.adoc index ff29dbcca2..02d7d26793 100644 --- a/logging/logging_alerts/default-logging-alerts.adoc +++ b/logging/logging_alerts/default-logging-alerts.adoc @@ -18,4 +18,4 @@ include::modules/cluster-logging-elasticsearch-rules.adoc[leveloffset=+1] [role="_additional-resources"] [id="additional-resources_default-logging-alerts"] == Additional resources -* xref:../../monitoring/managing-alerts.adoc#modifying-core-platform-alerting-rules_managing-alerts[Modifying core platform alerting rules] +* xref:../../observability/monitoring/managing-alerts.adoc#modifying-core-platform-alerting-rules_managing-alerts[Modifying core platform alerting rules] diff --git a/logging/troubleshooting/troubleshooting-logging-alerts.adoc b/logging/troubleshooting/troubleshooting-logging-alerts.adoc index 5041225775..ab045e74eb 100644 --- a/logging/troubleshooting/troubleshooting-logging-alerts.adoc +++ b/logging/troubleshooting/troubleshooting-logging-alerts.adoc @@ -12,7 +12,7 @@ include::modules/es-cluster-health-is-red.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards] +* xref:../../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards] * link:https://www.elastic.co/guide/en/elasticsearch/reference/7.13/fix-common-cluster-issues.html#fix-red-yellow-cluster-status[Fix a red or yellow cluster status] [id="elasticsearch-cluster-health-is-yellow"] diff --git a/machine_management/creating-infrastructure-machinesets.adoc b/machine_management/creating-infrastructure-machinesets.adoc index 5fa32108c1..40defa1188 100644 --- a/machine_management/creating-infrastructure-machinesets.adoc +++ b/machine_management/creating-infrastructure-machinesets.adoc @@ -130,6 +130,6 @@ include::modules/infrastructure-moving-monitoring.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../monitoring/configuring-the-monitoring-stack.adoc#moving-monitoring-components-to-different-nodes_configuring-the-monitoring-stack[Moving monitoring components to different nodes] +* xref:../observability/monitoring/configuring-the-monitoring-stack.adoc#moving-monitoring-components-to-different-nodes_configuring-the-monitoring-stack[Moving monitoring components to different nodes] * xref:../logging/scheduling_resources/logging-node-selectors.adoc#logging-node-selectors[Using node selectors to move logging resources] * xref:../logging/scheduling_resources/logging-taints-tolerations.adoc#cluster-logging-logstore-tolerations_logging-taints-tolerations[Using taints and tolerations to control logging pod placement] diff --git a/migrating_from_ocp_3_to_4/index.adoc b/migrating_from_ocp_3_to_4/index.adoc index d18158abfe..1b5d5173ab 100644 --- a/migrating_from_ocp_3_to_4/index.adoc +++ b/migrating_from_ocp_3_to_4/index.adoc @@ -14,7 +14,7 @@ Before migrating from {product-title} 3 to 4, you can check xref:../migrating_fr * xref:../architecture/architecture.adoc#architecture[Architecture] * xref:../architecture/architecture-installation.adoc#architecture-installation[Installation and update] -* xref:../storage/index.adoc#index[Storage], xref:../networking/understanding-networking.adoc#understanding-networking[network], xref:../logging/cluster-logging.adoc#cluster-logging[logging], xref:../security/index.adoc#index[security], and xref:../monitoring/monitoring-overview.adoc#monitoring-overview[monitoring considerations] +* xref:../storage/index.adoc#index[Storage], xref:../networking/understanding-networking.adoc#understanding-networking[network], xref:../logging/cluster-logging.adoc#cluster-logging[logging], xref:../security/index.adoc#index[security], and xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[monitoring considerations] [id="mtc-3-to-4-overview-planning-network-considerations-mtc"] == Planning network considerations diff --git a/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc index 2f0abbf7d7..29b5530240 100644 --- a/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc +++ b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc @@ -236,4 +236,4 @@ Review the following monitoring changes when transitioning from {product-title} The default alert that triggers to ensure the availability of the monitoring structure was called `DeadMansSwitch` in {product-title} 3.11. This was renamed to `Watchdog` in {product-title} 4. If you had PagerDuty integration set up with this alert in {product-title} 3.11, you must set up the PagerDuty integration for the `Watchdog` alert in {product-title} 4. -For more information, see xref:../monitoring/managing-alerts.adoc#applying-custom-alertmanager-configuration_managing-alerts[Applying custom Alertmanager configuration]. +For more information, see xref:../observability/monitoring/managing-alerts.adoc#applying-custom-alertmanager-configuration_managing-alerts[Applying custom Alertmanager configuration]. diff --git a/modules/accessing-metrics-outside-cluster.adoc b/modules/accessing-metrics-outside-cluster.adoc index ae6152426d..de73684143 100644 --- a/modules/accessing-metrics-outside-cluster.adoc +++ b/modules/accessing-metrics-outside-cluster.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * monitoring/enabling-monitoring-for-user-defined-projects.adoc -// * monitoring/accessing-third-party-monitoring-apis.adoc +// * observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/accessing-third-party-monitoring-apis.adoc :_mod-docs-content-type: PROCEDURE [id="accessing-metrics-from-outside-cluster_{context}"] diff --git a/modules/creating-cluster-with-aws-kms-key.adoc b/modules/creating-cluster-with-aws-kms-key.adoc index 8b7a38c41e..f1271a3829 100644 --- a/modules/creating-cluster-with-aws-kms-key.adoc +++ b/modules/creating-cluster-with-aws-kms-key.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="creating-cluster-with-aws-kms-key"] diff --git a/modules/monitoring-about-accessing-monitoring-web-service-apis.adoc b/modules/monitoring-about-accessing-monitoring-web-service-apis.adoc index 9fdf386fa7..f1da0aa9f8 100644 --- a/modules/monitoring-about-accessing-monitoring-web-service-apis.adoc +++ b/modules/monitoring-about-accessing-monitoring-web-service-apis.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/accessing-third-party-monitoring-apis.adoc +// * observability/monitoring/accessing-third-party-monitoring-apis.adoc :_mod-docs-content-type: CONCEPT [id="about-accessing-monitoring-web-service-apis_{context}"] diff --git a/modules/monitoring-about-cluster-monitoring.adoc b/modules/monitoring-about-cluster-monitoring.adoc index e33f660f15..f4144d2695 100644 --- a/modules/monitoring-about-cluster-monitoring.adoc +++ b/modules/monitoring-about-cluster-monitoring.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/monitoring-overview.adoc +// * observability/monitoring/monitoring-overview.adoc // This module uses a conditionalized title so that the module // can be re-used in associated products but the title is not diff --git a/modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc b/modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc index de1f3c1360..adf62e552d 100644 --- a/modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc +++ b/modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: CONCEPT [id="about-creating-alerting-rules-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-about-querying-metrics.adoc b/modules/monitoring-about-querying-metrics.adoc index 5528e47a9a..a8e4651001 100644 --- a/modules/monitoring-about-querying-metrics.adoc +++ b/modules/monitoring-about-querying-metrics.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc // * virt/support/virt-prometheus-queries.adoc :_mod-docs-content-type: CONCEPT diff --git a/modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc b/modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc index 145e7d8bfb..6d6ec7ca0a 100644 --- a/modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc +++ b/modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="about-specifying-limits-and-requests-for-monitoring-components_{context}"] diff --git a/modules/monitoring-accessing-alerting-rules-for-your-project.adoc b/modules/monitoring-accessing-alerting-rules-for-your-project.adoc index 81dd2f2dde..90fceed828 100644 --- a/modules/monitoring-accessing-alerting-rules-for-your-project.adoc +++ b/modules/monitoring-accessing-alerting-rules-for-your-project.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="accessing-alerting-rules-for-your-project_{context}"] diff --git a/modules/monitoring-accessing-the-alerting-ui.adoc b/modules/monitoring-accessing-the-alerting-ui.adoc index d8b155067f..8ef40b41fd 100644 --- a/modules/monitoring-accessing-the-alerting-ui.adoc +++ b/modules/monitoring-accessing-the-alerting-ui.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc // * logging/logging_alerts/log-storage-alerts.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/monitoring-accessing-third-party-monitoring-web-service-apis.adoc b/modules/monitoring-accessing-third-party-monitoring-web-service-apis.adoc index 8792925f9a..336ae6a46b 100644 --- a/modules/monitoring-accessing-third-party-monitoring-web-service-apis.adoc +++ b/modules/monitoring-accessing-third-party-monitoring-web-service-apis.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/accessing-third-party-monitoring-apis.adoc +// * observability/monitoring/accessing-third-party-monitoring-apis.adoc :_mod-docs-content-type: PROCEDURE [id="accessing-a-monitoring-web-service-api_{context}"] diff --git a/modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc b/modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc index 150b453411..caff23c2d1 100644 --- a/modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc +++ b/modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="monitoring-adding-a-secret-to-the-alertmanager-configuration_{context}"] diff --git a/modules/monitoring-adding-cluster-id-labels-to-metrics.adoc b/modules/monitoring-adding-cluster-id-labels-to-metrics.adoc index f9c3bce966..804c21da9a 100644 --- a/modules/monitoring-adding-cluster-id-labels-to-metrics.adoc +++ b/modules/monitoring-adding-cluster-id-labels-to-metrics.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="adding-cluster-id-labels-to-metrics_{context}"] diff --git a/modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc b/modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc index 102342520b..23e26de104 100644 --- a/modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc +++ b/modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing_{context}"] diff --git a/modules/monitoring-applying-custom-alertmanager-configuration.adoc b/modules/monitoring-applying-custom-alertmanager-configuration.adoc index 3e49afface..1c1b1f54e9 100644 --- a/modules/monitoring-applying-custom-alertmanager-configuration.adoc +++ b/modules/monitoring-applying-custom-alertmanager-configuration.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="applying-custom-alertmanager-configuration_{context}"] diff --git a/modules/monitoring-assigning-tolerations-to-monitoring-components.adoc b/modules/monitoring-assigning-tolerations-to-monitoring-components.adoc index d63a6dfe02..f4b0a60cd1 100644 --- a/modules/monitoring-assigning-tolerations-to-monitoring-components.adoc +++ b/modules/monitoring-assigning-tolerations-to-monitoring-components.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="assigning-tolerations-to-monitoring-components_{context}"] diff --git a/modules/monitoring-attaching-additional-labels-to-your-time-series-and-alerts.adoc b/modules/monitoring-attaching-additional-labels-to-your-time-series-and-alerts.adoc index 0fb3662af9..3c73af40ed 100644 --- a/modules/monitoring-attaching-additional-labels-to-your-time-series-and-alerts.adoc +++ b/modules/monitoring-attaching-additional-labels-to-your-time-series-and-alerts.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="attaching-additional-labels-to-your-time-series-and-alerts_{context}"] diff --git a/modules/monitoring-choosing-a-metrics-collection-profile.adoc b/modules/monitoring-choosing-a-metrics-collection-profile.adoc index 16a710b505..4e8d40c30a 100644 --- a/modules/monitoring-choosing-a-metrics-collection-profile.adoc +++ b/modules/monitoring-choosing-a-metrics-collection-profile.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="choosing-a-metrics-collection-profile_{context}"] diff --git a/modules/monitoring-common-terms.adoc b/modules/monitoring-common-terms.adoc index e8d0a40240..025f506b4f 100644 --- a/modules/monitoring-common-terms.adoc +++ b/modules/monitoring-common-terms.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/monitoring-overview.adoc +// * observability/monitoring/monitoring-overview.adoc :_mod-docs-content-type: REFERENCE [id="openshift-monitoring-common-terms_{context}"] diff --git a/modules/monitoring-components-for-monitoring-user-defined-projects.adoc b/modules/monitoring-components-for-monitoring-user-defined-projects.adoc index ecae7a7f6b..8230fa4f3b 100644 --- a/modules/monitoring-components-for-monitoring-user-defined-projects.adoc +++ b/modules/monitoring-components-for-monitoring-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/monitoring-overview.adoc +// * observability/monitoring/monitoring-overview.adoc :_mod-docs-content-type: REFERENCE [id="components-for-monitoring-user-defined-projects_{context}"] diff --git a/modules/monitoring-configurable-monitoring-components.adoc b/modules/monitoring-configurable-monitoring-components.adoc index c4f2245703..ac31029b3f 100644 --- a/modules/monitoring-configurable-monitoring-components.adoc +++ b/modules/monitoring-configurable-monitoring-components.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc [id="configurable-monitoring-components_{context}"] = Configurable monitoring components diff --git a/modules/monitoring-configuring-a-local-persistent-volume-claim.adoc b/modules/monitoring-configuring-a-local-persistent-volume-claim.adoc index 9f8999d8ba..02c5570266 100644 --- a/modules/monitoring-configuring-a-local-persistent-volume-claim.adoc +++ b/modules/monitoring-configuring-a-local-persistent-volume-claim.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-a-local-persistent-volume-claim_{context}"] diff --git a/modules/monitoring-configuring-alert-receivers.adoc b/modules/monitoring-configuring-alert-receivers.adoc index 5ce7ba5a11..c8d560794b 100644 --- a/modules/monitoring-configuring-alert-receivers.adoc +++ b/modules/monitoring-configuring-alert-receivers.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc // * post_installation_configuration/configuring-alert-notifications.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/monitoring-configuring-cluster-for-application-monitoring.adoc b/modules/monitoring-configuring-cluster-for-application-monitoring.adoc index 9ac6604a7a..a2f97ce434 100644 --- a/modules/monitoring-configuring-cluster-for-application-monitoring.adoc +++ b/modules/monitoring-configuring-cluster-for-application-monitoring.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/application-monitoring.adoc +// * observability/monitoring/application-monitoring.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-cluster-for-application-monitoring_{context}"] diff --git a/modules/monitoring-configuring-external-alertmanagers.adoc b/modules/monitoring-configuring-external-alertmanagers.adoc index acccc17d1b..72df94644a 100644 --- a/modules/monitoring-configuring-external-alertmanagers.adoc +++ b/modules/monitoring-configuring-external-alertmanagers.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="monitoring-configuring-external-alertmanagers_{context}"] diff --git a/modules/monitoring-configuring-metrics-collection-profiles.adoc b/modules/monitoring-configuring-metrics-collection-profiles.adoc index a4fb053737..63a30051f1 100644 --- a/modules/monitoring-configuring-metrics-collection-profiles.adoc +++ b/modules/monitoring-configuring-metrics-collection-profiles.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="configuring-metrics-collection-profiles_{context}"] diff --git a/modules/monitoring-configuring-monitoring-for-an-application.adoc b/modules/monitoring-configuring-monitoring-for-an-application.adoc index 57d5c06268..c8a499d87b 100644 --- a/modules/monitoring-configuring-monitoring-for-an-application.adoc +++ b/modules/monitoring-configuring-monitoring-for-an-application.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/application-monitoring.adoc +// * observability/monitoring/application-monitoring.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-monitoring-for-an-application_{context}"] diff --git a/modules/monitoring-configuring-persistent-storage.adoc b/modules/monitoring-configuring-persistent-storage.adoc index 8c9d5e190c..279258649f 100644 --- a/modules/monitoring-configuring-persistent-storage.adoc +++ b/modules/monitoring-configuring-persistent-storage.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="configuring_persistent_storage_{context}"] diff --git a/modules/monitoring-configuring-pod-topology-spread-constraints-for-monitoring.adoc b/modules/monitoring-configuring-pod-topology-spread-constraints-for-monitoring.adoc index 878a657fb8..417a6d7ef8 100644 --- a/modules/monitoring-configuring-pod-topology-spread-constraints-for-monitoring.adoc +++ b/modules/monitoring-configuring-pod-topology-spread-constraints-for-monitoring.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="configuring_pod_topology_spread_constraintsfor_monitoring_{context}"] diff --git a/modules/monitoring-configuring-remote-write-storage.adoc b/modules/monitoring-configuring-remote-write-storage.adoc index 51712cf57f..c7b0ae7b47 100644 --- a/modules/monitoring-configuring-remote-write-storage.adoc +++ b/modules/monitoring-configuring-remote-write-storage.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="configuring_remote_write_storage_{context}"] diff --git a/modules/monitoring-configuring-secrets-for-alertmanager.adoc b/modules/monitoring-configuring-secrets-for-alertmanager.adoc index 7438e1e92b..06ae11f17f 100644 --- a/modules/monitoring-configuring-secrets-for-alertmanager.adoc +++ b/modules/monitoring-configuring-secrets-for-alertmanager.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="monitoring-configuring-secrets-for-alertmanager_{context}"] diff --git a/modules/monitoring-configuring-the-monitoring-stack.adoc b/modules/monitoring-configuring-the-monitoring-stack.adoc index c13683c787..c573e4f008 100644 --- a/modules/monitoring-configuring-the-monitoring-stack.adoc +++ b/modules/monitoring-configuring-the-monitoring-stack.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-the-monitoring-stack_{context}"] diff --git a/modules/monitoring-contents-of-the-metrics-ui.adoc b/modules/monitoring-contents-of-the-metrics-ui.adoc index b8a838b7a5..6d1a9366ea 100644 --- a/modules/monitoring-contents-of-the-metrics-ui.adoc +++ b/modules/monitoring-contents-of-the-metrics-ui.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc [id="contents-of-the-metrics-ui_{context}"] = Contents of the Metrics UI diff --git a/modules/monitoring-creating-a-monitoringstack-object-for-cluster-observability-operator.adoc b/modules/monitoring-creating-a-monitoringstack-object-for-cluster-observability-operator.adoc index 2f5aa22631..513a6f5a27 100644 --- a/modules/monitoring-creating-a-monitoringstack-object-for-cluster-observability-operator.adoc +++ b/modules/monitoring-creating-a-monitoringstack-object-for-cluster-observability-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// monitoring/cluster-observability-operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc +// * observability/monitoring/cluster-observability-operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc :_mod-docs-content-type: PROCEDURE [id="creating-a-monitoringstack-object-for-cluster-observability-operator_{context}"] diff --git a/modules/monitoring-creating-a-role-for-setting-up-metrics-collection.adoc b/modules/monitoring-creating-a-role-for-setting-up-metrics-collection.adoc index af2a54cb88..2273eb861f 100644 --- a/modules/monitoring-creating-a-role-for-setting-up-metrics-collection.adoc +++ b/modules/monitoring-creating-a-role-for-setting-up-metrics-collection.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/monitoring-your-own-services.adoc +// * observability/monitoring/monitoring-your-own-services.adoc [id="creating-a-role-for-setting-up-metrics-collection_{context}"] = Creating a role for setting up metrics collection diff --git a/modules/monitoring-creating-alert-routing-for-user-defined-projects.adoc b/modules/monitoring-creating-alert-routing-for-user-defined-projects.adoc index f4002a4286..691f8d8e1c 100644 --- a/modules/monitoring-creating-alert-routing-for-user-defined-projects.adoc +++ b/modules/monitoring-creating-alert-routing-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="creating-alert-routing-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc b/modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc index 49c6712910..6b803d9aca 100644 --- a/modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc +++ b/modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="creating-alerting-rules-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-creating-alerting-rules.adoc b/modules/monitoring-creating-alerting-rules.adoc index 6aef5fced3..4b906b6bc7 100644 --- a/modules/monitoring-creating-alerting-rules.adoc +++ b/modules/monitoring-creating-alerting-rules.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc [id="creating-alerting-rules-for-user-defined-projects_{context}"] = Creating alerting rules for user-defined projects diff --git a/modules/monitoring-creating-cluster-id-labels-for-metrics.adoc b/modules/monitoring-creating-cluster-id-labels-for-metrics.adoc index 424e44043c..a291c921eb 100644 --- a/modules/monitoring-creating-cluster-id-labels-for-metrics.adoc +++ b/modules/monitoring-creating-cluster-id-labels-for-metrics.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="creating-cluster-id-labels-for-metrics_{context}"] diff --git a/modules/monitoring-creating-cluster-monitoring-configmap.adoc b/modules/monitoring-creating-cluster-monitoring-configmap.adoc index 923caa1c94..f87637e98c 100644 --- a/modules/monitoring-creating-cluster-monitoring-configmap.adoc +++ b/modules/monitoring-creating-cluster-monitoring-configmap.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="creating-cluster-monitoring-configmap_{context}"] diff --git a/modules/monitoring-creating-new-alerting-rules.adoc b/modules/monitoring-creating-new-alerting-rules.adoc index 7b97a9fce2..c275345e8e 100644 --- a/modules/monitoring-creating-new-alerting-rules.adoc +++ b/modules/monitoring-creating-new-alerting-rules.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="creating-new-alerting-rules_{context}"] diff --git a/modules/monitoring-creating-scrape-sample-alerts.adoc b/modules/monitoring-creating-scrape-sample-alerts.adoc index 4e55e7363b..f0c8c20acc 100644 --- a/modules/monitoring-creating-scrape-sample-alerts.adoc +++ b/modules/monitoring-creating-scrape-sample-alerts.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="creating-scrape-sample-alerts_{context}"] diff --git a/modules/monitoring-creating-user-defined-workload-monitoring-configmap.adoc b/modules/monitoring-creating-user-defined-workload-monitoring-configmap.adoc index 4930534e99..4c89b48e19 100644 --- a/modules/monitoring-creating-user-defined-workload-monitoring-configmap.adoc +++ b/modules/monitoring-creating-user-defined-workload-monitoring-configmap.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="creating-user-defined-workload-monitoring-configmap_{context}"] diff --git a/modules/monitoring-default-monitoring-components.adoc b/modules/monitoring-default-monitoring-components.adoc index 97d85ba111..38b3780e95 100644 --- a/modules/monitoring-default-monitoring-components.adoc +++ b/modules/monitoring-default-monitoring-components.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/monitoring-overview.adoc +// * observability/monitoring/monitoring-overview.adoc :_mod-docs-content-type: REFERENCE [id="default-monitoring-components_{context}"] diff --git a/modules/monitoring-default-monitoring-targets.adoc b/modules/monitoring-default-monitoring-targets.adoc index ab8ae77857..95990a9cf4 100644 --- a/modules/monitoring-default-monitoring-targets.adoc +++ b/modules/monitoring-default-monitoring-targets.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/monitoring-overview.adoc +// * observability/monitoring/monitoring-overview.adoc :_mod-docs-content-type: REFERENCE [id="default-monitoring-targets_{context}"] diff --git a/modules/monitoring-deploying-a-sample-service-for-cluster-observability-operator.adoc b/modules/monitoring-deploying-a-sample-service-for-cluster-observability-operator.adoc index 5b0234df93..3f89b1891d 100644 --- a/modules/monitoring-deploying-a-sample-service-for-cluster-observability-operator.adoc +++ b/modules/monitoring-deploying-a-sample-service-for-cluster-observability-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// monitoring/cluster-observability-operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc +// * observability/monitoring/cluster-observability-operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc :_mod-docs-content-type: PROCEDURE [id="deploying-a-sample-service-for-cluster-observability-operator_{context}"] diff --git a/modules/monitoring-deploying-a-sample-service.adoc b/modules/monitoring-deploying-a-sample-service.adoc index 4fe7d00a0b..24068bc2ab 100644 --- a/modules/monitoring-deploying-a-sample-service.adoc +++ b/modules/monitoring-deploying-a-sample-service.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc :_mod-docs-content-type: PROCEDURE [id="deploying-a-sample-service_{context}"] diff --git a/modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc b/modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc index 8510839947..1b3c439393 100644 --- a/modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc +++ b/modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/troubleshooting-monitoring-issues.adoc +// * observability/monitoring/troubleshooting-monitoring-issues.adoc // * support/troubleshooting/investigating-monitoring-issues.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/monitoring-disabling-monitoring-for-user-defined-projects.adoc b/modules/monitoring-disabling-monitoring-for-user-defined-projects.adoc index 1b1109e6fe..f99536fd06 100644 --- a/modules/monitoring-disabling-monitoring-for-user-defined-projects.adoc +++ b/modules/monitoring-disabling-monitoring-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="disabling-monitoring-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-disabling-the-local-alertmanager.adoc b/modules/monitoring-disabling-the-local-alertmanager.adoc index f110b124be..88f309d669 100644 --- a/modules/monitoring-disabling-the-local-alertmanager.adoc +++ b/modules/monitoring-disabling-the-local-alertmanager.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="monitoring-disabling-the-local-alertmanager_{context}"] diff --git a/modules/monitoring-editing-silences.adoc b/modules/monitoring-editing-silences.adoc index 0847971d78..be7588044b 100644 --- a/modules/monitoring-editing-silences.adoc +++ b/modules/monitoring-editing-silences.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="editing-silences_{context}"] diff --git a/modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc b/modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc index 88ce3686e0..194a2b4264 100644 --- a/modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc +++ b/modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-alert-routing-for-user-defined-projects.adoc +// * observability/monitoring/enabling-alert-routing-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing_{context}"] diff --git a/modules/monitoring-enabling-monitoring-for-user-defined-projects.adoc b/modules/monitoring-enabling-monitoring-for-user-defined-projects.adoc index 6c448f7548..63dfd31070 100644 --- a/modules/monitoring-enabling-monitoring-for-user-defined-projects.adoc +++ b/modules/monitoring-enabling-monitoring-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="enabling-monitoring-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-enabling-query-logging-for-thanos-querier.adoc b/modules/monitoring-enabling-query-logging-for-thanos-querier.adoc index 3b40852b6e..7a330eaef2 100644 --- a/modules/monitoring-enabling-query-logging-for-thanos-querier.adoc +++ b/modules/monitoring-enabling-query-logging-for-thanos-querier.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="enabling-query-logging-for-thanos-querier_{context}"] diff --git a/modules/monitoring-enabling-the-platform-alertmanager-instance-for-user-defined-alert-routing.adoc b/modules/monitoring-enabling-the-platform-alertmanager-instance-for-user-defined-alert-routing.adoc index 3403a890cf..713c4fdba3 100644 --- a/modules/monitoring-enabling-the-platform-alertmanager-instance-for-user-defined-alert-routing.adoc +++ b/modules/monitoring-enabling-the-platform-alertmanager-instance-for-user-defined-alert-routing.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-alert-routing-for-user-defined-projects.adoc +// * observability/monitoring/enabling-alert-routing-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="enabling-the-platform-alertmanager-instance-for-user-defined-alert-routing_{context}"] diff --git a/modules/monitoring-example-remote-write-authentication-settings.adoc b/modules/monitoring-example-remote-write-authentication-settings.adoc index 09d1bb584e..2139d1ebdb 100644 --- a/modules/monitoring-example-remote-write-authentication-settings.adoc +++ b/modules/monitoring-example-remote-write-authentication-settings.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: REFERENCE [id="example-remote-write-authentication-settings_{context}"] diff --git a/modules/monitoring-excluding-a-user-defined-project-from-monitoring.adoc b/modules/monitoring-excluding-a-user-defined-project-from-monitoring.adoc index f2ee399d14..7a8e821cec 100644 --- a/modules/monitoring-excluding-a-user-defined-project-from-monitoring.adoc +++ b/modules/monitoring-excluding-a-user-defined-project-from-monitoring.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * monitoring/enabling-monitoring-for-user-defined-projects.adoc -// * monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="excluding-a-user-defined-project-from-monitoring_{context}"] diff --git a/modules/monitoring-expiring-silences.adoc b/modules/monitoring-expiring-silences.adoc index 516209484f..2451560e2a 100644 --- a/modules/monitoring-expiring-silences.adoc +++ b/modules/monitoring-expiring-silences.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="expiring-silences_{context}"] diff --git a/modules/monitoring-exploring-the-visualized-metrics.adoc b/modules/monitoring-exploring-the-visualized-metrics.adoc index f82961f830..df3d0a797b 100644 --- a/modules/monitoring-exploring-the-visualized-metrics.adoc +++ b/modules/monitoring-exploring-the-visualized-metrics.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc :_mod-docs-content-type: PROCEDURE [id="exploring-the-visualized-metrics_{context}"] diff --git a/modules/monitoring-exposing-custom-application-metrics-for-horizontal-pod-autoscaling.adoc b/modules/monitoring-exposing-custom-application-metrics-for-horizontal-pod-autoscaling.adoc index b7a6d2d08d..15c6d44813 100644 --- a/modules/monitoring-exposing-custom-application-metrics-for-horizontal-pod-autoscaling.adoc +++ b/modules/monitoring-exposing-custom-application-metrics-for-horizontal-pod-autoscaling.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/application-monitoring.adoc +// * observability/monitoring/application-monitoring.adoc [id="exposing-custom-application-metrics-for-horizontal-pod-autoscaling_{context}"] = Exposing custom application metrics for horizontal pod autoscaling diff --git a/modules/monitoring-getting-detailed-information-about-a-target.adoc b/modules/monitoring-getting-detailed-information-about-a-target.adoc index 44b9110c22..e2a9ad9566 100644 --- a/modules/monitoring-getting-detailed-information-about-a-target.adoc +++ b/modules/monitoring-getting-detailed-information-about-a-target.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc :_mod-docs-content-type: PROCEDURE [id="getting-detailed-information-about-a-target_{context}"] diff --git a/modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc b/modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc index 19dca016a2..ccd2d8c9e9 100644 --- a/modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc +++ b/modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="getting-information-about-alerts-silences-and-alerting-rules_{context}"] diff --git a/modules/monitoring-granting-user-permissions-using-the-cli.adoc b/modules/monitoring-granting-user-permissions-using-the-cli.adoc index 56e7e68eea..df5e0c9a36 100644 --- a/modules/monitoring-granting-user-permissions-using-the-cli.adoc +++ b/modules/monitoring-granting-user-permissions-using-the-cli.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="granting-user-permissions-using-the-cli_{context}"] diff --git a/modules/monitoring-granting-user-permissions-using-the-web-console.adoc b/modules/monitoring-granting-user-permissions-using-the-web-console.adoc index b5384895a4..ce5b4a7507 100644 --- a/modules/monitoring-granting-user-permissions-using-the-web-console.adoc +++ b/modules/monitoring-granting-user-permissions-using-the-web-console.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="granting-user-permissions-using-the-web-console_{context}"] diff --git a/modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc b/modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc index cd9ab1546e..bf72a9a7da 100644 --- a/modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc +++ b/modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-alert-routing-for-user-defined-projects.adoc +// * observability/monitoring/enabling-alert-routing-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="granting-users-permission-to-configure-alert-routing-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-granting-users-permission-to-configure-monitoring-for-user-defined-projects.adoc b/modules/monitoring-granting-users-permission-to-configure-monitoring-for-user-defined-projects.adoc index cd6ee4fe08..8d4db2c9dc 100644 --- a/modules/monitoring-granting-users-permission-to-configure-monitoring-for-user-defined-projects.adoc +++ b/modules/monitoring-granting-users-permission-to-configure-monitoring-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="granting-users-permission-to-configure-monitoring-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc b/modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc index 1cd7e5ff4e..cab9462160 100644 --- a/modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc +++ b/modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc :_mod-docs-content-type: CONCEPT [id="granting-users-permission-to-monitor-user-defined-projects_{context}"] diff --git a/modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc b/modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc index 9922aaa49d..d36dd17248 100644 --- a/modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc +++ b/modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/troubleshooting-monitoring-issues.adoc +// * observability/monitoring/troubleshooting-monitoring-issues.adoc // * support/troubleshooting/investigating-monitoring-issues.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/monitoring-limiting-scrape-samples-in-user-defined-projects.adoc b/modules/monitoring-limiting-scrape-samples-in-user-defined-projects.adoc index c0a8a2a523..d98ba26caa 100644 --- a/modules/monitoring-limiting-scrape-samples-in-user-defined-projects.adoc +++ b/modules/monitoring-limiting-scrape-samples-in-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="controlling-the-impact-of-unbound-attributes-in-user-defined-projects_{context}"] diff --git a/modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc b/modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc index 248e5b94b1..197d58772c 100644 --- a/modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc +++ b/modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="listing-alerting-rules-for-all-projects-in-a-single-view_{context}"] diff --git a/modules/monitoring-maintenance-and-support.adoc b/modules/monitoring-maintenance-and-support.adoc index ba5022d6c8..f6796901c5 100644 --- a/modules/monitoring-maintenance-and-support.adoc +++ b/modules/monitoring-maintenance-and-support.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc [id="maintenance-and-support_{context}"] = Maintenance and support for monitoring diff --git a/modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc b/modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc index d5d6b05b6c..c4dc896028 100644 --- a/modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc +++ b/modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc // :_mod-docs-content-type: CONCEPT diff --git a/modules/monitoring-managing-core-platform-alerting-rules.adoc b/modules/monitoring-managing-core-platform-alerting-rules.adoc index 8af0edfcf4..04eb637b20 100644 --- a/modules/monitoring-managing-core-platform-alerting-rules.adoc +++ b/modules/monitoring-managing-core-platform-alerting-rules.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: CONCEPT [id="managing-core-platform-alerting-rules_{context}"] diff --git a/modules/monitoring-managing-silences.adoc b/modules/monitoring-managing-silences.adoc index 32f285ea3d..15104adcc2 100644 --- a/modules/monitoring-managing-silences.adoc +++ b/modules/monitoring-managing-silences.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: CONCEPT [id="managing-silences_{context}"] diff --git a/modules/monitoring-modifying-core-platform-alerting-rules.adoc b/modules/monitoring-modifying-core-platform-alerting-rules.adoc index 26ae2c5e8a..7311d1a7e9 100644 --- a/modules/monitoring-modifying-core-platform-alerting-rules.adoc +++ b/modules/monitoring-modifying-core-platform-alerting-rules.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="modifying-core-platform-alerting-rules_{context}"] diff --git a/modules/monitoring-modifying-retention-time-and-size-for-prometheus-metrics-data.adoc b/modules/monitoring-modifying-retention-time-and-size-for-prometheus-metrics-data.adoc index fe31e00856..b653a9fe35 100644 --- a/modules/monitoring-modifying-retention-time-and-size-for-prometheus-metrics-data.adoc +++ b/modules/monitoring-modifying-retention-time-and-size-for-prometheus-metrics-data.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="modifying-retention-time-and-size-for-prometheus-metrics-data_{context}"] diff --git a/modules/monitoring-modifying-the-retention-time-for-thanos-ruler-metrics-data.adoc b/modules/monitoring-modifying-the-retention-time-for-thanos-ruler-metrics-data.adoc index 5f810a2f5a..1eb403a321 100644 --- a/modules/monitoring-modifying-the-retention-time-for-thanos-ruler-metrics-data.adoc +++ b/modules/monitoring-modifying-the-retention-time-for-thanos-ruler-metrics-data.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="modifying-the-retention-time-for-thanos-ruler-metrics-data_{context}"] diff --git a/modules/monitoring-moving-monitoring-components-to-different-nodes.adoc b/modules/monitoring-moving-monitoring-components-to-different-nodes.adoc index accaf808e4..2d1a7dbc14 100644 --- a/modules/monitoring-moving-monitoring-components-to-different-nodes.adoc +++ b/modules/monitoring-moving-monitoring-components-to-different-nodes.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="moving-monitoring-components-to-different-nodes_{context}"] diff --git a/modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc b/modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc index f4626df8e1..17b2b1ecbf 100644 --- a/modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc +++ b/modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: CONCEPT [id="Optimizing-alerting-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-querying-metrics-by-using-the-federation-endpoint-for-prometheus.adoc b/modules/monitoring-querying-metrics-by-using-the-federation-endpoint-for-prometheus.adoc index 255356a333..16bcae0abe 100644 --- a/modules/monitoring-querying-metrics-by-using-the-federation-endpoint-for-prometheus.adoc +++ b/modules/monitoring-querying-metrics-by-using-the-federation-endpoint-for-prometheus.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/accessing-third-party-monitoring-apis.adoc +// * observability/monitoring/accessing-third-party-monitoring-apis.adoc :_mod-docs-content-type: PROCEDURE [id="monitoring-querying-metrics-by-using-the-federation-endpoint-for-prometheus_{context}"] diff --git a/modules/monitoring-querying-metrics-for-all-projects-as-an-administrator.adoc b/modules/monitoring-querying-metrics-for-all-projects-as-an-administrator.adoc index 1c909cde57..00a8754df0 100644 --- a/modules/monitoring-querying-metrics-for-all-projects-as-an-administrator.adoc +++ b/modules/monitoring-querying-metrics-for-all-projects-as-an-administrator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc // * virt/support/virt-prometheus-queries.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/monitoring-querying-metrics-for-user-defined-projects-as-a-developer.adoc b/modules/monitoring-querying-metrics-for-user-defined-projects-as-a-developer.adoc index 2f7cdbf216..b59b59b6c1 100644 --- a/modules/monitoring-querying-metrics-for-user-defined-projects-as-a-developer.adoc +++ b/modules/monitoring-querying-metrics-for-user-defined-projects-as-a-developer.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc // * virt/support/virt-prometheus-queries.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/monitoring-removing-alerting-rules-for-user-defined-projects.adoc b/modules/monitoring-removing-alerting-rules-for-user-defined-projects.adoc index 41d63cdbd9..fd21d052db 100644 --- a/modules/monitoring-removing-alerting-rules-for-user-defined-projects.adoc +++ b/modules/monitoring-removing-alerting-rules-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="removing-alerting-rules-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-resizing-a-persistent-storage-volume.adoc b/modules/monitoring-resizing-a-persistent-storage-volume.adoc index 776ee16ae0..dd63a9f101 100644 --- a/modules/monitoring-resizing-a-persistent-storage-volume.adoc +++ b/modules/monitoring-resizing-a-persistent-storage-volume.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="resizing-a-persistent-storage-volume_{context}"] diff --git a/modules/monitoring-reviewing-monitoring-dashboards-admin.adoc b/modules/monitoring-reviewing-monitoring-dashboards-admin.adoc index 046e20d36a..a66628902b 100644 --- a/modules/monitoring-reviewing-monitoring-dashboards-admin.adoc +++ b/modules/monitoring-reviewing-monitoring-dashboards-admin.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/reviewing-monitoring-dashboards.adoc +// * observability/monitoring/reviewing-monitoring-dashboards.adoc :_mod-docs-content-type: PROCEDURE [id="reviewing-monitoring-dashboards-admin_{context}"] diff --git a/modules/monitoring-reviewing-monitoring-dashboards-developer.adoc b/modules/monitoring-reviewing-monitoring-dashboards-developer.adoc index 1bcd8019e9..b0d4b3a169 100644 --- a/modules/monitoring-reviewing-monitoring-dashboards-developer.adoc +++ b/modules/monitoring-reviewing-monitoring-dashboards-developer.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/reviewing-monitoring-dashboards.adoc +// * observability/monitoring/reviewing-monitoring-dashboards.adoc :_mod-docs-content-type: PROCEDURE [id="reviewing-monitoring-dashboards-developer_{context}"] diff --git a/modules/monitoring-running-metrics-queries.adoc b/modules/monitoring-running-metrics-queries.adoc index 6da280122c..a9c3357e91 100644 --- a/modules/monitoring-running-metrics-queries.adoc +++ b/modules/monitoring-running-metrics-queries.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/examining-cluster-metrics.adoc +// * observability/monitoring/examining-cluster-metrics.adoc [id="running-metrics-queries_{context}"] = Running metrics queries diff --git a/modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc b/modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc index 950921e154..214aa7534e 100644 --- a/modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc +++ b/modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: CONCEPT [id="searching-alerts-silences-and-alerting-rules_{context}"] diff --git a/modules/monitoring-sending-notifications-to-external-systems.adoc b/modules/monitoring-sending-notifications-to-external-systems.adoc index 36702c78d5..c1546123e5 100644 --- a/modules/monitoring-sending-notifications-to-external-systems.adoc +++ b/modules/monitoring-sending-notifications-to-external-systems.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc // * post_installation_configuration/configuring-alert-notifications.adoc :_mod-docs-content-type: CONCEPT diff --git a/modules/monitoring-setting-audit-log-levels-for-the-prometheus-adapter.adoc b/modules/monitoring-setting-audit-log-levels-for-the-prometheus-adapter.adoc index 6ef8c67f07..d19394eff9 100644 --- a/modules/monitoring-setting-audit-log-levels-for-the-prometheus-adapter.adoc +++ b/modules/monitoring-setting-audit-log-levels-for-the-prometheus-adapter.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="setting-audit-log-levels-for-the-prometheus-adapter_{context}"] diff --git a/modules/monitoring-setting-log-levels-for-monitoring-components.adoc b/modules/monitoring-setting-log-levels-for-monitoring-components.adoc index 3c84901640..a4f05419cd 100644 --- a/modules/monitoring-setting-log-levels-for-monitoring-components.adoc +++ b/modules/monitoring-setting-log-levels-for-monitoring-components.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="setting-log-levels-for-monitoring-components_{context}"] diff --git a/modules/monitoring-setting-query-log-file-for-prometheus.adoc b/modules/monitoring-setting-query-log-file-for-prometheus.adoc index f50343cf37..6192086cdc 100644 --- a/modules/monitoring-setting-query-log-file-for-prometheus.adoc +++ b/modules/monitoring-setting-query-log-file-for-prometheus.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="setting-query-log-file-for-prometheus_{context}"] diff --git a/modules/monitoring-setting-scrape-sample-and-label-limits-for-user-defined-projects.adoc b/modules/monitoring-setting-scrape-sample-and-label-limits-for-user-defined-projects.adoc index 0637411290..e2019fdbf3 100644 --- a/modules/monitoring-setting-scrape-sample-and-label-limits-for-user-defined-projects.adoc +++ b/modules/monitoring-setting-scrape-sample-and-label-limits-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="setting-scrape-sample-and-label-limits-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-setting-the-body-size-limit-for-metrics-scraping.adoc b/modules/monitoring-setting-the-body-size-limit-for-metrics-scraping.adoc index 15d3b715e2..89d3c05f97 100644 --- a/modules/monitoring-setting-the-body-size-limit-for-metrics-scraping.adoc +++ b/modules/monitoring-setting-the-body-size-limit-for-metrics-scraping.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="setting-the-body-size-limit-for-metrics-scraping_{context}"] diff --git a/modules/monitoring-setting-up-metrics-collection-for-user-defined-projects.adoc b/modules/monitoring-setting-up-metrics-collection-for-user-defined-projects.adoc index c6c89e3ecb..762683dba3 100644 --- a/modules/monitoring-setting-up-metrics-collection-for-user-defined-projects.adoc +++ b/modules/monitoring-setting-up-metrics-collection-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc :_mod-docs-content-type: CONCEPT [id="setting-up-metrics-collection-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-setting-up-pod-topology-spread-constraints-for-alertmanager.adoc b/modules/monitoring-setting-up-pod-topology-spread-constraints-for-alertmanager.adoc index 16cc659350..f19a6d52c6 100644 --- a/modules/monitoring-setting-up-pod-topology-spread-constraints-for-alertmanager.adoc +++ b/modules/monitoring-setting-up-pod-topology-spread-constraints-for-alertmanager.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="setting-up-pod-topology-spread-constraints-for-alertmanager_{context}"] diff --git a/modules/monitoring-setting-up-pod-topology-spread-constraints-for-prometheus.adoc b/modules/monitoring-setting-up-pod-topology-spread-constraints-for-prometheus.adoc index df9ed8fefa..2ffbadd515 100644 --- a/modules/monitoring-setting-up-pod-topology-spread-constraints-for-prometheus.adoc +++ b/modules/monitoring-setting-up-pod-topology-spread-constraints-for-prometheus.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="setting-up-pod-topology-spread-constraints-for-prometheus_{context}"] diff --git a/modules/monitoring-setting-up-pod-topology-spread-constraints-for-thanos-ruler.adoc b/modules/monitoring-setting-up-pod-topology-spread-constraints-for-thanos-ruler.adoc index 9427ced524..6d16adc9f2 100644 --- a/modules/monitoring-setting-up-pod-topology-spread-constraints-for-thanos-ruler.adoc +++ b/modules/monitoring-setting-up-pod-topology-spread-constraints-for-thanos-ruler.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="setting-up-pod-topology-spread-constraints-for-thanos-ruler_{context}"] diff --git a/modules/monitoring-silencing-alerts.adoc b/modules/monitoring-silencing-alerts.adoc index 98d9b04290..d6674aa83f 100644 --- a/modules/monitoring-silencing-alerts.adoc +++ b/modules/monitoring-silencing-alerts.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="silencing-alerts_{context}"] diff --git a/modules/monitoring-specifying-how-a-service-is-monitored-by-cluster-observability-operator.adoc b/modules/monitoring-specifying-how-a-service-is-monitored-by-cluster-observability-operator.adoc index 4720b43c25..eeaeff4e70 100644 --- a/modules/monitoring-specifying-how-a-service-is-monitored-by-cluster-observability-operator.adoc +++ b/modules/monitoring-specifying-how-a-service-is-monitored-by-cluster-observability-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// monitoring/cluster-observability-operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc +// * observability/monitoring/cluster-observability-operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc :_mod-docs-content-type: PROCEDURE [id="specifying-how-a-service-is-monitored-by-cluster-observability-operator_{context}"] diff --git a/modules/monitoring-specifying-how-a-service-is-monitored.adoc b/modules/monitoring-specifying-how-a-service-is-monitored.adoc index 609c6166f8..bd5c6795b6 100644 --- a/modules/monitoring-specifying-how-a-service-is-monitored.adoc +++ b/modules/monitoring-specifying-how-a-service-is-monitored.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc :_mod-docs-content-type: PROCEDURE [id="specifying-how-a-service-is-monitored_{context}"] diff --git a/modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc b/modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc index f0479d13f4..87c1f7ca25 100644 --- a/modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc +++ b/modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: PROCEDURE [id="specifying-limits-and-resource-requests-for-monitoring-components_{context}"] diff --git a/modules/monitoring-support-considerations.adoc b/modules/monitoring-support-considerations.adoc index d97b35c8c5..20e96b73dc 100644 --- a/modules/monitoring-support-considerations.adoc +++ b/modules/monitoring-support-considerations.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="support-considerations_{context}"] diff --git a/modules/monitoring-supported-remote-write-authentication-settings.adoc b/modules/monitoring-supported-remote-write-authentication-settings.adoc index f217b9e82d..864c4e70a2 100644 --- a/modules/monitoring-supported-remote-write-authentication-settings.adoc +++ b/modules/monitoring-supported-remote-write-authentication-settings.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: REFERENCE [id="supported_remote_write_authentication_settings_{context}"] diff --git a/modules/monitoring-targets-for-user-defined-projects.adoc b/modules/monitoring-targets-for-user-defined-projects.adoc index eafabcff96..817526103e 100644 --- a/modules/monitoring-targets-for-user-defined-projects.adoc +++ b/modules/monitoring-targets-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/monitoring-overview.adoc +// * observability/monitoring/monitoring-overview.adoc :_mod-docs-content-type: CONCEPT [id="monitoring-targets-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-tips-for-optimizing-alerting-rules-for-core-platform-monitoring.adoc b/modules/monitoring-tips-for-optimizing-alerting-rules-for-core-platform-monitoring.adoc index d982b0b09a..27cc361d17 100644 --- a/modules/monitoring-tips-for-optimizing-alerting-rules-for-core-platform-monitoring.adoc +++ b/modules/monitoring-tips-for-optimizing-alerting-rules-for-core-platform-monitoring.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-alerts.adoc +// * observability/monitoring/managing-alerts.adoc :_mod-docs-content-type: CONCEPT [id="tips-for-optimizing-alerting-rules-for-core-platform-monitoring_{context}"] diff --git a/modules/monitoring-understanding-alert-routing-for-user-defined-projects.adoc b/modules/monitoring-understanding-alert-routing-for-user-defined-projects.adoc index edb2e2dfbb..a53525e3e5 100644 --- a/modules/monitoring-understanding-alert-routing-for-user-defined-projects.adoc +++ b/modules/monitoring-understanding-alert-routing-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/enabling-alert-routing-for-user-defined-projects.adoc +// * observability/monitoring/enabling-alert-routing-for-user-defined-projects.adoc :_mod-docs-content-type: CONCEPT [id="understanding-alert-routing-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-understanding-metrics.adoc b/modules/monitoring-understanding-metrics.adoc index a66146f614..76c2308666 100644 --- a/modules/monitoring-understanding-metrics.adoc +++ b/modules/monitoring-understanding-metrics.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc :_mod-docs-content-type: CONCEPT [id="understanding-metrics_{context}"] diff --git a/modules/monitoring-understanding-the-cluster-observability-operator.adoc b/modules/monitoring-understanding-the-cluster-observability-operator.adoc index 87dbb82efa..0e04213894 100644 --- a/modules/monitoring-understanding-the-cluster-observability-operator.adoc +++ b/modules/monitoring-understanding-the-cluster-observability-operator.adoc @@ -1,6 +1,6 @@ //Module included in the following assemblies: // -// monitoring/cluster_observability_operator/cluster-observability-operator-overview.adoc +// * observability/monitoring/cluster_observability_operator/cluster-observability-operator-overview.adoc :_mod-docs-content-type: CONCEPT [id="understanding-the-cluster-observability-operator_{context}"] diff --git a/modules/monitoring-understanding-the-monitoring-stack.adoc b/modules/monitoring-understanding-the-monitoring-stack.adoc index 5de4d5d962..87b1359ec5 100644 --- a/modules/monitoring-understanding-the-monitoring-stack.adoc +++ b/modules/monitoring-understanding-the-monitoring-stack.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * virt/support/virt-openshift-cluster-monitoring.adoc -// * monitoring/monitoring-overview.adoc +// * observability/monitoring/monitoring-overview.adoc // This module uses a conditionalized title so that the module // can be re-used in associated products but the title is not diff --git a/modules/monitoring-uninstalling-cluster-observability-operator-using-the-web-console.adoc b/modules/monitoring-uninstalling-cluster-observability-operator-using-the-web-console.adoc index 4327ec3666..272e2ef531 100644 --- a/modules/monitoring-uninstalling-cluster-observability-operator-using-the-web-console.adoc +++ b/modules/monitoring-uninstalling-cluster-observability-operator-using-the-web-console.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: -// * monitoring/cluster_observability_operator/installing-the-cluster-observability-operator.adoc +// * observability/monitoring/cluster_observability_operator/installing-the-cluster-observability-operator.adoc :_mod-docs-content-type: PROCEDURE [id="uninstalling-the-cluster-observability-operator-using-the-web-console_{context}"] diff --git a/modules/monitoring-unmanaged-monitoring-operators.adoc b/modules/monitoring-unmanaged-monitoring-operators.adoc index 9436195cc9..0b8b7216c6 100644 --- a/modules/monitoring-unmanaged-monitoring-operators.adoc +++ b/modules/monitoring-unmanaged-monitoring-operators.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="unmanaged-monitoring-operators_{context}"] diff --git a/modules/monitoring-using-node-selectors-to-move-monitoring-components.adoc b/modules/monitoring-using-node-selectors-to-move-monitoring-components.adoc index fcac608997..766176960e 100644 --- a/modules/monitoring-using-node-selectors-to-move-monitoring-components.adoc +++ b/modules/monitoring-using-node-selectors-to-move-monitoring-components.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/configuring-the-monitoring-stack.adoc +// * observability/monitoring/configuring-the-monitoring-stack.adoc :_mod-docs-content-type: CONCEPT [id="using-node-selectors-to-move-monitoring-components_{context}"] diff --git a/modules/monitoring-viewing-a-list-of-available-metrics.adoc b/modules/monitoring-viewing-a-list-of-available-metrics.adoc index 2c7682e587..e28cc3d773 100644 --- a/modules/monitoring-viewing-a-list-of-available-metrics.adoc +++ b/modules/monitoring-viewing-a-list-of-available-metrics.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/managing-metrics.adoc +// * observability/monitoring/managing-metrics.adoc :_mod-docs-content-type: PROCEDURE [id="viewing-a-list-of-available-metrics_{context}"] diff --git a/modules/ocm-settings-tab.adoc b/modules/ocm-settings-tab.adoc index 680c935cd1..b1cdf610e0 100644 --- a/modules/ocm-settings-tab.adoc +++ b/modules/ocm-settings-tab.adoc @@ -7,7 +7,7 @@ The **Settings** tab provides a few options for the cluster owner: -* **Monitoring**, which is enabled by default, allows for reporting done on user-defined actions. See link:https://docs.openshift.com/rosa/monitoring/osd-understanding-the-monitoring-stack.html[Understanding the monitoring stack]. +* **Monitoring**, which is enabled by default, allows for reporting done on user-defined actions. See link:https://docs.openshift.com/rosa/observability/monitoring/monitoring-overview.html#understanding-the-monitoring-stack_monitoring-overview.html[Understanding the monitoring stack]. * **Update strategy** allows you to determine if the cluster automatically updates on a certain day of the week at a specified time or if all updates are scheduled manually. * **Node draining** sets the duration that protected workloads are respected during updates. When this duration has passed, the node is forcibly removed. * **Update status** shows the current version and if there are any updates available. diff --git a/modules/sd-disabling-monitoring-for-user-defined-projects.adoc b/modules/sd-disabling-monitoring-for-user-defined-projects.adoc index 75be920f42..09892184fe 100644 --- a/modules/sd-disabling-monitoring-for-user-defined-projects.adoc +++ b/modules/sd-disabling-monitoring-for-user-defined-projects.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc +// * observability/monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc :_mod-docs-content-type: PROCEDURE [id="sd-disabling-monitoring-for-user-defined-projects_{context}"] diff --git a/modules/sd-monitoring-troubleshooting-issues.adoc b/modules/sd-monitoring-troubleshooting-issues.adoc index 042f831916..a553fa9013 100644 --- a/modules/sd-monitoring-troubleshooting-issues.adoc +++ b/modules/sd-monitoring-troubleshooting-issues.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * monitoring/troubleshooting-monitoring-issues.adoc +// * observability/monitoring/troubleshooting-monitoring-issues.adoc :_mod-docs-content-type: PROCEDURE [id="troubleshooting-monitoring-issues_{context}"] diff --git a/networking/ingress-operator.adoc b/networking/ingress-operator.adoc index 69a073d50f..997064ceb1 100644 --- a/networking/ingress-operator.adoc +++ b/networking/ingress-operator.adoc @@ -52,7 +52,7 @@ include::modules/nw-autoscaling-ingress-controller.adoc[leveloffset=+2] ifndef::openshift-rosa,openshift-dedicated[] [role="_additional-resources"] .Additional resources -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] * xref:../nodes/cma/nodes-cma-autoscaling-custom-install.adoc#nodes-cma-autoscaling-custom-install[Installing the custom metrics autoscaler] diff --git a/networking/metallb/metallb-troubleshoot-support.adoc b/networking/metallb/metallb-troubleshoot-support.adoc index 2eb96b7251..837db22619 100644 --- a/networking/metallb/metallb-troubleshoot-support.adoc +++ b/networking/metallb/metallb-troubleshoot-support.adoc @@ -25,7 +25,7 @@ include::modules/nw-metallb-metrics.adoc[leveloffset=+1] .Additional resources -* See xref:../../monitoring/managing-metrics.adoc#about-querying-metrics_managing-metrics[Querying metrics] for information about using the monitoring dashboard. +* See xref:../../observability/monitoring/managing-metrics.adoc#about-querying-metrics_managing-metrics[Querying metrics] for information about using the monitoring dashboard. // Collecting data include::modules/nw-metallb-collecting-data.adoc[leveloffset=+1] diff --git a/networking/ptp/using-ptp-events.adoc b/networking/ptp/using-ptp-events.adoc index 48f1109b72..4290563f9d 100644 --- a/networking/ptp/using-ptp-events.adoc +++ b/networking/ptp/using-ptp-events.adoc @@ -61,6 +61,6 @@ include::modules/cnf-monitoring-fast-events-metrics.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] +* xref:../../observability/monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] include::modules/nw-ptp-operator-metrics-reference.adoc[leveloffset=+1] diff --git a/nodes/nodes/nodes-nodes-machine-config-daemon-metrics.adoc b/nodes/nodes/nodes-nodes-machine-config-daemon-metrics.adoc index 6472926dd3..12fb16e32e 100644 --- a/nodes/nodes/nodes-nodes-machine-config-daemon-metrics.adoc +++ b/nodes/nodes/nodes-nodes-machine-config-daemon-metrics.adoc @@ -12,9 +12,9 @@ include::modules/machine-config-daemon-metrics.adoc[leveloffset=+1] .Additional resources ifndef::openshift-rosa,openshift-dedicated[] -* xref:../../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] +* xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] * xref:../../support/gathering-cluster-data.adoc#gathering-cluster-data[Gathering data about your cluster] endif::openshift-rosa,openshift-dedicated[] ifdef::openshift-rosa,openshift-dedicated[] -* xref:../../monitoring/monitoring-overview.adoc#monitoring-overview[Understanding the monitoring stack] +* xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Understanding the monitoring stack] endif::openshift-rosa,openshift-dedicated[] diff --git a/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc b/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc index 0e6fc15164..c0ea2b831e 100644 --- a/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc +++ b/observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc @@ -40,6 +40,6 @@ include::modules/distr-tracing-tempo-configuring-tempostack-metrics-and-alerts.a [role="_additional-resources"] [id="additional-resources_distr-tracing-tempo-configuring-tempostack-metrics-and-alerts"] ==== Additional resources -* xref:../../../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] include::modules/distr-tracing-tempo-configuring-tempooperator-metrics-and-alerts.adoc[leveloffset=+2] diff --git a/observability/index.adoc b/observability/index.adoc index 0ff5c5f36e..3dfa898636 100644 --- a/observability/index.adoc +++ b/observability/index.adoc @@ -24,8 +24,7 @@ Monitor the in-cluster health and performance of your applications running on {p Monitoring stack components are deployed by default in every {product-title} installation and are managed by the Cluster Monitoring Operator (CMO). These components include Prometheus, Alertmanager, Thanos Querier, and others. The CMO also deploys the Telemeter Client, which sends a subset of data from platform Prometheus instances to Red Hat to facilitate Remote Health Monitoring for clusters. -For more information, see xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. -//after the file is added to the observability directory, update xref path to ../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview]. +For more information, see xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. [id="cluster-logging-index"] == Logging diff --git a/monitoring/_attributes b/observability/monitoring/_attributes similarity index 100% rename from monitoring/_attributes rename to observability/monitoring/_attributes diff --git a/monitoring/accessing-third-party-monitoring-apis.adoc b/observability/monitoring/accessing-third-party-monitoring-apis.adoc similarity index 71% rename from monitoring/accessing-third-party-monitoring-apis.adoc rename to observability/monitoring/accessing-third-party-monitoring-apis.adoc index 3898543206..a9cda9509a 100644 --- a/monitoring/accessing-third-party-monitoring-apis.adoc +++ b/observability/monitoring/accessing-third-party-monitoring-apis.adoc @@ -23,7 +23,7 @@ To avoid these issues, follow these recommendations: include::modules/monitoring-about-accessing-monitoring-web-service-apis.adoc[leveloffset=+1] .Additional resources -* xref:../monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards] +* xref:../../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards] include::modules/monitoring-accessing-third-party-monitoring-web-service-apis.adoc[leveloffset=+1] @@ -38,8 +38,8 @@ include::modules/accessing-metrics-outside-cluster.adoc[leveloffset=+1] == Additional resources ifndef::openshift-dedicated,openshift-rosa[] -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] endif::openshift-dedicated,openshift-rosa[] -* xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring_remote_write_storage_configuring-the-monitoring-stack[Configuring remote write storage] -* xref:../monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] -* xref:../monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring_remote_write_storage_configuring-the-monitoring-stack[Configuring remote write storage] +* xref:../../observability/monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] +* xref:../../observability/monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] diff --git a/monitoring/application-monitoring.adoc b/observability/monitoring/application-monitoring.adoc similarity index 84% rename from monitoring/application-monitoring.adoc rename to observability/monitoring/application-monitoring.adoc index 002a7bf4af..eb7033cbf1 100644 --- a/monitoring/application-monitoring.adoc +++ b/observability/monitoring/application-monitoring.adoc @@ -17,4 +17,4 @@ include::modules/monitoring-exposing-custom-application-metrics-for-horizontal-p == Next steps -* To automatically adjust the number of pods in which the application runs, xref:../monitoring/application-monitoring.adoc#application-monitoring[configure Horizontal Pod Autoscaling for the application.] +* To automatically adjust the number of pods in which the application runs, xref:../../observability/monitoring/application-monitoring.adoc#application-monitoring[configure Horizontal Pod Autoscaling for the application.] diff --git a/monitoring/cluster_observability_operator/_attributes b/observability/monitoring/cluster_observability_operator/_attributes similarity index 100% rename from monitoring/cluster_observability_operator/_attributes rename to observability/monitoring/cluster_observability_operator/_attributes diff --git a/monitoring/cluster_observability_operator/cluster-observability-operator-overview.adoc b/observability/monitoring/cluster_observability_operator/cluster-observability-operator-overview.adoc similarity index 100% rename from monitoring/cluster_observability_operator/cluster-observability-operator-overview.adoc rename to observability/monitoring/cluster_observability_operator/cluster-observability-operator-overview.adoc diff --git a/monitoring/cluster_observability_operator/cluster-observability-operator-release-notes.adoc b/observability/monitoring/cluster_observability_operator/cluster-observability-operator-release-notes.adoc similarity index 100% rename from monitoring/cluster_observability_operator/cluster-observability-operator-release-notes.adoc rename to observability/monitoring/cluster_observability_operator/cluster-observability-operator-release-notes.adoc diff --git a/monitoring/cluster_observability_operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc b/observability/monitoring/cluster_observability_operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc similarity index 100% rename from monitoring/cluster_observability_operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc rename to observability/monitoring/cluster_observability_operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc diff --git a/monitoring/cluster_observability_operator/images b/observability/monitoring/cluster_observability_operator/images similarity index 100% rename from monitoring/cluster_observability_operator/images rename to observability/monitoring/cluster_observability_operator/images diff --git a/monitoring/cluster_observability_operator/installing-the-cluster-observability-operator.adoc b/observability/monitoring/cluster_observability_operator/installing-the-cluster-observability-operator.adoc similarity index 84% rename from monitoring/cluster_observability_operator/installing-the-cluster-observability-operator.adoc rename to observability/monitoring/cluster_observability_operator/installing-the-cluster-observability-operator.adoc index 28f21f3f68..f2707189b9 100644 --- a/monitoring/cluster_observability_operator/installing-the-cluster-observability-operator.adoc +++ b/observability/monitoring/cluster_observability_operator/installing-the-cluster-observability-operator.adoc @@ -12,7 +12,7 @@ include::snippets/technology-preview.adoc[leveloffset=+2] As a cluster administrator, you can install the {coo-first} from OperatorHub by using the {product-title} web console or CLI. OperatorHub is a user interface that works in conjunction with Operator Lifecycle Manager (OLM), which installs and manages Operators on a cluster. -To install the {coo-short} using OperatorHub, follow the procedure described in xref:../../operators/admin/olm-adding-operators-to-cluster.adoc[Adding Operators to a cluster]. +To install the {coo-short} using OperatorHub, follow the procedure described in xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[Adding Operators to a cluster]. // Uninstalling COO using the OCP web console include::modules/monitoring-uninstalling-cluster-observability-operator-using-the-web-console.adoc[leveloffset=+1] diff --git a/monitoring/cluster_observability_operator/modules b/observability/monitoring/cluster_observability_operator/modules similarity index 100% rename from monitoring/cluster_observability_operator/modules rename to observability/monitoring/cluster_observability_operator/modules diff --git a/monitoring/cluster_observability_operator/snippets b/observability/monitoring/cluster_observability_operator/snippets similarity index 100% rename from monitoring/cluster_observability_operator/snippets rename to observability/monitoring/cluster_observability_operator/snippets diff --git a/monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc b/observability/monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc similarity index 100% rename from monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc rename to observability/monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc diff --git a/monitoring/configuring-hpa-for-an-application.adoc b/observability/monitoring/configuring-hpa-for-an-application.adoc similarity index 70% rename from monitoring/configuring-hpa-for-an-application.adoc rename to observability/monitoring/configuring-hpa-for-an-application.adoc index 85dd8571d5..a1b48f9a75 100644 --- a/monitoring/configuring-hpa-for-an-application.adoc +++ b/observability/monitoring/configuring-hpa-for-an-application.adoc @@ -15,9 +15,9 @@ include::snippets/technology-preview.adoc[leveloffset=+0] * Install the OpenShift CLI (`oc`). * You must log in to the cluster with a user that has the `cluster-admin` role. -* Make sure you configured the cluster for application monitoring. In the following example, it is presumed that Prometheus and Alertmanager instances were installed in the `default` project. See xref:../monitoring/application-monitoring.adoc#configuring-cluster-for-application-monitoring_application-monitoring[Application monitoring]. -* Make sure you configured monitoring for your application. In the following example, it is presumed that the application and the service monitor for it were installed in the `default` project. See xref:../monitoring/application-monitoring.adoc#configuring-monitoring-for-an-application_application-monitoring[Application monitoring]. -* Make sure your application exposes metrics using the `prometheus-adapter`. In the following example, it is presumed that `prometheus-adapater` was installed in the `default` project. See xref:../monitoring/application-monitoring.adoc#exposing-custom-application-metrics-for-horizontal-pod-autoscaling_application-monitoring[Application monitoring]. +* Make sure you configured the cluster for application monitoring. In the following example, it is presumed that Prometheus and Alertmanager instances were installed in the `default` project. See xref:../../observability/monitoring/application-monitoring.adoc#configuring-cluster-for-application-monitoring_application-monitoring[Application monitoring]. +* Make sure you configured monitoring for your application. In the following example, it is presumed that the application and the service monitor for it were installed in the `default` project. See xref:../../observability/monitoring/application-monitoring.adoc#configuring-monitoring-for-an-application_application-monitoring[Application monitoring]. +* Make sure your application exposes metrics using the `prometheus-adapter`. In the following example, it is presumed that `prometheus-adapter` was installed in the `default` project. See xref:../../observability/monitoring/application-monitoring.adoc#exposing-custom-application-metrics-for-horizontal-pod-autoscaling_application-monitoring[Application monitoring]. include::modules/configuring-hpa-based-on-application-metrics.adoc[leveloffset=+1] diff --git a/monitoring/configuring-the-monitoring-stack.adoc b/observability/monitoring/configuring-the-monitoring-stack.adoc similarity index 62% rename from monitoring/configuring-the-monitoring-stack.adoc rename to observability/monitoring/configuring-the-monitoring-stack.adoc index b4107db38d..3f4c4388e5 100644 --- a/monitoring/configuring-the-monitoring-stack.adoc +++ b/observability/monitoring/configuring-the-monitoring-stack.adoc @@ -28,7 +28,7 @@ Only the parameters and fields listed in the xref:../monitoring/config-map-refer ifndef::openshift-dedicated,openshift-rosa[] == Prerequisites -* The monitoring stack imposes additional resource requirements. Consult the computing resources recommendations in xref:../scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc#scaling-cluster-monitoring-operator[Scaling the Cluster Monitoring Operator] and verify that you have sufficient resources. +* The monitoring stack imposes additional resource requirements. Consult the computing resources recommendations in xref:../../scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc#scaling-cluster-monitoring-operator[Scaling the Cluster Monitoring Operator] and verify that you have sufficient resources. endif::openshift-dedicated,openshift-rosa[] // Maintenance and support for monitoring @@ -69,7 +69,7 @@ include::modules/monitoring-creating-user-defined-workload-monitoring-configmap. [role="_additional-resources"] .Additional resources -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] endif::openshift-dedicated,openshift-rosa[] // Configuring the monitoring stack @@ -79,12 +79,12 @@ include::modules/monitoring-configuring-the-monitoring-stack.adoc[leveloffset=+1 .Additional resources ifndef::openshift-dedicated,openshift-rosa[] -* Configuration reference for the xref:../monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc#clustermonitoringconfiguration[`cluster-monitoring-config`] config map +* Configuration reference for the xref:../../observability/monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc#clustermonitoringconfiguration[`cluster-monitoring-config`] config map endif::openshift-dedicated,openshift-rosa[] -* Configuration reference for the xref:../monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc#userworkloadconfiguration[`user-workload-monitoring-config`] config map +* Configuration reference for the xref:../../observability/monitoring/config-map-reference-for-the-cluster-monitoring-operator.adoc#userworkloadconfiguration[`user-workload-monitoring-config`] config map ifndef::openshift-dedicated,openshift-rosa[] -* See xref:../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 -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* 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 +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] endif::openshift-dedicated,openshift-rosa[] // Configurable monitoring components @@ -96,12 +96,12 @@ include::modules/monitoring-using-node-selectors-to-move-monitoring-components.a .Additional resources // The nodes topics may apply to OSD/ROSA when that content is ported from OCP. ifndef::openshift-dedicated,openshift-rosa[] -* xref:../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-updating_nodes-nodes-working[Understanding how to update labels on nodes] -* xref:../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors] -* xref:../nodes/scheduling/nodes-scheduler-pod-affinity.adoc[Placing pods relative to other pods using affinity and anti-affinity rules] -* xref:../nodes/scheduling/nodes-scheduler-pod-topology-spread-constraints.adoc[Controlling pod placement by using pod topology spread constraints] +* xref:../../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-updating_nodes-nodes-working[Understanding how to update labels on nodes] +* xref:../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors] +* xref:../../nodes/scheduling/nodes-scheduler-pod-affinity.adoc[Placing pods relative to other pods using affinity and anti-affinity rules] +* xref:../../nodes/scheduling/nodes-scheduler-pod-topology-spread-constraints.adoc[Controlling pod placement by using pod topology spread constraints] endif::openshift-dedicated,openshift-rosa[] -* xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring_pod_topology_spread_constraintsfor_monitoring_configuring-the-monitoring-stack[Configuring pod topology spread constraints for monitoring] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring_pod_topology_spread_constraintsfor_monitoring_configuring-the-monitoring-stack[Configuring pod topology spread constraints for monitoring] * link:https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector[Kubernetes documentation about node selectors] include::modules/monitoring-moving-monitoring-components-to-different-nodes.adoc[leveloffset=+2] @@ -111,12 +111,12 @@ include::modules/monitoring-moving-monitoring-components-to-different-nodes.adoc .Additional resources ifndef::openshift-dedicated,openshift-rosa[] -* See xref:../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 -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* 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 +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] // This xref might be relevant for ROSA/OSD if the Node content is reused: -* xref:../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-updating_nodes-nodes-working[Understanding how to update labels on nodes] +* xref:../../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-updating_nodes-nodes-working[Understanding how to update labels on nodes] // This xref might be relevant for ROSA/OSD if the Node content is reused: -* xref:../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors] +* xref:../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors] endif::openshift-dedicated,openshift-rosa[] * See the link:https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector[Kubernetes documentation] for details on the `nodeSelector` constraint @@ -126,10 +126,10 @@ include::modules/monitoring-assigning-tolerations-to-monitoring-components.adoc[ [role="_additional-resources"] .Additional resources ifndef::openshift-dedicated,openshift-rosa[] -* See xref:../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 -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* 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 +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] // This xref might be relevant for ROSA/OSD if the Node content is reused: -* See the xref:../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[{product-title} documentation] on taints and tolerations +* See the xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[{product-title} documentation] on taints and tolerations endif::openshift-dedicated,openshift-rosa[] * See the link:https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[Kubernetes documentation] on taints and tolerations @@ -171,16 +171,16 @@ include::modules/monitoring-modifying-the-retention-time-for-thanos-ruler-metric [role="_additional-resources"] .Additional resources ifndef::openshift-dedicated,openshift-rosa[] -* xref:../monitoring/configuring-the-monitoring-stack.adoc#creating-cluster-monitoring-configmap_configuring-the-monitoring-stack[Creating a cluster monitoring config map] -* xref:../scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc#prometheus-database-storage-requirements_cluster-monitoring-operator[Prometheus database storage requirements] -* xref:../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Recommended configurable storage technology] -* xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage] -* xref:../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage] -* xref:../storage/persistent_storage/persistent_storage_local/persistent-storage-local.adoc#persistent-storage-using-local-volume[Configure local persistent storage] -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#creating-cluster-monitoring-configmap_configuring-the-monitoring-stack[Creating a cluster monitoring config map] +* xref:../../scalability_and_performance/recommended-performance-scale-practices/recommended-infrastructure-practices.adoc#prometheus-database-storage-requirements_cluster-monitoring-operator[Prometheus database storage requirements] +* xref:../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Recommended configurable storage technology] +* xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage] +* xref:../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage] +* xref:../../storage/persistent_storage/persistent_storage_local/persistent-storage-local.adoc#persistent-storage-using-local-volume[Configure local persistent storage] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] endif::openshift-dedicated,openshift-rosa[] ifdef::openshift-dedicated,openshift-rosa[] -* xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage] +* xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage] endif::openshift-dedicated,openshift-rosa[] // Configuring remote write storage for Prometheus @@ -195,8 +195,8 @@ include::modules/monitoring-example-remote-write-authentication-settings.adoc[le * See link:https://prometheus.io/docs/practices/remote_write/#remote-write-tuning[Tuning remote write settings] for information about how to optimize remote write settings for different use cases. ifndef::openshift-dedicated,openshift-rosa[] // This xref might be relevant for ROSA/OSD if this content is reused: -* See xref:../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets-about_nodes-pods-secrets[Understanding secrets] for steps to create and configure `Secret` objects in {product-title}. -* See the xref:../rest_api/monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#spec-remotewrite-2[Prometheus REST API reference for remote write] for information about additional optional fields. +* See xref:../../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets-about_nodes-pods-secrets[Understanding secrets] for steps to create and configure `Secret` objects in {product-title}. +* See the xref:../../rest_api/monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#spec-remotewrite-2[Prometheus REST API reference for remote write] for information about additional optional fields. endif::openshift-dedicated,openshift-rosa[] // Configuring labels for outgoing metrics @@ -206,9 +206,9 @@ include::modules/monitoring-creating-cluster-id-labels-for-metrics.adoc[leveloff [role="_additional-resources"] .Additional resources -* For details about write relabel configuration, see xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring_remote_write_storage_configuring-the-monitoring-stack[Configuring remote write storage]. +* For details about write relabel configuration, see xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring_remote_write_storage_configuring-the-monitoring-stack[Configuring remote write storage]. ifndef::openshift-dedicated,openshift-rosa[] -* For information about how to get your cluster ID, see xref:../support/gathering-cluster-data.adoc#support-get-cluster-id_gathering-cluster-data[Obtaining your cluster ID]. +* For information about how to get your cluster ID, see xref:../../support/gathering-cluster-data.adoc#support-get-cluster-id_gathering-cluster-data[Obtaining your cluster ID]. endif::openshift-dedicated,openshift-rosa[] // Configuring metrics collection profiles @@ -220,8 +220,8 @@ include::modules/monitoring-choosing-a-metrics-collection-profile.adoc[leveloffs [role="_additional-resources"] .Additional resources -* See xref:../monitoring/managing-metrics.adoc#viewing-a-list-of-available-metrics_managing-metrics[Viewing a list of available metrics] for steps to view a list of metrics being collected for a cluster. -* See xref:../nodes/clusters/nodes-cluster-enabling-features.adoc[Enabling features using feature gates] for steps to enable Technology Preview features. +* See xref:../../observability/monitoring/managing-metrics.adoc#viewing-a-list-of-available-metrics_managing-metrics[Viewing a list of available metrics] for steps to view a list of metrics being collected for a cluster. +* See xref:../../nodes/clusters/nodes-cluster-enabling-features.adoc[Enabling features using feature gates] for steps to enable Technology Preview features. endif::openshift-dedicated,openshift-rosa[] // Managing scrape sample limits for user-defined projects @@ -233,9 +233,9 @@ include::modules/monitoring-creating-scrape-sample-alerts.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../monitoring/configuring-the-monitoring-stack.adoc#creating-user-defined-workload-monitoring-configmap_configuring-the-monitoring-stack[Creating a user-defined workload monitoring config map] -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] -* See xref:../monitoring/troubleshooting-monitoring-issues.adoc#determining-why-prometheus-is-consuming-disk-space_troubleshooting-monitoring-issues[Determining why Prometheus is consuming a lot of disk space] for steps to query which metrics have the highest number of scrape samples. +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#creating-user-defined-workload-monitoring-configmap_configuring-the-monitoring-stack[Creating a user-defined workload monitoring config map] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* See xref:../../observability/monitoring/troubleshooting-monitoring-issues.adoc#determining-why-prometheus-is-consuming-disk-space_troubleshooting-monitoring-issues[Determining why Prometheus is consuming a lot of disk space] for steps to query which metrics have the highest number of scrape samples. endif::openshift-dedicated,openshift-rosa[] //Configuring external alertmanagers @@ -252,8 +252,8 @@ ifndef::openshift-dedicated,openshift-rosa[] [role="_additional-resources"] .Additional resources -* See xref:../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. -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* 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. +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] endif::openshift-dedicated,openshift-rosa[] // Configuring topology spread constraints for monitoring components @@ -264,7 +264,7 @@ include::modules/monitoring-configuring-pod-topology-spread-constraints-for-moni ifndef::openshift-dedicated,openshift-rosa[] // This xref might be relevant to ROSA/OSD if the Node content is reused: -* xref:../nodes/scheduling/nodes-scheduler-pod-topology-spread-constraints.adoc#nodes-scheduler-pod-topology-spread-constraints-about[Controlling pod placement by using pod topology spread constraints] +* xref:../../nodes/scheduling/nodes-scheduler-pod-topology-spread-constraints.adoc#nodes-scheduler-pod-topology-spread-constraints-about[Controlling pod placement by using pod topology spread constraints] endif::openshift-dedicated,openshift-rosa[] * link:https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/[Kubernetes Pod Topology Spread Constraints documentation] @@ -284,8 +284,8 @@ include::modules/monitoring-setting-query-log-file-for-prometheus.adoc[leveloffs ifndef::openshift-dedicated,openshift-rosa[] [role="_additional-resources"] .Additional resources -* See xref:../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 -* See xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] for steps to enable user-defined monitoring. +* 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 +* See xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] for steps to enable user-defined monitoring. endif::openshift-dedicated,openshift-rosa[] // Enabling query logging for Thanos Querier @@ -295,7 +295,7 @@ include::modules/monitoring-enabling-query-logging-for-thanos-querier.adoc[level [role="_additional-resources"] .Additional resources -* See xref:../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. +* 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 @@ -305,7 +305,7 @@ include::modules/monitoring-setting-audit-log-levels-for-the-prometheus-adapter. [role="_additional-resources"] .Additional resources -* See xref:../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. +* 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[] // Disabling the local Alertmanager @@ -315,12 +315,12 @@ include::modules/monitoring-disabling-the-local-alertmanager.adoc[leveloffset=+1 [role="_additional-resources"] .Additional resources * link:https://prometheus.io/docs/alerting/latest/alertmanager/[Prometheus Alertmanager documentation] -* xref:../monitoring/managing-alerts.adoc#[Managing alerts] +* xref:../../observability/monitoring/managing-alerts.adoc#[Managing alerts] endif::openshift-dedicated,openshift-rosa[] ifndef::openshift-dedicated,openshift-rosa[] == Next steps -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] -* Learn about xref:../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[remote health reporting] and, if necessary, opt out of it. +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* Learn about xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[remote health reporting] and, if necessary, opt out of it. endif::openshift-dedicated,openshift-rosa[] diff --git a/monitoring/enabling-alert-routing-for-user-defined-projects.adoc b/observability/monitoring/enabling-alert-routing-for-user-defined-projects.adoc similarity index 84% rename from monitoring/enabling-alert-routing-for-user-defined-projects.adoc rename to observability/monitoring/enabling-alert-routing-for-user-defined-projects.adoc index 0fb2c76f52..4940206be7 100644 --- a/monitoring/enabling-alert-routing-for-user-defined-projects.adoc +++ b/observability/monitoring/enabling-alert-routing-for-user-defined-projects.adoc @@ -43,10 +43,10 @@ include::modules/monitoring-granting-users-permission-to-configure-alert-routing .Additional resources ifndef::openshift-dedicated,openshift-rosa[] -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user defined projects] endif::openshift-dedicated,openshift-rosa[] -* xref:../monitoring/managing-alerts.adoc#creating-alert-routing-for-user-defined-projects_managing-alerts[Creating alert routing for user-defined projects] +* xref:../../observability/monitoring/managing-alerts.adoc#creating-alert-routing-for-user-defined-projects_managing-alerts[Creating alert routing for user-defined projects] == Next steps -* xref:../monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] +* xref:../../observability/monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] diff --git a/monitoring/enabling-monitoring-for-user-defined-projects.adoc b/observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc similarity index 66% rename from monitoring/enabling-monitoring-for-user-defined-projects.adoc rename to observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc index 8a90acaa8a..26f633be4f 100644 --- a/monitoring/enabling-monitoring-for-user-defined-projects.adoc +++ b/observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc @@ -16,9 +16,9 @@ include::modules/monitoring-enabling-monitoring-for-user-defined-projects.adoc[l [role="_additional-resources"] .Additional resources -* xref:../monitoring/configuring-the-monitoring-stack.adoc#creating-user-defined-workload-monitoring-configmap_configuring-the-monitoring-stack[Creating a user-defined workload monitoring config map] -* xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Configuring the monitoring stack] -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#granting-users-permission-to-configure-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Granting users permission to configure monitoring for user-defined projects] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#creating-user-defined-workload-monitoring-configmap_configuring-the-monitoring-stack[Creating a user-defined workload monitoring config map] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Configuring the monitoring stack] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#granting-users-permission-to-configure-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Granting users permission to configure monitoring for user-defined projects] // Granting users permission to monitor user-defined projects include::modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc[leveloffset=+1] @@ -34,7 +34,7 @@ include::modules/accessing-metrics-outside-cluster.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] // Excluding a user-defined project from monitoring include::modules/monitoring-excluding-a-user-defined-project-from-monitoring.adoc[leveloffset=+1] @@ -44,4 +44,4 @@ include::modules/monitoring-disabling-monitoring-for-user-defined-projects.adoc[ == Next steps -* xref:../monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] +* xref:../../observability/monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] diff --git a/monitoring/images b/observability/monitoring/images similarity index 100% rename from monitoring/images rename to observability/monitoring/images diff --git a/monitoring/managing-alerts.adoc b/observability/monitoring/managing-alerts.adoc similarity index 87% rename from monitoring/managing-alerts.adoc rename to observability/monitoring/managing-alerts.adoc index 70cef44eb1..48bba08414 100644 --- a/monitoring/managing-alerts.adoc +++ b/observability/monitoring/managing-alerts.adoc @@ -52,7 +52,7 @@ include::modules/monitoring-modifying-core-platform-alerting-rules.adoc[leveloff [role="_additional-resources"] .Additional resources -* See xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for details about {product-title} {product-version} monitoring architecture. +* See xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for details about {product-title} {product-version} monitoring architecture. * See the link:https://prometheus.io/docs/alerting/alertmanager/[Alertmanager documentation] for information about alerting rules. * See the link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config[Prometheus relabeling documentation] for information about how relabeling works. * See the link:https://prometheus.io/docs/practices/alerting/[Prometheus alerting documentation] for further guidelines on optimizing alerts. @@ -66,7 +66,7 @@ include::modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc[l .Additional resources * See the link:https://prometheus.io/docs/practices/alerting/[Prometheus alerting documentation] for further guidelines on optimizing alerts ifndef::openshift-rosa,openshift-dedicated[] -* See xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for details about {product-title} {product-version} monitoring architecture +* See xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for details about {product-title} {product-version} monitoring architecture endif::[] // creating alerting rules for user defined projects @@ -75,7 +75,7 @@ include::modules/monitoring-creating-alerting-rules-for-user-defined-projects.ad [role="_additional-resources"] .Additional resources -* See xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for details about {product-title} {product-version} monitoring architecture. +* See xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for details about {product-title} {product-version} monitoring architecture. include::modules/monitoring-accessing-alerting-rules-for-your-project.adoc[leveloffset=+2] include::modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc[leveloffset=+2] @@ -110,10 +110,10 @@ include::modules/monitoring-applying-a-custom-configuration-to-alertmanager-for- * See link:https://www.pagerduty.com/docs/guides/prometheus-integration-guide/[the PagerDuty Prometheus Integration Guide] to learn how to retrieve the `service_key`. * See link:https://prometheus.io/docs/alerting/configuration/[Alertmanager configuration] for configuring alerting through different alert receivers. ifndef::openshift-rosa,openshift-dedicated[] -* See xref:../monitoring/enabling-alert-routing-for-user-defined-projects.adoc#enabling-alert-routing-for-user-defined-projects[Enabling alert routing for user-defined projects] to learn how to enable a dedicated instance of Alertmanager for user-defined alert routing. +* See xref:../../observability/monitoring/enabling-alert-routing-for-user-defined-projects.adoc#enabling-alert-routing-for-user-defined-projects[Enabling alert routing for user-defined projects] to learn how to enable a dedicated instance of Alertmanager for user-defined alert routing. == Next steps -* xref:../monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards] +* xref:../../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards] endif::[] diff --git a/monitoring/managing-metrics.adoc b/observability/monitoring/managing-metrics.adoc similarity index 87% rename from monitoring/managing-metrics.adoc rename to observability/monitoring/managing-metrics.adoc index c0713d74b5..b7d4556e88 100644 --- a/monitoring/managing-metrics.adoc +++ b/observability/monitoring/managing-metrics.adoc @@ -26,12 +26,12 @@ include::modules/monitoring-specifying-how-a-service-is-monitored.adoc[leveloffs .Additional resources ifndef::openshift-dedicated,openshift-rosa[] -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] endif::openshift-dedicated,openshift-rosa[] * link:https://access.redhat.com/articles/6675491[How to scrape metrics using TLS in a ServiceMonitor configuration in a user-defined project] ifndef::openshift-dedicated,openshift-rosa[] -* xref:../rest_api/monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc[PodMonitor API] -* xref:../rest_api/monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc[ServiceMonitor API] +* xref:../../rest_api/monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc[PodMonitor API] +* xref:../../rest_api/monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc[ServiceMonitor API] endif::openshift-dedicated,openshift-rosa[] // Viewing a list of available metrics for a cluster diff --git a/monitoring/modules b/observability/monitoring/modules similarity index 100% rename from monitoring/modules rename to observability/monitoring/modules diff --git a/monitoring/monitoring-overview.adoc b/observability/monitoring/monitoring-overview.adoc similarity index 52% rename from monitoring/monitoring-overview.adoc rename to observability/monitoring/monitoring-overview.adoc index 08117ffee9..2b9780fbc7 100644 --- a/monitoring/monitoring-overview.adoc +++ b/observability/monitoring/monitoring-overview.adoc @@ -11,16 +11,16 @@ toc::[] [role="_abstract"] ifndef::openshift-dedicated,openshift-rosa[] -{product-title} includes a preconfigured, preinstalled, and self-updating monitoring stack that provides monitoring for core platform components. You also have the option to xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[enable monitoring for user-defined projects]. +{product-title} includes a preconfigured, preinstalled, and self-updating monitoring stack that provides monitoring for core platform components. You also have the option to xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[enable monitoring for user-defined projects]. -A cluster administrator can xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[configure the monitoring stack] with the supported configurations. {product-title} delivers monitoring best practices out of the box. +A cluster administrator can xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[configure the monitoring stack] with the supported configurations. {product-title} delivers monitoring best practices out of the box. -A set of alerts are included by default that immediately notify administrators about issues with a cluster. Default dashboards in the {product-title} web console include visual representations of cluster metrics to help you to quickly understand the state of your cluster. With the {product-title} web console, you can xref:../monitoring/managing-metrics.adoc#managing-metrics[view and manage metrics], xref:../monitoring/managing-alerts.adoc#managing-alerts[alerts], and xref:../monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[review monitoring dashboards]. +A set of alerts are included by default that immediately notify administrators about issues with a cluster. Default dashboards in the {product-title} web console include visual representations of cluster metrics to help you to quickly understand the state of your cluster. With the {product-title} web console, you can xref:../../observability/monitoring/managing-metrics.adoc#managing-metrics[view and manage metrics], xref:../../observability/monitoring/managing-alerts.adoc#managing-alerts[alerts], and xref:../../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[review monitoring dashboards]. -In the *Observe* section of {product-title} web console, you can access and manage monitoring features such as xref:../monitoring/managing-metrics.adoc#managing-metrics[metrics], xref:../monitoring/managing-alerts.adoc#managing-alerts[alerts], xref:../monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[monitoring dashboards], and xref:../monitoring/managing-metrics.adoc#getting-detailed-information-about-a-target_managing-metrics[metrics targets]. +In the *Observe* section of {product-title} web console, you can access and manage monitoring features such as xref:../../observability/monitoring/managing-metrics.adoc#managing-metrics[metrics], xref:../../observability/monitoring/managing-alerts.adoc#managing-alerts[alerts], xref:../../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[monitoring dashboards], and xref:../../observability/monitoring/managing-metrics.adoc#getting-detailed-information-about-a-target_managing-metrics[metrics targets]. After installing {product-title}, cluster administrators can optionally enable monitoring for user-defined projects. By using this feature, cluster administrators, developers, and other users can specify how services and pods are monitored in their own projects. -As a cluster administrator, you can find answers to common problems such as user metrics unavailability and high consumption of disk space by Prometheus in xref:../monitoring/troubleshooting-monitoring-issues.adoc#troubleshooting-monitoring-issues[Troubleshooting monitoring issues]. +As a cluster administrator, you can find answers to common problems such as user metrics unavailability and high consumption of disk space by Prometheus in xref:../../observability/monitoring/troubleshooting-monitoring-issues.adoc#troubleshooting-monitoring-issues[Troubleshooting monitoring issues]. endif::openshift-dedicated,openshift-rosa[] ifdef::openshift-dedicated,openshift-rosa[] @@ -42,18 +42,18 @@ ifndef::openshift-dedicated,openshift-rosa[] [id="additional-resources_monitoring-overview"] == Additional resources -* xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] -* xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#granting-users-permission-to-monitor-user-defined-projects_enabling-monitoring-for-user-defined-projects[Granting users permission to monitor user-defined projects] -* xref:../security/tls-security-profiles.adoc#tls-security-profiles[Configuring TLS security profiles] +* xref:../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#granting-users-permission-to-monitor-user-defined-projects_enabling-monitoring-for-user-defined-projects[Granting users permission to monitor user-defined projects] +* xref:../../security/tls-security-profiles.adoc#tls-security-profiles[Configuring TLS security profiles] endif::openshift-dedicated,openshift-rosa[] [id="next-steps_monitoring-overview"] == Next steps ifndef::openshift-dedicated,openshift-rosa[] -* xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Configuring the monitoring stack] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Configuring the monitoring stack] endif::openshift-dedicated,openshift-rosa[] ifdef::openshift-dedicated,openshift-rosa[] -* xref:../monitoring/sd-accessing-monitoring-for-user-defined-projects.adoc#sd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] +* xref:../../observability/monitoring/sd-accessing-monitoring-for-user-defined-projects.adoc#sd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] endif::openshift-dedicated,openshift-rosa[] diff --git a/monitoring/reviewing-monitoring-dashboards.adoc b/observability/monitoring/reviewing-monitoring-dashboards.adoc similarity index 83% rename from monitoring/reviewing-monitoring-dashboards.adoc rename to observability/monitoring/reviewing-monitoring-dashboards.adoc index df4603c4b3..3ef6849679 100644 --- a/monitoring/reviewing-monitoring-dashboards.adoc +++ b/observability/monitoring/reviewing-monitoring-dashboards.adoc @@ -53,10 +53,10 @@ ifndef::openshift-dedicated,openshift-rosa[] [id="additional-resources-reviewing-monitoring-dashboards"] .Additional resources -* xref:../applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc#monitoring-project-and-application-metrics-using-developer-perspective[Monitoring project and application metrics using the Developer perspective] +* xref:../../applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc#monitoring-project-and-application-metrics-using-developer-perspective[Monitoring project and application metrics using the Developer perspective] endif::openshift-dedicated,openshift-rosa[] [id="next-steps_reviewing-monitoring-dashboards"] == Next steps -* xref:../monitoring/accessing-third-party-monitoring-apis.adoc#accessing-third-party-monitoring-apis[Accessing monitoring APIs by using the CLI] +* xref:../../observability/monitoring/accessing-third-party-monitoring-apis.adoc#accessing-third-party-monitoring-apis[Accessing monitoring APIs by using the CLI] diff --git a/monitoring/sd-accessing-monitoring-for-user-defined-projects.adoc b/observability/monitoring/sd-accessing-monitoring-for-user-defined-projects.adoc similarity index 87% rename from monitoring/sd-accessing-monitoring-for-user-defined-projects.adoc rename to observability/monitoring/sd-accessing-monitoring-for-user-defined-projects.adoc index 04fd3366a1..eefb3acc0d 100644 --- a/monitoring/sd-accessing-monitoring-for-user-defined-projects.adoc +++ b/observability/monitoring/sd-accessing-monitoring-for-user-defined-projects.adoc @@ -31,4 +31,4 @@ Optionally, you can disable monitoring for user-defined projects during or after [id="accessing-user-defined-monitoring-next-steps"] == Next steps -* xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack_configuring-the-monitoring-stack[Configuring the monitoring stack] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack_configuring-the-monitoring-stack[Configuring the monitoring stack] diff --git a/monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc b/observability/monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc similarity index 100% rename from monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc rename to observability/monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc diff --git a/monitoring/snippets b/observability/monitoring/snippets similarity index 100% rename from monitoring/snippets rename to observability/monitoring/snippets diff --git a/monitoring/troubleshooting-monitoring-issues.adoc b/observability/monitoring/troubleshooting-monitoring-issues.adoc similarity index 53% rename from monitoring/troubleshooting-monitoring-issues.adoc rename to observability/monitoring/troubleshooting-monitoring-issues.adoc index 0c82da9ec6..aa49a6aa3f 100644 --- a/monitoring/troubleshooting-monitoring-issues.adoc +++ b/observability/monitoring/troubleshooting-monitoring-issues.adoc @@ -20,9 +20,9 @@ include::modules/monitoring-investigating-why-user-defined-metrics-are-unavailab [role="_additional-resources"] .Additional resources -* xref:../monitoring/configuring-the-monitoring-stack.adoc#creating-user-defined-workload-monitoring-configmap_configuring-the-monitoring-stack[Creating a user-defined workload monitoring config map] -* See xref:../monitoring/managing-metrics.adoc#specifying-how-a-service-is-monitored_managing-metrics[Specifying how a service is monitored] for details on how to create a `ServiceMonitor` or `PodMonitor` resource -* See xref:../monitoring/managing-metrics.adoc#getting-detailed-information-about-a-target_managing-metrics[Getting detailed information about metrics targets] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#creating-user-defined-workload-monitoring-configmap_configuring-the-monitoring-stack[Creating a user-defined workload monitoring config map] +* See xref:../../observability/monitoring/managing-metrics.adoc#specifying-how-a-service-is-monitored_managing-metrics[Specifying how a service is monitored] for details on how to create a `ServiceMonitor` or `PodMonitor` resource +* See xref:../../observability/monitoring/managing-metrics.adoc#getting-detailed-information-about-a-target_managing-metrics[Getting detailed information about metrics targets] endif::openshift-dedicated,openshift-rosa[] // Investigating why user-defined project metrics are unavailable (OSD/ROSA) @@ -36,6 +36,6 @@ include::modules/monitoring-determining-why-prometheus-is-consuming-disk-space.a [role="_additional-resources"] .Additional resources -* xref:../monitoring/accessing-third-party-monitoring-apis.adoc#about-accessing-monitoring-web-service-apis_accessing-monitoring-apis-by-using-the-cli[Accessing monitoring APIs by using the CLI] -* xref:../monitoring/configuring-the-monitoring-stack.adoc#setting-scrape-sample-and-label-limits-for-user-defined-projects_configuring-the-monitoring-stack[Setting a scrape sample limit for user-defined projects] -* xref:../support/getting-support.adoc#support-submitting-a-case_getting-support[Submitting a support case] +* xref:../../observability/monitoring/accessing-third-party-monitoring-apis.adoc#about-accessing-monitoring-web-service-apis_accessing-monitoring-apis-by-using-the-cli[Accessing monitoring APIs by using the CLI] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#setting-scrape-sample-and-label-limits-for-user-defined-projects_configuring-the-monitoring-stack[Setting a scrape sample limit for user-defined projects] +* xref:../../support/getting-support.adoc#support-submitting-a-case_getting-support[Submitting a support case] diff --git a/observability/network_observability/metrics-alerts-dashboards.adoc b/observability/network_observability/metrics-alerts-dashboards.adoc index 29426384b2..e5061a1d54 100644 --- a/observability/network_observability/metrics-alerts-dashboards.adoc +++ b/observability/network_observability/metrics-alerts-dashboards.adoc @@ -14,4 +14,4 @@ include::modules/network-observability-includelist-example.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* For more information about creating alerts that you can see on the dashboard, see xref:../../monitoring/managing-alerts.adoc#creating-alerting-rules-for-user-defined-projects_managing-alerts[Creating alerting rules for user-defined projects]. +* For more information about creating alerts that you can see on the dashboard, see xref:../../observability/monitoring/managing-alerts.adoc#creating-alerting-rules-for-user-defined-projects_managing-alerts[Creating alerting rules for user-defined projects]. diff --git a/observability/network_observability/network-observability-operator-monitoring.adoc b/observability/network_observability/network-observability-operator-monitoring.adoc index 513a6b1204..6392ee42f8 100644 --- a/observability/network_observability/network-observability-operator-monitoring.adoc +++ b/observability/network_observability/network-observability-operator-monitoring.adoc @@ -15,4 +15,4 @@ include::modules/network-observability-rate-limit-alert.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* For more information about creating alerts that you can see on the dashboard, see xref:../../monitoring/managing-alerts.adoc#creating-alerting-rules-for-user-defined-projects_managing-alerts[Creating alerting rules for user-defined projects]. \ No newline at end of file +* For more information about creating alerts that you can see on the dashboard, see xref:../../observability/monitoring/managing-alerts.adoc#creating-alerting-rules-for-user-defined-projects_managing-alerts[Creating alerting rules for user-defined projects]. \ No newline at end of file diff --git a/observability/otel/otel-configuring-otelcol-metrics.adoc b/observability/otel/otel-configuring-otelcol-metrics.adoc index 632117ace6..a5e99832d8 100644 --- a/observability/otel/otel-configuring-otelcol-metrics.adoc +++ b/observability/otel/otel-configuring-otelcol-metrics.adoc @@ -37,4 +37,4 @@ You can use the *Administrator* view of the web console to verify successful con * Go to *Observe* -> *Targets*, filter by *Source: User*, and check that the *ServiceMonitors* in the `opentelemetry-collector-` format have the *Up* status. .Additional resources -* xref:../../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] diff --git a/observability/power_monitoring/visualizing-power-monitoring-metrics.adoc b/observability/power_monitoring/visualizing-power-monitoring-metrics.adoc index 15d69d0a46..0e5c25fbf8 100644 --- a/observability/power_monitoring/visualizing-power-monitoring-metrics.adoc +++ b/observability/power_monitoring/visualizing-power-monitoring-metrics.adoc @@ -18,6 +18,6 @@ include::modules/power-monitoring-metrics-overview.adoc[leveloffset=+1] [role="_additional-resources"] [id="additional-resources_visualizing-power-monitoring-metrics"] == Additional resources -* xref:../../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] //after the file is added to the observability directory, update xref path to ../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects diff --git a/operators/operator_sdk/osdk-monitoring-prometheus.adoc b/operators/operator_sdk/osdk-monitoring-prometheus.adoc index 7bd8e3e59c..d37509cc8b 100644 --- a/operators/operator_sdk/osdk-monitoring-prometheus.adoc +++ b/operators/operator_sdk/osdk-monitoring-prometheus.adoc @@ -31,5 +31,5 @@ Do not use the Prometheus Operator in the `openshift-monitoring` project. Red Ha .Additional resources * link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.13/html-single/operators/index#osdk-monitoring-custom-metrics_osdk-monitoring-prometheus[Exposing custom metrics for Go-based Operators] (OpenShift Container Platform documentation) * link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.13/html-single/operators/index#osdk-ansible-metrics_osdk-monitoring-prometheus[Exposing custom metrics for Ansible-based Operators] (OpenShift Container Platform documentation) -* xref:../../monitoring/monitoring-overview.adoc#understanding-the-monitoring-stack_monitoring-overview[Understanding the monitoring stack] in {product-title} +* xref:../../observability/monitoring/monitoring-overview.adoc#understanding-the-monitoring-stack_monitoring-overview[Understanding the monitoring stack] in {product-title} endif::openshift-dedicated,openshift-rosa[] diff --git a/osd_getting_started/osd-getting-started.adoc b/osd_getting_started/osd-getting-started.adoc index a8ffe37b85..759fb6f8c2 100644 --- a/osd_getting_started/osd-getting-started.adoc +++ b/osd_getting_started/osd-getting-started.adoc @@ -74,7 +74,7 @@ include::modules/deleting-cluster.adoc[leveloffset=+1] * xref:../adding_service_cluster/adding-service.adoc#adding-service[Adding services to a cluster using the {cluster-manager} console] * xref:../osd_cluster_admin/osd_nodes/osd-nodes-machinepools-about.adoc#osd-machine-pools-about[About machine pools] * xref:../osd_cluster_admin/osd_nodes/osd-nodes-about-autoscaling-nodes.adoc#nodes-about-autoscaling-nodes[About autoscaling nodes on a cluster] -* xref:../monitoring/configuring-the-monitoring-stack.adoc[Configuring the monitoring stack] +* xref:../observability/monitoring/configuring-the-monitoring-stack.adoc[Configuring the monitoring stack] [id="additional-resources_{context}"] == Additional resources diff --git a/post_installation_configuration/cluster-tasks.adoc b/post_installation_configuration/cluster-tasks.adoc index 442b356ffc..55c9d03c3f 100644 --- a/post_installation_configuration/cluster-tasks.adoc +++ b/post_installation_configuration/cluster-tasks.adoc @@ -119,7 +119,7 @@ documentation for details on how and when you can create additional resource ins |`alertmanager.monitoring.coreos.com` |`main` |`openshift-monitoring` -|Controls the xref:../monitoring/managing-alerts.adoc#managing-alerts[Alertmanager] deployment parameters. +|Controls the xref:../observability/monitoring/managing-alerts.adoc#managing-alerts[Alertmanager] deployment parameters. |`ingresscontroller.operator.openshift.io` |`default` diff --git a/post_installation_configuration/configuring-alert-notifications.adoc b/post_installation_configuration/configuring-alert-notifications.adoc index 5ad4aa1cb6..be0dc31b7b 100644 --- a/post_installation_configuration/configuring-alert-notifications.adoc +++ b/post_installation_configuration/configuring-alert-notifications.adoc @@ -15,5 +15,5 @@ include::modules/monitoring-configuring-alert-receivers.adoc[leveloffset=+2] [role="_additional-resources"] == Additional resources -* xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] -* xref:../monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] +* xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] +* xref:../observability/monitoring/managing-alerts.adoc#managing-alerts[Managing alerts] diff --git a/rosa_getting_started/rosa-getting-started.adoc b/rosa_getting_started/rosa-getting-started.adoc index 841f9f6ae1..40f0826bc8 100644 --- a/rosa_getting_started/rosa-getting-started.adoc +++ b/rosa_getting_started/rosa-getting-started.adoc @@ -80,7 +80,7 @@ include::modules/rosa-getting-started-deleting-a-cluster.adoc[leveloffset=+1] * xref:../adding_service_cluster/adding-service.adoc#adding-service[Adding services to a cluster using the {cluster-manager} console] * xref:../rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc#rosa-managing-worker-nodes[Managing compute nodes] -* xref:../monitoring/configuring-the-monitoring-stack.adoc[Configuring the monitoring stack] +* xref:../observability/monitoring/configuring-the-monitoring-stack.adoc[Configuring the monitoring stack] [role="_additional-resources"] [id="additional-resources_{context}"] diff --git a/rosa_getting_started/rosa-quickstart-guide-ui.adoc b/rosa_getting_started/rosa-quickstart-guide-ui.adoc index 1143b2deaa..c291409b74 100644 --- a/rosa_getting_started/rosa-quickstart-guide-ui.adoc +++ b/rosa_getting_started/rosa-quickstart-guide-ui.adoc @@ -155,7 +155,7 @@ include::modules/rosa-getting-started-deleting-a-cluster.adoc[leveloffset=+1] * xref:../adding_service_cluster/adding-service.adoc#adding-service[Adding services to a cluster using the {cluster-manager} console] * xref:../rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc#rosa-managing-worker-nodes[Managing compute nodes] -* xref:../monitoring/configuring-the-monitoring-stack.adoc[Configuring the monitoring stack] +* xref:../observability/monitoring/configuring-the-monitoring-stack.adoc[Configuring the monitoring stack] [role="_additional-resources"] [id="additional-resources_{context}"] diff --git a/rosa_release_notes/rosa-release-notes.adoc b/rosa_release_notes/rosa-release-notes.adoc index 392fd64f89..bfeb1f986f 100644 --- a/rosa_release_notes/rosa-release-notes.adoc +++ b/rosa_release_notes/rosa-release-notes.adoc @@ -94,7 +94,7 @@ For more information on region availabilities, see xref:../rosa_architecture/ros * **Documentation update.** The CLI Tools section was added to the ROSA documentation and includes more detailed information to help you fully use all of the supported CLI tools. The ROSA CLI section can now be found nested inside the CLI Tools heading. For more information, see xref:../cli_reference/index.adoc[CLI tools overview]. -* **Documentation update.** The Monitoring section in the documentation was expanded and now includes more detailed information to help you conveniently manage your ROSA clusters. For more information, see xref:../monitoring/monitoring-overview.adoc#about-openshift-monitoring[About Red Hat OpenShift Service on AWS monitoring]. +* **Documentation update.** The Monitoring section in the documentation was expanded and now includes more detailed information to help you conveniently manage your ROSA clusters. For more information, see xref:../observability/monitoring/monitoring-overview.adoc#about-openshift-monitoring[About Red Hat OpenShift Service on AWS monitoring]. [id="rosa-q2-2023_{context}"] === Q2 2023 diff --git a/security/cert_manager_operator/cert-manager-monitoring.adoc b/security/cert_manager_operator/cert-manager-monitoring.adoc index 86be09c920..753cbb66ba 100644 --- a/security/cert_manager_operator/cert-manager-monitoring.adoc +++ b/security/cert_manager_operator/cert-manager-monitoring.adoc @@ -14,7 +14,7 @@ include::modules/cert-manager-enable-metrics.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../monitoring/managing-metrics.adoc#setting-up-metrics-collection-for-user-defined-projects_managing-metrics[Setting up metrics collection for user-defined projects] +* xref:../../observability/monitoring/managing-metrics.adoc#setting-up-metrics-collection-for-user-defined-projects_managing-metrics[Setting up metrics collection for user-defined projects] // Querying metrics for the {cert-manager-operator} include::modules/cert-manager-query-metrics.adoc[leveloffset=+1] \ No newline at end of file diff --git a/serverless/observability/admin-metrics/serverless-admin-metrics.adoc b/serverless/observability/admin-metrics/serverless-admin-metrics.adoc index fb093d70f7..d5b8bc8eb4 100644 --- a/serverless/observability/admin-metrics/serverless-admin-metrics.adoc +++ b/serverless/observability/admin-metrics/serverless-admin-metrics.adoc @@ -9,7 +9,7 @@ toc::[] Metrics enable cluster administrators to monitor how {ServerlessProductName} cluster components and workloads are performing. ifdef::openshift-enterprise[] -You can view different metrics for {ServerlessProductName} by navigating to xref:../../../monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards-admin_reviewing-monitoring-dashboards[*Dashboards*] in the {product-title} web console *Administrator* perspective. +You can view different metrics for {ServerlessProductName} by navigating to xref:../../../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards-admin_reviewing-monitoring-dashboards[*Dashboards*] in the {product-title} web console *Administrator* perspective. endif::[] ifdef::openshift-dedicated,openshift-rosa[] @@ -20,7 +20,7 @@ endif::[] == Prerequisites ifdef::openshift-enterprise[] -* See the {product-title} documentation on xref:../../../monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] for information about enabling metrics for your cluster. +* See the {product-title} documentation on xref:../../../observability/monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] for information about enabling metrics for your cluster. * You have access to an {product-title} account with cluster administrator access. endif::[] diff --git a/serverless/observability/developer-metrics/serverless-developer-metrics.adoc b/serverless/observability/developer-metrics/serverless-developer-metrics.adoc index 379819e010..53998b954f 100644 --- a/serverless/observability/developer-metrics/serverless-developer-metrics.adoc +++ b/serverless/observability/developer-metrics/serverless-developer-metrics.adoc @@ -9,7 +9,7 @@ toc::[] Metrics enable developers to monitor how Knative services are performing. You can use the {product-title} monitoring stack to record and view health checks and metrics for your Knative services. ifdef::openshift-enterprise[] -You can view different metrics for {ServerlessProductName} by navigating to xref:../../../monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards-developer_reviewing-monitoring-dashboards[*Dashboards*] in the {product-title} web console *Developer* perspective. +You can view different metrics for {ServerlessProductName} by navigating to xref:../../../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards-developer_reviewing-monitoring-dashboards[*Dashboards*] in the {product-title} web console *Developer* perspective. endif::[] ifdef::openshift-dedicated,openshift-rosa[] @@ -32,7 +32,7 @@ ifdef::openshift-enterprise[] [id="additional-resources_serverless-service-monitoring"] [role="_additional-resources"] == Additional resources -* xref:../../../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] -* xref:../../../monitoring/managing-metrics.adoc#specifying-how-a-service-is-monitored[Enabling monitoring for user-defined projects] -* xref:../../../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Specifying how a service is monitored] +* xref:../../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] +* xref:../../../observability/monitoring/managing-metrics.adoc#specifying-how-a-service-is-monitored[Enabling monitoring for user-defined projects] +* xref:../../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Specifying how a service is monitored] endif::[] diff --git a/service_mesh/v2x/ossm-observability.adoc b/service_mesh/v2x/ossm-observability.adoc index 6bd3c7faad..0f224c4dcd 100644 --- a/service_mesh/v2x/ossm-observability.adoc +++ b/service_mesh/v2x/ossm-observability.adoc @@ -53,7 +53,7 @@ ifndef::openshift-rosa,openshift-dedicated[] [id="additional-resources_user-workload-monitoring"] == Additional resources -* xref:../../monitoring/enabling-monitoring-for-user-defined-projects.adoc[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc[Enabling monitoring for user-defined projects] * xref:../../observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.adoc[Installing the distributed tracing platform (Tempo)] * xref:../../observability/otel/otel-installing.adoc[Installing the Red Hat build of OpenTelemetry] endif::openshift-rosa,openshift-dedicated[] diff --git a/storage/persistent_storage/persistent_storage_local/persistent-storage-local.adoc b/storage/persistent_storage/persistent_storage_local/persistent-storage-local.adoc index 410ba92e8b..5cc3cbf228 100644 --- a/storage/persistent_storage/persistent_storage_local/persistent-storage-local.adoc +++ b/storage/persistent_storage/persistent_storage_local/persistent-storage-local.adoc @@ -37,7 +37,7 @@ include::modules/persistent-storage-local-tolerations.adoc[leveloffset=+1] include::modules/persistent-storage-local-metrics.adoc[leveloffset=+1] -For more information about metrics, see xref:../../../monitoring/managing-metrics.adoc#managing-metric[Managing metrics]. +For more information about metrics, see xref:../../../observability/monitoring/managing-metrics.adoc#managing-metric[Managing metrics]. == Deleting the Local Storage Operator resources diff --git a/support/remote_health_monitoring/about-remote-health-monitoring.adoc b/support/remote_health_monitoring/about-remote-health-monitoring.adoc index b629dc93e7..317b25855b 100644 --- a/support/remote_health_monitoring/about-remote-health-monitoring.adoc +++ b/support/remote_health_monitoring/about-remote-health-monitoring.adoc @@ -93,7 +93,7 @@ include::modules/understanding-telemetry-and-insights-operator-data-flow.adoc[le [role="_additional-resources"] .Additional resources -* See xref:../../monitoring/monitoring-overview.adoc#monitoring-overview_monitoring-overview[Monitoring overview] for more information about the {product-title} monitoring stack. +* See xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview_monitoring-overview[Monitoring overview] for more information about the {product-title} monitoring stack. ifndef::openshift-rosa,openshift-dedicated[] * See xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[Configuring your firewall] for details about configuring a firewall and enabling endpoints for Telemetry and Insights diff --git a/support/troubleshooting/investigating-monitoring-issues.adoc b/support/troubleshooting/investigating-monitoring-issues.adoc index 38fc61b2ba..8070a5643b 100644 --- a/support/troubleshooting/investigating-monitoring-issues.adoc +++ b/support/troubleshooting/investigating-monitoring-issues.adoc @@ -17,9 +17,9 @@ include::modules/monitoring-investigating-why-user-defined-metrics-are-unavailab [role="_additional-resources"] .Additional resources -* xref:../../monitoring/configuring-the-monitoring-stack.adoc#creating-user-defined-workload-monitoring-configmap_configuring-the-monitoring-stack[Creating a user-defined workload monitoring config map] -* See xref:../../monitoring/managing-metrics.adoc#specifying-how-a-service-is-monitored_managing-metrics[Specifying how a service is monitored] for details on how to create a service monitor or pod monitor -* See xref:../../monitoring/managing-metrics.adoc#getting-detailed-information-about-a-target_managing-metrics[Getting detailed information about a metrics target] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#creating-user-defined-workload-monitoring-configmap_configuring-the-monitoring-stack[Creating a user-defined workload monitoring config map] +* See xref:../../observability/monitoring/managing-metrics.adoc#specifying-how-a-service-is-monitored_managing-metrics[Specifying how a service is monitored] for details on how to create a service monitor or pod monitor +* See xref:../../observability/monitoring/managing-metrics.adoc#getting-detailed-information-about-a-target_managing-metrics[Getting detailed information about a metrics target] // Determining why Prometheus is consuming a lot of disk space include::modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc[leveloffset=+1] @@ -27,4 +27,4 @@ include::modules/monitoring-determining-why-prometheus-is-consuming-disk-space.a [role="_additional-resources"] .Additional resources -* See xref:../../monitoring/configuring-the-monitoring-stack.adoc#setting-scrape-sample-and-label-limits-for-user-defined-projects_configuring-the-monitoring-stack[Setting a scrape sample limit for user-defined projects] for details on how to set a scrape sample limit and create related alerting rules +* See xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#setting-scrape-sample-and-label-limits-for-user-defined-projects_configuring-the-monitoring-stack[Setting a scrape sample limit for user-defined projects] for details on how to set a scrape sample limit and create related alerting rules diff --git a/virt/monitoring/virt-exposing-custom-metrics-for-vms.adoc b/virt/monitoring/virt-exposing-custom-metrics-for-vms.adoc index b66ca7e9b3..d5889da35d 100644 --- a/virt/monitoring/virt-exposing-custom-metrics-for-vms.adoc +++ b/virt/monitoring/virt-exposing-custom-metrics-for-vms.adoc @@ -22,13 +22,13 @@ include::modules/virt-accessing-node-exporter-outside-cluster.adoc[leveloffset=+ == Additional resources // Hiding in ROSA/OSD as not supported ifndef::openshift-rosa,openshift-dedicated[] -* xref:../../monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Configuring the monitoring stack] +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[Configuring the monitoring stack] -* xref:../../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] -* xref:../../monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] +* xref:../../observability/monitoring/managing-metrics.adoc#managing-metrics[Managing metrics] -* xref:../../monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards] +* xref:../../observability/monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards] * xref:../../applications/application-health.adoc#application-health[Monitoring application health by using health checks] endif::openshift-rosa,openshift-dedicated[] diff --git a/virt/monitoring/virt-monitoring-overview.adoc b/virt/monitoring/virt-monitoring-overview.adoc index bf6c2a1553..52825d1e01 100644 --- a/virt/monitoring/virt-monitoring-overview.adoc +++ b/virt/monitoring/virt-monitoring-overview.adoc @@ -31,7 +31,7 @@ xref:../../virt/monitoring/virt-monitoring-vm-health.adoc#virt-monitoring-vm-hea Configure readiness, liveness, and guest agent ping probes and a watchdog for VMs. xref:../../virt/monitoring/virt-runbooks.adoc#virt-runbooks[Runbooks]:: -Diagnose and resolve issues that trigger {VirtProductName} xref:../../monitoring/managing-alerts.adoc#managing-alerts[alerts] in the {product-title} web console. +Diagnose and resolve issues that trigger {VirtProductName} xref:../../observability/monitoring/managing-alerts.adoc#managing-alerts[alerts] in the {product-title} web console. //:FeatureName: The guest agent ping probe //include::snippets/technology-preview.adoc[] diff --git a/virt/monitoring/virt-prometheus-queries.adoc b/virt/monitoring/virt-prometheus-queries.adoc index 40e63f1b60..ad676a957d 100644 --- a/virt/monitoring/virt-prometheus-queries.adoc +++ b/virt/monitoring/virt-prometheus-queries.adoc @@ -39,7 +39,7 @@ include::modules/virt-live-migration-metrics.adoc[leveloffset=+2] [role="_additional-resources"] == Additional resources -* xref:../../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] +* xref:../../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] * link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Querying Prometheus] diff --git a/virt/monitoring/virt-runbooks.adoc b/virt/monitoring/virt-runbooks.adoc index 742cedac3c..6e87571ca3 100644 --- a/virt/monitoring/virt-runbooks.adoc +++ b/virt/monitoring/virt-runbooks.adoc @@ -8,7 +8,7 @@ toc::[] :!virt-runbooks: -You can use the procedures in these runbooks to diagnose and resolve issues that trigger {VirtProductName} xref:../../monitoring/managing-alerts.adoc#managing-alerts[alerts]. +You can use the procedures in these runbooks to diagnose and resolve issues that trigger {VirtProductName} xref:../../observability/monitoring/managing-alerts.adoc#managing-alerts[alerts]. {VirtProductName} alerts are displayed on the *Virtualization* -> *Overview* -> xref:../../virt/getting_started/virt-web-console-overview.adoc#overview-overview_virt-web-console-overview[*Overview* tab] in the web console. diff --git a/virt/support/virt-collecting-virt-data.adoc b/virt/support/virt-collecting-virt-data.adoc index 90a060be32..7fa74d0be2 100644 --- a/virt/support/virt-collecting-virt-data.adoc +++ b/virt/support/virt-collecting-virt-data.adoc @@ -20,7 +20,7 @@ Prometheus is a time-series database and a rule evaluation engine for metrics. P Alertmanager:: The Alertmanager service handles alerts received from Prometheus. The Alertmanager is also responsible for sending the alerts to external notification systems. -For information about the {product-title} monitoring stack, see xref:../../monitoring/monitoring-overview.adoc#about-openshift-monitoring[About {product-title} monitoring]. +For information about the {product-title} monitoring stack, see xref:../../observability/monitoring/monitoring-overview.adoc#about-openshift-monitoring[About {product-title} monitoring]. // This procedure is in the assembly so that we can add xrefs instead of a long list of additional resources. [id="virt-collecting-data-about-your-environment_{context}"] @@ -30,8 +30,8 @@ Collecting data about your environment minimizes the time required to analyze an .Prerequisites -* xref:../../monitoring/configuring-the-monitoring-stack.adoc#modifying-retention-time-for-prometheus-metrics-data_configuring-the-monitoring-stack[Set the retention time for Prometheus metrics data] to a minimum of seven days. -* xref:../../monitoring/managing-alerts.adoc#sending-notifications-to-external-systems_managing-alerts[Configure the Alertmanager to capture relevant alerts and to send alert notifications to a dedicated mailbox] so that they can be viewed and persisted outside the cluster. +* xref:../../observability/monitoring/configuring-the-monitoring-stack.adoc#modifying-retention-time-for-prometheus-metrics-data_configuring-the-monitoring-stack[Set the retention time for Prometheus metrics data] to a minimum of seven days. +* xref:../../observability/monitoring/managing-alerts.adoc#sending-notifications-to-external-systems_managing-alerts[Configure the Alertmanager to capture relevant alerts and to send alert notifications to a dedicated mailbox] so that they can be viewed and persisted outside the cluster. * Record the exact number of affected nodes and virtual machines. .Procedure @@ -41,10 +41,10 @@ ifndef::openshift-rosa,openshift-dedicated[] . xref:../../support/gathering-cluster-data.adoc#support_gathering_data_gathering-cluster-data[Collect must-gather data for the cluster]. . link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.15/html-single/troubleshooting_openshift_data_foundation/index#downloading-log-files-and-diagnostic-information_rhodf[Collect must-gather data for {rh-storage-first}], if necessary. . xref:../../virt/support/virt-collecting-virt-data.adoc#virt-using-virt-must-gather_virt-collecting-virt-data[Collect must-gather data for {VirtProductName}]. -. xref:../../monitoring/managing-metrics.adoc#querying-metrics-for-all-projects-as-an-administrator_managing-metrics[Collect Prometheus metrics for the cluster]. +. xref:../../observability/monitoring/managing-metrics.adoc#querying-metrics-for-all-projects-as-an-administrator_managing-metrics[Collect Prometheus metrics for the cluster]. endif::openshift-rosa,openshift-dedicated[] ifdef::openshift-rosa,openshift-dedicated[] -* xref:../../monitoring/managing-metrics.adoc#querying-metrics-for-all-projects-as-an-administrator_managing-metrics[Collect Prometheus metrics for the cluster]. +* xref:../../observability/monitoring/managing-metrics.adoc#querying-metrics-for-all-projects-as-an-administrator_managing-metrics[Collect Prometheus metrics for the cluster]. endif::openshift-rosa,openshift-dedicated[] [id="virt-collecting-data-about-vms_{context}"] diff --git a/welcome/about-hcp.adoc b/welcome/about-hcp.adoc index 4cf1404a46..0acf8ae8c0 100644 --- a/welcome/about-hcp.adoc +++ b/welcome/about-hcp.adoc @@ -58,7 +58,7 @@ Use the following sections to find content to help you learn about and use {hcp- | link:https://learn.openshift.com/?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[OpenShift Interactive Learning Portal] | xref:../storage/index.adoc#storage-overview[Storage] -| xref:../monitoring/monitoring-overview.adoc#monitoring-overview_virt-monitoring-overview[Monitoring overview] +| xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview_virt-monitoring-overview[Monitoring overview] | xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle] | diff --git a/welcome/index.adoc b/welcome/index.adoc index 8e7b74dad2..31c3f3ee94 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -297,9 +297,9 @@ Use the Cluster Version Operator (CVO) to upgrade your {product-title} cluster. - **xref:../observability/network_observability/network-observability-overview.adoc#network-observability-overview[Network Observability]**: Observe network traffic for {product-title} clusters by using eBPF technology to create and enrich network flows. You can xref:../observability/network_observability/metrics-alerts-dashboards.adoc#metrics-alerts-dashboards_metrics-alerts-dashboards[view dashboards, customize alerts], and xref:../observability/network_observability/observing-network-traffic.adoc#network-observability-trafficflow_nw-observe-network-traffic[analyze network flow] information for further insight and troubleshooting. -- **xref:../monitoring/monitoring-overview.adoc#monitoring-overview[In-cluster monitoring]**: -Learn to xref:../monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[configure the monitoring stack]. -After configuring monitoring, use the web console to access xref:../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. +- **xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[In-cluster monitoring]**: +Learn to xref:../observability/monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[configure the monitoring stack]. +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. - **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. By 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]. diff --git a/welcome/learn_more_about_openshift.adoc b/welcome/learn_more_about_openshift.adoc index 1dae8ef0d9..684b2fb65a 100644 --- a/welcome/learn_more_about_openshift.adoc +++ b/welcome/learn_more_about_openshift.adoc @@ -52,7 +52,7 @@ Use the following sections to find content to help you learn about and use {prod | link:https://learn.openshift.com/?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[OpenShift Interactive Learning Portal] | xref:../networking/understanding-networking.adoc#understanding-networking[Networking] -| xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] +| xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] | link:https://access.redhat.com/support/policy/updates/openshift#ocp4_phases[{product-title} Life Cycle] | @@ -96,7 +96,7 @@ Use the following sections to find content to help you learn about and use {prod | | -| xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring] +| xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring] | |