diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index cb949e93ceb9..0c36a2aeb0fb 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -2654,6 +2654,123 @@ Topics: 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: Logging + Dir: logging + Distros: openshift-enterprise,openshift-origin + Topics: + - Name: Release notes + Dir: logging_release_notes + Topics: + - Name: Logging 5.9 + File: logging-5-9-release-notes + - Name: Logging 5.8 + File: logging-5-8-release-notes + - Name: Logging 5.7 + File: logging-5-7-release-notes + - Name: Support + File: cluster-logging-support + - Name: Troubleshooting logging + Dir: troubleshooting + Topics: + - Name: Viewing Logging status + File: cluster-logging-cluster-status + - Name: Troubleshooting log forwarding + File: log-forwarding-troubleshooting + - Name: Troubleshooting logging alerts + File: troubleshooting-logging-alerts + - Name: Viewing the status of the Elasticsearch log store + File: cluster-logging-log-store-status + - Name: About Logging + File: cluster-logging + - Name: Installing Logging + File: cluster-logging-deploying + - Name: Updating Logging + File: cluster-logging-upgrading + Distros: openshift-enterprise,openshift-origin + - Name: Visualizing logs + Dir: log_visualization + Topics: + - Name: About log visualization + File: log-visualization + - Name: Log visualization with the web console + File: log-visualization-ocp-console + - Name: Viewing cluster dashboards + File: cluster-logging-dashboards + - Name: Log visualization with Kibana + File: logging-kibana + - Name: Configuring your Logging deployment + Dir: config + Distros: openshift-enterprise,openshift-origin + Topics: + - Name: Configuring CPU and memory limits for Logging components + File: cluster-logging-memory + - Name: Configuring systemd-journald for Logging + File: cluster-logging-systemd + - Name: Log collection and forwarding + Dir: log_collection_forwarding + Topics: + - Name: About log collection and forwarding + File: log-forwarding + - Name: Log output types + File: logging-output-types + - Name: Enabling JSON log forwarding + File: cluster-logging-enabling-json-logging + - Name: Configuring log forwarding + File: configuring-log-forwarding + - Name: Configuring the logging collector + File: cluster-logging-collector + - Name: Collecting and storing Kubernetes events + File: cluster-logging-eventrouter + - Name: Log storage + Dir: log_storage + Topics: + - Name: About log storage + File: about-log-storage + - Name: Installing log storage + File: installing-log-storage + - Name: Configuring the LokiStack log store + File: cluster-logging-loki + - Name: Configuring the Elasticsearch log store + File: logging-config-es-store + - Name: Logging alerts + Dir: logging_alerts + Topics: + - Name: Default logging alerts + File: default-logging-alerts + - Name: Custom logging alerts + File: custom-logging-alerts + - Name: Performance and reliability tuning + Dir: performance_reliability + Topics: + - Name: Flow control mechanisms + File: logging-flow-control-mechanisms + - Name: Filtering logs by content + File: logging-content-filtering + - Name: Filtering logs by metadata + File: logging-input-spec-filtering + - Name: Scheduling resources + Dir: scheduling_resources + Topics: + - Name: Using node selectors to move logging resources + File: logging-node-selectors + - Name: Using tolerations to control logging pod placement + File: logging-taints-tolerations + - Name: Uninstalling Logging + File: cluster-logging-uninstall + - Name: Exported fields + File: cluster-logging-exported-fields + Distros: openshift-enterprise,openshift-origin + - Name: API reference + Dir: api_reference + Topics: + # - Name: 5.8 Logging API reference + # File: logging-5-8-reference + # - Name: 5.7 Logging API reference + # File: logging-5-7-reference + - Name: 5.6 Logging API reference + File: logging-5-6-reference + - Name: Glossary + File: logging-common-terms - Name: Distributed tracing Dir: distr_tracing Distros: openshift-enterprise @@ -2772,124 +2889,6 @@ Topics: - Name: Uninstalling power monitoring File: uninstalling-power-monitoring --- -Name: Logging -Dir: logging -Distros: openshift-enterprise,openshift-origin -Topics: -- Name: Release notes - Dir: logging_release_notes - Topics: - - Name: Logging 5.9 - File: logging-5-9-release-notes - - Name: Logging 5.8 - File: logging-5-8-release-notes - - Name: Logging 5.7 - File: logging-5-7-release-notes -- Name: Support - File: cluster-logging-support -- Name: Troubleshooting logging - Dir: troubleshooting - Topics: - - Name: Viewing Logging status - File: cluster-logging-cluster-status - - Name: Troubleshooting log forwarding - File: log-forwarding-troubleshooting - - Name: Troubleshooting logging alerts - File: troubleshooting-logging-alerts - - Name: Viewing the status of the Elasticsearch log store - File: cluster-logging-log-store-status -- Name: About Logging - File: cluster-logging -- Name: Installing Logging - File: cluster-logging-deploying -- Name: Updating Logging - File: cluster-logging-upgrading - Distros: openshift-enterprise,openshift-origin -- Name: Visualizing logs - Dir: log_visualization - Topics: - - Name: About log visualization - File: log-visualization - - Name: Log visualization with the web console - File: log-visualization-ocp-console - - Name: Viewing cluster dashboards - File: cluster-logging-dashboards - - Name: Log visualization with Kibana - File: logging-kibana -- Name: Configuring your Logging deployment - Dir: config - Distros: openshift-enterprise,openshift-origin - Topics: - - Name: Configuring CPU and memory limits for Logging components - File: cluster-logging-memory - - Name: Configuring systemd-journald for Logging - File: cluster-logging-systemd -- Name: Log collection and forwarding - Dir: log_collection_forwarding - Topics: - - Name: About log collection and forwarding - File: log-forwarding - - Name: Log output types - File: logging-output-types - - Name: Enabling JSON log forwarding - File: cluster-logging-enabling-json-logging - - Name: Configuring log forwarding - File: configuring-log-forwarding - - Name: Configuring the logging collector - File: cluster-logging-collector - - Name: Collecting and storing Kubernetes events - File: cluster-logging-eventrouter -- Name: Log storage - Dir: log_storage - Topics: - - Name: About log storage - File: about-log-storage - - Name: Installing log storage - File: installing-log-storage - - Name: Configuring the LokiStack log store - File: cluster-logging-loki - - Name: Configuring the Elasticsearch log store - File: logging-config-es-store -- Name: Logging alerts - Dir: logging_alerts - Topics: - - Name: Default logging alerts - File: default-logging-alerts - - Name: Custom logging alerts - File: custom-logging-alerts -- Name: Performance and reliability tuning - Dir: performance_reliability - Topics: - - Name: Flow control mechanisms - File: logging-flow-control-mechanisms - - Name: Filtering logs by content - File: logging-content-filtering - - Name: Filtering logs by metadata - File: logging-input-spec-filtering -- Name: Scheduling resources - Dir: scheduling_resources - Topics: - - Name: Using node selectors to move logging resources - File: logging-node-selectors - - Name: Using tolerations to control logging pod placement - File: logging-taints-tolerations -- Name: Uninstalling Logging - File: cluster-logging-uninstall -- Name: Exported fields - File: cluster-logging-exported-fields - Distros: openshift-enterprise,openshift-origin -- Name: API reference - Dir: api_reference - Topics: -# - Name: 5.8 Logging API reference -# File: logging-5-8-reference -# - Name: 5.7 Logging API reference -# File: logging-5-7-reference - - Name: 5.6 Logging API reference - File: logging-5-6-reference -- Name: Glossary - File: logging-common-terms ---- 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 db25730d8fcf..73ab593484c6 100644 --- a/_topic_maps/_topic_map_osd.yml +++ b/_topic_maps/_topic_map_osd.yml @@ -1142,123 +1142,6 @@ Topics: # - Name: Adding worker nodes to single-node OpenShift clusters # File: nodes-sno-worker-nodes --- -Name: Logging -Dir: logging -Distros: openshift-dedicated -Topics: -- Name: Release notes - Dir: logging_release_notes - Topics: - - Name: Logging 5.9 - File: logging-5-9-release-notes - - Name: Logging 5.8 - File: logging-5-8-release-notes - - Name: Logging 5.7 - File: logging-5-7-release-notes -- Name: Support - File: cluster-logging-support -- Name: Troubleshooting logging - Dir: troubleshooting - Topics: - - Name: Viewing Logging status - File: cluster-logging-cluster-status - - Name: Troubleshooting log forwarding - File: log-forwarding-troubleshooting - - Name: Troubleshooting logging alerts - File: troubleshooting-logging-alerts - - Name: Viewing the status of the Elasticsearch log store - File: cluster-logging-log-store-status -- Name: About Logging - File: cluster-logging -- Name: Installing Logging - File: cluster-logging-deploying -- Name: Updating Logging - File: cluster-logging-upgrading -- Name: Visualizing logs - Dir: log_visualization - Topics: - - Name: About log visualization - File: log-visualization - - Name: Log visualization with the web console - File: log-visualization-ocp-console - - Name: Viewing cluster dashboards - File: cluster-logging-dashboards - - Name: Log visualization with Kibana - File: logging-kibana -- Name: Accessing the service logs - File: sd-accessing-the-service-logs -- Name: Configuring your Logging deployment - Dir: config - Topics: - - Name: Configuring CPU and memory limits for Logging components - File: cluster-logging-memory - #- Name: Configuring systemd-journald and Fluentd - # File: cluster-logging-systemd -- Name: Log collection and forwarding - Dir: log_collection_forwarding - Topics: - - Name: About log collection and forwarding - File: log-forwarding - - Name: Log output types - File: logging-output-types - - Name: Enabling JSON log forwarding - File: cluster-logging-enabling-json-logging - - Name: Configuring log forwarding - File: configuring-log-forwarding - - Name: Configuring the logging collector - File: cluster-logging-collector - - Name: Collecting and storing Kubernetes events - File: cluster-logging-eventrouter -- Name: Log storage - Dir: log_storage - Topics: - - Name: About log storage - File: about-log-storage - - Name: Installing log storage - File: installing-log-storage - - Name: Configuring the LokiStack log store - File: cluster-logging-loki - - Name: Configuring the Elasticsearch log store - File: logging-config-es-store -- Name: Logging alerts - Dir: logging_alerts - Topics: - - Name: Default logging alerts - File: default-logging-alerts - - Name: Custom logging alerts - File: custom-logging-alerts -- Name: Performance and reliability tuning - Dir: performance_reliability - Topics: - - Name: Flow control mechanisms - File: logging-flow-control-mechanisms - - Name: Filtering logs by content - File: logging-content-filtering - - Name: Filtering logs by metadata - File: logging-input-spec-filtering -- Name: Scheduling resources - Dir: scheduling_resources - Topics: - - Name: Using node selectors to move logging resources - File: logging-node-selectors - - Name: Using tolerations to control logging pod placement - File: logging-taints-tolerations -- Name: Uninstalling Logging - File: cluster-logging-uninstall -- Name: Exported fields - File: cluster-logging-exported-fields -- Name: API reference - Dir: api_reference - Topics: -# - Name: 5.8 Logging API reference -# File: logging-5-8-reference -# - Name: 5.7 Logging API reference -# File: logging-5-7-reference - - Name: 5.6 Logging API reference - File: logging-5-6-reference -- Name: Glossary - File: logging-common-terms ---- Name: Observability Dir: observability Distros: openshift-dedicated @@ -1289,6 +1172,122 @@ Topics: File: troubleshooting-monitoring-issues - Name: Config map reference for the Cluster Monitoring Operator File: config-map-reference-for-the-cluster-monitoring-operator +- Name: Logging + Dir: logging + Distros: openshift-dedicated + Topics: + - Name: Release notes + Dir: logging_release_notes + Topics: + - Name: Logging 5.9 + File: logging-5-9-release-notes + - Name: Logging 5.8 + File: logging-5-8-release-notes + - Name: Logging 5.7 + File: logging-5-7-release-notes + - Name: Support + File: cluster-logging-support + - Name: Troubleshooting logging + Dir: troubleshooting + Topics: + - Name: Viewing Logging status + File: cluster-logging-cluster-status + - Name: Troubleshooting log forwarding + File: log-forwarding-troubleshooting + - Name: Troubleshooting logging alerts + File: troubleshooting-logging-alerts + - Name: Viewing the status of the Elasticsearch log store + File: cluster-logging-log-store-status + - Name: About Logging + File: cluster-logging + - Name: Installing Logging + File: cluster-logging-deploying + - Name: Updating Logging + File: cluster-logging-upgrading + - Name: Visualizing logs + Dir: log_visualization + Topics: + - Name: About log visualization + File: log-visualization + - Name: Log visualization with the web console + File: log-visualization-ocp-console + - Name: Viewing cluster dashboards + File: cluster-logging-dashboards + - Name: Log visualization with Kibana + File: logging-kibana + - Name: Accessing the service logs + File: sd-accessing-the-service-logs + - Name: Configuring your Logging deployment + Dir: config + Topics: + - Name: Configuring CPU and memory limits for Logging components + File: cluster-logging-memory + #- Name: Configuring systemd-journald and Fluentd + # File: cluster-logging-systemd + - Name: Log collection and forwarding + Dir: log_collection_forwarding + Topics: + - Name: About log collection and forwarding + File: log-forwarding + - Name: Log output types + File: logging-output-types + - Name: Enabling JSON log forwarding + File: cluster-logging-enabling-json-logging + - Name: Configuring log forwarding + File: configuring-log-forwarding + - Name: Configuring the logging collector + File: cluster-logging-collector + - Name: Collecting and storing Kubernetes events + File: cluster-logging-eventrouter + - Name: Log storage + Dir: log_storage + Topics: + - Name: About log storage + File: about-log-storage + - Name: Installing log storage + File: installing-log-storage + - Name: Configuring the LokiStack log store + File: cluster-logging-loki + - Name: Configuring the Elasticsearch log store + File: logging-config-es-store + - Name: Logging alerts + Dir: logging_alerts + Topics: + - Name: Default logging alerts + File: default-logging-alerts + - Name: Custom logging alerts + File: custom-logging-alerts + - Name: Performance and reliability tuning + Dir: performance_reliability + Topics: + - Name: Flow control mechanisms + File: logging-flow-control-mechanisms + - Name: Filtering logs by content + File: logging-content-filtering + - Name: Filtering logs by metadata + File: logging-input-spec-filtering + - Name: Scheduling resources + Dir: scheduling_resources + Topics: + - Name: Using node selectors to move logging resources + File: logging-node-selectors + - Name: Using tolerations to control logging pod placement + File: logging-taints-tolerations + - Name: Uninstalling Logging + File: cluster-logging-uninstall + - Name: Exported fields + File: cluster-logging-exported-fields + - Name: API reference + Dir: api_reference + Topics: + # - Name: 5.8 Logging API reference + # File: logging-5-8-reference + # - Name: 5.7 Logging API reference + # File: logging-5-7-reference + - Name: 5.6 Logging API reference + File: logging-5-6-reference + - Name: Glossary + File: logging-common-terms --- Name: Service Mesh Dir: service_mesh diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml index 4ca80c7a3b92..184400b09ade 100644 --- a/_topic_maps/_topic_map_rosa.yml +++ b/_topic_maps/_topic_map_rosa.yml @@ -1386,125 +1386,6 @@ Topics: # - Name: Adding worker nodes to single-node OpenShift clusters # File: nodes-sno-worker-nodes --- -Name: Logging -Dir: logging -Distros: openshift-rosa -Topics: -- Name: Release notes - Dir: logging_release_notes - Topics: - - Name: Logging 5.9 - File: logging-5-9-release-notes - - Name: Logging 5.8 - File: logging-5-8-release-notes - - Name: Logging 5.7 - File: logging-5-7-release-notes -- Name: Support - File: cluster-logging-support -- Name: Troubleshooting logging - Dir: troubleshooting - Topics: - - Name: Viewing Logging status - File: cluster-logging-cluster-status - - Name: Troubleshooting log forwarding - File: log-forwarding-troubleshooting - - Name: Troubleshooting logging alerts - File: troubleshooting-logging-alerts - - Name: Viewing the status of the Elasticsearch log store - File: cluster-logging-log-store-status -- Name: About Logging - File: cluster-logging -- Name: Installing Logging - File: cluster-logging-deploying -- Name: Updating Logging - File: cluster-logging-upgrading -- Name: Visualizing logs - Dir: log_visualization - Topics: - - Name: About log visualization - File: log-visualization - - Name: Log visualization with the web console - File: log-visualization-ocp-console - - Name: Viewing cluster dashboards - File: cluster-logging-dashboards - - Name: Log visualization with Kibana - File: logging-kibana -- Name: Accessing the service logs - File: sd-accessing-the-service-logs -- Name: Viewing cluster logs in the AWS Console - File: rosa-viewing-logs -- Name: Configuring your Logging deployment - Dir: config - Topics: - - Name: Configuring CPU and memory limits for Logging components - File: cluster-logging-memory - #- Name: Configuring systemd-journald and Fluentd - # File: cluster-logging-systemd -- Name: Log collection and forwarding - Dir: log_collection_forwarding - Topics: - - Name: About log collection and forwarding - File: log-forwarding - - Name: Log output types - File: logging-output-types - - Name: Enabling JSON log forwarding - File: cluster-logging-enabling-json-logging - - Name: Configuring log forwarding - File: configuring-log-forwarding - - Name: Configuring the logging collector - File: cluster-logging-collector - - Name: Collecting and storing Kubernetes events - File: cluster-logging-eventrouter -- Name: Log storage - Dir: log_storage - Topics: - - Name: About log storage - File: about-log-storage - - Name: Installing log storage - File: installing-log-storage - - Name: Configuring the LokiStack log store - File: cluster-logging-loki - - Name: Configuring the Elasticsearch log store - File: logging-config-es-store -- Name: Logging alerts - Dir: logging_alerts - Topics: - - Name: Default logging alerts - File: default-logging-alerts - - Name: Custom logging alerts - File: custom-logging-alerts -- Name: Performance and reliability tuning - Dir: performance_reliability - Topics: - - Name: Flow control mechanisms - File: logging-flow-control-mechanisms - - Name: Filtering logs by content - File: logging-content-filtering - - Name: Filtering logs by metadata - File: logging-input-spec-filtering -- Name: Scheduling resources - Dir: scheduling_resources - Topics: - - Name: Using node selectors to move logging resources - File: logging-node-selectors - - Name: Using tolerations to control logging pod placement - File: logging-taints-tolerations -- Name: Uninstalling Logging - File: cluster-logging-uninstall -- Name: Exported fields - File: cluster-logging-exported-fields -- Name: API reference - Dir: api_reference - Topics: -# - Name: 5.8 Logging API reference -# File: logging-5-8-reference -# - Name: 5.7 Logging API reference -# File: logging-5-7-reference - - Name: 5.6 Logging API reference - File: logging-5-6-reference -- Name: Glossary - File: logging-common-terms ---- Name: Observability Dir: observability Distros: openshift-rosa @@ -1535,6 +1416,124 @@ Topics: File: troubleshooting-monitoring-issues - Name: Config map reference for the Cluster Monitoring Operator File: config-map-reference-for-the-cluster-monitoring-operator +- Name: Logging + Dir: logging + Distros: openshift-rosa + Topics: + - Name: Release notes + Dir: logging_release_notes + Topics: + - Name: Logging 5.9 + File: logging-5-9-release-notes + - Name: Logging 5.8 + File: logging-5-8-release-notes + - Name: Logging 5.7 + File: logging-5-7-release-notes + - Name: Support + File: cluster-logging-support + - Name: Troubleshooting logging + Dir: troubleshooting + Topics: + - Name: Viewing Logging status + File: cluster-logging-cluster-status + - Name: Troubleshooting log forwarding + File: log-forwarding-troubleshooting + - Name: Troubleshooting logging alerts + File: troubleshooting-logging-alerts + - Name: Viewing the status of the Elasticsearch log store + File: cluster-logging-log-store-status + - Name: About Logging + File: cluster-logging + - Name: Installing Logging + File: cluster-logging-deploying + - Name: Updating Logging + File: cluster-logging-upgrading + - Name: Visualizing logs + Dir: log_visualization + Topics: + - Name: About log visualization + File: log-visualization + - Name: Log visualization with the web console + File: log-visualization-ocp-console + - Name: Viewing cluster dashboards + File: cluster-logging-dashboards + - Name: Log visualization with Kibana + File: logging-kibana + - Name: Accessing the service logs + File: sd-accessing-the-service-logs + - Name: Viewing cluster logs in the AWS Console + File: rosa-viewing-logs + - Name: Configuring your Logging deployment + Dir: config + Topics: + - Name: Configuring CPU and memory limits for Logging components + File: cluster-logging-memory + #- Name: Configuring systemd-journald and Fluentd + # File: cluster-logging-systemd + - Name: Log collection and forwarding + Dir: log_collection_forwarding + Topics: + - Name: About log collection and forwarding + File: log-forwarding + - Name: Log output types + File: logging-output-types + - Name: Enabling JSON log forwarding + File: cluster-logging-enabling-json-logging + - Name: Configuring log forwarding + File: configuring-log-forwarding + - Name: Configuring the logging collector + File: cluster-logging-collector + - Name: Collecting and storing Kubernetes events + File: cluster-logging-eventrouter + - Name: Log storage + Dir: log_storage + Topics: + - Name: About log storage + File: about-log-storage + - Name: Installing log storage + File: installing-log-storage + - Name: Configuring the LokiStack log store + File: cluster-logging-loki + - Name: Configuring the Elasticsearch log store + File: logging-config-es-store + - Name: Logging alerts + Dir: logging_alerts + Topics: + - Name: Default logging alerts + File: default-logging-alerts + - Name: Custom logging alerts + File: custom-logging-alerts + - Name: Performance and reliability tuning + Dir: performance_reliability + Topics: + - Name: Flow control mechanisms + File: logging-flow-control-mechanisms + - Name: Filtering logs by content + File: logging-content-filtering + - Name: Filtering logs by metadata + File: logging-input-spec-filtering + - Name: Scheduling resources + Dir: scheduling_resources + Topics: + - Name: Using node selectors to move logging resources + File: logging-node-selectors + - Name: Using tolerations to control logging pod placement + File: logging-taints-tolerations + - Name: Uninstalling Logging + File: cluster-logging-uninstall + - Name: Exported fields + File: cluster-logging-exported-fields + - Name: API reference + Dir: api_reference + Topics: + # - Name: 5.8 Logging API reference + # File: logging-5-8-reference + # - Name: 5.7 Logging API reference + # File: logging-5-7-reference + - Name: 5.6 Logging API reference + File: logging-5-6-reference + - Name: Glossary + File: logging-common-terms --- Name: Service Mesh Dir: service_mesh diff --git a/adding_service_cluster/adding-service.adoc b/adding_service_cluster/adding-service.adoc index b5684aa30682..d99a497236f5 100644 --- a/adding_service_cluster/adding-service.adoc +++ b/adding_service_cluster/adding-service.adoc @@ -25,5 +25,5 @@ include::modules/deleting-service.adoc[leveloffset=+1] ifdef::openshift-rosa[] [role="_additional-resources"] == Additional resources -* xref:../logging/log_collection_forwarding/configuring-log-forwarding.adoc#cluster-logging-collector-log-forward-cloudwatch_configuring-log-forwarding[Forwarding logs to Amazon CloudWatch] +* xref:../observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc#cluster-logging-collector-log-forward-cloudwatch_configuring-log-forwarding[Forwarding logs to Amazon CloudWatch] endif::[] diff --git a/adding_service_cluster/rosa-available-services.adoc b/adding_service_cluster/rosa-available-services.adoc index feec8febc42b..39530c7c42b1 100644 --- a/adding_service_cluster/rosa-available-services.adoc +++ b/adding_service_cluster/rosa-available-services.adoc @@ -16,7 +16,7 @@ include::modules/aws-cloudwatch.adoc[leveloffset=+1] .Additional resources * link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] -* xref:../logging/log_collection_forwarding/configuring-log-forwarding.adoc#cluster-logging-collector-log-forward-cloudwatch_configuring-log-forwarding[Forwarding logs to Amazon CloudWatch] +* xref:../observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc#cluster-logging-collector-log-forward-cloudwatch_configuring-log-forwarding[Forwarding logs to Amazon CloudWatch] include::modules/osd-rhoam.adoc[leveloffset=+1] diff --git a/architecture/index.adoc b/architecture/index.adoc index bdf5acc911ec..7540249760fe 100644 --- a/architecture/index.adoc +++ b/architecture/index.adoc @@ -25,7 +25,7 @@ endif::openshift-dedicated,openshift-rosa[] * For more information on storage, see xref:../storage/index.adoc#index[{product-title} storage]. * For more information on authentication, see xref:../authentication/index.adoc#index[{product-title} authentication]. * For more information on Operator Lifecycle Manager (OLM), see xref:../operators/understanding/olm/olm-understanding-olm.adoc#olm-understanding-olm[OLM]. -* For more information on logging, see xref:../logging/cluster-logging.adoc#cluster-logging[About Logging]. +* For more information on logging, see xref:../observability/logging/cluster-logging.adoc#cluster-logging[About Logging]. // Topic not included in the OSD/ROSA docs ifndef::openshift-dedicated,openshift-rosa[] * For more information on over-the-air (OTA) updates, see xref:../updating/understanding_updates/intro-to-updates.adoc#understanding-openshift-updates[Introduction to OpenShift updates]. diff --git a/cicd/gitops/viewing-argo-cd-logs.adoc b/cicd/gitops/viewing-argo-cd-logs.adoc index af11fee67677..556d0f576a45 100644 --- a/cicd/gitops/viewing-argo-cd-logs.adoc +++ b/cicd/gitops/viewing-argo-cd-logs.adoc @@ -13,4 +13,4 @@ include::modules/gitops-storing-and-retrieving-argo-cd-logs.adoc[leveloffset=+1] [role="_additional-resources"] [id="additional-resources_viewing-argo-cd-logs"] == Additional resources -* xref:../../logging/cluster-logging-deploying.adoc#cluster-logging-deploy-console_cluster-logging-deploying[Installing {logging} using the web console] +* xref:../../observability/logging/cluster-logging-deploying.adoc#cluster-logging-deploy-console_cluster-logging-deploying[Installing {logging} using the web console] diff --git a/cicd/pipelines/viewing-pipeline-logs-using-the-openshift-logging-operator.adoc b/cicd/pipelines/viewing-pipeline-logs-using-the-openshift-logging-operator.adoc index 8fe4700773fc..20e9a3daf1a3 100644 --- a/cicd/pipelines/viewing-pipeline-logs-using-the-openshift-logging-operator.adoc +++ b/cicd/pipelines/viewing-pipeline-logs-using-the-openshift-logging-operator.adoc @@ -26,6 +26,6 @@ include::modules/op-viewing-pipeline-logs-in-kibana.adoc[leveloffset=+1] [role="_additional-resources"] [id="additional-resources_viewing-pipeline-logs-using-the-openshift-logging-operator"] == Additional resources -* xref:../../logging/cluster-logging-deploying.adoc[Installing OpenShift Logging] -* xref:../../logging/log_visualization/log-visualization.adoc#log-visualization-resource-logs_log-visualization[Viewing logs for a resource] -* xref:../../logging/log_visualization/logging-kibana.adoc#logging-kibana[Log visualization with Kibana] +* xref:../../observability/logging/cluster-logging-deploying.adoc#cluster-logging-deploying[Installing OpenShift Logging] +* xref:../../observability/logging/log_visualization/log-visualization.adoc#log-visualization-resource-logs_log-visualization[Viewing logs for a resource] +* xref:../../observability/logging/log_visualization/logging-kibana.adoc#logging-kibana[Log visualization with Kibana] diff --git a/machine_management/creating-infrastructure-machinesets.adoc b/machine_management/creating-infrastructure-machinesets.adoc index 40defa118869..a8e0200e1420 100644 --- a/machine_management/creating-infrastructure-machinesets.adoc +++ b/machine_management/creating-infrastructure-machinesets.adoc @@ -131,5 +131,5 @@ include::modules/infrastructure-moving-monitoring.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources * 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] +* xref:../observability/logging/scheduling_resources/logging-node-selectors.adoc#logging-node-selectors[Using node selectors to move logging resources] +* xref:../observability/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 1b5d5173ab2c..cbf073deaa74 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:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[monitoring considerations] +* xref:../storage/index.adoc#index[Storage], xref:../networking/understanding-networking.adoc#understanding-networking[network], xref:../observability/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 d83843d07285..1480fc770c22 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 @@ -176,21 +176,21 @@ Review the following logging changes to consider when transitioning from {produc {product-title} 4 provides a simple deployment mechanism for OpenShift Logging, by using a Cluster Logging custom resource. -For more information, see xref:../logging/cluster-logging-deploying.adoc#cluster-logging-deploying_cluster-logging-deploying[Installing OpenShift Logging]. +For more information, see xref:../observability/logging/cluster-logging-deploying.adoc#cluster-logging-deploying_cluster-logging-deploying[Installing OpenShift Logging]. [discrete] ==== Aggregated logging data You cannot transition your aggregate logging data from {product-title} 3.11 into your new {product-title} 4 cluster. -For more information, see xref:../logging/cluster-logging.adoc#cluster-logging-about_cluster-logging[About OpenShift Logging]. +For more information, see xref:../observability/logging/cluster-logging.adoc#cluster-logging-about_cluster-logging[About OpenShift Logging]. [discrete] ==== Unsupported logging configurations Some logging configurations that were available in {product-title} 3.11 are no longer supported in {product-title} {product-version}. -For more information on the explicitly unsupported logging cases, see the xref:../logging/cluster-logging-support.adoc#cluster-logging-support[logging support documentation]. +For more information on the explicitly unsupported logging cases, see the xref:../observability/logging/cluster-logging-support.adoc#cluster-logging-support[logging support documentation]. [id="migration-preparing-security"] === Security considerations diff --git a/modules/about-log-collection.adoc b/modules/about-log-collection.adoc index dc3ccbb5e7a0..f716c5fe7a3e 100644 --- a/modules/about-log-collection.adoc +++ b/modules/about-log-collection.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: CONCEPT [id="about-log-collection_{context}"] diff --git a/modules/adding-cluster-notification-contacts.adoc b/modules/adding-cluster-notification-contacts.adoc index b27a8d68b23d..0e6127f7207f 100644 --- a/modules/adding-cluster-notification-contacts.adoc +++ b/modules/adding-cluster-notification-contacts.adoc @@ -2,7 +2,7 @@ // // * rosa_cluster_admin/rosa_logging/rosa-accessing-the-service-logs.adoc // * osd_cluster_admin/osd_logging/osd-accessing-the-service-logs.adoc -// * logging/sd-accessing-the-service-logs.adoc +// * observability/logging/sd-accessing-the-service-logs.adoc :_mod-docs-content-type: PROCEDURE [id="adding-cluster-notification-contacts_{context}"] diff --git a/modules/cluster-logging-about-crd.adoc b/modules/cluster-logging-about-crd.adoc index f21de4446bfd..fa0ddafa887e 100644 --- a/modules/cluster-logging-about-crd.adoc +++ b/modules/cluster-logging-about-crd.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-deploying.adoc :_mod-docs-content-type: REFERENCE [id="cluster-logging-about-crd_{context}"] diff --git a/modules/cluster-logging-about-es-logstore.adoc b/modules/cluster-logging-about-es-logstore.adoc index a536ace2b41a..c73abb216ac5 100644 --- a/modules/cluster-logging-about-es-logstore.adoc +++ b/modules/cluster-logging-about-es-logstore.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc :_mod-docs-content-type: CONCEPT [id="cluster-logging-about-es-logstore_{context}"] diff --git a/modules/cluster-logging-about.adoc b/modules/cluster-logging-about.adoc index d3cb4668116d..00e5b373b466 100644 --- a/modules/cluster-logging-about.adoc +++ b/modules/cluster-logging-about.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * virt/support/virt-openshift-cluster-monitoring.adoc -// * logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc // * serverless/monitor/cluster-logging-serverless.adoc :_mod-docs-content-type: CONCEPT diff --git a/modules/cluster-logging-clo-status-comp.adoc b/modules/cluster-logging-clo-status-comp.adoc index 9faf17b065da..972d5d8f641f 100644 --- a/modules/cluster-logging-clo-status-comp.adoc +++ b/modules/cluster-logging-clo-status-comp.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/troubleshooting/cluster-logging-cluster-status.adoc +// * observability/logging/troubleshooting/cluster-logging-cluster-status.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-clo-status-comp_{context}"] diff --git a/modules/cluster-logging-clo-status.adoc b/modules/cluster-logging-clo-status.adoc index ce8547226196..c13cd9741cca 100644 --- a/modules/cluster-logging-clo-status.adoc +++ b/modules/cluster-logging-clo-status.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/troubleshooting/cluster-logging-cluster-status.adoc +// * observability/logging/troubleshooting/cluster-logging-cluster-status.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-clo-status_{context}"] diff --git a/modules/cluster-logging-cloudwatch.adoc b/modules/cluster-logging-cloudwatch.adoc index d404a68a6380..b96cd3c0e755 100644 --- a/modules/cluster-logging-cloudwatch.adoc +++ b/modules/cluster-logging-cloudwatch.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc // // This module uses conditionalized paragraphs so that the module // can be re-used in associated products. diff --git a/modules/cluster-logging-collecting-storing-kubernetes-events.adoc b/modules/cluster-logging-collecting-storing-kubernetes-events.adoc index 98a22e66e2e7..bccbe91ded7b 100644 --- a/modules/cluster-logging-collecting-storing-kubernetes-events.adoc +++ b/modules/cluster-logging-collecting-storing-kubernetes-events.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc :_mod-docs-content-type: CONCEPT [id="cluster-logging-collecting-storing-kubernetes-events-about_{context}"] diff --git a/modules/cluster-logging-collector-limits.adoc b/modules/cluster-logging-collector-limits.adoc index 43ab4abe998c..8d736b22fcd1 100644 --- a/modules/cluster-logging-collector-limits.adoc +++ b/modules/cluster-logging-collector-limits.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-collector.adoc +// * observability/logging/cluster-logging-collector.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-limits_{context}"] diff --git a/modules/cluster-logging-collector-log-forward-es.adoc b/modules/cluster-logging-collector-log-forward-es.adoc index 3e5c036cffd7..c335d5277c39 100644 --- a/modules/cluster-logging-collector-log-forward-es.adoc +++ b/modules/cluster-logging-collector-log-forward-es.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-log-forward-es_{context}"] diff --git a/modules/cluster-logging-collector-log-forward-gcp.adoc b/modules/cluster-logging-collector-log-forward-gcp.adoc index 70a4170ef309..e97cb76d993f 100644 --- a/modules/cluster-logging-collector-log-forward-gcp.adoc +++ b/modules/cluster-logging-collector-log-forward-gcp.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/configuring-log-forwarding.adoc +// * observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-log-forward-gcp_{context}"] diff --git a/modules/cluster-logging-collector-log-forward-kafka.adoc b/modules/cluster-logging-collector-log-forward-kafka.adoc index b6bc06ff0b68..c00e527724b0 100644 --- a/modules/cluster-logging-collector-log-forward-kafka.adoc +++ b/modules/cluster-logging-collector-log-forward-kafka.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/cluster-logging-collector-log-forward-logs-from-application-pods.adoc b/modules/cluster-logging-collector-log-forward-logs-from-application-pods.adoc index 285ea042d564..40c7dc284a3b 100644 --- a/modules/cluster-logging-collector-log-forward-logs-from-application-pods.adoc +++ b/modules/cluster-logging-collector-log-forward-logs-from-application-pods.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/configuring-log-forwarding.adoc +// * observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-log-forward-logs-from-application-pods_{context}"] diff --git a/modules/cluster-logging-collector-log-forward-loki.adoc b/modules/cluster-logging-collector-log-forward-loki.adoc index 56bd0e2d3069..e0323dbd3de2 100644 --- a/modules/cluster-logging-collector-log-forward-loki.adoc +++ b/modules/cluster-logging-collector-log-forward-loki.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-log-forward-loki_{context}"] diff --git a/modules/cluster-logging-collector-log-forward-project.adoc b/modules/cluster-logging-collector-log-forward-project.adoc index c0709fa8a5e7..88192094c2d4 100644 --- a/modules/cluster-logging-collector-log-forward-project.adoc +++ b/modules/cluster-logging-collector-log-forward-project.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/configuring-log-forwarding.adoc +// * observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-log-forward-project_{context}"] diff --git a/modules/cluster-logging-collector-log-forward-secret-cloudwatch.adoc b/modules/cluster-logging-collector-log-forward-secret-cloudwatch.adoc index 1fa3fd8528a5..b15719f75dd6 100644 --- a/modules/cluster-logging-collector-log-forward-secret-cloudwatch.adoc +++ b/modules/cluster-logging-collector-log-forward-secret-cloudwatch.adoc @@ -1,7 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-external.adoc -// +// * observability/logging/cluster-logging-external.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-log-forward-secret-cloudwatch_{context}"] diff --git a/modules/cluster-logging-collector-log-forward-sts-cloudwatch.adoc b/modules/cluster-logging-collector-log-forward-sts-cloudwatch.adoc index 0549fddb7971..721c3ee84a86 100644 --- a/modules/cluster-logging-collector-log-forward-sts-cloudwatch.adoc +++ b/modules/cluster-logging-collector-log-forward-sts-cloudwatch.adoc @@ -1,19 +1,13 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/configuring-log-forwarding.adoc +// * observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-log-forward-sts-cloudwatch_{context}"] = Forwarding logs to Amazon CloudWatch from STS enabled clusters For clusters with AWS Security Token Service (STS) enabled, you can create an AWS service account manually or create a credentials request by using the -ifdef::openshift-enterprise,openshift-origin[] -xref:../../authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc[Cloud Credential Operator(CCO)] -endif::[] -ifdef::openshift-dedicated[] -link:https://docs.openshift.com/container-platform/latest/authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.html[Cloud Credential Operator(CCO)] -endif::[] - utility `ccoctl`. +link:https://docs.openshift.com/container-platform/latest/authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.html[Cloud Credential Operator(CCO)] utility `ccoctl`. .Prerequisites diff --git a/modules/cluster-logging-collector-pod-location.adoc b/modules/cluster-logging-collector-pod-location.adoc index 47adf0104ddd..5c7f5756f1d3 100644 --- a/modules/cluster-logging-collector-pod-location.adoc +++ b/modules/cluster-logging-collector-pod-location.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-collector.adoc +// * observability/logging/cluster-logging-collector.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-pod-location_{context}"] diff --git a/modules/cluster-logging-collector-tolerations.adoc b/modules/cluster-logging-collector-tolerations.adoc index eb8a555f8e35..32ee32b5d4ff 100644 --- a/modules/cluster-logging-collector-tolerations.adoc +++ b/modules/cluster-logging-collector-tolerations.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/scheduling_resources/logging-taints-tolerations.adoc +// * observability/logging/scheduling_resources/logging-taints-tolerations.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-tolerations_{context}"] diff --git a/modules/cluster-logging-collector-tuning.adoc b/modules/cluster-logging-collector-tuning.adoc index d96be37f9a39..7762eaee3f72 100644 --- a/modules/cluster-logging-collector-tuning.adoc +++ b/modules/cluster-logging-collector-tuning.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/cluster-logging-collector.adoc +// * observability/logging/log_collection_forwarding/cluster-logging-collector.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-collector-tuning_{context}"] diff --git a/modules/cluster-logging-configuring-image-about.adoc b/modules/cluster-logging-configuring-image-about.adoc index 842c6e764f74..4db1ab11fe61 100644 --- a/modules/cluster-logging-configuring-image-about.adoc +++ b/modules/cluster-logging-configuring-image-about.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-configuring.adoc +// * observability/logging/cluster-logging-configuring.adoc [id="cluster-logging-configuring-image-about_{context}"] = Understanding {logging} component images diff --git a/modules/cluster-logging-cpu-memory.adoc b/modules/cluster-logging-cpu-memory.adoc index 3c06f7479d8b..0fc270daab8b 100644 --- a/modules/cluster-logging-cpu-memory.adoc +++ b/modules/cluster-logging-cpu-memory.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-collector.adoc +// * observability/logging/cluster-logging-collector.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-memory-limits_{context}"] diff --git a/modules/cluster-logging-dashboards-access.adoc b/modules/cluster-logging-dashboards-access.adoc index ac6377b7011d..52c31afb421e 100644 --- a/modules/cluster-logging-dashboards-access.adoc +++ b/modules/cluster-logging-dashboards-access.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_visualization/cluster-logging-dashboards.adoc +// * observability/logging/log_visualization/cluster-logging-dashboards.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-dashboards-access_{context}"] diff --git a/modules/cluster-logging-dashboards-es.adoc b/modules/cluster-logging-dashboards-es.adoc index c24b016f5086..a5ef10c44a85 100644 --- a/modules/cluster-logging-dashboards-es.adoc +++ b/modules/cluster-logging-dashboards-es.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_visualization/cluster-logging-dashboards.adoc +// * observability/logging/log_visualization/cluster-logging-dashboards.adoc [id="cluster-logging-dashboards-es_{context}"] = Charts on the Logging/Elasticsearch nodes dashboard diff --git a/modules/cluster-logging-dashboards-logging.adoc b/modules/cluster-logging-dashboards-logging.adoc index d4f8f0296ddb..f4f54650870d 100644 --- a/modules/cluster-logging-dashboards-logging.adoc +++ b/modules/cluster-logging-dashboards-logging.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_visualization/cluster-logging-dashboards.adoc +// * observability/logging/log_visualization/cluster-logging-dashboards.adoc :_mod-docs-content-type: CONCEPT [id="cluster-logging-dashboards-logging_{context}"] diff --git a/modules/cluster-logging-deploy-cli.adoc b/modules/cluster-logging-deploy-cli.adoc index 1f124aa1f953..37a2bc435260 100644 --- a/modules/cluster-logging-deploy-cli.adoc +++ b/modules/cluster-logging-deploy-cli.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-deploying.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-deploy-cli_{context}"] diff --git a/modules/cluster-logging-deploy-console.adoc b/modules/cluster-logging-deploy-console.adoc index 5353eb283e30..90ae23447b02 100644 --- a/modules/cluster-logging-deploy-console.adoc +++ b/modules/cluster-logging-deploy-console.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-deploying.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-deploy-console_{context}"] diff --git a/modules/cluster-logging-deploy-es-cli.adoc b/modules/cluster-logging-deploy-es-cli.adoc index 8dd631004561..323ee7fc2ec4 100644 --- a/modules/cluster-logging-deploy-es-cli.adoc +++ b/modules/cluster-logging-deploy-es-cli.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_storage/installing-log-storage.adoc +// * observability/logging/log_storage/installing-log-storage.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-deploy-es-cli_{context}"] diff --git a/modules/cluster-logging-deploy-multitenant.adoc b/modules/cluster-logging-deploy-multitenant.adoc index f66b815a31f4..a8f87c04ae0f 100644 --- a/modules/cluster-logging-deploy-multitenant.adoc +++ b/modules/cluster-logging-deploy-multitenant.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-deploying.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-deploy-multitenant_{context}"] diff --git a/modules/cluster-logging-deploying-about.adoc b/modules/cluster-logging-deploying-about.adoc index e8d799c67bf4..0754015be64b 100644 --- a/modules/cluster-logging-deploying-about.adoc +++ b/modules/cluster-logging-deploying-about.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying-about.adoc +// * observability/logging/cluster-logging-deploying-about.adoc // * serverless/monitor/cluster-logging-serverless.adoc :_mod-docs-content-type: CONCEPT diff --git a/modules/cluster-logging-elasticsearch-audit.adoc b/modules/cluster-logging-elasticsearch-audit.adoc index 51bb4cc8958b..aaadac6ca974 100644 --- a/modules/cluster-logging-elasticsearch-audit.adoc +++ b/modules/cluster-logging-elasticsearch-audit.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-elasticsearch.adoc +// * observability/logging/cluster-logging-elasticsearch.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-elasticsearch-audit_{context}"] diff --git a/modules/cluster-logging-elasticsearch-exposing.adoc b/modules/cluster-logging-elasticsearch-exposing.adoc index 4e02a829386c..b3b8da576c9e 100644 --- a/modules/cluster-logging-elasticsearch-exposing.adoc +++ b/modules/cluster-logging-elasticsearch-exposing.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-elasticsearch.adoc +// * observability/logging/cluster-logging-elasticsearch.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-elasticsearch-exposing_{context}"] diff --git a/modules/cluster-logging-elasticsearch-ha.adoc b/modules/cluster-logging-elasticsearch-ha.adoc index 47542c99c70c..0f8058955c1c 100644 --- a/modules/cluster-logging-elasticsearch-ha.adoc +++ b/modules/cluster-logging-elasticsearch-ha.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-elasticsearch.adoc +// * observability/logging/cluster-logging-elasticsearch.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-elasticsearch-ha_{context}"] diff --git a/modules/cluster-logging-elasticsearch-persistent-storage-empty.adoc b/modules/cluster-logging-elasticsearch-persistent-storage-empty.adoc index f85584454636..b1982b462ca5 100644 --- a/modules/cluster-logging-elasticsearch-persistent-storage-empty.adoc +++ b/modules/cluster-logging-elasticsearch-persistent-storage-empty.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-elasticsearch-storage.adoc +// * observability/logging/cluster-logging-elasticsearch-storage.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-elasticsearch-persistent-storage-empty_{context}"] diff --git a/modules/cluster-logging-elasticsearch-retention.adoc b/modules/cluster-logging-elasticsearch-retention.adoc index 543d6a41bba0..e99b91be31c8 100644 --- a/modules/cluster-logging-elasticsearch-retention.adoc +++ b/modules/cluster-logging-elasticsearch-retention.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-elasticsearch.adoc +// * observability/logging/cluster-logging-elasticsearch.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-elasticsearch-retention_{context}"] diff --git a/modules/cluster-logging-elasticsearch-rules.adoc b/modules/cluster-logging-elasticsearch-rules.adoc index 0ebf37a93271..ead76991f3e4 100644 --- a/modules/cluster-logging-elasticsearch-rules.adoc +++ b/modules/cluster-logging-elasticsearch-rules.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/logging_alerts/default-logging-alerts.adoc +// * observability/logging/logging_alerts/default-logging-alerts.adoc :_mod-docs-content-type: REFERENCE [id="cluster-logging-elasticsearch-rules_{context}"] diff --git a/modules/cluster-logging-elasticsearch-scaledown.adoc b/modules/cluster-logging-elasticsearch-scaledown.adoc index dea23e5cc746..8d6326827bd1 100644 --- a/modules/cluster-logging-elasticsearch-scaledown.adoc +++ b/modules/cluster-logging-elasticsearch-scaledown.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-log-store.adoc +// * observability/logging/cluster-logging-log-store.adoc [id="cluster-logging-elasticsearch-scaledown_{context}"] = Scaling down Elasticsearch pods diff --git a/modules/cluster-logging-elasticsearch-storage.adoc b/modules/cluster-logging-elasticsearch-storage.adoc index 7aff28b14a3f..03d8949fade0 100644 --- a/modules/cluster-logging-elasticsearch-storage.adoc +++ b/modules/cluster-logging-elasticsearch-storage.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-elasticsearch.adoc +// * observability/logging/cluster-logging-elasticsearch.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-elasticsearch-storage_{context}"] diff --git a/modules/cluster-logging-eventrouter-about.adoc b/modules/cluster-logging-eventrouter-about.adoc index edb7d8df9d32..de0ca45eb6c9 100644 --- a/modules/cluster-logging-eventrouter-about.adoc +++ b/modules/cluster-logging-eventrouter-about.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc :_mod-docs-content-type: CONCEPT [id="cluster-logging-eventrouter-about_{context}"] diff --git a/modules/cluster-logging-eventrouter-deploy.adoc b/modules/cluster-logging-eventrouter-deploy.adoc index a32b4d2dc077..0857649c0a2f 100644 --- a/modules/cluster-logging-eventrouter-deploy.adoc +++ b/modules/cluster-logging-eventrouter-deploy.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/cluster-logging-eventrouter.adoc +// * observability/logging/log_collection_forwarding/cluster-logging-eventrouter.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-eventrouter-deploy_{context}"] diff --git a/modules/cluster-logging-export-fields.adoc b/modules/cluster-logging-export-fields.adoc index 2a4a8dc7c96f..bd26089089ed 100644 --- a/modules/cluster-logging-export-fields.adoc +++ b/modules/cluster-logging-export-fields.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc :_mod-docs-content-type: CONCEPT [id="cluster-logging-export-fields-about_{context}"] diff --git a/modules/cluster-logging-forwarding-separate-indices.adoc b/modules/cluster-logging-forwarding-separate-indices.adoc index 25382128fbe5..edb1092c22ec 100644 --- a/modules/cluster-logging-forwarding-separate-indices.adoc +++ b/modules/cluster-logging-forwarding-separate-indices.adoc @@ -1,5 +1,6 @@ // Module is included in the following assemblies: -// * logging/log_collection_forwarding/log-forwarding +// +// * observability/logging/log_collection_forwarding/log-forwarding :_mod-docs-content-type: PROCEDURE [id="cluster-logging-forwarding-separate-indices_{context}"] diff --git a/modules/cluster-logging-json-logging-about.adoc b/modules/cluster-logging-json-logging-about.adoc index 2f691fdde4b6..3f4b02793a86 100644 --- a/modules/cluster-logging-json-logging-about.adoc +++ b/modules/cluster-logging-json-logging-about.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc :_mod-docs-content-type: CONCEPT [id="cluster-logging-json-logging-about_{context}"] diff --git a/modules/cluster-logging-kibana-limits.adoc b/modules/cluster-logging-kibana-limits.adoc index aac3c3a66374..af28054b855e 100644 --- a/modules/cluster-logging-kibana-limits.adoc +++ b/modules/cluster-logging-kibana-limits.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-visualizer.adoc +// * observability/logging/cluster-logging-visualizer.adoc [id="cluster-logging-kibana-limits_{context}"] = Configure the CPU and memory limits for the log visualizer diff --git a/modules/cluster-logging-kibana-scaling.adoc b/modules/cluster-logging-kibana-scaling.adoc index e2ed84ccb1f7..cd7f3c4a734e 100644 --- a/modules/cluster-logging-kibana-scaling.adoc +++ b/modules/cluster-logging-kibana-scaling.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-visualizer.adoc +// * observability/logging/cluster-logging-visualizer.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-kibana-scaling_{context}"] diff --git a/modules/cluster-logging-log-store-status-comp.adoc b/modules/cluster-logging-log-store-status-comp.adoc index f9f96f74f824..448f0565cb74 100644 --- a/modules/cluster-logging-log-store-status-comp.adoc +++ b/modules/cluster-logging-log-store-status-comp.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-elasticsearch.adoc +// * observability/logging/cluster-logging-elasticsearch.adoc [id="cluster-logging-elasticsearch-status-comp_{context}"] = Viewing the status of the log store components diff --git a/modules/cluster-logging-log-store-status-viewing.adoc b/modules/cluster-logging-log-store-status-viewing.adoc index 2ddfdcac806b..6e26cadd0314 100644 --- a/modules/cluster-logging-log-store-status-viewing.adoc +++ b/modules/cluster-logging-log-store-status-viewing.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-log-store.adoc +// * observability/logging/cluster-logging-log-store.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-log-store-comp-viewing_{context}"] diff --git a/modules/cluster-logging-logstore-limits.adoc b/modules/cluster-logging-logstore-limits.adoc index fad6536708a6..70d71aadbfde 100644 --- a/modules/cluster-logging-logstore-limits.adoc +++ b/modules/cluster-logging-logstore-limits.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-elasticsearch.adoc +// * observability/logging/cluster-logging-elasticsearch.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-logstore-limits_{context}"] diff --git a/modules/cluster-logging-logstore-tolerations.adoc b/modules/cluster-logging-logstore-tolerations.adoc index 3c320c73fe22..342719f1d410 100644 --- a/modules/cluster-logging-logstore-tolerations.adoc +++ b/modules/cluster-logging-logstore-tolerations.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/scheduling_resources/logging-taints-tolerations.adoc +// * observability/logging/scheduling_resources/logging-taints-tolerations.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-logstore-tolerations_{context}"] diff --git a/modules/cluster-logging-maintenance-support-list.adoc b/modules/cluster-logging-maintenance-support-list.adoc index d155b02edc9c..cc1d8165c49e 100644 --- a/modules/cluster-logging-maintenance-support-list.adoc +++ b/modules/cluster-logging-maintenance-support-list.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-support.adoc +// * observability/logging/cluster-logging-support.adoc [id="cluster-logging-maintenance-support-list_{context}"] = Unsupported configurations diff --git a/modules/cluster-logging-manual-rollout-rolling.adoc b/modules/cluster-logging-manual-rollout-rolling.adoc index 542e13274a2d..bbd85f70e993 100644 --- a/modules/cluster-logging-manual-rollout-rolling.adoc +++ b/modules/cluster-logging-manual-rollout-rolling.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_storage/logging-config-es-store.adoc +// * observability/logging/log_storage/logging-config-es-store.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-manual-rollout-rolling_{context}"] diff --git a/modules/cluster-logging-must-gather-about.adoc b/modules/cluster-logging-must-gather-about.adoc index 5947cf947961..d27d0c947daf 100644 --- a/modules/cluster-logging-must-gather-about.adoc +++ b/modules/cluster-logging-must-gather-about.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-support.adoc +// * observability/logging/cluster-logging-support.adoc :_mod-docs-content-type: CONCEPT [id="about-must-gather_{context}"] diff --git a/modules/cluster-logging-must-gather-collecting.adoc b/modules/cluster-logging-must-gather-collecting.adoc index d1ea89829b4c..36ea531933b2 100644 --- a/modules/cluster-logging-must-gather-collecting.adoc +++ b/modules/cluster-logging-must-gather-collecting.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-support.adoc +// * observability/logging/cluster-logging-support.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-must-gather-collecting_{context}"] diff --git a/modules/cluster-logging-removing-unused-components-if-no-elasticsearch.adoc b/modules/cluster-logging-removing-unused-components-if-no-elasticsearch.adoc index ebee7883bd49..8671766110e5 100644 --- a/modules/cluster-logging-removing-unused-components-if-no-elasticsearch.adoc +++ b/modules/cluster-logging-removing-unused-components-if-no-elasticsearch.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-collector.adoc +// * observability/logging/cluster-logging-collector.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-removing-unused-components-if-no-elasticsearch_{context}"] diff --git a/modules/cluster-logging-systemd-scaling.adoc b/modules/cluster-logging-systemd-scaling.adoc index a92726515e28..c9252419a262 100644 --- a/modules/cluster-logging-systemd-scaling.adoc +++ b/modules/cluster-logging-systemd-scaling.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/config/cluster-logging-systemd +// * observability/logging/config/cluster-logging-systemd :_mod-docs-content-type: PROCEDURE [id="cluster-logging-systemd-scaling_{context}"] diff --git a/modules/cluster-logging-troubleshoot-logging.adoc b/modules/cluster-logging-troubleshoot-logging.adoc index bda3e59c1341..208e39fd32e1 100644 --- a/modules/cluster-logging-troubleshoot-logging.adoc +++ b/modules/cluster-logging-troubleshoot-logging.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc :_mod-docs-content-type: CONCEPT [id="cluster-logging-troubleshoot-logging-about_{context}"] diff --git a/modules/cluster-logging-troubleshooting-unknown.adoc b/modules/cluster-logging-troubleshooting-unknown.adoc index 92e173aa7ce8..834e111e22a0 100644 --- a/modules/cluster-logging-troubleshooting-unknown.adoc +++ b/modules/cluster-logging-troubleshooting-unknown.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-troublehsooting.adoc +// * observability/logging/cluster-logging-troublehsooting.adoc [id="cluster-logging-troubleshooting-unknown_{context}"] = Troubleshooting a Kubernetes unknown error while connecting to Elasticsearch diff --git a/modules/cluster-logging-upgrading-elasticsearch.adoc b/modules/cluster-logging-upgrading-elasticsearch.adoc index 9a62639a987e..47450c4af811 100644 --- a/modules/cluster-logging-upgrading-elasticsearch.adoc +++ b/modules/cluster-logging-upgrading-elasticsearch.adoc @@ -1,5 +1,6 @@ // Module file include in the following assemblies: -// logging/cluster-logging-upgrading.adoc +// +// * observability/logging/cluster-logging-upgrading.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-upgrading-elasticsearch_{context}"] diff --git a/modules/cluster-logging-visualizer-indices.adoc b/modules/cluster-logging-visualizer-indices.adoc index 1b6deaab2d61..ddd8fa306615 100644 --- a/modules/cluster-logging-visualizer-indices.adoc +++ b/modules/cluster-logging-visualizer-indices.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_visualizer/logging-kibana.adoc +// * observability/logging/log_visualizer/logging-kibana.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-visualizer-indices_{context}"] diff --git a/modules/cluster-logging-visualizer-kibana.adoc b/modules/cluster-logging-visualizer-kibana.adoc index 0ae118f203cb..e8f520b9c531 100644 --- a/modules/cluster-logging-visualizer-kibana.adoc +++ b/modules/cluster-logging-visualizer-kibana.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/viewing/cluster-logging-visualizer.adoc +// * observability/logging/viewing/cluster-logging-visualizer.adoc :_mod-docs-content-type: PROCEDURE [id="cluster-logging-visualizer-kibana_{context}"] diff --git a/modules/cluster-logging-visualizer-launch.adoc b/modules/cluster-logging-visualizer-launch.adoc index 4bb32430077b..040e35903c23 100644 --- a/modules/cluster-logging-visualizer-launch.adoc +++ b/modules/cluster-logging-visualizer-launch.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-visualizer.adoc +// * observability/logging/cluster-logging-visualizer.adoc [id="cluster-logging-visualizer-launch_{context}"] = Launching the log visualizer diff --git a/modules/configuring-log-storage-cr.adoc b/modules/configuring-log-storage-cr.adoc index 16709f3579e4..4811f2319010 100644 --- a/modules/configuring-log-storage-cr.adoc +++ b/modules/configuring-log-storage-cr.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc -// * logging/cluster-logging-loki.adoc +// * observability/logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-loki.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-log-storage-cr_{context}"] diff --git a/modules/configuring-log-visualizer.adoc b/modules/configuring-log-visualizer.adoc index 797943e3e4de..beb7d08ea63f 100644 --- a/modules/configuring-log-visualizer.adoc +++ b/modules/configuring-log-visualizer.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * logging/log_visualization/log-visualization.adoc -// * logging/cluster-logging-deploying.adoc +// * observability/logging/log_visualization/log-visualization.adoc +// * observability/logging/cluster-logging-deploying.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-log-visualizer_{context}"] diff --git a/modules/configuring-logging-collector.adoc b/modules/configuring-logging-collector.adoc index e0666009014f..7328f04225a9 100644 --- a/modules/configuring-logging-collector.adoc +++ b/modules/configuring-logging-collector.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc -// * logging/log_collection_forwarding/cluster-logging-collector.adoc +// * observability/logging/cluster-logging-deploying.adoc +// * observability/logging/log_collection_forwarding/cluster-logging-collector.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-logging-collector_{context}"] diff --git a/modules/configuring-logging-loki-ruler.adoc b/modules/configuring-logging-loki-ruler.adoc index 7d23c0476c90..00bfae081851 100644 --- a/modules/configuring-logging-loki-ruler.adoc +++ b/modules/configuring-logging-loki-ruler.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/logging_alerts/custom-logging-alerts.adoc +// * observability/logging/logging_alerts/custom-logging-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-logging-loki-ruler_{context}"] diff --git a/modules/create-cluster-logging-cli.adoc b/modules/create-cluster-logging-cli.adoc index c743485f16b0..b60e30e01544 100644 --- a/modules/create-cluster-logging-cli.adoc +++ b/modules/create-cluster-logging-cli.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-deploying.adoc :_mod-docs-content-type: PROCEDURE [id="create-cluster-logging-cli_{context}"] diff --git a/modules/create-lokistack-cr-console.adoc b/modules/create-lokistack-cr-console.adoc index 4ea6fa73486d..cbccb37ff68a 100644 --- a/modules/create-lokistack-cr-console.adoc +++ b/modules/create-lokistack-cr-console.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_storage/installing-log-storage.adoc +// * observability/logging/log_storage/installing-log-storage.adoc :_mod-docs-content-type: PROCEDURE [id="create-lokistack-cr-console_{context}"] diff --git a/modules/creating-logfilesmetricexporter.adoc b/modules/creating-logfilesmetricexporter.adoc index 078ed7da8ff1..0ba34fe0ec13 100644 --- a/modules/creating-logfilesmetricexporter.adoc +++ b/modules/creating-logfilesmetricexporter.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/cluster-logging-collector.adoc +// * observability/logging/log_collection_forwarding/cluster-logging-collector.adoc :_mod-docs-content-type: PROCEDURE [id="creating-logfilesmetricexporter_{context}"] diff --git a/modules/dedicated-cluster-install-deploy.adoc b/modules/dedicated-cluster-install-deploy.adoc index f4fe1c3c2f66..34910deeffe9 100644 --- a/modules/dedicated-cluster-install-deploy.adoc +++ b/modules/dedicated-cluster-install-deploy.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/dedicated-cluster-deploying.adoc +// * observability/logging/dedicated-cluster-deploying.adoc [id="dedicated-cluster-install-deploy"] diff --git a/modules/enabling-log-console-plugin.adoc b/modules/enabling-log-console-plugin.adoc index e3876ffd85a5..2f684ea00185 100644 --- a/modules/enabling-log-console-plugin.adoc +++ b/modules/enabling-log-console-plugin.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_visualization/log-visualization-ocp-console.adoc +// * observability/logging/log_visualization/log-visualization-ocp-console.adoc :_mod-docs-content-type: PROCEDURE [id="enabling-log-console-plugin_{context}"] diff --git a/modules/es-cluster-health-is-red.adoc b/modules/es-cluster-health-is-red.adoc index 9a087ffd76e5..e01cbee90f53 100644 --- a/modules/es-cluster-health-is-red.adoc +++ b/modules/es-cluster-health-is-red.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/troubleshooting/troubleshooting-logging-alerts.adoc +// * observability/logging/troubleshooting/troubleshooting-logging-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="es-cluster-health-is-red_{context}"] diff --git a/modules/es-disk-space-low.adoc b/modules/es-disk-space-low.adoc index c647e27159ed..c7fcb94a9e7c 100644 --- a/modules/es-disk-space-low.adoc +++ b/modules/es-disk-space-low.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/troubleshooting/troubleshooting-logging-alerts.adoc +// * observability/logging/troubleshooting/troubleshooting-logging-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="es-disk-space-low_{context}"] diff --git a/modules/es-node-disk-flood-watermark-reached.adoc b/modules/es-node-disk-flood-watermark-reached.adoc index c6030aadcbb8..15475715ce84 100644 --- a/modules/es-node-disk-flood-watermark-reached.adoc +++ b/modules/es-node-disk-flood-watermark-reached.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/troubleshooting/troubleshooting-logging-alerts.adoc +// * observability/logging/troubleshooting/troubleshooting-logging-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="es-node-disk-flood-watermark-reached_{context}"] diff --git a/modules/es-node-disk-high-watermark-reached.adoc b/modules/es-node-disk-high-watermark-reached.adoc index 30326628a7bf..231469ee9331 100644 --- a/modules/es-node-disk-high-watermark-reached.adoc +++ b/modules/es-node-disk-high-watermark-reached.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/troubleshooting/troubleshooting-logging-alerts.adoc +// * observability/logging/troubleshooting/troubleshooting-logging-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="es-node-disk-high-watermark-reached_{context}"] diff --git a/modules/es-node-disk-low-watermark-reached.adoc b/modules/es-node-disk-low-watermark-reached.adoc index 490716adcce0..8e72e3e48950 100644 --- a/modules/es-node-disk-low-watermark-reached.adoc +++ b/modules/es-node-disk-low-watermark-reached.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/troubleshooting/troubleshooting-logging-alerts.adoc +// * observability/logging/troubleshooting/troubleshooting-logging-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="es-node-disk-low-watermark-reached_{context}"] diff --git a/modules/log-collection-rbac-permissions.adoc b/modules/log-collection-rbac-permissions.adoc index 9638c00224c9..80e18026b482 100644 --- a/modules/log-collection-rbac-permissions.adoc +++ b/modules/log-collection-rbac-permissions.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="log-collection-rbac-permissions_{context}"] diff --git a/modules/log-collector-http-server.adoc b/modules/log-collector-http-server.adoc index 8bdb3720a87a..c6476dd18e14 100644 --- a/modules/log-collector-http-server.adoc +++ b/modules/log-collector-http-server.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/cluster-logging-collector.adoc +// * observability/logging/log_collection_forwarding/cluster-logging-collector.adoc :_mod-docs-content-type: PROCEDURE [id="log-collector-http-server_{context}"] diff --git a/modules/log-collector-resources-scheduling.adoc b/modules/log-collector-resources-scheduling.adoc index 8632232af10f..6f6e00d67bfe 100644 --- a/modules/log-collector-resources-scheduling.adoc +++ b/modules/log-collector-resources-scheduling.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="log-collector-resources-scheduling_{context}"] diff --git a/modules/log-collector-rsyslog-server.adoc b/modules/log-collector-rsyslog-server.adoc index 5cc9199195f0..4acfca11f26d 100644 --- a/modules/log-collector-rsyslog-server.adoc +++ b/modules/log-collector-rsyslog-server.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/cluster-logging-collector.adoc +// * observability/logging/log_collection_forwarding/cluster-logging-collector.adoc :_mod-docs-content-type: PROCEDURE [id="log-collector-rsyslog-server_{context}"] diff --git a/modules/log-forwarding-collector-outputs.adoc b/modules/log-forwarding-collector-outputs.adoc index 9fbe6a37e15b..e45289c3a123 100644 --- a/modules/log-forwarding-collector-outputs.adoc +++ b/modules/log-forwarding-collector-outputs.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: REFERENCE [id="log-forwarding-collector-outputs_{context}"] diff --git a/modules/log-forwarding-implementations.adoc b/modules/log-forwarding-implementations.adoc index ff165f7ca8cf..92b5934d0f39 100644 --- a/modules/log-forwarding-implementations.adoc +++ b/modules/log-forwarding-implementations.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: CONCEPT [id="log-forwarding-implementations_{context}"] diff --git a/modules/logging-architecture-overview.adoc b/modules/logging-architecture-overview.adoc index c0f76b856be5..5e1715f2cf24 100644 --- a/modules/logging-architecture-overview.adoc +++ b/modules/logging-architecture-overview.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc :_mod-docs-content-type: CONCEPT [id="logging-architecture-overview_{context}"] diff --git a/modules/logging-audit-log-filtering.adoc b/modules/logging-audit-log-filtering.adoc index a89768257084..d7c0687f024a 100644 --- a/modules/logging-audit-log-filtering.adoc +++ b/modules/logging-audit-log-filtering.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: -//logging/log_collection_forwarding/configuring-log-forwarding.adoc // +// * observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc + :_mod-docs-content-type: CONCEPT [id="logging-audit-filtering_{context}"] = Overview of API audit filter diff --git a/modules/logging-content-filter-drop-records.adoc b/modules/logging-content-filter-drop-records.adoc index 993966bb24b1..3dbd51690292 100644 --- a/modules/logging-content-filter-drop-records.adoc +++ b/modules/logging-content-filter-drop-records.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/performance_reliability/logging-content-filtering.adoc +// * observability/logging/performance_reliability/logging-content-filtering.adoc :_mod-docs-content-type: PROCEDURE [id="logging-content-filter-drop-records_{context}"] diff --git a/modules/logging-content-filter-prune-records.adoc b/modules/logging-content-filter-prune-records.adoc index a796daacb4f4..89e08fcd48a8 100644 --- a/modules/logging-content-filter-prune-records.adoc +++ b/modules/logging-content-filter-prune-records.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/performance_reliability/logging-content-filtering.adoc +// * observability/logging/performance_reliability/logging-content-filtering.adoc :_mod-docs-content-type: PROCEDURE [id="logging-content-filter-prune-records_{context}"] diff --git a/modules/logging-create-clf.adoc b/modules/logging-create-clf.adoc index 0af9dcc756b2..abe6aef7bfee 100644 --- a/modules/logging-create-clf.adoc +++ b/modules/logging-create-clf.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: REFERENCE [id="logging-create-clf_{context}"] diff --git a/modules/logging-create-loki-cr-cli.adoc b/modules/logging-create-loki-cr-cli.adoc index d28b97ef284a..3ac2006bd660 100644 --- a/modules/logging-create-loki-cr-cli.adoc +++ b/modules/logging-create-loki-cr-cli.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_storage/installing-log-storage.adoc +// * observability/logging/log_storage/installing-log-storage.adoc :_mod-docs-content-type: PROCEDURE [id="logging-create-loki-cr-cli_{context}"] diff --git a/modules/logging-delivery-tuning.adoc b/modules/logging-delivery-tuning.adoc index 9e60557e02a5..49db092ad44a 100644 --- a/modules/logging-delivery-tuning.adoc +++ b/modules/logging-delivery-tuning.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/configuring-log-forwarding.adoc +// * observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc :_mod-docs-content-type: REFERENCE [id="logging-delivery-tuning_{context}"] diff --git a/modules/logging-enabling-loki-alerts.adoc b/modules/logging-enabling-loki-alerts.adoc index b36eaf8688dc..ea36798e9e40 100644 --- a/modules/logging-enabling-loki-alerts.adoc +++ b/modules/logging-enabling-loki-alerts.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// logging/logging_alerts/custom-logging-alerts.adoc +// * observability/logging/logging_alerts/custom-logging-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="logging-enabling-loki-alerts_{context}"] diff --git a/modules/logging-es-storage-considerations.adoc b/modules/logging-es-storage-considerations.adoc index cf1d095bcad8..4e59447e3fed 100644 --- a/modules/logging-es-storage-considerations.adoc +++ b/modules/logging-es-storage-considerations.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-deploying.adoc :_mod-docs-content-type: CONCEPT [id="logging-es-storage-considerations_{context}"] diff --git a/modules/logging-fluentd-collector-alerts.adoc b/modules/logging-fluentd-collector-alerts.adoc index 5953f504886e..d9a087c70aea 100644 --- a/modules/logging-fluentd-collector-alerts.adoc +++ b/modules/logging-fluentd-collector-alerts.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/logging_alerts/default-logging-alerts.adoc +// * observability/logging/logging_alerts/default-logging-alerts.adoc :_mod-docs-content-type: REFERENCE [id="logging-fluentd-collector-alerts_{context}"] diff --git a/modules/logging-forward-splunk.adoc b/modules/logging-forward-splunk.adoc index 0d304595c5c6..fd6377ecf98c 100644 --- a/modules/logging-forward-splunk.adoc +++ b/modules/logging-forward-splunk.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/configuring-log-forwarding.adoc +// * observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="logging-forward-splunk_{context}"] diff --git a/modules/logging-forwarding-azure.adoc b/modules/logging-forwarding-azure.adoc index 3650a7bb3456..c3f98eb9cb64 100644 --- a/modules/logging-forwarding-azure.adoc +++ b/modules/logging-forwarding-azure.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// * logging/configuring-log-forwarding.adoc +// +// * observability/logging/configuring-log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="logging-forwarding-azure_{context}"] diff --git a/modules/logging-http-forward.adoc b/modules/logging-http-forward.adoc index 86a9e98c1ae3..90307000ef5c 100644 --- a/modules/logging-http-forward.adoc +++ b/modules/logging-http-forward.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/configuring-log-forwarding.adoc +// * observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc :_mod-docs-content-type: PROCEDURE [id="logging-http-forward_{context}"] diff --git a/modules/logging-input-spec-filter-audit-infrastructure.adoc b/modules/logging-input-spec-filter-audit-infrastructure.adoc index 788b93e20090..5428616dbe95 100644 --- a/modules/logging-input-spec-filter-audit-infrastructure.adoc +++ b/modules/logging-input-spec-filter-audit-infrastructure.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/performance_reliability/logging-input-spec-filtering.adoc +// * observability/logging/performance_reliability/logging-input-spec-filtering.adoc :_mod-docs-content-type: PROCEDURE [id="logging-input-spec-filter-audit-infrastructure_{context}"] diff --git a/modules/logging-input-spec-filter-labels-expressions.adoc b/modules/logging-input-spec-filter-labels-expressions.adoc index fe358eb60ab0..c27189e897d3 100644 --- a/modules/logging-input-spec-filter-labels-expressions.adoc +++ b/modules/logging-input-spec-filter-labels-expressions.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/performance_reliability/logging-input-spec-filtering.adoc +// * observability/logging/performance_reliability/logging-input-spec-filtering.adoc :_mod-docs-content-type: PROCEDURE [id="logging-input-spec-filter-labels-expressions_{context}"] diff --git a/modules/logging-input-spec-filter-namespace-container.adoc b/modules/logging-input-spec-filter-namespace-container.adoc index 083bbcbb2ef2..0d7ae0d434cc 100644 --- a/modules/logging-input-spec-filter-namespace-container.adoc +++ b/modules/logging-input-spec-filter-namespace-container.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/performance_reliability/logging-input-spec-filtering.adoc +// * observability/logging/performance_reliability/logging-input-spec-filtering.adoc :_mod-docs-content-type: PROCEDURE [id="logging-input-spec-filter-namespace-container_{context}"] diff --git a/modules/logging-install-es-operator.adoc b/modules/logging-install-es-operator.adoc index 6aeb872b6c35..53b9aa54d433 100644 --- a/modules/logging-install-es-operator.adoc +++ b/modules/logging-install-es-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-deploying.adoc :_mod-docs-content-type: PROCEDURE [id="logging-install-es-operator_{context}"] diff --git a/modules/logging-loki-cli-install.adoc b/modules/logging-loki-cli-install.adoc index 901af29d506b..8a4975640651 100644 --- a/modules/logging-loki-cli-install.adoc +++ b/modules/logging-loki-cli-install.adoc @@ -1,5 +1,6 @@ // Module is included in the following assemblies: -// logging/log_storage/installing-log-storage.adoc +// +// * observability/logging/log_storage/installing-log-storage.adoc :_mod-docs-content-type: PROCEDURE [id="logging-loki-cli-install_{context}"] diff --git a/modules/logging-loki-gui-install.adoc b/modules/logging-loki-gui-install.adoc index 5060a2c9dbee..0521262767ff 100644 --- a/modules/logging-loki-gui-install.adoc +++ b/modules/logging-loki-gui-install.adoc @@ -1,6 +1,6 @@ // Module is included in the following assemblies: // -// logging/log_storage/installing-log-storage.adoc +// * observability/logging/log_storage/installing-log-storage.adoc :_mod-docs-content-type: PROCEDURE [id="logging-loki-gui-install_{context}"] diff --git a/modules/logging-loki-log-access.adoc b/modules/logging-loki-log-access.adoc index 149f88bc45c8..cc17cd24b72c 100644 --- a/modules/logging-loki-log-access.adoc +++ b/modules/logging-loki-log-access.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * network_observability/installing-operators.adoc -// * logging/cluster-logging-loki.adoc +// * observability/logging/cluster-logging-loki.adoc :_mod-docs-content-type: CONCEPT [id="logging-loki-log-access_{context}"] diff --git a/modules/logging-loki-memberlist-ip.adoc b/modules/logging-loki-memberlist-ip.adoc index 4b31df4bbf05..85e8af520d3e 100644 --- a/modules/logging-loki-memberlist-ip.adoc +++ b/modules/logging-loki-memberlist-ip.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-loki.adoc +// * observability/logging/cluster-logging-loki.adoc :_mod-docs-content-type: CONCEPT [id="logging-loki-memberlist-ip_{context}"] diff --git a/modules/logging-loki-pod-placement.adoc b/modules/logging-loki-pod-placement.adoc index ab8f89d7a5b3..b8ae9c92e777 100644 --- a/modules/logging-loki-pod-placement.adoc +++ b/modules/logging-loki-pod-placement.adoc @@ -1,5 +1,6 @@ // Module included in the following assemblies: -// logging/log_storage/cluster-logging-loki.adoc +// +// * observability/logging/log_storage/cluster-logging-loki.adoc :_mod-docs-content-type: CONCEPT [id="logging-loki-pod-placement_{context}"] diff --git a/modules/logging-loki-reliability-hardening.adoc b/modules/logging-loki-reliability-hardening.adoc index 92c5202dd5a8..5e4820acd3be 100644 --- a/modules/logging-loki-reliability-hardening.adoc +++ b/modules/logging-loki-reliability-hardening.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-loki.adoc +// * observability/logging/cluster-logging-loki.adoc :_mod-docs-content-type: CONCEPT [id="logging-loki-reliability-hardening_{context}"] diff --git a/modules/logging-loki-restart-hardening.adoc b/modules/logging-loki-restart-hardening.adoc index 37d0eca9383e..bffc92103cd6 100644 --- a/modules/logging-loki-restart-hardening.adoc +++ b/modules/logging-loki-restart-hardening.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-loki.adoc +// * observability/logging/cluster-logging-loki.adoc :_mod-docs-content-type: CONCEPT [id="logging-loki-restart-hardening_{context}"] diff --git a/modules/logging-loki-retention.adoc b/modules/logging-loki-retention.adoc index 8018594714eb..f38c532231db 100644 --- a/modules/logging-loki-retention.adoc +++ b/modules/logging-loki-retention.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// logging/cluster-logging-loki.adoc +// * observability/logging/cluster-logging-loki.adoc :_mod-docs-content-type: PROCEDURE [id="logging-loki-retention_{context}"] diff --git a/modules/logging-loki-storage-aws.adoc b/modules/logging-loki-storage-aws.adoc index bc46753742f9..e4f92727d621 100644 --- a/modules/logging-loki-storage-aws.adoc +++ b/modules/logging-loki-storage-aws.adoc @@ -1,6 +1,7 @@ // Module is included in the following assemblies: -// logging/log_storage/installing-log-storage.adoc // +// * observability/logging/log_storage/installing-log-storage.adoc + :_mod-docs-content-type: PROCEDURE [id="logging-loki-storage-aws_{context}"] = AWS storage diff --git a/modules/logging-loki-storage-azure.adoc b/modules/logging-loki-storage-azure.adoc index 353ea47907c9..6c5c032d35d2 100644 --- a/modules/logging-loki-storage-azure.adoc +++ b/modules/logging-loki-storage-azure.adoc @@ -1,6 +1,7 @@ // Module is included in the following assemblies: -// logging/log_storage/installing-log-storage.adoc // +// * observability/logging/log_storage/installing-log-storage.adoc + :_mod-docs-content-type: PROCEDURE [id="logging-loki-storage-azure_{context}"] = Azure storage diff --git a/modules/logging-loki-storage-gcp.adoc b/modules/logging-loki-storage-gcp.adoc index 3a8a254f74f1..28737f800478 100644 --- a/modules/logging-loki-storage-gcp.adoc +++ b/modules/logging-loki-storage-gcp.adoc @@ -1,6 +1,7 @@ // Module is included in the following assemblies: -// logging/log_storage/installing-log-storage.adoc // +// * observability/logging/log_storage/installing-log-storage.adoc + :_mod-docs-content-type: PROCEDURE [id="logging-loki-storage-gcp_{context}"] = Google Cloud Platform storage diff --git a/modules/logging-loki-storage-minio.adoc b/modules/logging-loki-storage-minio.adoc index 8013858b8db6..8327dcf24a9c 100644 --- a/modules/logging-loki-storage-minio.adoc +++ b/modules/logging-loki-storage-minio.adoc @@ -1,6 +1,7 @@ // Module is included in the following assemblies: -// logging/log_storage/installing-log-storage.adoc // +// * observability/logging/log_storage/installing-log-storage.adoc + :_mod-docs-content-type: PROCEDURE [id="logging-loki-storage-minio_{context}"] = Minio storage diff --git a/modules/logging-loki-storage-odf.adoc b/modules/logging-loki-storage-odf.adoc index c48197909c2d..7a74d1f53243 100644 --- a/modules/logging-loki-storage-odf.adoc +++ b/modules/logging-loki-storage-odf.adoc @@ -1,6 +1,7 @@ // Module is included in the following assemblies: -// logging/cluster-logging-loki.adoc // +// * observability/logging/cluster-logging-loki.adoc + :_mod-docs-content-type: PROCEDURE [id="logging-loki-storage-odf_{context}"] = {rh-storage} storage diff --git a/modules/logging-loki-storage-swift.adoc b/modules/logging-loki-storage-swift.adoc index 6fb97197b291..c4566a5dab24 100644 --- a/modules/logging-loki-storage-swift.adoc +++ b/modules/logging-loki-storage-swift.adoc @@ -1,6 +1,7 @@ // Module is included in the following assemblies: -// logging/log_storage/installing-log-storage.adoc // +// * observability/logging/log_storage/installing-log-storage.adoc + :_mod-docs-content-type: PROCEDURE [id="logging-loki-storage-swift_{context}"] = Swift storage diff --git a/modules/logging-loki-storage.adoc b/modules/logging-loki-storage.adoc index 160339622f47..09f99e9cade0 100644 --- a/modules/logging-loki-storage.adoc +++ b/modules/logging-loki-storage.adoc @@ -1,6 +1,7 @@ // Module is included in the following assemblies: -// logging/log_storage/installing-log-storage.adoc // +// * observability/logging/log_storage/installing-log-storage.adoc + :_mod-docs-content-type: CONCEPT [id="logging-loki-storage_{context}"] = Loki object storage diff --git a/modules/logging-loki-zone-aware-rep.adoc b/modules/logging-loki-zone-aware-rep.adoc index be76d3519a95..f4f7de42ba95 100644 --- a/modules/logging-loki-zone-aware-rep.adoc +++ b/modules/logging-loki-zone-aware-rep.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-loki.adoc +// * observability/logging/cluster-logging-loki.adoc :_mod-docs-content-type: CONCEPT [id="logging-loki-zone-aware-rep_{context}"] diff --git a/modules/logging-loki-zone-fail-recovery.adoc b/modules/logging-loki-zone-fail-recovery.adoc index 7befcf756b42..7f7a136dc8b8 100644 --- a/modules/logging-loki-zone-fail-recovery.adoc +++ b/modules/logging-loki-zone-fail-recovery.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-loki.adoc +// * observability/logging/cluster-logging-loki.adoc :_mod-docs-content-type: PROCEDURE [id="logging-loki-zone-fail-recovery_{context}"] diff --git a/modules/logging-operator-upgrading-all-ns.adoc b/modules/logging-operator-upgrading-all-ns.adoc index 07bfc6b4801d..8e2e74e8fbc8 100644 --- a/modules/logging-operator-upgrading-all-ns.adoc +++ b/modules/logging-operator-upgrading-all-ns.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-upgrading.adoc +// * observability/logging/cluster-logging-upgrading.adoc :_mod-docs-content-type: PROCEDURE [id="logging-operator-upgrading-all-ns_{context}"] diff --git a/modules/logging-plugin-es-loki.adoc b/modules/logging-plugin-es-loki.adoc index b5ed6a8ad0b5..0b961149b0ec 100644 --- a/modules/logging-plugin-es-loki.adoc +++ b/modules/logging-plugin-es-loki.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_visualization/log-visualization-ocp-console.adoc +// * observability/logging/log_visualization/log-visualization-ocp-console.adoc :_mod-docs-content-type: PROCEDURE [id="logging-plugin-es-loki_{context}"] diff --git a/modules/logging-release-notes-5-8-3.adoc b/modules/logging-release-notes-5-8-3.adoc index bd1011c0a424..670e0a3fbfe5 100644 --- a/modules/logging-release-notes-5-8-3.adoc +++ b/modules/logging-release-notes-5-8-3.adoc @@ -1,4 +1,7 @@ -// module included in /logging/logging-5-8-release-notes +// Module included in the following assemblies: +// +// * observability/logging/logging-5-8-release-notes.adoc + :_mod-docs-content-type: REFERENCE [id="logging-release-notes-5-8-3_{context}"] = Logging 5.8.3 diff --git a/modules/logging-release-notes-5-8-4.adoc b/modules/logging-release-notes-5-8-4.adoc index 396bee517e3f..474b94088530 100644 --- a/modules/logging-release-notes-5-8-4.adoc +++ b/modules/logging-release-notes-5-8-4.adoc @@ -1,4 +1,7 @@ -// module included in /logging/logging-5-8-release-notes +// Module included in the following assemblies: +// +// * observability/logging/logging-5-8-release-notes.adoc + :_mod-docs-content-type: REFERENCE [id="logging-release-notes-5-8-4_{context}"] = Logging 5.8.4 diff --git a/modules/logging-set-input-rate-limit.adoc b/modules/logging-set-input-rate-limit.adoc index b433af9c7f15..34862bb65eca 100644 --- a/modules/logging-set-input-rate-limit.adoc +++ b/modules/logging-set-input-rate-limit.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/performance_reliability/logging-flow-control-mechanisms.adoc +// * observability/logging/performance_reliability/logging-flow-control-mechanisms.adoc :_mod-docs-content-type: PROCEDURE [id="logging-set-input-rate-limit_{context}"] diff --git a/modules/logging-set-output-rate-limit.adoc b/modules/logging-set-output-rate-limit.adoc index e9ed96d38af9..d983b9792e32 100644 --- a/modules/logging-set-output-rate-limit.adoc +++ b/modules/logging-set-output-rate-limit.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/performance_reliability/logging-flow-control-mechanisms.adoc +// * observability/logging/performance_reliability/logging-flow-control-mechanisms.adoc :_mod-docs-content-type: PROCEDURE [id="logging-set-output-rate-limit_{context}"] diff --git a/modules/logging-upgrading-clo.adoc b/modules/logging-upgrading-clo.adoc index 7a53b16352b0..a0775d5b2311 100644 --- a/modules/logging-upgrading-clo.adoc +++ b/modules/logging-upgrading-clo.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-upgrading.adoc +// * observability/logging/cluster-logging-upgrading.adoc :_mod-docs-content-type: PROCEDURE [id="logging-upgrading-clo_{context}"] diff --git a/modules/logging-upgrading-loki.adoc b/modules/logging-upgrading-loki.adoc index 8a63436b185b..649c59126d5c 100644 --- a/modules/logging-upgrading-loki.adoc +++ b/modules/logging-upgrading-loki.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-upgrading.adoc +// * observability/logging/cluster-logging-upgrading.adoc :_mod-docs-content-type: PROCEDURE [id="logging-upgrading-loki_{context}"] diff --git a/modules/logging-vector-collector-alerts.adoc b/modules/logging-vector-collector-alerts.adoc index 1f4a643f46da..aeab74952b8c 100644 --- a/modules/logging-vector-collector-alerts.adoc +++ b/modules/logging-vector-collector-alerts.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/logging_alerts/default-logging-alerts.adoc +// * observability/logging/logging_alerts/default-logging-alerts.adoc :_mod-docs-content-type: REFERENCE [id="logging-vector-collector-alerts_{context}"] diff --git a/modules/logging-vector-fluentd-feature-comparison.adoc b/modules/logging-vector-fluentd-feature-comparison.adoc index 03052043c2ff..090be1899d03 100644 --- a/modules/logging-vector-fluentd-feature-comparison.adoc +++ b/modules/logging-vector-fluentd-feature-comparison.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: REFERENCE [id="logging-vector-fluentd-feature-comparison_{context}"] diff --git a/modules/loki-deployment-sizing.adoc b/modules/loki-deployment-sizing.adoc index 3a3bdb822e50..2caee351ebfc 100644 --- a/modules/loki-deployment-sizing.adoc +++ b/modules/loki-deployment-sizing.adoc @@ -1,5 +1,5 @@ // Module is included in the following assemblies: -// * logging/log_storage/installing-log-storage.adoc +// * observability/logging/log_storage/installing-log-storage.adoc // * network_observability/installing-operators.adoc ifeval::["{context}" == "installing-log-storage"] diff --git a/modules/loki-rate-limit-errors.adoc b/modules/loki-rate-limit-errors.adoc index 953edd53a341..cb7f93af8c32 100644 --- a/modules/loki-rate-limit-errors.adoc +++ b/modules/loki-rate-limit-errors.adoc @@ -1,7 +1,7 @@ // Module is included in the following assemblies: -// * logging/cluster-logging-loki.adoc -// * logging/log_collection_forwarding/log-forwarding.adoc -// * logging/troubleshooting/log-forwarding-troubleshooting.adoc +// * observability/logging/cluster-logging-loki.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/troubleshooting/log-forwarding-troubleshooting.adoc :_mod-docs-content-type: PROCEDURE [id="loki-rate-limit-errors_{context}"] diff --git a/modules/loki-rbac-rules-permissions.adoc b/modules/loki-rbac-rules-permissions.adoc index 8113a09dbee9..0b527c6572dd 100644 --- a/modules/loki-rbac-rules-permissions.adoc +++ b/modules/loki-rbac-rules-permissions.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/logging_alerts/custom-logging-alerts.adoc +// * observability/logging/logging_alerts/custom-logging-alerts.adoc :_mod-docs-content-type: REFERENCE [id="loki-rbac-rules-permissions_{context}"] diff --git a/modules/monitoring-accessing-the-alerting-ui.adoc b/modules/monitoring-accessing-the-alerting-ui.adoc index 8ef40b41fd3a..7b56fe6e3132 100644 --- a/modules/monitoring-accessing-the-alerting-ui.adoc +++ b/modules/monitoring-accessing-the-alerting-ui.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * observability/monitoring/managing-alerts.adoc -// * logging/logging_alerts/log-storage-alerts.adoc +// * observability/logging/logging_alerts/log-storage-alerts.adoc :_mod-docs-content-type: PROCEDURE [id="monitoring-accessing-the-alerting-ui_{context}"] diff --git a/modules/nodes-edge-remote-workers-network.adoc b/modules/nodes-edge-remote-workers-network.adoc index 6029aec4e808..9ecf2dd815cf 100644 --- a/modules/nodes-edge-remote-workers-network.adoc +++ b/modules/nodes-edge-remote-workers-network.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/nodes-edge-remote-workers.adoc +// * observability/logging/nodes-edge-remote-workers.adoc [id="nodes-edge-remote-workers-network_{context}"] = Network separation with remote worker nodes diff --git a/modules/nodes-edge-remote-workers-power.adoc b/modules/nodes-edge-remote-workers-power.adoc index b48d1311150b..676376980f08 100644 --- a/modules/nodes-edge-remote-workers-power.adoc +++ b/modules/nodes-edge-remote-workers-power.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/nodes-edge-remote-workers.adoc +// * observability/logging/nodes-edge-remote-workers.adoc [id="nodes-edge-remote-workers-power_{context}"] = Power loss on remote worker nodes diff --git a/modules/nodes-edge-remote-workers-strategies.adoc b/modules/nodes-edge-remote-workers-strategies.adoc index 979bcd4acad6..8522b206893e 100644 --- a/modules/nodes-edge-remote-workers-strategies.adoc +++ b/modules/nodes-edge-remote-workers-strategies.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/nodes-edge-remote-workers.adoc +// * observability/logging/nodes-edge-remote-workers.adoc [id="nodes-edge-remote-workers-strategies_{context}"] = Remote worker node strategies diff --git a/modules/nodes-scheduler-node-selectors-about.adoc b/modules/nodes-scheduler-node-selectors-about.adoc index f8292d447805..9287f268f5e9 100644 --- a/modules/nodes-scheduler-node-selectors-about.adoc +++ b/modules/nodes-scheduler-node-selectors-about.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * nodes/nodes-scheduler-node-selector.adoc -// * logging/scheduling_resources/logging-node-selectors.adoc +// * observability/logging/scheduling_resources/logging-node-selectors.adoc :_mod-docs-content-type: CONCEPT [id="nodes-scheduler-node-selectors-about_{context}"] diff --git a/modules/nodes-scheduler-taints-tolerations-about.adoc b/modules/nodes-scheduler-taints-tolerations-about.adoc index fc457a148376..2c4f69af7181 100644 --- a/modules/nodes-scheduler-taints-tolerations-about.adoc +++ b/modules/nodes-scheduler-taints-tolerations-about.adoc @@ -2,7 +2,7 @@ // // * nodes/scheduling/nodes-scheduler-taints-tolerations.adoc // * post_installation_configuration/node-tasks.adoc -// * logging/scheduling_resources/logging-taints-tolerations.adoc +// * observability/logging/scheduling_resources/logging-taints-tolerations.adoc ifeval::["{context}" == "nodes-scheduler-taints-tolerations"] :nodes-scheduler-taints-tolerations: diff --git a/modules/ossm-config-sampling.adoc b/modules/ossm-config-sampling.adoc index cbd05e6ac7bd..99d266e9045c 100644 --- a/modules/ossm-config-sampling.adoc +++ b/modules/ossm-config-sampling.adoc @@ -23,7 +23,7 @@ The Envoy proxy sampling rate applies for applications that are available to a S The Jaeger remote sampling rate applies to applications that are external to the Service Mesh, and do not use the Envoy proxy, such as a database. This sampling rate determines how much data the distributed tracing system collects and stores. ifdef::openshift-enterprise[] -For more information, see xref:../../observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc#distr-tracing-config-sampling_deploying-distributed-tracing-platform[Distributed tracing configuration options]. +For more information, see link:https://docs.openshift.com/container-platform/latest/observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.html#distr-tracing-config-sampling_distr-tracing-jaeger-configuring[Distributed tracing sampling configuration options]. endif::[] ==== diff --git a/modules/ossm-routing-ingress.adoc b/modules/ossm-routing-ingress.adoc index e0551aff4059..0ee80c7263e9 100644 --- a/modules/ossm-routing-ingress.adoc +++ b/modules/ossm-routing-ingress.adoc @@ -25,7 +25,7 @@ If the `EXTERNAL-IP` value is set, your environment has an external load balance If the `EXTERNAL-IP` value is ``, or perpetually ``, your environment does not provide an external load balancer for the ingress gateway. ifdef::openshift-enterprise[] -You can access the gateway using the service's xref:../../networking/configuring-node-port-service-range.adoc[node port]. +You can access the gateway using the service's xref:../../networking/configuring-node-port-service-range.adoc#configuring-node-port-service-range[node port]. endif::[] //// diff --git a/modules/redeploying-fluentd-pods.adoc b/modules/redeploying-fluentd-pods.adoc index 5885536c6faa..2b22053c5219 100644 --- a/modules/redeploying-fluentd-pods.adoc +++ b/modules/redeploying-fluentd-pods.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/troubleshooting/log-forwarding-troubleshooting.adoc +// * observability/logging/troubleshooting/log-forwarding-troubleshooting.adoc :_mod-docs-content-type: PROCEDURE [id="redeploying-fluentd-pods_{context}"] diff --git a/modules/rosa-cluster-logging-collector-log-forward-sts-cloudwatch.adoc b/modules/rosa-cluster-logging-collector-log-forward-sts-cloudwatch.adoc index d2f80c82f14b..3f52f70ba95d 100644 --- a/modules/rosa-cluster-logging-collector-log-forward-sts-cloudwatch.adoc +++ b/modules/rosa-cluster-logging-collector-log-forward-sts-cloudwatch.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/log-forwarding.adoc +// * observability/logging/log_collection_forwarding/log-forwarding.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/rosa-view-cloudwatch-logs.adoc b/modules/rosa-view-cloudwatch-logs.adoc index fda1cbc264cf..f7d72d88f6c7 100644 --- a/modules/rosa-view-cloudwatch-logs.adoc +++ b/modules/rosa-view-cloudwatch-logs.adoc @@ -2,7 +2,7 @@ // Module included in the following assemblies: // // * rosa_cluster_admin/rosa_logging/rosa-viewing-logs.adoc -// * logging/rosa-viewing-logs.adoc +// * observability/logging/rosa-viewing-logs.adoc :_mod-docs-content-type: PROCEDURE [id="rosa-view-cloudwatch-logs_{context}"] diff --git a/modules/sdpolicy-logging.adoc b/modules/sdpolicy-logging.adoc index bbfc8aefe0cf..e4a660c03f84 100644 --- a/modules/sdpolicy-logging.adoc +++ b/modules/sdpolicy-logging.adoc @@ -6,7 +6,7 @@ = Logging {product-title} provides optional integrated log forwarding to Amazon CloudWatch (on AWS) or Google Cloud Logging (on GCP). -For more information, see link:https://docs.openshift.com/dedicated/logging/log_collection_forwarding/log-forwarding.html[About log collection and forwarding]. +For more information, see link:https://docs.openshift.com/dedicated/observability/logging/log_collection_forwarding/log-forwarding.html[About log collection and forwarding]. [id="audit-logging_{context}"] == Cluster audit logging diff --git a/modules/supported-log-outputs.adoc b/modules/supported-log-outputs.adoc index 1c16d8ca0c41..35c746172d5f 100644 --- a/modules/supported-log-outputs.adoc +++ b/modules/supported-log-outputs.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_collection_forwarding/logging-output-types.adoc +// * observability/logging/log_collection_forwarding/logging-output-types.adoc :_mod-docs-content-type: REFERENCE [id="supported-log-outputs_{context}"] diff --git a/modules/uninstall-cluster-logging-operator.adoc b/modules/uninstall-cluster-logging-operator.adoc index 9b77c682ec83..4ecb290fec0f 100644 --- a/modules/uninstall-cluster-logging-operator.adoc +++ b/modules/uninstall-cluster-logging-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-uninstall.adoc +// * observability/logging/cluster-logging-uninstall.adoc :_mod-docs-content-type: PROCEDURE [id="uninstall-cluster-logging-operator_{context}"] diff --git a/modules/uninstall-es-operator.adoc b/modules/uninstall-es-operator.adoc index b120f4cecf99..cc9599203d6d 100644 --- a/modules/uninstall-es-operator.adoc +++ b/modules/uninstall-es-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-uninstall.adoc +// * observability/logging/cluster-logging-uninstall.adoc :_mod-docs-content-type: PROCEDURE [id="uninstall-es-operator_{context}"] diff --git a/modules/uninstall-logging-delete-pvcs.adoc b/modules/uninstall-logging-delete-pvcs.adoc index edd8bd17bd19..f1eb7ff18a39 100644 --- a/modules/uninstall-logging-delete-pvcs.adoc +++ b/modules/uninstall-logging-delete-pvcs.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-uninstall.adoc +// * observability/logging/cluster-logging-uninstall.adoc :_mod-docs-content-type: PROCEDURE [id="uninstall-logging-delete-pvcs_{context}"] diff --git a/modules/uninstall-loki-operator.adoc b/modules/uninstall-loki-operator.adoc index b741b9822402..872a9477e3a4 100644 --- a/modules/uninstall-loki-operator.adoc +++ b/modules/uninstall-loki-operator.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/cluster-logging-uninstall.adoc +// * observability/logging/cluster-logging-uninstall.adoc :_mod-docs-content-type: PROCEDURE [id="uninstall-loki-operator_{context}"] diff --git a/modules/unmanaged-operators.adoc b/modules/unmanaged-operators.adoc index 391d244af038..673db4424cc9 100644 --- a/modules/unmanaged-operators.adoc +++ b/modules/unmanaged-operators.adoc @@ -2,7 +2,7 @@ // // * architecture/architecture-installation.adoc // * updating/updating-cluster-within-minor.adoc -// * logging/cluster-logging-support.adoc +// * observability/logging/cluster-logging-support.adoc [id="unmanaged-operators_{context}"] = Support policy for unmanaged Operators diff --git a/modules/viewing-resource-logs-cli-console.adoc b/modules/viewing-resource-logs-cli-console.adoc index 54a76b0c6d70..c385e848b604 100644 --- a/modules/viewing-resource-logs-cli-console.adoc +++ b/modules/viewing-resource-logs-cli-console.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * logging/log_visualization/log-visualization.adoc +// * observability/logging/log_visualization/log-visualization.adoc // * nodes/pods/nodes-pods-viewing.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/viewing-the-service-logs-cli.adoc b/modules/viewing-the-service-logs-cli.adoc index 33a93ecd32e7..1beb7d662391 100644 --- a/modules/viewing-the-service-logs-cli.adoc +++ b/modules/viewing-the-service-logs-cli.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * osd_cluster_admin/osd_logging/osd-accessing-the-service-logs.adoc -// * logging/sd-accessing-the-service-logs.adoc +// * observability/logging/sd-accessing-the-service-logs.adoc :_mod-docs-content-type: PROCEDURE [id="viewing-the-service-logs-cli_{context}"] diff --git a/modules/viewing-the-service-logs-ocm.adoc b/modules/viewing-the-service-logs-ocm.adoc index 06460b9c5c0f..3fb6c05ff2f5 100644 --- a/modules/viewing-the-service-logs-ocm.adoc +++ b/modules/viewing-the-service-logs-ocm.adoc @@ -2,7 +2,7 @@ // // * rosa_cluster_admin/rosa_logging/rosa-accessing-the-service-logs.adoc // * osd_cluster_admin/osd_logging/osd-accessing-the-service-logs.adoc -// * logging/sd-accessing-the-service-logs.adoc +// * observability/logging/sd-accessing-the-service-logs.adoc :_mod-docs-content-type: PROCEDURE [id="viewing-the-service-logs-ocm_{context}"] diff --git a/modules/viewing-the-service-logs.adoc b/modules/viewing-the-service-logs.adoc index 8f8cb8e0f2df..346e25fc64e7 100644 --- a/modules/viewing-the-service-logs.adoc +++ b/modules/viewing-the-service-logs.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * osd_cluster_admin/osd_logging/osd-accessing-the-service-logs.adoc -// * logging/sd-accessing-the-service-logs.adoc +// * observability/logging/sd-accessing-the-service-logs.adoc :_mod-docs-content-type: PROCEDURE [id="viewing-the-service-logs_{context}"] diff --git a/observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc b/observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc index 48400f386789..476c1453584f 100644 --- a/observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc +++ b/observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc @@ -16,7 +16,7 @@ During an update, the {DTProductName} Operators upgrade the managed {DTShortName [IMPORTANT] ==== -If you have not already updated your {es-op} as described in xref:../../../logging/cluster-logging-upgrading.adoc#cluster-logging-upgrading_cluster-logging-upgrading[Updating OpenShift Logging], complete that update before updating your {JaegerName} Operator. +If you have not already updated your {es-op} as described in xref:../../../observability/logging/cluster-logging-upgrading.adoc#cluster-logging-upgrading_cluster-logging-upgrading[Updating OpenShift Logging], complete that update before updating your {JaegerName} Operator. ==== [role="_additional-resources"] @@ -25,4 +25,4 @@ If you have not already updated your {es-op} as described in xref:../../../loggi * xref:../../../operators/understanding/olm/olm-understanding-olm.adoc#olm-understanding-olm[Operator Lifecycle Manager concepts and resources] * xref:../../../operators/admin/olm-upgrading-operators.adoc#olm-upgrading-operators[Updating installed Operators] -* xref:../../../logging/cluster-logging-upgrading.adoc#cluster-logging-upgrading_cluster-logging-upgrading[Updating OpenShift Logging] +* xref:../../../observability/logging/cluster-logging-upgrading.adoc#cluster-logging-upgrading_cluster-logging-upgrading[Updating OpenShift Logging] diff --git a/observability/index.adoc b/observability/index.adoc index 3dfa898636ad..dac781d6e8d7 100644 --- a/observability/index.adoc +++ b/observability/index.adoc @@ -30,7 +30,7 @@ For more information, see xref:../observability/monitoring/monitoring-overview.a == Logging Collect, visualize, forward, and store log data to troubleshoot issues, identify performance bottlenecks, and detect security threats. In logging 5.7 and later versions, users can configure the LokiStack deployment to produce customized alerts and recorded metrics. -For more information, see xref:../logging/cluster-logging.adoc#cluster-logging[About Logging]. +For more information, see xref:../observability/logging/cluster-logging.adoc#cluster-logging[About Logging]. //after the file is added to the observability directory, update xref path to ../observability/logging/cluster-logging.adoc#cluster-logging[About Logging]. [id="distr-tracing-architecture-index"] diff --git a/logging/_attributes b/observability/logging/_attributes similarity index 100% rename from logging/_attributes rename to observability/logging/_attributes diff --git a/logging/api_reference/_attributes b/observability/logging/api_reference/_attributes similarity index 100% rename from logging/api_reference/_attributes rename to observability/logging/api_reference/_attributes diff --git a/logging/api_reference/images b/observability/logging/api_reference/images similarity index 100% rename from logging/api_reference/images rename to observability/logging/api_reference/images diff --git a/logging/api_reference/logging-5-6-reference.adoc b/observability/logging/api_reference/logging-5-6-reference.adoc similarity index 100% rename from logging/api_reference/logging-5-6-reference.adoc rename to observability/logging/api_reference/logging-5-6-reference.adoc diff --git a/logging/api_reference/logging-5-7-reference.adoc b/observability/logging/api_reference/logging-5-7-reference.adoc similarity index 100% rename from logging/api_reference/logging-5-7-reference.adoc rename to observability/logging/api_reference/logging-5-7-reference.adoc diff --git a/logging/api_reference/logging-5-8-reference.adoc b/observability/logging/api_reference/logging-5-8-reference.adoc similarity index 100% rename from logging/api_reference/logging-5-8-reference.adoc rename to observability/logging/api_reference/logging-5-8-reference.adoc diff --git a/logging/api_reference/modules b/observability/logging/api_reference/modules similarity index 100% rename from logging/api_reference/modules rename to observability/logging/api_reference/modules diff --git a/logging/api_reference/snippets b/observability/logging/api_reference/snippets similarity index 100% rename from logging/api_reference/snippets rename to observability/logging/api_reference/snippets diff --git a/logging/cluster-logging-deploying.adoc b/observability/logging/cluster-logging-deploying.adoc similarity index 81% rename from logging/cluster-logging-deploying.adoc rename to observability/logging/cluster-logging-deploying.adoc index 80b591d37639..ac5b6c7239f2 100644 --- a/logging/cluster-logging-deploying.adoc +++ b/observability/logging/cluster-logging-deploying.adoc @@ -39,7 +39,7 @@ After you have installed the {clo}, you can configure your deployment by creatin [TIP] ==== -If you are not using the Elasticsearch log store, you can remove the internal Elasticsearch `logStore` and Kibana `visualization` components from the `ClusterLogging` custom resource (CR). Removing these components is optional but saves resources. See xref:../logging/log_storage/logging-config-es-store.adoc#cluster-logging-removing-unused-components-if-no-elasticsearch_logging-config-es-store[Removing unused components if you do not use the Elasticsearch log store]. +If you are not using the Elasticsearch log store, you can remove the internal Elasticsearch `logStore` and Kibana `visualization` components from the `ClusterLogging` custom resource (CR). Removing these components is optional but saves resources. See xref:../../observability/logging/log_storage/logging-config-es-store.adoc#cluster-logging-removing-unused-components-if-no-elasticsearch_logging-config-es-store[Removing unused components if you do not use the Elasticsearch log store]. ==== include::modules/cluster-logging-about-crd.adoc[leveloffset=+2] @@ -52,9 +52,9 @@ include::modules/cluster-logging-deploy-multitenant.adoc[leveloffset=+2] .Additional resources ifdef::openshift-enterprise,openshift-origin[] -* xref:../networking/network_policy/about-network-policy.adoc[About network policy] -* xref:../networking/openshift_sdn/about-openshift-sdn.adoc[About the OpenShift SDN default CNI network provider] -* xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc[About the OVN-Kubernetes default Container Network Interface (CNI) network provider] +* xref:../../networking/network_policy/about-network-policy.adoc#about-network-policy[About network policy] +* xref:../../networking/openshift_sdn/about-openshift-sdn.adoc#about-openshift-sdn[About the OpenShift SDN default CNI network provider] +* xref:../../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[About the OVN-Kubernetes default Container Network Interface (CNI) network provider] endif::[] ifdef::openshift-rosa,openshift-dedicated[] * link:https://docs.openshift.com/container-platform/latest/networking/network_policy/about-network-policy.html[About network policy] diff --git a/logging/cluster-logging-exported-fields.adoc b/observability/logging/cluster-logging-exported-fields.adoc similarity index 100% rename from logging/cluster-logging-exported-fields.adoc rename to observability/logging/cluster-logging-exported-fields.adoc diff --git a/logging/cluster-logging-support.adoc b/observability/logging/cluster-logging-support.adoc similarity index 96% rename from logging/cluster-logging-support.adoc rename to observability/logging/cluster-logging-support.adoc index dc03238d1d7e..cfd97936523c 100644 --- a/logging/cluster-logging-support.adoc +++ b/observability/logging/cluster-logging-support.adoc @@ -58,7 +58,7 @@ When opening a support case, it is helpful to provide debugging information abou You can use the ifdef::openshift-enterprise,openshift-origin[] -xref:../support/gathering-cluster-data.adoc#gathering-cluster-data[`must-gather` tool] +xref:../../support/gathering-cluster-data.adoc#gathering-cluster-data[`must-gather` tool] endif::[] ifdef::openshift-rosa,openshift-dedicated[] link:https://docs.openshift.com/container-platform/latest/support/gathering-cluster-data.html#gathering-cluster-data[`must-gather` tool] diff --git a/logging/cluster-logging-uninstall.adoc b/observability/logging/cluster-logging-uninstall.adoc similarity index 87% rename from logging/cluster-logging-uninstall.adoc rename to observability/logging/cluster-logging-uninstall.adoc index 7485e21465aa..1f53a2c7eaa0 100644 --- a/logging/cluster-logging-uninstall.adoc +++ b/observability/logging/cluster-logging-uninstall.adoc @@ -19,7 +19,7 @@ include::modules/olm-deleting-operators-from-a-cluster-using-cli.adoc[leveloffse [role="_additional-resources"] .Additional resources ifdef::openshift-enterprise,openshift-origin[] -* xref:../storage/understanding-persistent-storage.adoc#reclaim-manual_understanding-persistent-storage[Reclaiming a persistent volume manually] +* xref:../../storage/understanding-persistent-storage.adoc#reclaim-manual_understanding-persistent-storage[Reclaiming a persistent volume manually] endif::[] ifdef::openshift-rosa,openshift-dedicated[] * link:https://docs.openshift.com/container-platform/latest/storage/understanding-persistent-storage.html#reclaim-manual_understanding-persistent-storage[Reclaiming a persistent volume manually] diff --git a/logging/cluster-logging-upgrading.adoc b/observability/logging/cluster-logging-upgrading.adoc similarity index 87% rename from logging/cluster-logging-upgrading.adoc rename to observability/logging/cluster-logging-upgrading.adoc index ac2536b88589..eb74c57abae8 100644 --- a/logging/cluster-logging-upgrading.adoc +++ b/observability/logging/cluster-logging-upgrading.adoc @@ -13,7 +13,7 @@ There are two types of {logging} updates: minor release updates (5.y.z) and majo If you installed the {logging} Operators using the *Automatic* update approval option, your Operators receive minor version updates automatically. You do not need to complete any manual update steps. -If you installed the {logging} Operators using the *Manual* update approval option, you must manually approve minor version updates. For more information, see xref:../operators/admin/olm-upgrading-operators.adoc#olm-approving-pending-upgrade_olm-upgrading-operators[Manually approving a pending Operator update]. +If you installed the {logging} Operators using the *Manual* update approval option, you must manually approve minor version updates. For more information, see xref:../../operators/admin/olm-upgrading-operators.adoc#olm-approving-pending-upgrade_olm-upgrading-operators[Manually approving a pending Operator update]. [id="cluster-logging-upgrading-major"] == Major release updates diff --git a/logging/cluster-logging.adoc b/observability/logging/cluster-logging.adoc similarity index 63% rename from logging/cluster-logging.adoc rename to observability/logging/cluster-logging.adoc index 66fd659dc53b..3219d31cb6e9 100644 --- a/logging/cluster-logging.adoc +++ b/observability/logging/cluster-logging.adoc @@ -11,41 +11,41 @@ As a cluster administrator, you can deploy {logging} on an {product-title} clust include::snippets/logging-kibana-dep-snip.adoc[] -{product-title} cluster administrators can deploy {logging} by using Operators. For information, see xref:../logging/cluster-logging-deploying.adoc#cluster-logging-deploying[Installing {logging}]. +{product-title} cluster administrators can deploy {logging} by using Operators. For information, see xref:../../observability/logging/cluster-logging-deploying.adoc#cluster-logging-deploying[Installing {logging}]. The Operators are responsible for deploying, upgrading, and maintaining {logging}. After the Operators are installed, you can create a `ClusterLogging` custom resource (CR) to schedule {logging} pods and other resources necessary to support {logging}. You can also create a `ClusterLogForwarder` CR to specify which logs are collected, how they are transformed, and where they are forwarded to. [NOTE] ==== -Because the internal {product-title} Elasticsearch log store does not provide secure storage for audit logs, audit logs are not stored in the internal Elasticsearch instance by default. If you want to send the audit logs to the default internal Elasticsearch log store, for example to view the audit logs in Kibana, you must use the Log Forwarding API as described in xref:../logging/log_storage/logging-config-es-store.adoc#cluster-logging-elasticsearch-audit_logging-config-es-store[Forward audit logs to the log store]. +Because the internal {product-title} Elasticsearch log store does not provide secure storage for audit logs, audit logs are not stored in the internal Elasticsearch instance by default. If you want to send the audit logs to the default internal Elasticsearch log store, for example to view the audit logs in Kibana, you must use the Log Forwarding API as described in xref:../../observability/logging/log_storage/logging-config-es-store.adoc#cluster-logging-elasticsearch-audit_logging-config-es-store[Forward audit logs to the log store]. ==== include::modules/logging-architecture-overview.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../logging/log_visualization/log-visualization-ocp-console.adoc#log-visualization-ocp-console[Log visualization with the web console] +* xref:../../observability/logging/log_visualization/log-visualization-ocp-console.adoc#log-visualization-ocp-console[Log visualization with the web console] include::modules/cluster-logging-about.adoc[leveloffset=+1] ifdef::openshift-rosa,openshift-dedicated[] include::modules/cluster-logging-cloudwatch.adoc[leveloffset=+1] .Next steps -* See xref:../logging/log_collection_forwarding/configuring-log-forwarding.adoc#cluster-logging-collector-log-forward-cloudwatch_configuring-log-forwarding[Forwarding logs to Amazon CloudWatch] for instructions. +* See xref:../../observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc#cluster-logging-collector-log-forward-cloudwatch_configuring-log-forwarding[Forwarding logs to Amazon CloudWatch] for instructions. endif::[] include::modules/cluster-logging-json-logging-about.adoc[leveloffset=+2] include::modules/cluster-logging-collecting-storing-kubernetes-events.adoc[leveloffset=+2] -For information, see xref:../logging/log_collection_forwarding/cluster-logging-eventrouter.adoc#cluster-logging-eventrouter[About collecting and storing Kubernetes events]. +For information, see xref:../../observability/logging/log_collection_forwarding/cluster-logging-eventrouter.adoc#cluster-logging-eventrouter[About collecting and storing Kubernetes events]. include::modules/cluster-logging-troubleshoot-logging.adoc[leveloffset=+2] include::modules/cluster-logging-export-fields.adoc[leveloffset=+2] -For information, see xref:../logging/cluster-logging-exported-fields.adoc#cluster-logging-exported-fields[About exporting fields]. +For information, see xref:../../observability/logging/cluster-logging-exported-fields.adoc#cluster-logging-exported-fields[About exporting fields]. include::modules/cluster-logging-eventrouter-about.adoc[leveloffset=+2] -For information, see xref:../logging/log_collection_forwarding/cluster-logging-eventrouter.adoc#cluster-logging-eventrouter[Collecting and storing Kubernetes events]. +For information, see xref:../../observability/logging/log_collection_forwarding/cluster-logging-eventrouter.adoc#cluster-logging-eventrouter[Collecting and storing Kubernetes events]. diff --git a/logging/config/_attributes b/observability/logging/config/_attributes similarity index 100% rename from logging/config/_attributes rename to observability/logging/config/_attributes diff --git a/logging/config/cluster-logging-configuring.adoc b/observability/logging/config/cluster-logging-configuring.adoc similarity index 100% rename from logging/config/cluster-logging-configuring.adoc rename to observability/logging/config/cluster-logging-configuring.adoc diff --git a/logging/config/cluster-logging-memory.adoc b/observability/logging/config/cluster-logging-memory.adoc similarity index 100% rename from logging/config/cluster-logging-memory.adoc rename to observability/logging/config/cluster-logging-memory.adoc diff --git a/logging/config/cluster-logging-systemd.adoc b/observability/logging/config/cluster-logging-systemd.adoc similarity index 100% rename from logging/config/cluster-logging-systemd.adoc rename to observability/logging/config/cluster-logging-systemd.adoc diff --git a/logging/config/images b/observability/logging/config/images similarity index 100% rename from logging/config/images rename to observability/logging/config/images diff --git a/logging/config/modules b/observability/logging/config/modules similarity index 100% rename from logging/config/modules rename to observability/logging/config/modules diff --git a/logging/config/snippets b/observability/logging/config/snippets similarity index 100% rename from logging/config/snippets rename to observability/logging/config/snippets diff --git a/logging/dedicated-cluster-deploying.adoc b/observability/logging/dedicated-cluster-deploying.adoc similarity index 100% rename from logging/dedicated-cluster-deploying.adoc rename to observability/logging/dedicated-cluster-deploying.adoc diff --git a/logging/dedicated-cluster-logging.adoc b/observability/logging/dedicated-cluster-logging.adoc similarity index 100% rename from logging/dedicated-cluster-logging.adoc rename to observability/logging/dedicated-cluster-logging.adoc diff --git a/logging/images b/observability/logging/images similarity index 100% rename from logging/images rename to observability/logging/images diff --git a/logging/log_collection_forwarding/_attributes b/observability/logging/log_collection_forwarding/_attributes similarity index 100% rename from logging/log_collection_forwarding/_attributes rename to observability/logging/log_collection_forwarding/_attributes diff --git a/logging/log_collection_forwarding/cluster-logging-collector.adoc b/observability/logging/log_collection_forwarding/cluster-logging-collector.adoc similarity index 90% rename from logging/log_collection_forwarding/cluster-logging-collector.adoc rename to observability/logging/log_collection_forwarding/cluster-logging-collector.adoc index 32d96035def7..638aeddc2a63 100644 --- a/logging/log_collection_forwarding/cluster-logging-collector.adoc +++ b/observability/logging/log_collection_forwarding/cluster-logging-collector.adoc @@ -31,6 +31,6 @@ include::modules/log-collector-http-server.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../../logging/log_collection_forwarding/configuring-log-forwarding.adoc#logging-audit-filtering_configuring-log-forwarding[Overview of API audit filter] +* xref:../../../observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc#logging-audit-filtering_configuring-log-forwarding[Overview of API audit filter] include::modules/cluster-logging-collector-tuning.adoc[leveloffset=+1] diff --git a/logging/log_collection_forwarding/cluster-logging-enabling-json-logging.adoc b/observability/logging/log_collection_forwarding/cluster-logging-enabling-json-logging.adoc similarity index 85% rename from logging/log_collection_forwarding/cluster-logging-enabling-json-logging.adoc rename to observability/logging/log_collection_forwarding/cluster-logging-enabling-json-logging.adoc index 52f93e1e6418..6cccc45412de 100644 --- a/logging/log_collection_forwarding/cluster-logging-enabling-json-logging.adoc +++ b/observability/logging/log_collection_forwarding/cluster-logging-enabling-json-logging.adoc @@ -16,4 +16,4 @@ include::modules/cluster-logging-forwarding-separate-indices.adoc[leveloffset=+1 [role="_additional-resources"] .Additional resources -* xref:../../logging/log_collection_forwarding/log-forwarding.adoc#log-forwarding[About log forwarding] +* xref:../../../observability/logging/log_collection_forwarding/log-forwarding.adoc#log-forwarding[About log forwarding] diff --git a/logging/log_collection_forwarding/cluster-logging-eventrouter.adoc b/observability/logging/log_collection_forwarding/cluster-logging-eventrouter.adoc similarity index 100% rename from logging/log_collection_forwarding/cluster-logging-eventrouter.adoc rename to observability/logging/log_collection_forwarding/cluster-logging-eventrouter.adoc diff --git a/logging/log_collection_forwarding/configuring-log-forwarding.adoc b/observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc similarity index 94% rename from logging/log_collection_forwarding/configuring-log-forwarding.adoc rename to observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc index 878df6da9d3b..182853fc925a 100644 --- a/logging/log_collection_forwarding/configuring-log-forwarding.adoc +++ b/observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc @@ -37,7 +37,7 @@ include::modules/logging-audit-log-filtering.adoc[leveloffset=+1] .Additional resources ifdef::openshift-enterprise,openshift-origin[] -* xref:../../networking/ovn_kubernetes_network_provider/logging-network-policy.adoc#logging-network-policy[Logging for egress firewall and network policy rules] +* xref:../../../networking/ovn_kubernetes_network_provider/logging-network-policy.adoc#logging-network-policy[Logging for egress firewall and network policy rules] endif::[] ifdef::openshift-rosa,openshift-dedicated[] * link:https://docs.openshift.com/container-platform/latest/networking/ovn_kubernetes_network_provider/logging-network-policy.html#logging-network-policy[Logging for egress firewall and network policy rules] diff --git a/logging/log_collection_forwarding/images b/observability/logging/log_collection_forwarding/images similarity index 100% rename from logging/log_collection_forwarding/images rename to observability/logging/log_collection_forwarding/images diff --git a/logging/log_collection_forwarding/log-forwarding.adoc b/observability/logging/log_collection_forwarding/log-forwarding.adoc similarity index 81% rename from logging/log_collection_forwarding/log-forwarding.adoc rename to observability/logging/log_collection_forwarding/log-forwarding.adoc index 47ec3d4d0cc0..277bdc6d8418 100644 --- a/logging/log_collection_forwarding/log-forwarding.adoc +++ b/observability/logging/log_collection_forwarding/log-forwarding.adoc @@ -35,7 +35,7 @@ To use the multi log forwarder feature, you must create a service account and cl [IMPORTANT] ==== -In order to support multi log forwarding in additional namespaces other than the `openshift-logging` namespace, you must xref:../../logging/cluster-logging-upgrading.adoc#logging-operator-upgrading-all-ns_cluster-logging-upgrading[update the {clo} to watch all namespaces]. This functionality is supported by default in new {clo} version 5.8 installations. +In order to support multi log forwarding in additional namespaces other than the `openshift-logging` namespace, you must xref:../../../observability/logging/cluster-logging-upgrading.adoc#logging-operator-upgrading-all-ns_cluster-logging-upgrading[update the {clo} to watch all namespaces]. This functionality is supported by default in new {clo} version 5.8 installations. ==== include::modules/log-collection-rbac-permissions.adoc[leveloffset=+3] @@ -43,7 +43,7 @@ include::modules/log-collection-rbac-permissions.adoc[leveloffset=+3] [role="_additional-resources"] .Additional resources ifdef::openshift-enterprise[] -* xref:../../authentication/using-rbac.adoc#using-rbac[Using RBAC to define and apply permissions] -* xref:../../authentication/using-service-accounts-in-applications.adoc#using-service-accounts-in-applications[Using service accounts in applications] +* xref:../../../authentication/using-rbac.adoc#using-rbac[Using RBAC to define and apply permissions] +* xref:../../../authentication/using-service-accounts-in-applications.adoc#using-service-accounts-in-applications[Using service accounts in applications] endif::[] * link:https://kubernetes.io/docs/reference/access-authn-authz/rbac/[Using RBAC Authorization Kubernetes documentation] diff --git a/logging/log_collection_forwarding/logging-output-types.adoc b/observability/logging/log_collection_forwarding/logging-output-types.adoc similarity index 100% rename from logging/log_collection_forwarding/logging-output-types.adoc rename to observability/logging/log_collection_forwarding/logging-output-types.adoc diff --git a/logging/log_collection_forwarding/modules b/observability/logging/log_collection_forwarding/modules similarity index 100% rename from logging/log_collection_forwarding/modules rename to observability/logging/log_collection_forwarding/modules diff --git a/logging/log_collection_forwarding/snippets b/observability/logging/log_collection_forwarding/snippets similarity index 100% rename from logging/log_collection_forwarding/snippets rename to observability/logging/log_collection_forwarding/snippets diff --git a/logging/log_storage/_attributes b/observability/logging/log_storage/_attributes similarity index 100% rename from logging/log_storage/_attributes rename to observability/logging/log_storage/_attributes diff --git a/logging/log_storage/about-log-storage.adoc b/observability/logging/log_storage/about-log-storage.adoc similarity index 82% rename from logging/log_storage/about-log-storage.adoc rename to observability/logging/log_storage/about-log-storage.adoc index c09b3c8c8464..25257ccec92f 100644 --- a/logging/log_storage/about-log-storage.adoc +++ b/observability/logging/log_storage/about-log-storage.adoc @@ -7,7 +7,7 @@ include::_attributes/attributes-openshift-dedicated.adoc[] toc::[] -You can use an internal Loki or Elasticsearch log store on your cluster for storing logs, or you can use a xref:../../logging/log_collection_forwarding/configuring-log-forwarding.adoc#logging-create-clf_configuring-log-forwarding[`ClusterLogForwarder` custom resource (CR)] to forward logs to an external store. +You can use an internal Loki or Elasticsearch log store on your cluster for storing logs, or you can use a xref:../../../observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc#logging-create-clf_configuring-log-forwarding[`ClusterLogForwarder` custom resource (CR)] to forward logs to an external store. [id="log-storage-overview-types"] == Log storage types diff --git a/logging/log_storage/cluster-logging-loki.adoc b/observability/logging/log_storage/cluster-logging-loki.adoc similarity index 85% rename from logging/log_storage/cluster-logging-loki.adoc rename to observability/logging/log_storage/cluster-logging-loki.adoc index 9e20ed537e70..51e4f43b4e16 100644 --- a/logging/log_storage/cluster-logging-loki.adoc +++ b/observability/logging/log_storage/cluster-logging-loki.adoc @@ -22,7 +22,7 @@ include::modules/logging-loki-reliability-hardening.adoc[leveloffset=+1] .Additional resources * link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#podantiaffinity-v1-core[`PodAntiAffinity` v1 core Kubernetes documentation] * link:https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity[Assigning Pods to Nodes Kubernetes documentation] -* xref:../../nodes/scheduling/nodes-scheduler-pod-affinity.adoc#nodes-scheduler-pod-affinity[Placing pods relative to other pods using affinity and anti-affinity rules] +* xref:../../../nodes/scheduling/nodes-scheduler-pod-affinity.adoc#nodes-scheduler-pod-affinity[Placing pods relative to other pods using affinity and anti-affinity rules] include::modules/logging-loki-zone-aware-rep.adoc[leveloffset=+1] @@ -34,7 +34,7 @@ include::modules/logging-loki-zone-fail-recovery.adoc[leveloffset=+2] * link:https://kubernetes.io/docs/setup/best-practices/multiple-zones/#storage-access-for-zones[Kubernetes storage documentation]. ifdef::openshift-enterprise[] -* xref:../../nodes/scheduling/nodes-scheduler-pod-topology-spread-constraints.adoc#nodes-scheduler-pod-topology-spread-constraints-configuring[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-configuring[Controlling pod placement by using pod topology spread constraints] endif::[] include::modules/logging-loki-log-access.adoc[leveloffset=+1,tag=!NetObservMode] @@ -43,7 +43,7 @@ include::modules/logging-loki-log-access.adoc[leveloffset=+1,tag=!NetObservMode] .Additional resources ifdef::openshift-enterprise[] -* xref:../../authentication/using-rbac.adoc[Using RBAC to define and apply permissions] +* xref:../../../authentication/using-rbac.adoc#using-rbac[Using RBAC to define and apply permissions] endif::[] include::modules/logging-loki-retention.adoc[leveloffset=+1] diff --git a/logging/log_storage/images b/observability/logging/log_storage/images similarity index 100% rename from logging/log_storage/images rename to observability/logging/log_storage/images diff --git a/logging/log_storage/installing-log-storage.adoc b/observability/logging/log_storage/installing-log-storage.adoc similarity index 86% rename from logging/log_storage/installing-log-storage.adoc rename to observability/logging/log_storage/installing-log-storage.adoc index d8483d7539b9..a2c93934ab43 100644 --- a/logging/log_storage/installing-log-storage.adoc +++ b/observability/logging/log_storage/installing-log-storage.adoc @@ -24,13 +24,13 @@ include::modules/loki-create-object-storage-secret-console.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../../logging/log_storage/installing-log-storage.adoc#logging-loki-storage_installing-log-storage[Loki object storage] +* xref:../../../observability/logging/log_storage/installing-log-storage.adoc#logging-loki-storage_installing-log-storage[Loki object storage] ifdef::openshift-enterprise[] [id="installing-log-storage-loki-sts"] == Deploying a Loki log store on an STS enabled cluster -For some storage providers, you can use the CCO utility (`ccoctl`) during installation to implement short-term credentials. These credentials are created and managed outside the {product-title} cluster. xref:../../authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds[Manual mode with short-term credentials for components]. +For some storage providers, you can use the CCO utility (`ccoctl`) during installation to implement short-term credentials. These credentials are created and managed outside the {product-title} cluster. xref:../../../authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds[Manual mode with short-term credentials for components]. [NOTE] ==== @@ -48,7 +48,7 @@ include::modules/loki-create-object-storage-secret-cli.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../../logging/log_storage/installing-log-storage.adoc#logging-loki-storage_installing-log-storage[Loki object storage] +* xref:../../../observability/logging/log_storage/installing-log-storage.adoc#logging-loki-storage_installing-log-storage[Loki object storage] include::modules/logging-create-loki-cr-cli.adoc[leveloffset=+2,tag=!pre-5.9] diff --git a/logging/log_storage/logging-config-es-store.adoc b/observability/logging/log_storage/logging-config-es-store.adoc similarity index 91% rename from logging/log_storage/logging-config-es-store.adoc rename to observability/logging/log_storage/logging-config-es-store.adoc index c87995133e15..4dad37a0f212 100644 --- a/logging/log_storage/logging-config-es-store.adoc +++ b/observability/logging/log_storage/logging-config-es-store.adoc @@ -21,7 +21,7 @@ include::modules/cluster-logging-elasticsearch-audit.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../logging/log_collection_forwarding/log-forwarding.adoc#log-forwarding[About log collection and forwarding] +* xref:../../../observability/logging/log_collection_forwarding/log-forwarding.adoc#log-forwarding[About log collection and forwarding] include::modules/cluster-logging-elasticsearch-retention.adoc[leveloffset=+1] diff --git a/logging/log_storage/modules b/observability/logging/log_storage/modules similarity index 100% rename from logging/log_storage/modules rename to observability/logging/log_storage/modules diff --git a/logging/log_storage/snippets b/observability/logging/log_storage/snippets similarity index 100% rename from logging/log_storage/snippets rename to observability/logging/log_storage/snippets diff --git a/logging/log_visualization/_attributes b/observability/logging/log_visualization/_attributes similarity index 100% rename from logging/log_visualization/_attributes rename to observability/logging/log_visualization/_attributes diff --git a/logging/log_visualization/cluster-logging-dashboards.adoc b/observability/logging/log_visualization/cluster-logging-dashboards.adoc similarity index 74% rename from logging/log_visualization/cluster-logging-dashboards.adoc rename to observability/logging/log_visualization/cluster-logging-dashboards.adoc index 0cf36304b28a..a504a420e16d 100644 --- a/logging/log_visualization/cluster-logging-dashboards.adoc +++ b/observability/logging/log_visualization/cluster-logging-dashboards.adoc @@ -22,7 +22,7 @@ The *Logging/Elasticsearch Nodes* dashboard contains charts that show details ab include::modules/cluster-logging-dashboards-access.adoc[leveloffset=+1] -For information on the dashboard charts, see xref:../../logging/log_visualization/cluster-logging-dashboards.adoc#cluster-logging-dashboards-logging_cluster-logging-dashboards[About the OpenShift Logging dashboard] and xref:../../logging/log_visualization/cluster-logging-dashboards.adoc#cluster-logging-dashboards-es_cluster-logging-dashboards[About the Logging/Elastisearch Nodes dashboard]. +For information on the dashboard charts, see xref:../../../observability/logging/log_visualization/cluster-logging-dashboards.adoc#cluster-logging-dashboards-logging_cluster-logging-dashboards[About the OpenShift Logging dashboard] and xref:../../../observability/logging/log_visualization/cluster-logging-dashboards.adoc#cluster-logging-dashboards-es_cluster-logging-dashboards[About the Logging/Elastisearch Nodes dashboard]. include::modules/cluster-logging-dashboards-logging.adoc[leveloffset=+1] include::modules/cluster-logging-dashboards-es.adoc[leveloffset=+1] diff --git a/logging/log_visualization/images b/observability/logging/log_visualization/images similarity index 100% rename from logging/log_visualization/images rename to observability/logging/log_visualization/images diff --git a/logging/log_visualization/log-visualization-ocp-console.adoc b/observability/logging/log_visualization/log-visualization-ocp-console.adoc similarity index 77% rename from logging/log_visualization/log-visualization-ocp-console.adoc rename to observability/logging/log_visualization/log-visualization-ocp-console.adoc index 5b2d991e178f..133922d52d7e 100644 --- a/logging/log_visualization/log-visualization-ocp-console.adoc +++ b/observability/logging/log_visualization/log-visualization-ocp-console.adoc @@ -9,7 +9,7 @@ toc::[] You can use the {product-title} web console to visualize log data by configuring the {log-plug}. -For information about configuring the plugin during the {logging} installation, see xref:../../logging/cluster-logging-deploying.adoc#cluster-logging-deploy-console_cluster-logging-deploying[Installing the {logging} using the web console]. +For information about configuring the plugin during the {logging} installation, see xref:../../../observability/logging/cluster-logging-deploying.adoc#cluster-logging-deploy-console_cluster-logging-deploying[Installing the {logging} using the web console]. If you have already installed the {logging} and want to configure the plugin, use one of the following procedures. diff --git a/logging/log_visualization/log-visualization.adoc b/observability/logging/log_visualization/log-visualization.adoc similarity index 100% rename from logging/log_visualization/log-visualization.adoc rename to observability/logging/log_visualization/log-visualization.adoc diff --git a/logging/log_visualization/logging-kibana.adoc b/observability/logging/log_visualization/logging-kibana.adoc similarity index 84% rename from logging/log_visualization/logging-kibana.adoc rename to observability/logging/log_visualization/logging-kibana.adoc index 6cffbc9fe45b..27aaf807cabd 100644 --- a/logging/log_visualization/logging-kibana.adoc +++ b/observability/logging/log_visualization/logging-kibana.adoc @@ -19,7 +19,7 @@ Use and configuration of the Kibana interface is beyond the scope of this docume [NOTE] ==== -The audit logs are not stored in the internal {product-title} Elasticsearch instance by default. To view the audit logs in Kibana, you must use the xref:../../logging/log_storage/logging-config-es-store.adoc#cluster-logging-elasticsearch-audit_logging-config-es-store[Log Forwarding API] to configure a pipeline that uses the `default` output for audit logs. +The audit logs are not stored in the internal {product-title} Elasticsearch instance by default. To view the audit logs in Kibana, you must use the xref:../../../observability/logging/log_storage/logging-config-es-store.adoc#cluster-logging-elasticsearch-audit_logging-config-es-store[Log Forwarding API] to configure a pipeline that uses the `default` output for audit logs. ==== include::modules/cluster-logging-visualizer-indices.adoc[leveloffset=+1] diff --git a/logging/log_visualization/modules b/observability/logging/log_visualization/modules similarity index 100% rename from logging/log_visualization/modules rename to observability/logging/log_visualization/modules diff --git a/logging/log_visualization/snippets b/observability/logging/log_visualization/snippets similarity index 100% rename from logging/log_visualization/snippets rename to observability/logging/log_visualization/snippets diff --git a/logging/logging-common-terms.adoc b/observability/logging/logging-common-terms.adoc similarity index 100% rename from logging/logging-common-terms.adoc rename to observability/logging/logging-common-terms.adoc diff --git a/logging/logging_alerts/_attributes b/observability/logging/logging_alerts/_attributes similarity index 100% rename from logging/logging_alerts/_attributes rename to observability/logging/logging_alerts/_attributes diff --git a/logging/logging_alerts/custom-logging-alerts.adoc b/observability/logging/logging_alerts/custom-logging-alerts.adoc similarity index 86% rename from logging/logging_alerts/custom-logging-alerts.adoc rename to observability/logging/logging_alerts/custom-logging-alerts.adoc index 7a050d4b5b9a..7e8e01ac252d 100644 --- a/logging/logging_alerts/custom-logging-alerts.adoc +++ b/observability/logging/logging_alerts/custom-logging-alerts.adoc @@ -22,7 +22,7 @@ include::modules/loki-rbac-rules-permissions.adoc[leveloffset=+1] ifdef::openshift-enterprise[] [role="_additional-resources"] .Additional resources -* xref:../../authentication/using-rbac.adoc#using-rbac[Using RBAC to define and apply permissions] +* xref:../../../authentication/using-rbac.adoc#using-rbac[Using RBAC to define and apply permissions] endif::[] include::modules/logging-enabling-loki-alerts.adoc[leveloffset=+1] @@ -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:../../observability/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] +* 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/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/observability/logging/logging_alerts/default-logging-alerts.adoc similarity index 75% rename from logging/logging_alerts/default-logging-alerts.adoc rename to observability/logging/logging_alerts/default-logging-alerts.adoc index 02d7d2679387..a7077f517327 100644 --- a/logging/logging_alerts/default-logging-alerts.adoc +++ b/observability/logging/logging_alerts/default-logging-alerts.adoc @@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[] toc::[] -Logging alerts are installed as part of the {clo} installation. Alerts depend on metrics exported by the log collection and log storage backends. These metrics are enabled if you selected the option to *Enable operator recommended cluster monitoring on this namespace* when installing the {clo}. For more information about installing logging Operators, see xref:../../logging/cluster-logging-deploying#cluster-logging-deploy-console_cluster-logging-deploying[Installing {logging} using the web console]. +Logging alerts are installed as part of the {clo} installation. Alerts depend on metrics exported by the log collection and log storage backends. These metrics are enabled if you selected the option to *Enable operator recommended cluster monitoring on this namespace* when installing the {clo}. For more information about installing logging Operators, see xref:../../../observability/logging/cluster-logging-deploying#cluster-logging-deploy-console_cluster-logging-deploying[Installing {logging} using the web console]. Default logging alerts are sent to the {product-title} monitoring stack Alertmanager in the `openshift-monitoring` namespace, unless you have disabled the local Alertmanager instance. @@ -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:../../observability/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/logging_alerts/images b/observability/logging/logging_alerts/images similarity index 100% rename from logging/logging_alerts/images rename to observability/logging/logging_alerts/images diff --git a/logging/logging_alerts/modules b/observability/logging/logging_alerts/modules similarity index 100% rename from logging/logging_alerts/modules rename to observability/logging/logging_alerts/modules diff --git a/logging/logging_alerts/snippets b/observability/logging/logging_alerts/snippets similarity index 100% rename from logging/logging_alerts/snippets rename to observability/logging/logging_alerts/snippets diff --git a/logging/logging_release_notes/_attributes b/observability/logging/logging_release_notes/_attributes similarity index 100% rename from logging/logging_release_notes/_attributes rename to observability/logging/logging_release_notes/_attributes diff --git a/logging/logging_release_notes/images b/observability/logging/logging_release_notes/images similarity index 100% rename from logging/logging_release_notes/images rename to observability/logging/logging_release_notes/images diff --git a/logging/logging_release_notes/logging-5-7-release-notes.adoc b/observability/logging/logging_release_notes/logging-5-7-release-notes.adoc similarity index 100% rename from logging/logging_release_notes/logging-5-7-release-notes.adoc rename to observability/logging/logging_release_notes/logging-5-7-release-notes.adoc diff --git a/logging/logging_release_notes/logging-5-8-release-notes.adoc b/observability/logging/logging_release_notes/logging-5-8-release-notes.adoc similarity index 100% rename from logging/logging_release_notes/logging-5-8-release-notes.adoc rename to observability/logging/logging_release_notes/logging-5-8-release-notes.adoc diff --git a/logging/logging_release_notes/logging-5-9-release-notes.adoc b/observability/logging/logging_release_notes/logging-5-9-release-notes.adoc similarity index 100% rename from logging/logging_release_notes/logging-5-9-release-notes.adoc rename to observability/logging/logging_release_notes/logging-5-9-release-notes.adoc diff --git a/logging/logging_release_notes/modules b/observability/logging/logging_release_notes/modules similarity index 100% rename from logging/logging_release_notes/modules rename to observability/logging/logging_release_notes/modules diff --git a/logging/logging_release_notes/snippets b/observability/logging/logging_release_notes/snippets similarity index 100% rename from logging/logging_release_notes/snippets rename to observability/logging/logging_release_notes/snippets diff --git a/logging/modules b/observability/logging/modules similarity index 100% rename from logging/modules rename to observability/logging/modules diff --git a/logging/performance_reliability/_attributes b/observability/logging/performance_reliability/_attributes similarity index 100% rename from logging/performance_reliability/_attributes rename to observability/logging/performance_reliability/_attributes diff --git a/logging/performance_reliability/images b/observability/logging/performance_reliability/images similarity index 100% rename from logging/performance_reliability/images rename to observability/logging/performance_reliability/images diff --git a/logging/performance_reliability/logging-content-filtering.adoc b/observability/logging/performance_reliability/logging-content-filtering.adoc similarity index 64% rename from logging/performance_reliability/logging-content-filtering.adoc rename to observability/logging/performance_reliability/logging-content-filtering.adoc index 3e668b66c5ad..8a9bcdf57893 100644 --- a/logging/performance_reliability/logging-content-filtering.adoc +++ b/observability/logging/performance_reliability/logging-content-filtering.adoc @@ -18,8 +18,8 @@ Content filters are distinct from `input` selectors. `input` selectors select or Log data volume can be reduced by using one of the following methods: -* xref:../../logging/performance_reliability/logging-content-filtering.adoc#logging-content-filter-drop-records_logging-content-filtering[Configuring content filters to drop unwanted log records] -* xref:../../logging/performance_reliability/logging-content-filtering.adoc#logging-content-filter-prune-records_logging-content-filtering[Configuring content filters to prune log records] +* xref:../../../observability/logging/performance_reliability/logging-content-filtering.adoc#logging-content-filter-drop-records_logging-content-filtering[Configuring content filters to drop unwanted log records] +* xref:../../../observability/logging/performance_reliability/logging-content-filtering.adoc#logging-content-filter-prune-records_logging-content-filtering[Configuring content filters to prune log records] include::modules/logging-content-filter-drop-records.adoc[leveloffset=+1] include::modules/logging-content-filter-prune-records.adoc[leveloffset=+1] @@ -27,4 +27,4 @@ include::modules/logging-content-filter-prune-records.adoc[leveloffset=+1] [role="_additional-resources"] [id="additional-resources_logging-content-filtering"] == Additional resources -* xref:../../logging/log_collection_forwarding/configuring-log-forwarding.adoc#cluster-logging-collector-log-forwarding-about_configuring-log-forwarding[About forwarding logs to third-party systems] +* xref:../../../observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc#cluster-logging-collector-log-forwarding-about_configuring-log-forwarding[About forwarding logs to third-party systems] diff --git a/logging/performance_reliability/logging-flow-control-mechanisms.adoc b/observability/logging/performance_reliability/logging-flow-control-mechanisms.adoc similarity index 95% rename from logging/performance_reliability/logging-flow-control-mechanisms.adoc rename to observability/logging/performance_reliability/logging-flow-control-mechanisms.adoc index 74f9b542f7ff..15529c06a209 100644 --- a/logging/performance_reliability/logging-flow-control-mechanisms.adoc +++ b/observability/logging/performance_reliability/logging-flow-control-mechanisms.adoc @@ -39,6 +39,6 @@ include::modules/logging-set-output-rate-limit.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../logging/log_collection_forwarding/logging-output-types.adoc#logging-output-types[Log output types] +* xref:../../../observability/logging/log_collection_forwarding/logging-output-types.adoc#logging-output-types[Log output types] include::modules/logging-set-input-rate-limit.adoc[leveloffset=+1] diff --git a/logging/performance_reliability/logging-input-spec-filtering.adoc b/observability/logging/performance_reliability/logging-input-spec-filtering.adoc similarity index 100% rename from logging/performance_reliability/logging-input-spec-filtering.adoc rename to observability/logging/performance_reliability/logging-input-spec-filtering.adoc diff --git a/logging/performance_reliability/modules b/observability/logging/performance_reliability/modules similarity index 100% rename from logging/performance_reliability/modules rename to observability/logging/performance_reliability/modules diff --git a/logging/performance_reliability/snippets b/observability/logging/performance_reliability/snippets similarity index 100% rename from logging/performance_reliability/snippets rename to observability/logging/performance_reliability/snippets diff --git a/logging/rosa-viewing-logs.adoc b/observability/logging/rosa-viewing-logs.adoc similarity index 100% rename from logging/rosa-viewing-logs.adoc rename to observability/logging/rosa-viewing-logs.adoc diff --git a/logging/scheduling_resources/_attributes b/observability/logging/scheduling_resources/_attributes similarity index 100% rename from logging/scheduling_resources/_attributes rename to observability/logging/scheduling_resources/_attributes diff --git a/logging/scheduling_resources/images b/observability/logging/scheduling_resources/images similarity index 100% rename from logging/scheduling_resources/images rename to observability/logging/scheduling_resources/images diff --git a/logging/scheduling_resources/logging-node-selectors.adoc b/observability/logging/scheduling_resources/logging-node-selectors.adoc similarity index 82% rename from logging/scheduling_resources/logging-node-selectors.adoc rename to observability/logging/scheduling_resources/logging-node-selectors.adoc index e02f345267e7..6b6a0702eb28 100644 --- a/logging/scheduling_resources/logging-node-selectors.adoc +++ b/observability/logging/scheduling_resources/logging-node-selectors.adoc @@ -20,4 +20,4 @@ include::modules/cluster-logging-collector-pod-location.adoc[leveloffset=+1] [role="_additional-resources"] [id="additional-resources_logging-node-selection"] == Additional resources -* 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] diff --git a/logging/scheduling_resources/logging-taints-tolerations.adoc b/observability/logging/scheduling_resources/logging-taints-tolerations.adoc similarity index 88% rename from logging/scheduling_resources/logging-taints-tolerations.adoc rename to observability/logging/scheduling_resources/logging-taints-tolerations.adoc index 86744f087dd9..abc74c0b4fa2 100644 --- a/logging/scheduling_resources/logging-taints-tolerations.adoc +++ b/observability/logging/scheduling_resources/logging-taints-tolerations.adoc @@ -23,7 +23,7 @@ include::modules/cluster-logging-collector-pod-location.adoc[leveloffset=+1] [id="additional-resources_cluster-logging-tolerations"] == Additional resources ifdef::openshift-enterprise,openshift-origin[] -* xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints] +* xref:../../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints] endif::[] ifdef::openshift-rosa,openshift-dedicated[] * link:https://docs.openshift.com/container-platform/latest/nodes/scheduling/nodes-scheduler-taints-tolerations.html#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints] diff --git a/logging/scheduling_resources/modules b/observability/logging/scheduling_resources/modules similarity index 100% rename from logging/scheduling_resources/modules rename to observability/logging/scheduling_resources/modules diff --git a/logging/scheduling_resources/snippets b/observability/logging/scheduling_resources/snippets similarity index 100% rename from logging/scheduling_resources/snippets rename to observability/logging/scheduling_resources/snippets diff --git a/logging/sd-accessing-the-service-logs.adoc b/observability/logging/sd-accessing-the-service-logs.adoc similarity index 100% rename from logging/sd-accessing-the-service-logs.adoc rename to observability/logging/sd-accessing-the-service-logs.adoc diff --git a/logging/snippets b/observability/logging/snippets similarity index 100% rename from logging/snippets rename to observability/logging/snippets diff --git a/logging/troubleshooting/_attributes b/observability/logging/troubleshooting/_attributes similarity index 100% rename from logging/troubleshooting/_attributes rename to observability/logging/troubleshooting/_attributes diff --git a/logging/troubleshooting/cluster-logging-cluster-status.adoc b/observability/logging/troubleshooting/cluster-logging-cluster-status.adoc similarity index 100% rename from logging/troubleshooting/cluster-logging-cluster-status.adoc rename to observability/logging/troubleshooting/cluster-logging-cluster-status.adoc diff --git a/logging/troubleshooting/cluster-logging-log-store-status.adoc b/observability/logging/troubleshooting/cluster-logging-log-store-status.adoc similarity index 100% rename from logging/troubleshooting/cluster-logging-log-store-status.adoc rename to observability/logging/troubleshooting/cluster-logging-log-store-status.adoc diff --git a/logging/troubleshooting/images b/observability/logging/troubleshooting/images similarity index 100% rename from logging/troubleshooting/images rename to observability/logging/troubleshooting/images diff --git a/logging/troubleshooting/log-forwarding-troubleshooting.adoc b/observability/logging/troubleshooting/log-forwarding-troubleshooting.adoc similarity index 100% rename from logging/troubleshooting/log-forwarding-troubleshooting.adoc rename to observability/logging/troubleshooting/log-forwarding-troubleshooting.adoc diff --git a/logging/troubleshooting/modules b/observability/logging/troubleshooting/modules similarity index 100% rename from logging/troubleshooting/modules rename to observability/logging/troubleshooting/modules diff --git a/logging/troubleshooting/snippets b/observability/logging/troubleshooting/snippets similarity index 100% rename from logging/troubleshooting/snippets rename to observability/logging/troubleshooting/snippets diff --git a/logging/troubleshooting/troubleshooting-logging-alerts.adoc b/observability/logging/troubleshooting/troubleshooting-logging-alerts.adoc similarity index 95% rename from logging/troubleshooting/troubleshooting-logging-alerts.adoc rename to observability/logging/troubleshooting/troubleshooting-logging-alerts.adoc index ab045e74eb46..66d130f11f96 100644 --- a/logging/troubleshooting/troubleshooting-logging-alerts.adoc +++ b/observability/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:../../observability/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/observability/network_observability/installing-operators.adoc b/observability/network_observability/installing-operators.adoc index 4579d42f2132..83c617b67480 100644 --- a/observability/network_observability/installing-operators.adoc +++ b/observability/network_observability/installing-operators.adoc @@ -11,7 +11,7 @@ The {loki-op} integrates a gateway that implements multi-tenancy and authenticat [NOTE] ==== -The {loki-op} can also be used for xref:../../logging/log_storage/cluster-logging-loki.adoc#cluster-logging-loki[configuring the LokiStack log store]. The Network Observability Operator requires a dedicated LokiStack separate from the {logging}. +The {loki-op} can also be used for xref:../../observability/logging/log_storage/cluster-logging-loki.adoc#cluster-logging-loki[configuring the LokiStack log store]. The Network Observability Operator requires a dedicated LokiStack separate from the {logging}. ==== include::modules/network-observability-without-loki.adoc[leveloffset=+1] @@ -26,7 +26,7 @@ include::modules/network-observability-loki-secret.adoc[leveloffset=+2] .Additional resources * xref:../../observability/network_observability/flowcollector-api.adoc#network-observability-flowcollector-api-specifications_network_observability[Flow Collector API Reference] * xref:../../observability/network_observability/configuring-operator.adoc#network-observability-flowcollector-view_network_observability[Flow Collector sample resource] -* xref:../../logging/log_storage/installing-log-storage.adoc#logging-loki-storage_installing-log-storage[Loki object storage] +* xref:../../observability/logging/log_storage/installing-log-storage.adoc#logging-loki-storage_installing-log-storage[Loki object storage] include::modules/network-observability-lokistack-create.adoc[leveloffset=+2] include::modules/logging-creating-new-group-cluster-admin-user-role.adoc[leveloffset=+2] diff --git a/ocm/ocm-overview.adoc b/ocm/ocm-overview.adoc index 78df5cd33aaa..43194b702636 100644 --- a/ocm/ocm-overview.adoc +++ b/ocm/ocm-overview.adoc @@ -67,6 +67,6 @@ include::modules/ocm-settings-tab.adoc[leveloffset=+2] * For the complete documentation for {cluster-manager}, see link:https://access.redhat.com/documentation/en-us/openshift_cluster_manager/2022/html-single/managing_clusters/index[{cluster-manager} documentation]. ifdef::openshift-dedicated,openshift-rosa[] -* For steps to add cluster notification contacts, see xref:../logging/sd-accessing-the-service-logs.adoc#adding-cluster-notification-contacts_sd-accessing-the-service-logs[Adding cluster notification contacts]. +* For steps to add cluster notification contacts, see xref:../observability/logging/sd-accessing-the-service-logs.adoc#adding-cluster-notification-contacts_sd-accessing-the-service-logs[Adding cluster notification contacts]. endif::[] diff --git a/post_installation_configuration/cluster-tasks.adoc b/post_installation_configuration/cluster-tasks.adoc index 670fcb7cc577..682b17fa7ff1 100644 --- a/post_installation_configuration/cluster-tasks.adoc +++ b/post_installation_configuration/cluster-tasks.adoc @@ -619,8 +619,8 @@ include::modules/infrastructure-moving-monitoring.adoc[leveloffset=+2] For information about moving {logging} resources, see: -* 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] +* xref:../observability/logging/scheduling_resources/logging-node-selectors.adoc#logging-node-selectors[Using node selectors to move logging resources] +* xref:../observability/logging/scheduling_resources/logging-taints-tolerations.adoc#cluster-logging-logstore-tolerations_logging-taints-tolerations[Using taints and tolerations to control logging pod placement] include::modules/cluster-autoscaler-about.adoc[leveloffset=+1] include::modules/cluster-autoscaler-cr.adoc[leveloffset=+2] diff --git a/post_installation_configuration/storage-configuration.adoc b/post_installation_configuration/storage-configuration.adoc index 9ad9d7d51a35..4d37241d44f0 100644 --- a/post_installation_configuration/storage-configuration.adoc +++ b/post_installation_configuration/storage-configuration.adoc @@ -83,4 +83,4 @@ include::modules/deploy-red-hat-openshift-container-storage.adoc[leveloffset=+1] [role="_additional-resources"] [id="admission-plug-ins-additional-resources"] == Additional resources -* xref:../logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store] +* xref:../observability/logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store] diff --git a/rosa_planning/rosa-limits-scalability.adoc b/rosa_planning/rosa-limits-scalability.adoc index 2e410382adca..7ccfeb2c798a 100644 --- a/rosa_planning/rosa-limits-scalability.adoc +++ b/rosa_planning/rosa-limits-scalability.adoc @@ -22,4 +22,4 @@ include::modules/sd-planning-considerations.adoc[leveloffset=+1] [id="additional-resources_rosa-limits-scalability"] == Additional resources -* xref:../logging/sd-accessing-the-service-logs.adoc#sd-accessing-the-service-logs[Accessing the service logs for ROSA clusters] +* xref:../observability/logging/sd-accessing-the-service-logs.adoc#sd-accessing-the-service-logs[Accessing the service logs for ROSA clusters] diff --git a/rosa_planning/rosa-understanding-terraform.adoc b/rosa_planning/rosa-understanding-terraform.adoc index 028ef340ead7..eef9faebe064 100644 --- a/rosa_planning/rosa-understanding-terraform.adoc +++ b/rosa_planning/rosa-understanding-terraform.adoc @@ -33,4 +33,4 @@ include::modules/rosa-sts-account-roles-terraform.adoc[leveloffset=+1] [id="additional-resources_rosa-understanding-terraform"] == Additional resources -* xref:../logging/sd-accessing-the-service-logs.adoc#sd-accessing-the-service-logs[Accessing the service logs for ROSA clusters] +* xref:../observability/logging/sd-accessing-the-service-logs.adoc#sd-accessing-the-service-logs[Accessing the service logs for ROSA clusters] diff --git a/scalability_and_performance/optimization/optimizing-storage.adoc b/scalability_and_performance/optimization/optimizing-storage.adoc index c6d7593ede43..2a17cc92913c 100644 --- a/scalability_and_performance/optimization/optimizing-storage.adoc +++ b/scalability_and_performance/optimization/optimizing-storage.adoc @@ -35,4 +35,4 @@ include::modules/optimizing-storage-azure.adoc[leveloffset=+1] [role="_additional-resources"] [id="admission-plug-ins-additional-resources"] == Additional resources -* xref:../../logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store] +* xref:../../observability/logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store] diff --git a/security/audit-log-view.adoc b/security/audit-log-view.adoc index 96068a8c257e..32eec4acfb99 100644 --- a/security/audit-log-view.adoc +++ b/security/audit-log-view.adoc @@ -36,5 +36,5 @@ ifndef::openshift-rosa,openshift-dedicated[] * xref:../support/gathering-cluster-data.adoc#about-must-gather_gathering-cluster-data[Must-gather tool] * link:https://github.com/kubernetes/apiserver/blob/master/pkg/apis/audit/v1/types.go#L72[API audit log event structure] * xref:../security/audit-log-policy-config.adoc#audit-log-policy-config[Configuring the audit log policy] -* xref:../logging/log_collection_forwarding/log-forwarding.adoc#log-forwarding[About log forwarding] +* xref:../observability/logging/log_collection_forwarding/log-forwarding.adoc#log-forwarding[About log forwarding] endif::[] diff --git a/security/container_security/security-monitoring.adoc b/security/container_security/security-monitoring.adoc index 547d17e256ca..d0e32f473c2b 100644 --- a/security/container_security/security-monitoring.adoc +++ b/security/container_security/security-monitoring.adoc @@ -25,5 +25,5 @@ include::modules/security-monitoring-audit-logging.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources * xref:../../nodes/clusters/nodes-containers-events.adoc#nodes-containers-events[List of system events] -* xref:../../logging/cluster-logging.adoc#cluster-logging[Understanding OpenShift Logging] +* xref:../../observability/logging/cluster-logging.adoc#cluster-logging[Understanding OpenShift Logging] * xref:../../security/audit-log-view.adoc#audit-log-view[Viewing audit logs] diff --git a/service_mesh/v1x/ossm-custom-resources.adoc b/service_mesh/v1x/ossm-custom-resources.adoc index 8807a3082092..500b9ffc939a 100644 --- a/service_mesh/v1x/ossm-custom-resources.adoc +++ b/service_mesh/v1x/ossm-custom-resources.adoc @@ -42,7 +42,7 @@ include::modules/ossm-jaeger-config-elasticsearch-v1x.adoc[leveloffset=+2] include::modules/ossm-jaeger-config-es-cleaner-v1x.adoc[leveloffset=+2] ifdef::openshift-enterprise[] -For more information about configuring Elasticsearch with {product-title}, see xref:../../logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store]. +For more information about configuring Elasticsearch with {product-title}, see xref:../../observability/logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store]. endif::[] include::modules/ossm-cr-threescale.adoc[leveloffset=+1] diff --git a/service_mesh/v1x/preparing-ossm-installation.adoc b/service_mesh/v1x/preparing-ossm-installation.adoc index bfa6c559b1b3..77b62212d584 100644 --- a/service_mesh/v1x/preparing-ossm-installation.adoc +++ b/service_mesh/v1x/preparing-ossm-installation.adoc @@ -42,7 +42,7 @@ include::modules/ossm-installation-activities.adoc[leveloffset=+1] ifdef::openshift-enterprise[] [WARNING] ==== -See xref:../../logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store] for details on configuring the default Jaeger parameters for Elasticsearch in a production environment. +See xref:../../observability/logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store] for details on configuring the default Jaeger parameters for Elasticsearch in a production environment. ==== == Next steps diff --git a/service_mesh/v2x/ossm-reference-jaeger.adoc b/service_mesh/v2x/ossm-reference-jaeger.adoc index 7c537712b086..afea73724a48 100644 --- a/service_mesh/v2x/ossm-reference-jaeger.adoc +++ b/service_mesh/v2x/ossm-reference-jaeger.adoc @@ -41,8 +41,8 @@ include::modules/distr-tracing-config-sampling.adoc[leveloffset=+2] include::modules/distr-tracing-config-storage.adoc[leveloffset=+2] -ifdef::openshift-enterprise,openshift-dedicated[] -For more information about configuring Elasticsearch with {product-title}, see xref:../../logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store] or xref:../../observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc[Configuring and deploying distributed tracing]. +ifdef::openshift-enterprise[] +For more information about configuring Elasticsearch with {product-title}, see xref:../../observability/logging/log_storage/logging-config-es-store.adoc#logging-config-es-store[Configuring the Elasticsearch log store] or xref:../../observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc#distr-tracing-jaeger-configuring[Configuring and deploying distributed tracing]. //TO DO For information about connecting to an external Elasticsearch instance, see xref:../../observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc#jaeger-config-external-es_jaeger-deploying[Connecting to an existing Elasticsearch instance]. endif::[] diff --git a/snippets/about-node-selectors.adoc b/snippets/about-node-selectors.adoc index 61541fb54e85..1957883470f5 100644 --- a/snippets/about-node-selectors.adoc +++ b/snippets/about-node-selectors.adoc @@ -1,7 +1,7 @@ // Snippets included in the following assemblies and modules: // // * nodes/scheduling/nodes-scheduler-node-selectors.adoc -// * logging/scheduling_resources/logging-node-selection.adoc +// * observability/logging/scheduling_resources/logging-node-selection.adoc :_mod-docs-content-type: SNIPPET diff --git a/snippets/audit-logs-default.adoc b/snippets/audit-logs-default.adoc index 29e1444dc967..45ec4ee4115e 100644 --- a/snippets/audit-logs-default.adoc +++ b/snippets/audit-logs-default.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies and modules: // -// * logging/log_collection_forwarding/configuring-log-forwarding.adoc +// * observability/logging/log_collection_forwarding/configuring-log-forwarding.adoc // // * modules/cluster-logging-elasticsearch-audit.adoc diff --git a/snippets/logging-compatibility-snip.adoc b/snippets/logging-compatibility-snip.adoc index d2d72bed1325..be76bdca0ec4 100644 --- a/snippets/logging-compatibility-snip.adoc +++ b/snippets/logging-compatibility-snip.adoc @@ -1,8 +1,8 @@ // Text snippet included in the following assemblies: // -// logging/cluster-logging-support.adoc -// logging/logging_release_notes/logging-5-7-release-notes.adoc -// logging/logging_release_notes/logging-5-8-release-notes.adoc +// * observability/logging/cluster-logging-support.adoc +// * observability/logging/logging_release_notes/logging-5-7-release-notes.adoc +// * observability/logging/logging_release_notes/logging-5-8-release-notes.adoc // // Text snippet included in the following modules: // diff --git a/snippets/logging-elastic-dep-snip.adoc b/snippets/logging-elastic-dep-snip.adoc index 55ca863f2a38..7a232dc874a7 100644 --- a/snippets/logging-elastic-dep-snip.adoc +++ b/snippets/logging-elastic-dep-snip.adoc @@ -1,6 +1,6 @@ // Text snippet included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-deploying.adoc // // Text snippet included in the following modules: // diff --git a/snippets/logging-fluentd-dep-snip.adoc b/snippets/logging-fluentd-dep-snip.adoc index 1b5e3389bc14..da8022c318fa 100644 --- a/snippets/logging-fluentd-dep-snip.adoc +++ b/snippets/logging-fluentd-dep-snip.adoc @@ -1,6 +1,6 @@ // Text snippet included in the following assemblies: // -// * logging/cluster-logging-deploying.adoc +// * observability/logging/cluster-logging-deploying.adoc // // Text snippet included in the following modules: // diff --git a/snippets/logging-kibana-dep-snip.adoc b/snippets/logging-kibana-dep-snip.adoc index 859935220381..c1aa6614d17a 100644 --- a/snippets/logging-kibana-dep-snip.adoc +++ b/snippets/logging-kibana-dep-snip.adoc @@ -1,6 +1,6 @@ // Text snippet included in the following assemblies: // -// logging/cluster-logging.adoc +// * observability/logging/cluster-logging.adoc // // Text snippet included in the following modules: // diff --git a/snippets/logging-stable-updates-snip.adoc b/snippets/logging-stable-updates-snip.adoc index d2570a2ed29a..ca8d0e33997f 100644 --- a/snippets/logging-stable-updates-snip.adoc +++ b/snippets/logging-stable-updates-snip.adoc @@ -1,7 +1,7 @@ // Text snippet included in the following assemblies: // -// logging/logging_release_notes/logging-5-7-release-notes.adoc -// logging/logging_release_notes/logging-5-8-release-notes.adoc +// * observability/logging/logging_release_notes/logging-5-7-release-notes.adoc +// * observability/logging/logging_release_notes/logging-5-8-release-notes.adoc // // Text snippet included in the following modules: // logging-loki-gui-install.adoc diff --git a/snippets/logging-supported-config-snip.adoc b/snippets/logging-supported-config-snip.adoc index 9ed256e6f7c8..222e20106d90 100644 --- a/snippets/logging-supported-config-snip.adoc +++ b/snippets/logging-supported-config-snip.adoc @@ -1,6 +1,6 @@ // Text snippet included in the following assemblies: // -// logging/cluster-logging-support.adoc +// * observability/logging/cluster-logging-support.adoc // // Text snippet included in the following modules: // diff --git a/support/index.adoc b/support/index.adoc index aa60dd222cc2..15b1f1060541 100644 --- a/support/index.adoc +++ b/support/index.adoc @@ -125,11 +125,11 @@ endif::openshift-rosa,openshift-dedicated[] ** Investigate why user-defined metrics are unavailable. ** Determine why Prometheus is consuming a lot of disk space. -* xref:../logging/cluster-logging.adoc#cluster-logging[Logging issues]: A cluster administrator can follow the procedures in the "Support" and "Troubleshooting logging" sections to resolve logging issues: +* xref:../observability/logging/cluster-logging.adoc#cluster-logging[Logging issues]: A cluster administrator can follow the procedures in the "Support" and "Troubleshooting logging" sections to resolve logging issues: -** xref:../logging/troubleshooting/cluster-logging-cluster-status.adoc#cluster-logging-clo-status_cluster-logging-cluster-status[Viewing the status of the {clo}]. -** xref:../logging/troubleshooting/cluster-logging-cluster-status.adoc#cluster-logging-clo-status-comp_cluster-logging-cluster-status[Viewing the status of {logging} components]. -** xref:../logging/troubleshooting/troubleshooting-logging-alerts.adoc#troubleshooting-logging-alerts[Troubleshooting logging alerts]. -** xref:../logging/cluster-logging-support.adoc#cluster-logging-must-gather-collecting_cluster-logging-support[Collecting information about your logging environment by using the `oc adm must-gather` command]. +** xref:../observability/logging/troubleshooting/cluster-logging-cluster-status.adoc#cluster-logging-clo-status_cluster-logging-cluster-status[Viewing the status of the {clo}]. +** xref:../observability/logging/troubleshooting/cluster-logging-cluster-status.adoc#cluster-logging-clo-status-comp_cluster-logging-cluster-status[Viewing the status of {logging} components]. +** xref:../observability/logging/troubleshooting/troubleshooting-logging-alerts.adoc#troubleshooting-logging-alerts[Troubleshooting logging alerts]. +** xref:../observability/logging/cluster-logging-support.adoc#cluster-logging-must-gather-collecting_cluster-logging-support[Collecting information about your logging environment by using the `oc adm must-gather` command]. * xref:../support/troubleshooting/diagnosing-oc-issues.adoc#diagnosing-oc-issues[{oc-first} issues]: Investigate {oc-first} issues by increasing the log level. diff --git a/virt/install/preparing-cluster-for-virt.adoc b/virt/install/preparing-cluster-for-virt.adoc index 81d0d6e4b2a4..75e0ca7c7817 100644 --- a/virt/install/preparing-cluster-for-virt.adoc +++ b/virt/install/preparing-cluster-for-virt.adoc @@ -40,7 +40,7 @@ You can use the following platforms with {VirtProductName}: ifndef::openshift-rosa,openshift-dedicated[] * On-premise bare metal servers. See xref:../../installing/installing_bare_metal/preparing-to-install-on-bare-metal.adoc#virt-planning-bare-metal-cluster-for-ocp-virt_preparing-to-install-on-bare-metal[Planning a bare metal cluster for {VirtProductName}]. -* Amazon Web Services bare metal instances. See xref:../../installing/installing_aws/installing-aws-customizations.html#installing-aws-customizations[Installing a cluster on AWS with customizations]. +* Amazon Web Services bare metal instances. See xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[Installing a cluster on AWS with customizations]. //See link:https://access.redhat.com/articles/6409731[Deploy {VirtProductName} on AWS metal instance types]. // seems outdated with references to OCS - remove? * {ibm-cloud-name} Bare Metal Servers. See link:https://access.redhat.com/articles/6738731[Deploy {VirtProductName} on {ibm-cloud-name} Bare Metal nodes]. diff --git a/virt/support/virt-troubleshooting.adoc b/virt/support/virt-troubleshooting.adoc index 9d152a76fdf8..264b5ede11f4 100644 --- a/virt/support/virt-troubleshooting.adoc +++ b/virt/support/virt-troubleshooting.adoc @@ -83,8 +83,8 @@ include::modules/virt-loki-log-queries.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources for LokiStack and LogQL -* xref:../../logging/log_storage/about-log-storage.adoc#about-log-storage[About log storage] -* xref:../../logging/log_storage/installing-log-storage.adoc#cluster-logging-loki-deploy_installing-log-storage[Deploying the LokiStack] +* xref:../../observability/logging/log_storage/about-log-storage.adoc#about-log-storage[About log storage] +* xref:../../observability/logging/log_storage/installing-log-storage.adoc#cluster-logging-loki-deploy_installing-log-storage[Deploying the LokiStack] * link:https://grafana.com/docs/loki/latest/logql/log_queries/[LogQL log queries] in the Grafana documentation include::modules/virt-common-error-messages.adoc[leveloffset=+1] diff --git a/welcome/about-hcp.adoc b/welcome/about-hcp.adoc index 0acf8ae8c01f..4c3aeff28fdb 100644 --- a/welcome/about-hcp.adoc +++ b/welcome/about-hcp.adoc @@ -53,7 +53,7 @@ Use the following sections to find content to help you learn about and use {hcp- | xref:../architecture/rosa-architecture-models.adoc#rosa-architecture-models[{hcp-title} architecture] | xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[Installing {hcp-title}] -| xref:../logging/cluster-logging.adoc#cluster-logging[Logging] +| xref:../observability/logging/cluster-logging.adoc#cluster-logging[Logging] | xref:../support/index.adoc#support-overview[Getting Support] | link:https://learn.openshift.com/?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[OpenShift Interactive Learning Portal] diff --git a/welcome/index.adoc b/welcome/index.adoc index 2ce0cdef8838..4dbb69f4e269 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -288,7 +288,7 @@ Use the Cluster Version Operator (CVO) to upgrade your {product-title} cluster. === Observe a cluster -- **xref:../logging/cluster-logging.adoc#cluster-logging[OpenShift Logging]**: Learn about logging and configure different logging components, such as log storage, log collectors, and the logging web console plugin. +- **xref:../observability/logging/cluster-logging.adoc#cluster-logging[OpenShift Logging]**: Learn about logging and configure different logging components, such as log storage, log collectors, and the logging web console plugin. - **xref:../observability/distr_tracing/distr_tracing_arch/distr-tracing-architecture.adoc#distr-tracing-architecture[Red Hat OpenShift distributed tracing platform]**: Store and visualize large volumes of requests passing through distributed systems, across the whole stack of microservices, and under heavy loads. Use the distributed tracing platform for monitoring distributed transactions, gathering insights into your instrumented services, network profiling, performance and latency optimization, root cause analysis, and troubleshooting the interaction between components in modern cloud-native microservices-based applications. diff --git a/welcome/learn_more_about_openshift.adoc b/welcome/learn_more_about_openshift.adoc index 684b2fb65a9e..c325385c7b7c 100644 --- a/welcome/learn_more_about_openshift.adoc +++ b/welcome/learn_more_about_openshift.adoc @@ -47,7 +47,7 @@ Use the following sections to find content to help you learn about and use {prod | xref:../architecture/architecture.adoc#architecture[Architecture] | xref:../post_installation_configuration/machine-configuration-tasks.adoc#post-install-machine-configuration-tasks[Post installation configuration] -| xref:../logging/cluster-logging.adoc#cluster-logging[Logging] +| xref:../observability/logging/cluster-logging.adoc#cluster-logging[Logging] | link:https://access.redhat.com/articles/4217411[OpenShift Knowledgebase articles] | link:https://learn.openshift.com/?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[OpenShift Interactive Learning Portal] @@ -88,7 +88,7 @@ Use the following sections to find content to help you learn about and use {prod | link:https://access.redhat.com/articles/4217411[OpenShift Knowledgebase articles] | -| xref:../logging/cluster-logging.adoc#cluster-logging[Logging] +| xref:../observability/logging/cluster-logging.adoc#cluster-logging[Logging] | link:https://access.redhat.com/support/policy/updates/openshift#ocp4_phases[{product-title} Life Cycle] |