Skip to content

Conversation

gabriel-rh
Copy link
Contributor

@gabriel-rh gabriel-rh commented Oct 16, 2025

Version(s):
4.19-

Issue:
OBSDOCS-2572

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 16, 2025
@ocpdocs-previewbot
Copy link

Copy link

openshift-ci bot commented Oct 16, 2025

@gabriel-rh: 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-sigs/prow repository. I understand the commands that are listed here.

@gabriel-rh gabriel-rh merged commit fc2d772 into openshift:enterprise-4.19 Oct 16, 2025
2 checks passed
@gabriel-rh
Copy link
Contributor Author

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@gabriel-rh: #100644 failed to apply on top of branch "enterprise-4.18":

Applying: OBSDOCS-2572 Remove COO content 4.19
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	modules/coo-distributed-tracing-ui-plugin-using.adoc
M	modules/coo-troubleshooting-ui-plugin-using.adoc
M	observability/cluster_observability_operator/cluster-observability-operator-overview.adoc
M	observability/cluster_observability_operator/cluster-observability-operator-release-notes.adoc
M	observability/cluster_observability_operator/ui_plugins/dashboard-ui-plugin.adoc
M	observability/cluster_observability_operator/ui_plugins/distributed-tracing-ui-plugin.adoc
M	observability/cluster_observability_operator/ui_plugins/logging-ui-plugin.adoc
M	observability/cluster_observability_operator/ui_plugins/monitoring-ui-plugin.adoc
M	observability/cluster_observability_operator/ui_plugins/observability-ui-plugins-overview.adoc
Falling back to patching base and 3-way merge...
Removing observability/cluster_observability_operator/ui_plugins/troubleshooting-ui-plugin.adoc
Removing observability/cluster_observability_operator/ui_plugins/snippets
CONFLICT (modify/delete): observability/cluster_observability_operator/ui_plugins/observability-ui-plugins-overview.adoc deleted in OBSDOCS-2572 Remove COO content 4.19 and modified in HEAD. Version HEAD of observability/cluster_observability_operator/ui_plugins/observability-ui-plugins-overview.adoc left in tree.
CONFLICT (modify/delete): observability/cluster_observability_operator/ui_plugins/monitoring-ui-plugin.adoc deleted in OBSDOCS-2572 Remove COO content 4.19 and modified in HEAD. Version HEAD of observability/cluster_observability_operator/ui_plugins/monitoring-ui-plugin.adoc left in tree.
Removing observability/cluster_observability_operator/ui_plugins/modules
CONFLICT (modify/delete): observability/cluster_observability_operator/ui_plugins/logging-ui-plugin.adoc deleted in OBSDOCS-2572 Remove COO content 4.19 and modified in HEAD. Version HEAD of observability/cluster_observability_operator/ui_plugins/logging-ui-plugin.adoc left in tree.
Removing observability/cluster_observability_operator/ui_plugins/images
CONFLICT (modify/delete): observability/cluster_observability_operator/ui_plugins/distributed-tracing-ui-plugin.adoc deleted in OBSDOCS-2572 Remove COO content 4.19 and modified in HEAD. Version HEAD of observability/cluster_observability_operator/ui_plugins/distributed-tracing-ui-plugin.adoc left in tree.
CONFLICT (modify/delete): observability/cluster_observability_operator/ui_plugins/dashboard-ui-plugin.adoc deleted in OBSDOCS-2572 Remove COO content 4.19 and modified in HEAD. Version HEAD of observability/cluster_observability_operator/ui_plugins/dashboard-ui-plugin.adoc left in tree.
Removing observability/cluster_observability_operator/ui_plugins/_attributes
Removing observability/cluster_observability_operator/installing-the-cluster-observability-operator.adoc
Removing observability/cluster_observability_operator/configuring-the-cluster-observability-operator-to-monitor-a-service.adoc
CONFLICT (modify/delete): observability/cluster_observability_operator/cluster-observability-operator-release-notes.adoc deleted in OBSDOCS-2572 Remove COO content 4.19 and modified in HEAD. Version HEAD of observability/cluster_observability_operator/cluster-observability-operator-release-notes.adoc left in tree.
Auto-merging observability/cluster_observability_operator/cluster-observability-operator-overview.adoc
CONFLICT (content): Merge conflict in observability/cluster_observability_operator/cluster-observability-operator-overview.adoc
Removing observability/cluster_observability_operator/api-observability-package.adoc
Removing observability/cluster_observability_operator/api-monitoring-package.adoc
Removing modules/monitoring-validating-a-monitoringstack-for-cluster-observability-operator.adoc
Removing modules/monitoring-uninstalling-cluster-observability-operator-using-the-web-console.adoc
Removing modules/monitoring-understanding-the-cluster-observability-operator.adoc
Removing modules/monitoring-specifying-how-a-service-is-monitored-by-cluster-observability-operator.adoc
Removing modules/monitoring-scrape-targets-in-multiple-namespaces.adoc
Removing modules/monitoring-installing-cluster-observability-operator-using-the-web-console.adoc
Removing modules/monitoring-deploying-a-sample-service-for-cluster-observability-operator.adoc
Removing modules/monitoring-creating-a-monitoringstack-object-for-cluster-observability-operator.adoc
Removing modules/coo-versus-default-ocp-monitoring.adoc
CONFLICT (modify/delete): modules/coo-troubleshooting-ui-plugin-using.adoc deleted in OBSDOCS-2572 Remove COO content 4.19 and modified in HEAD. Version HEAD of modules/coo-troubleshooting-ui-plugin-using.adoc left in tree.
Removing modules/coo-troubleshooting-ui-plugin-install.adoc
Removing modules/coo-troubleshooting-ui-plugin-creating-alert.adoc
Removing modules/coo-target-users.adoc
Removing modules/coo-server-side-apply.adoc
Removing modules/coo-monitoring-ui-plugin-install.adoc
Removing modules/coo-logging-ui-plugin-install.adoc
Removing modules/coo-incident-detection-using.adoc
Removing modules/coo-incident-detection-overview.adoc
CONFLICT (modify/delete): modules/coo-distributed-tracing-ui-plugin-using.adoc deleted in OBSDOCS-2572 Remove COO content 4.19 and modified in HEAD. Version HEAD of modules/coo-distributed-tracing-ui-plugin-using.adoc left in tree.
Removing modules/coo-distributed-tracing-ui-plugin-install.adoc
Removing modules/coo-dashboard-ui-plugin-install.adoc
Removing modules/coo-dashboard-ui-plugin-configure.adoc
Removing modules/coo-advantages.adoc
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
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-2572 Remove COO content 4.19

In response to this:

/cherrypick enterprise-4.18

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants