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-152: Additional logging Support section clean up #64444

Merged
merged 1 commit into from
Sep 12, 2023
Merged

OBSDOCS-152: Additional logging Support section clean up #64444

merged 1 commit into from
Sep 12, 2023

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Sep 6, 2023 •
edited
Loading

Version(s):
4.11+

Issue:
Related to https://issues.redhat.com/browse/OBSDOCS-152

Link to docs preview:
https://64444--docspreview.netlify.app/openshift-enterprise/latest/logging/cluster-logging-support

QE review:

  • QE has approved this change.

Additional information:
Additional clean up to follow #63952, including cleaning up duplicated content and editing.

@abrennan89 abrennan89 added peer-review-needed Signifies that the peer review team needs to review this PR do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 labels Sep 6, 2023
@abrennan89 abrennan89 added this to the Continuous Release milestone Sep 6, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 6, 2023 •
edited by openshift-ci bot
Loading

@abrennan89: This pull request references OBSDOCS-152 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
Related to https://issues.redhat.com/browse/OBSDOCS-152

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:
Additional clean up to follow #63952, including cleaning up duplicated content and editing.

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-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 6, 2023
@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 6, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 6, 2023 •
edited
Loading

🤖 Updated build preview is available at:
https://64444--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/24429

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 6, 2023 •
edited by openshift-ci bot
Loading

@abrennan89: This pull request references OBSDOCS-152 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
Related to https://issues.redhat.com/browse/OBSDOCS-152

Link to docs preview:
https://64444--docspreview.netlify.app/openshift-enterprise/latest/logging/cluster-logging-support

QE review:

  • QE has approved this change.

Additional information:
Additional clean up to follow #63952, including cleaning up duplicated content and editing.

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.

@kabirbhartiRH
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 7, 2023 •
edited by openshift-ci bot
Loading

@abrennan89: This pull request references OBSDOCS-152 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
Related to https://issues.redhat.com/browse/OBSDOCS-152

Link to docs preview:
https://64444--docspreview.netlify.app/openshift-enterprise/latest/logging/cluster-logging-support

QE review:

  • QE has approved this change.

Additional information:
Additional clean up to follow #63952, including cleaning up duplicated content and editing.

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-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2023
@openshift-ci
Copy link

openshift-ci bot commented Sep 8, 2023

New changes are detected. LGTM label has been removed.

@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 Sep 8, 2023
@kcarmichael08
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 Sep 11, 2023
@abrennan89 abrennan89 removed the peer-review-needed Signifies that the peer review team needs to review this PR label Sep 11, 2023
@kcarmichael08 kcarmichael08 removed the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Sep 11, 2023
@bburt-rh
Copy link
Contributor

bburt-rh commented Sep 11, 2023 •
edited
Loading

Made a few suggestions, but overall LGTM. Thanks!

@bburt-rh bburt-rh 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 labels Sep 11, 2023
JoaoBraveCoding
JoaoBraveCoding reviewed Sep 12, 2023
View reviewed changes
Copy link
Contributor

@JoaoBraveCoding JoaoBraveCoding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my side LGTM just one minor comment/suggestion

@abrennan89 abrennan89 force-pushed the logging-support-2 branch 2 times, most recently from b8ee8f6 to c79447d Compare September 12, 2023 16:55
@abrennan89 abrennan89 removed the request for review from kcarmichael08 September 12, 2023 16:58
@bburt-rh
Copy link
Contributor

lgtm

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 12, 2023 •
edited by openshift-ci bot
Loading

@abrennan89: This pull request references OBSDOCS-152 which is a valid jira issue.

In response to this:

Version(s):
4.11+

Issue:
Related to https://issues.redhat.com/browse/OBSDOCS-152

Link to docs preview:
https://64444--docspreview.netlify.app/openshift-enterprise/latest/logging/cluster-logging-support

QE review:

  • QE has approved this change.

Additional information:
Additional clean up to follow #63952, including cleaning up duplicated content and editing.

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.

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.11

@openshift-cherrypick-robot
Copy link

@abrennan89: once the present PR merges, I will cherry-pick it on top of enterprise-4.11 in a new PR and assign it to you.

In response to this:

/cherrypick enterprise-4.11

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.

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@abrennan89: once the present PR merges, I will cherry-pick it on top of enterprise-4.12 in a new PR and assign it to you.

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.

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.13

@openshift-cherrypick-robot
Copy link

@abrennan89: once the present PR merges, I will cherry-pick it on top of enterprise-4.13 in a new PR and assign it to you.

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.

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link

@abrennan89: once the present PR merges, I will cherry-pick it on top of enterprise-4.14 in a new PR and assign it to you.

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.

@abrennan89 abrennan89 merged commit 057d03a into openshift:main Sep 12, 2023
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 12, 2023
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #64651

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 openshift-cherrypick-robot mentioned this pull request Sep 12, 2023
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #64652

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
Copy link

@abrennan89: #64444 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-152: Additional logging Support section clean up
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	logging/config/cluster-logging-collector.adoc
M	logging/troubleshooting/cluster-logging-must-gather.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Falling back to patching base and 3-way merge...
Removing modules/cluster-logging-maintenance-support-about.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
CONFLICT (modify/delete): logging/troubleshooting/cluster-logging-must-gather.adoc deleted in OBSDOCS-152: Additional logging Support section clean up and modified in HEAD. Version HEAD of logging/troubleshooting/cluster-logging-must-gather.adoc left in tree.
Removing logging/config/cluster-logging-maintenance-support.adoc
Auto-merging logging/config/cluster-logging-collector.adoc
CONFLICT (content): Merge conflict in logging/config/cluster-logging-collector.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
CONFLICT (content): Merge conflict in _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-152: Additional logging Support section clean up
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.11

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
Copy link

@abrennan89: new pull request created: #64653

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 openshift-cherrypick-robot mentioned this pull request Sep 12, 2023
Merged
@abrennan89 abrennan89 mentioned this pull request Sep 12, 2023
Merged
@abrennan89 abrennan89 deleted the logging-support-2 branch September 18, 2023 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoaoBraveCoding JoaoBraveCoding JoaoBraveCoding left review comments

@bburt-rh bburt-rh bburt-rh left review comments

@kcarmichael08 kcarmichael08 kcarmichael08 left review comments

Assignees

@kabirbhartiRH kabirbhartiRH

Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.
9 participants
@abrennan89 @openshift-ci-robot @ocpdocs-previewbot @kabirbhartiRH @kcarmichael08 @kalexand-rh @bburt-rh @openshift-cherrypick-robot @JoaoBraveCoding