Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OBSDOCS-919: move COO docs to Observability folder #74679

Merged
merged 1 commit into from
May 27, 2024
Merged

OBSDOCS-919: move COO docs to Observability folder #74679

merged 1 commit into from
May 27, 2024
+18 −17

Conversation

bburt-rh
Copy link
Contributor

@bburt-rh bburt-rh commented Apr 15, 2024 •
edited

Version(s): 4.12+

Issue: https://issues.redhat.com/browse/OBSDOCS-919

Link to docs preview:
https://74679--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/cluster_observability_operator/cluster-observability-operator-overview

QE review:

  • N/A - Only moves content in the topic map

Additional information:
This PR moves the Cluster Observability Operator content from under the Monitoring book up one level to under the Observability book.

I will put in redirect requests before merging this PR.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 15, 2024 •
edited by openshift-ci bot

@bburt-rh: This pull request references OBSDOCS-919 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): 4.12+

Issue: https://issues.redhat.com/browse/OBSDOCS-919

Link to docs preview:

QE review:

  • N/A - Only moves content in the topic map

Additional information:
This PR moves the Cluster Observability Operator content from under the Monitoring book up one level to under the Observability book.

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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 15, 2024
@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 15, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Apr 15, 2024 •
edited

🤖 Thu May 16 15:19:56 - Prow CI generated the docs preview:

https://74679--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/cluster_observability_operator/cluster-observability-operator-overview.html
https://74679--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/cluster_observability_operator/cluster-observability-operator-release-notes.html
https://74679--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/cluster_observability_operator/configuring-the-cluster-observability-operator-to-monitor-a-service.html
https://74679--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/cluster_observability_operator/installing-the-cluster-observability-operator.html

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 15, 2024 •
edited by openshift-ci bot

@bburt-rh: This pull request references OBSDOCS-919 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): 4.12+

Issue: https://issues.redhat.com/browse/OBSDOCS-919

Link to docs preview:
https://74679--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/cluster_observability_operator/cluster-observability-operator-overview

QE review:

  • N/A - Only moves content in the topic map

Additional information:
This PR moves the Cluster Observability Operator content from under the Monitoring book up one level to under the Observability book.

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.

@bburt-rh bburt-rh force-pushed the OBSDOCS-919-move-COO-docs-to-observability-folder branch from 1b17cc4 to 4cea788 Compare April 15, 2024 21:31
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 15, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 27, 2024
@bburt-rh bburt-rh force-pushed the OBSDOCS-919-move-COO-docs-to-observability-folder branch from 4cea788 to 2995316 Compare April 29, 2024 17:04
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 29, 2024
@bburt-rh bburt-rh added this to the Continuous Release milestone Apr 29, 2024
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 29, 2024
@bburt-rh bburt-rh force-pushed the OBSDOCS-919-move-COO-docs-to-observability-folder branch 3 times, most recently from 26ffac4 to 6099a76 Compare April 29, 2024 17:41
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 29, 2024
@bburt-rh bburt-rh force-pushed the OBSDOCS-919-move-COO-docs-to-observability-folder branch 2 times, most recently from 19168c4 to 2d817e8 Compare April 29, 2024 17:46
@bburt-rh
Copy link
Contributor Author

/retest

@bburt-rh bburt-rh force-pushed the OBSDOCS-919-move-COO-docs-to-observability-folder branch 2 times, most recently from 7c9798e to bcc68ac Compare April 29, 2024 18:22
@bburt-rh bburt-rh added the peer-review-needed Signifies that the peer review team needs to review this PR label May 21, 2024
@michaelryanpeter
Copy link
Contributor

/label peer-review-in-progress

@openshift-ci openshift-ci bot added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label May 21, 2024
@michaelryanpeter
Copy link
Contributor

/label peer-review-done
/remove-label peer-review-in-progress
/remove-label peer-review-needed

@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR peer-review-needed Signifies that the peer review team needs to review this PR labels May 21, 2024
bscott-rh added a commit to bscott-rh/openshift-docs that referenced this pull request May 22, 2024
@bscott-rh
COO redirects per openshift#74679
760e3e1
@bscott-rh bscott-rh mentioned this pull request May 22, 2024
Merged
bscott-rh added a commit that referenced this pull request May 23, 2024
@bscott-rh
Merge pull request #76378 from bscott-rh/coo-redirects
8bed820 
COO redirects per #74679
@gaurav-nelson gaurav-nelson merged commit 0e069a3 into openshift:main May 27, 2024
3 checks passed
@gaurav-nelson
Copy link
Contributor

/cherrypick enterprise-4.12

@gaurav-nelson
Copy link
Contributor

/cherrypick enterprise-4.13

@gaurav-nelson
Copy link
Contributor

/cherrypick enterprise-4.14

@gaurav-nelson
Copy link
Contributor

/cherrypick enterprise-4.15

@gaurav-nelson
Copy link
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot
Copy link

@gaurav-nelson: #74679 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-919-move-COO-docs-to-observability-folder
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in observability/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/cluster_observability_operator/_attributes
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _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-919-move-COO-docs-to-observability-folder
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-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

@gaurav-nelson: #74679 failed to apply on top of branch "enterprise-4.13":

Applying: OBSDOCS-919-move-COO-docs-to-observability-folder
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in observability/cluster_observability_operator/snippets
CONFLICT (content): Merge conflict in observability/cluster_observability_operator/modules
CONFLICT (content): Merge conflict in observability/cluster_observability_operator/images
CONFLICT (content): Merge conflict in observability/cluster_observability_operator/_attributes
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _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-919-move-COO-docs-to-observability-folder
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-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

@gaurav-nelson: new pull request created: #76492

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

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 27, 2024
Merged
@openshift-cherrypick-robot
Copy link

@gaurav-nelson: new pull request created: #76493

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

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 27, 2024
Merged
@openshift-cherrypick-robot
Copy link

@gaurav-nelson: new pull request created: #76494

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

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 27, 2024
Merged
@gaurav-nelson
Copy link
Contributor

@bburt-rh Can you please do manual cherrypicks for 4.12 & 4.13 ? I'm not familiar with these docs.

This was referenced May 28, 2024
Merged
Merged
Merged
Merged
apurvabhide17 pushed a commit to apurvabhide17/openshift-docs that referenced this pull request Jun 3, 2024
@bscott-rh @apurvabhide17
COO redirects per openshift#74679
9c0d6a0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ocpdocs-vale-bot ocpdocs-vale-bot ocpdocs-vale-bot left review comments

Assignees
No one assigned
Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@bburt-rh @openshift-ci-robot @ocpdocs-previewbot @michaelryanpeter @gaurav-nelson @openshift-cherrypick-robot @ocpdocs-vale-bot @openshift-merge-robot