OBSDOCS-692: Update Monitoring doc links and topic map position

[eromanova97]

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-692

Link to docs preview: https://74104--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/monitoring/monitoring-overview

QE review:

• N/A

Additional information:
This PR changes the topic map file, turns the assembly directories for monitoring into subdirectories of observability, and updates the affected xrefs.

[openshift-ci-robot]

@eromanova97: This pull request references OBSDOCS-692 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-692

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[ocpdocs-previewbot]

🤖 Wed Apr 10 18:06:11 - Prow CI generated the docs preview:
https://74104--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

[openshift-ci-robot]

@eromanova97: This pull request references OBSDOCS-692 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-692

Link to docs preview:

QE review:

• N/A

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@eromanova97: This pull request references OBSDOCS-692 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-692

Link to docs preview:

QE review:

• N/A

Additional information:
This PR changes the topic map file, turns the assembly directories for monitoring into subdirectories of observability, and updates the affected xrefs.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@eromanova97: This pull request references OBSDOCS-692 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-692

Link to docs preview: https://74104--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/monitoring/monitoring-overview

QE review:

• N/A

Additional information:
This PR changes the topic map file, turns the assembly directories for monitoring into subdirectories of observability, and updates the affected xrefs.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[eromanova97]

/retest

[bburt-rh]

/retest

[bburt-rh]

/retest

[openshift-ci]

@eromanova97: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[bburt-rh]

/cherrypick enterprise-4.12

[bburt-rh]

/cherrypick enterprise-4.13

[bburt-rh]

/cherrypick enterprise-4.14

[bburt-rh]

/cherrypick enterprise-4.15

[bburt-rh]

/cherrypick enterprise-4.16

[openshift-cherrypick-robot]

@bburt-rh: #74104 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-692: Update Monitoring doc links and topic map position
error: mode change for monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc, which is not in current HEAD
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-692: Update Monitoring doc links and topic map position
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@bburt-rh: #74104 failed to apply on top of branch "enterprise-4.13":

Applying: OBSDOCS-692: Update Monitoring doc links and topic map position
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc
M	backup_and_restore/application_backup_and_restore/troubleshooting.adoc
M	getting_started/openshift-overview.adoc
M	installing/installing-preparing.adoc
M	installing/validating-an-installation.adoc
M	machine_management/creating-infrastructure-machinesets.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
A	modules/creating-cluster-with-aws-kms-key.adoc
A	modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
M	modules/monitoring-configurable-monitoring-components.adoc
M	modules/monitoring-configuring-alert-receivers.adoc
M	modules/monitoring-creating-new-alerting-rules.adoc
M	modules/monitoring-default-monitoring-components.adoc
M	modules/monitoring-default-monitoring-targets.adoc
M	modules/monitoring-editing-silences.adoc
M	modules/monitoring-expiring-silences.adoc
M	modules/monitoring-managing-core-platform-alerting-rules.adoc
M	modules/monitoring-managing-silences.adoc
M	modules/monitoring-modifying-core-platform-alerting-rules.adoc
M	modules/monitoring-silencing-alerts.adoc
A	modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc
A	modules/monitoring-tips-for-optimizing-alerting-rules-for-core-platform-monitoring.adoc
M	monitoring/configuring-the-monitoring-stack.adoc
M	monitoring/managing-alerts.adoc
M	monitoring/reviewing-monitoring-dashboards.adoc
M	networking/ingress-operator.adoc
M	networking/metallb/metallb-troubleshoot-support.adoc
A	networking/ptp/using-ptp-events.adoc
M	observability/index.adoc
M	observability/network_observability/metrics-alerts-dashboards.adoc
M	observability/network_observability/network-observability-operator-monitoring.adoc
A	observability/power_monitoring/visualizing-power-monitoring-metrics.adoc
M	post_installation_configuration/cluster-tasks.adoc
M	rosa_getting_started/rosa-quickstart-guide-ui.adoc
M	rosa_release_notes/rosa-release-notes.adoc.git/rebase-apply/patch:2118: trailing whitespace.
For more information, see xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. 
warning: 1 line adds whitespace errors.

