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-460: Clean up about page and old references #66606

Merged
merged 1 commit into from
Oct 24, 2023
Merged

OBSDOCS-460: Clean up about page and old references #66606

merged 1 commit into from
Oct 24, 2023

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Oct 20, 2023 •
edited

Version(s):
4.11+

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

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

QE review:

  • QE has approved this change.

Additional information:
Breaking out some of the changes from #66171 to reduce the size of that PR 🛩️

@abrennan89 abrennan89 added this to the Continuous Release milestone Oct 20, 2023
@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 20, 2023
@openshift-ci-robot
Copy link

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

@abrennan89: This pull request references OBSDOCS-460 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 story 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-460

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:
Breaking out some of the changes from #66171 to reduce the size of that PR 🛩️

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 20, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 20, 2023 •
edited

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

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

@openshift-ci-robot
Copy link

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

@abrennan89: This pull request references OBSDOCS-460 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 story 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-460

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

QE review:

  • QE has approved this change.

Additional information:
Breaking out some of the changes from #66171 to reduce the size of that PR 🛩️

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 changed the title [WIP] OBSDOCS-460: Clean up about page and old references OBSDOCS-460: Clean up about page and old references Oct 20, 2023
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 20, 2023
@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. labels Oct 20, 2023
JoaoBraveCoding
JoaoBraveCoding reviewed Oct 20, 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.

Overall lgtm, just a comment

modules/logging-architecture-overview.adoc Outdated Show resolved Hide resolved
@agantony
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 Oct 20, 2023
agantony
agantony reviewed Oct 20, 2023
View reviewed changes
Copy link
Contributor

@agantony agantony left a comment

Choose a reason for hiding this comment

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

Added a few suggestions for your consideration; overall lgtm!

modules/logging-architecture-overview.adoc Outdated Show resolved Hide resolved
modules/logging-architecture-overview.adoc Outdated Show resolved Hide resolved
modules/logging-architecture-overview.adoc Outdated Show resolved Hide resolved
modules/logging-architecture-overview.adoc Outdated Show resolved Hide resolved
snippets/logging-kibana-dep-snip.adoc Outdated Show resolved Hide resolved
@agantony
Copy link
Contributor

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

@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 Oct 20, 2023
@anpingli
Copy link

Vector support FIPS from 5.5. https://issues.redhat.com/browse/LOG-2460 Shall I file another ticket?

@abrennan89
Copy link
Contributor Author

@anpingli no that's perfectly fine, I can update it in this PR. Thank you! 🙏🏻

@openshift-ci openshift-ci bot removed the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 20, 2023
@abrennan89 abrennan89 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 20, 2023
@jcantrill
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 20, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 23, 2023
@anpingli
Copy link

/lgtm

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

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

@abrennan89: This pull request references OBSDOCS-460 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 story 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-460

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

QE review:

  • QE has approved this change.

Additional information:
Breaking out some of the changes from #66171 to reduce the size of that PR 🛩️

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 25bb553 into openshift:main Oct 24, 2023
1 check passed
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.13

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.12

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.11

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 24, 2023
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #66803

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

Applying: OBSDOCS-460: Clean up about page and old references
Using index info to reconstruct a base tree...
M	modules/cluster-logging-feature-reference.adoc
Falling back to patching base and 3-way merge...
Removing modules/cluster-logging-update-logging.adoc
Auto-merging modules/cluster-logging-feature-reference.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-feature-reference.adoc
Removing modules/cluster-logging-about-components.adoc
Removing modules/cluster-logging-Uninstall-logging.adoc
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-460: Clean up about page and old references
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
Copy link

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

Applying: OBSDOCS-460: Clean up about page and old references
Using index info to reconstruct a base tree...
M	modules/cluster-logging-about-components.adoc
M	modules/cluster-logging-feature-reference.adoc
Falling back to patching base and 3-way merge...
Removing modules/cluster-logging-update-logging.adoc
Auto-merging modules/cluster-logging-feature-reference.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-feature-reference.adoc
CONFLICT (modify/delete): modules/cluster-logging-about-components.adoc deleted in OBSDOCS-460: Clean up about page and old references and modified in HEAD. Version HEAD of modules/cluster-logging-about-components.adoc left in tree.
Removing modules/cluster-logging-Uninstall-logging.adoc
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-460: Clean up about page and old references
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
Copy link

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

Applying: OBSDOCS-460: Clean up about page and old references
Using index info to reconstruct a base tree...
M	logging/cluster-logging.adoc
M	modules/cluster-logging-about-components.adoc
M	modules/cluster-logging-feature-reference.adoc
Falling back to patching base and 3-way merge...
Removing modules/cluster-logging-update-logging.adoc
Auto-merging modules/cluster-logging-feature-reference.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-feature-reference.adoc
CONFLICT (modify/delete): modules/cluster-logging-about-components.adoc deleted in OBSDOCS-460: Clean up about page and old references and modified in HEAD. Version HEAD of modules/cluster-logging-about-components.adoc left in tree.
Removing modules/cluster-logging-Uninstall-logging.adoc
Auto-merging logging/cluster-logging.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging.adoc
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-460: Clean up about page and old references
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 24, 2023
Merged
Merged
Merged
@abrennan89 abrennan89 deleted the cleanup-about-log branch November 13, 2023 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anpingli anpingli anpingli left review comments

@JoaoBraveCoding JoaoBraveCoding JoaoBraveCoding left review comments

@agantony agantony agantony left review comments

@jcantrill jcantrill Awaiting requested review from jcantrill

Assignees

@jcantrill jcantrill

@anpingli anpingli

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. lgtm Indicates that a PR is ready to be merged. 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.

None yet
8 participants
@abrennan89 @openshift-ci-robot @ocpdocs-previewbot @agantony @anpingli @jcantrill @openshift-cherrypick-robot @JoaoBraveCoding