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 docs cleanup #66389

Merged
merged 1 commit into from Oct 17, 2023
Merged

OBSDOCS-152: Additional logging docs cleanup #66389

merged 1 commit into from Oct 17, 2023

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Oct 17, 2023 •
edited

Version(s):
4.11+

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

Link to docs preview:

QE review:
Not required. There's no meaningful change to content, just removing unused files and moving existing content.
Peer reviewed by @nalhadef as #65906

Additional information:

  • Removed unused 5.3 release note files
  • Remove unused topic map entry
  • Remove unnecessary duplicated content (multiple includes for modules)
  • Moved snippet content into main "About" section
  • Updated metadata

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 17, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 17, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-152 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 epic to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

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

Link to docs preview:

QE review:
Not required. There's no meaningful change to content, just removing unused files and moving existing content.
Peer reviewed by @nalhadef as #65906

Additional information:

  • Removed unused 5.3 release note files
  • Remove unused topic map entry
  • Remove unnecessary duplicated content (multiple includes for modules)
  • Moved snippet content into main "About" section
  • Updated metadata

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 added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 17, 2023
@abrennan89 abrennan89 mentioned this pull request Oct 17, 2023
Closed
@abrennan89 abrennan89 added peer-review-done Signifies that the peer review team has reviewed this PR dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 labels Oct 17, 2023
@ocpdocs-previewbot
Copy link

🤖 Build preview is available at:
https://66389--docspreview.netlify.app

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

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 17, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-152 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 epic to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

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

Link to docs preview:

QE review:
Not required. There's no meaningful change to content, just removing unused files and moving existing content.
Peer reviewed by @nalhadef as #65906

Additional information:

  • Removed unused 5.3 release note files
  • Remove unused topic map entry
  • Remove unnecessary duplicated content (multiple includes for modules)
  • Moved snippet content into main "About" section
  • Updated metadata

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

openshift-ci-robot commented Oct 17, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-152 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 epic to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

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

Link to docs preview:

QE review:
Not required. There's no meaningful change to content, just removing unused files and moving existing content.
Peer reviewed by @nalhadef as #65906

Additional information:

  • Removed unused 5.3 release note files
  • Remove unused topic map entry
  • Remove unnecessary duplicated content (multiple includes for modules)
  • Moved snippet content into main "About" section
  • Updated metadata

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 bdf3f97 into openshift:main Oct 17, 2023
1 check passed
@abrennan89 abrennan89 added this to the Continuous Release milestone Oct 17, 2023
@openshift-cherrypick-robot
Copy link

@abrennan89: #66389 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-152: Additional logging docs cleanup
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	logging/v5_7/logging-5-7-configuration.adoc
M	modules/cluster-logging-about.adoc
M	modules/logging-loki-retention.adoc
Falling back to patching base and 3-way merge...
Removing snippets/logging-crs-by-operator-snip.adoc
Auto-merging modules/logging-loki-retention.adoc
CONFLICT (content): Merge conflict in modules/logging-loki-retention.adoc
Removing modules/cluster-logging-rn-5.3.9.adoc
Removing modules/cluster-logging-rn-5.3.8.adoc
Removing modules/cluster-logging-rn-5.3.14.adoc
Removing modules/cluster-logging-rn-5.3.13.adoc
Removing modules/cluster-logging-rn-5.3.12.adoc
Removing modules/cluster-logging-rn-5.3.11.adoc
Removing modules/cluster-logging-rn-5.3.10.adoc
Removing modules/cluster-logging-release-notes-5.3.z.adoc
Auto-merging modules/cluster-logging-about.adoc
Auto-merging logging/v5_7/logging-5-7-configuration.adoc
Removing logging/v5_5/logging-5-5-reference.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
Patch failed at 0001 OBSDOCS-152: Additional logging docs cleanup
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 openshift-cherrypick-robot mentioned this pull request Oct 17, 2023
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #66395

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 Oct 17, 2023
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #66396

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: #66389 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-152: Additional logging docs cleanup
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	logging/v5_5/logging-5-5-configuration.adoc
M	logging/v5_6/logging-5-6-configuration.adoc
M	logging/v5_7/logging-5-7-configuration.adoc
M	modules/cluster-logging-about.adoc
M	modules/logging-loki-retention.adoc
Falling back to patching base and 3-way merge...
Removing snippets/logging-crs-by-operator-snip.adoc
Auto-merging modules/logging-loki-retention.adoc
CONFLICT (content): Merge conflict in modules/logging-loki-retention.adoc
Removing modules/cluster-logging-rn-5.3.9.adoc
Removing modules/cluster-logging-rn-5.3.8.adoc
Removing modules/cluster-logging-rn-5.3.14.adoc
Removing modules/cluster-logging-rn-5.3.13.adoc
Removing modules/cluster-logging-rn-5.3.12.adoc
Removing modules/cluster-logging-rn-5.3.11.adoc
Removing modules/cluster-logging-rn-5.3.10.adoc
Removing modules/cluster-logging-release-notes-5.3.z.adoc
Auto-merging modules/cluster-logging-about.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-about.adoc
Auto-merging logging/v5_7/logging-5-7-configuration.adoc
CONFLICT (content): Merge conflict in logging/v5_7/logging-5-7-configuration.adoc
Auto-merging logging/v5_6/logging-5-6-configuration.adoc
CONFLICT (content): Merge conflict in logging/v5_6/logging-5-6-configuration.adoc
Removing logging/v5_5/logging-5-5-reference.adoc
Auto-merging logging/v5_5/logging-5-5-configuration.adoc
CONFLICT (content): Merge conflict in logging/v5_5/logging-5-5-configuration.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
Patch failed at 0001 OBSDOCS-152: Additional logging docs cleanup
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.

This was referenced Oct 17, 2023
Merged
Merged
@abrennan89 abrennan89 deleted the clean-branch branch November 13, 2023 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@abrennan89 @openshift-ci-robot @ocpdocs-previewbot @openshift-cherrypick-robot