M	security/cert_manager_operator/cert-manager-monitoring.adoc
M	service_mesh/v2x/ossm-observability.adoc
M	support/remote_health_monitoring/about-remote-health-monitoring.adoc
A	virt/monitoring/virt-exposing-custom-metrics-for-vms.adoc
A	virt/monitoring/virt-monitoring-overview.adoc
A	virt/monitoring/virt-prometheus-queries.adoc
A	virt/monitoring/virt-runbooks.adoc
M	virt/support/virt-collecting-virt-data.adoc
A	welcome/about-hcp.adoc
M	welcome/index.adoc
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
Auto-merging welcome/index.adoc
CONFLICT (modify/delete): welcome/about-hcp.adoc deleted in HEAD and modified in OBSDOCS-692: Update Monitoring doc links and topic map position. Version OBSDOCS-692: Update Monitoring doc links and topic map position of welcome/about-hcp.adoc left in tree.
Auto-merging virt/support/virt-runbooks.adoc
CONFLICT (content): Merge conflict in virt/support/virt-runbooks.adoc
Auto-merging virt/support/virt-collecting-virt-data.adoc
CONFLICT (content): Merge conflict in virt/support/virt-collecting-virt-data.adoc
Auto-merging virt/support/monitoring/virt-prometheus-queries.adoc
CONFLICT (content): Merge conflict in virt/support/monitoring/virt-prometheus-queries.adoc
Auto-merging virt/support/monitoring/virt-exposing-custom-metrics-for-vms.adoc
CONFLICT (content): Merge conflict in virt/support/monitoring/virt-exposing-custom-metrics-for-vms.adoc
CONFLICT (modify/delete): virt/monitoring/virt-monitoring-overview.adoc deleted in HEAD and modified in OBSDOCS-692: Update Monitoring doc links and topic map position. Version OBSDOCS-692: Update Monitoring doc links and topic map position of virt/monitoring/virt-monitoring-overview.adoc left in tree.
Auto-merging support/remote_health_monitoring/about-remote-health-monitoring.adoc
Auto-merging service_mesh/v2x/ossm-observability.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/ossm-observability.adoc
Auto-merging security/cert_manager_operator/cert-manager-monitoring.adoc
Auto-merging rosa_release_notes/rosa-release-notes.adoc
Auto-merging rosa_getting_started/rosa-quickstart-guide-ui.adoc
Auto-merging post_installation_configuration/cluster-tasks.adoc
CONFLICT (modify/delete): observability/power_monitoring/visualizing-power-monitoring-metrics.adoc deleted in HEAD and modified in OBSDOCS-692: Update Monitoring doc links and topic map position. Version OBSDOCS-692: Update Monitoring doc links and topic map position of observability/power_monitoring/visualizing-power-monitoring-metrics.adoc left in tree.
Auto-merging observability/network_observability/network-observability-operator-monitoring.adoc
CONFLICT (content): Merge conflict in observability/network_observability/network-observability-operator-monitoring.adoc
Auto-merging observability/network_observability/metrics-alerts-dashboards.adoc
CONFLICT (content): Merge conflict in observability/network_observability/metrics-alerts-dashboards.adoc
CONFLICT (content): Merge conflict in observability/monitoring/snippets
Auto-merging observability/monitoring/reviewing-monitoring-dashboards.adoc
CONFLICT (content): Merge conflict in observability/monitoring/modules
Auto-merging observability/monitoring/managing-alerts.adoc
CONFLICT (content): Merge conflict in observability/monitoring/managing-alerts.adoc
CONFLICT (content): Merge conflict in observability/monitoring/images
Auto-merging observability/monitoring/configuring-the-monitoring-stack.adoc
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/_attributes
CONFLICT (content): Merge conflict in observability/monitoring/_attributes
Auto-merging observability/index.adoc
CONFLICT (modify/delete): networking/ptp/using-ptp-events.adoc deleted in HEAD and modified in OBSDOCS-692: Update Monitoring doc links and topic map position. Version OBSDOCS-692: Update Monitoring doc links and topic map position of networking/ptp/using-ptp-events.adoc left in tree.
Auto-merging networking/metallb/metallb-troubleshoot-support.adoc
Auto-merging networking/ingress-operator.adoc
CONFLICT (modify/delete): modules/monitoring-tips-for-optimizing-alerting-rules-for-core-platform-monitoring.adoc deleted in HEAD and modified in OBSDOCS-692: Update Monitoring doc links and topic map position. Version OBSDOCS-692: Update Monitoring doc links and topic map position of modules/monitoring-tips-for-optimizing-alerting-rules-for-core-platform-monitoring.adoc left in tree.
CONFLICT (modify/delete): modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc deleted in HEAD and modified in OBSDOCS-692: Update Monitoring doc links and topic map position. Version OBSDOCS-692: Update Monitoring doc links and topic map position of modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc left in tree.
Auto-merging modules/monitoring-silencing-alerts.adoc
Auto-merging modules/monitoring-modifying-core-platform-alerting-rules.adoc
Auto-merging modules/monitoring-managing-silences.adoc
Auto-merging modules/monitoring-managing-core-platform-alerting-rules.adoc
Auto-merging modules/monitoring-expiring-silences.adoc
Auto-merging modules/monitoring-editing-silences.adoc
Auto-merging modules/monitoring-default-monitoring-targets.adoc
Auto-merging modules/monitoring-default-monitoring-components.adoc
Auto-merging modules/monitoring-creating-new-alerting-rules.adoc
Auto-merging modules/monitoring-configuring-alert-receivers.adoc
Auto-merging modules/monitoring-configurable-monitoring-components.adoc
CONFLICT (modify/delete): modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc deleted in HEAD and modified in OBSDOCS-692: Update Monitoring doc links and topic map position. Version OBSDOCS-692: Update Monitoring doc links and topic map position of modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc left in tree.
CONFLICT (modify/delete): modules/creating-cluster-with-aws-kms-key.adoc deleted in HEAD and modified in OBSDOCS-692: Update Monitoring doc links and topic map position. Version OBSDOCS-692: Update Monitoring doc links and topic map position of modules/creating-cluster-with-aws-kms-key.adoc left in tree.
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging machine_management/creating-infrastructure-machinesets.adoc
Auto-merging installing/validating-an-installation.adoc
Auto-merging installing/installing-preparing.adoc
Auto-merging getting_started/openshift-overview.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-692: Update Monitoring doc links and topic map position
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@bburt-rh: #74104 failed to apply on top of branch "enterprise-4.14":

Applying: OBSDOCS-692: Update Monitoring doc links and topic map position
.git/rebase-apply/patch:2118: trailing whitespace.
For more information, see xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_rosa.yml
M	backup_and_restore/application_backup_and_restore/troubleshooting.adoc
M	installing/installing-preparing.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/creating-cluster-with-aws-kms-key.adoc
M	modules/monitoring-default-monitoring-components.adoc
M	modules/monitoring-default-monitoring-targets.adoc
M	monitoring/configuring-the-monitoring-stack.adoc
M	networking/metallb/metallb-troubleshoot-support.adoc
M	rosa_release_notes/rosa-release-notes.adoc
M	security/cert_manager_operator/cert-manager-monitoring.adoc
M	virt/monitoring/virt-runbooks.adoc
M	virt/support/virt-collecting-virt-data.adoc
A	welcome/about-hcp.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
CONFLICT (modify/delete): welcome/about-hcp.adoc deleted in HEAD and modified in OBSDOCS-692: Update Monitoring doc links and topic map position. Version OBSDOCS-692: Update Monitoring doc links and topic map position of welcome/about-hcp.adoc left in tree.
Auto-merging virt/support/virt-collecting-virt-data.adoc
Auto-merging virt/monitoring/virt-runbooks.adoc
CONFLICT (content): Merge conflict in virt/monitoring/virt-runbooks.adoc
Auto-merging security/cert_manager_operator/cert-manager-monitoring.adoc
Auto-merging rosa_release_notes/rosa-release-notes.adoc
CONFLICT (content): Merge conflict in observability/monitoring/snippets
CONFLICT (content): Merge conflict in observability/monitoring/modules
CONFLICT (content): Merge conflict in observability/monitoring/images
Auto-merging observability/monitoring/configuring-the-monitoring-stack.adoc
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/_attributes
CONFLICT (content): Merge conflict in observability/monitoring/_attributes
Auto-merging networking/metallb/metallb-troubleshoot-support.adoc
Auto-merging modules/monitoring-default-monitoring-targets.adoc
Auto-merging modules/monitoring-default-monitoring-components.adoc
Auto-merging modules/creating-cluster-with-aws-kms-key.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging installing/installing-preparing.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-692: Update Monitoring doc links and topic map position
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@bburt-rh: #74104 failed to apply on top of branch "enterprise-4.15":

Applying: OBSDOCS-692: Update Monitoring doc links and topic map position
.git/rebase-apply/patch:2118: trailing whitespace.
For more information, see xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	backup_and_restore/application_backup_and_restore/troubleshooting.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/monitoring-default-monitoring-targets.adoc
M	networking/metallb/metallb-troubleshoot-support.adoc
M	osd_getting_started/osd-getting-started.adoc
M	rosa_getting_started/rosa-getting-started.adoc
M	rosa_getting_started/rosa-quickstart-guide-ui.adoc
M	virt/monitoring/virt-runbooks.adoc
M	welcome/about-hcp.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/about-hcp.adoc
Auto-merging virt/monitoring/virt-runbooks.adoc
CONFLICT (content): Merge conflict in virt/monitoring/virt-runbooks.adoc
Auto-merging rosa_getting_started/rosa-quickstart-guide-ui.adoc
Auto-merging rosa_getting_started/rosa-getting-started.adoc
Auto-merging osd_getting_started/osd-getting-started.adoc
CONFLICT (content): Merge conflict in observability/monitoring/snippets
CONFLICT (content): Merge conflict in observability/monitoring/modules
CONFLICT (content): Merge conflict in observability/monitoring/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/_attributes
CONFLICT (content): Merge conflict in observability/monitoring/_attributes
Auto-merging networking/metallb/metallb-troubleshoot-support.adoc
Auto-merging modules/monitoring-default-monitoring-targets.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-692: Update Monitoring doc links and topic map position
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@bburt-rh: #74104 failed to apply on top of branch "enterprise-4.16":

Applying: OBSDOCS-692: Update Monitoring doc links and topic map position
.git/rebase-apply/patch:2118: trailing whitespace.
For more information, see xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	backup_and_restore/application_backup_and_restore/troubleshooting.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/monitoring-default-monitoring-targets.adoc
M	networking/metallb/metallb-troubleshoot-support.adoc
M	osd_getting_started/osd-getting-started.adoc
M	rosa_getting_started/rosa-getting-started.adoc
M	rosa_getting_started/rosa-quickstart-guide-ui.adoc
M	virt/monitoring/virt-runbooks.adoc
M	welcome/about-hcp.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
Auto-merging welcome/about-hcp.adoc
Auto-merging virt/monitoring/virt-runbooks.adoc
CONFLICT (content): Merge conflict in virt/monitoring/virt-runbooks.adoc
Auto-merging rosa_getting_started/rosa-quickstart-guide-ui.adoc
Auto-merging rosa_getting_started/rosa-getting-started.adoc
Auto-merging osd_getting_started/osd-getting-started.adoc
CONFLICT (content): Merge conflict in observability/monitoring/snippets
CONFLICT (content): Merge conflict in observability/monitoring/modules
CONFLICT (content): Merge conflict in observability/monitoring/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/_attributes
CONFLICT (content): Merge conflict in observability/monitoring/_attributes
Auto-merging networking/metallb/metallb-troubleshoot-support.adoc
Auto-merging modules/monitoring-default-monitoring-targets.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-692: Update Monitoring doc links and topic map position
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[bburt-rh]

/cherrypick enterprise-4.15

[openshift-cherrypick-robot]

@bburt-rh: #74104 failed to apply on top of branch "enterprise-4.15":

Applying: OBSDOCS-692: Update Monitoring doc links and topic map position
.git/rebase-apply/patch:2118: trailing whitespace.
For more information, see xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	backup_and_restore/application_backup_and_restore/troubleshooting.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/monitoring-default-monitoring-targets.adoc
M	networking/metallb/metallb-troubleshoot-support.adoc
M	osd_getting_started/osd-getting-started.adoc
M	rosa_getting_started/rosa-getting-started.adoc
M	rosa_getting_started/rosa-quickstart-guide-ui.adoc
M	virt/monitoring/virt-runbooks.adoc
M	welcome/about-hcp.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/about-hcp.adoc
Auto-merging virt/monitoring/virt-runbooks.adoc
CONFLICT (content): Merge conflict in virt/monitoring/virt-runbooks.adoc
Auto-merging rosa_getting_started/rosa-quickstart-guide-ui.adoc
Auto-merging rosa_getting_started/rosa-getting-started.adoc
Auto-merging osd_getting_started/osd-getting-started.adoc
CONFLICT (content): Merge conflict in observability/monitoring/snippets
CONFLICT (content): Merge conflict in observability/monitoring/modules
CONFLICT (content): Merge conflict in observability/monitoring/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/_attributes
CONFLICT (content): Merge conflict in observability/monitoring/_attributes
Auto-merging networking/metallb/metallb-troubleshoot-support.adoc
Auto-merging modules/monitoring-default-monitoring-targets.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-692: Update Monitoring doc links and topic map position
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[bburt-rh]

/cherrypick enterprise-4.15

[bburt-rh]

/cherrypick enterprise-4.16

[openshift-cherrypick-robot]

@bburt-rh: #74104 failed to apply on top of branch "enterprise-4.15":

Applying: OBSDOCS-692: Update Monitoring doc links and topic map position
.git/rebase-apply/patch:2118: trailing whitespace.
For more information, see xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	backup_and_restore/application_backup_and_restore/troubleshooting.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/monitoring-default-monitoring-targets.adoc
M	networking/metallb/metallb-troubleshoot-support.adoc
M	osd_getting_started/osd-getting-started.adoc
M	rosa_getting_started/rosa-getting-started.adoc
M	rosa_getting_started/rosa-quickstart-guide-ui.adoc
M	welcome/about-hcp.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/about-hcp.adoc
Auto-merging rosa_getting_started/rosa-quickstart-guide-ui.adoc
Auto-merging rosa_getting_started/rosa-getting-started.adoc
Auto-merging osd_getting_started/osd-getting-started.adoc
CONFLICT (content): Merge conflict in observability/monitoring/snippets
CONFLICT (content): Merge conflict in observability/monitoring/modules
CONFLICT (content): Merge conflict in observability/monitoring/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/_attributes
CONFLICT (content): Merge conflict in observability/monitoring/_attributes
Auto-merging networking/metallb/metallb-troubleshoot-support.adoc
Auto-merging modules/monitoring-default-monitoring-targets.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-692: Update Monitoring doc links and topic map position
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@bburt-rh: #74104 failed to apply on top of branch "enterprise-4.16":

Applying: OBSDOCS-692: Update Monitoring doc links and topic map position
.git/rebase-apply/patch:2118: trailing whitespace.
For more information, see xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	backup_and_restore/application_backup_and_restore/troubleshooting.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/monitoring-default-monitoring-targets.adoc
M	networking/metallb/metallb-troubleshoot-support.adoc
M	osd_getting_started/osd-getting-started.adoc
M	rosa_getting_started/rosa-getting-started.adoc
M	rosa_getting_started/rosa-quickstart-guide-ui.adoc
M	welcome/about-hcp.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
Auto-merging welcome/about-hcp.adoc
Auto-merging rosa_getting_started/rosa-quickstart-guide-ui.adoc
Auto-merging rosa_getting_started/rosa-getting-started.adoc
Auto-merging osd_getting_started/osd-getting-started.adoc
CONFLICT (content): Merge conflict in observability/monitoring/snippets
CONFLICT (content): Merge conflict in observability/monitoring/modules
CONFLICT (content): Merge conflict in observability/monitoring/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/_attributes
CONFLICT (content): Merge conflict in observability/monitoring/_attributes
Auto-merging networking/metallb/metallb-troubleshoot-support.adoc
Auto-merging modules/monitoring-default-monitoring-targets.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-692: Update Monitoring doc links and topic map position
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[bergerhoffer]

/cherrypick enterprise-4.16

[openshift-cherrypick-robot]

@bergerhoffer: #74104 failed to apply on top of branch "enterprise-4.16":

Applying: OBSDOCS-692: Update Monitoring doc links and topic map position
.git/rebase-apply/patch:2118: trailing whitespace.
For more information, see xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] and xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	backup_and_restore/application_backup_and_restore/troubleshooting.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/monitoring-default-monitoring-targets.adoc
M	networking/metallb/metallb-troubleshoot-support.adoc
M	osd_getting_started/osd-getting-started.adoc
M	rosa_getting_started/rosa-getting-started.adoc
M	rosa_getting_started/rosa-quickstart-guide-ui.adoc
M	welcome/about-hcp.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
Auto-merging welcome/about-hcp.adoc
Auto-merging rosa_getting_started/rosa-quickstart-guide-ui.adoc
Auto-merging rosa_getting_started/rosa-getting-started.adoc
Auto-merging osd_getting_started/osd-getting-started.adoc
CONFLICT (content): Merge conflict in observability/monitoring/snippets
CONFLICT (content): Merge conflict in observability/monitoring/modules
CONFLICT (content): Merge conflict in observability/monitoring/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/monitoring/cluster_observability_operator/_attributes
CONFLICT (content): Merge conflict in observability/monitoring/_attributes
Auto-merging networking/metallb/metallb-troubleshoot-support.adoc
Auto-merging modules/monitoring-default-monitoring-targets.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-692: Update Monitoring doc links and topic map position
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.