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-594 + OBSDOCS-567: Logging upgrading docs and mCLF note #66749

Merged
merged 1 commit into from
Nov 1, 2023
Merged

OBSDOCS-594 + OBSDOCS-567: Logging upgrading docs and mCLF note #66749

merged 1 commit into from
Nov 1, 2023

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Oct 23, 2023 •
edited

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

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

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

In response to this:

Version(s):
4.11+

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 23, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 23, 2023 •
edited

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

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

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 23, 2023
@openshift-ci-robot
Copy link

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

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

In response to this:

Version(s):
4.11+

Issue:

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

QE review:

  • QE has approved this change.

Additional information:

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 force-pushed the OBSDOCS-594 branch 8 times, most recently from f25098d to c3513ad Compare October 26, 2023 13:52
@openshift-ci-robot
Copy link

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

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

In response to this:

Version(s):
4.11+ for upgrading section updates (manual cherrypick), 4.12+ for new upgrade and mCLF content

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

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 26, 2023 •
edited by openshift-ci bot

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

In response to this:

Version(s):
4.11+ for upgrading section updates (manual cherrypick), 4.12+ for new upgrade and mCLF content

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

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-594 + OBSDOCS-567: Logging upgrading docs and mCLF note OBSDOCS-594 + OBSDOCS-567: Logging upgrading docs and mCLF note Oct 26, 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 26, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 1, 2023 •
edited by openshift-ci bot

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

In response to this:

Version(s):
4.11+ for upgrading section updates (manual cherrypick), 4.12+ for new upgrade and mCLF content

Issue:

(Also indirectly related to https://issues.redhat.com/browse/OBSDOCS-460)

Link to docs preview:

QE review:

  • QE has approved this change.

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.

@stevsmit stevsmit added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Nov 1, 2023
stevsmit
stevsmit reviewed Nov 1, 2023
View reviewed changes
logging/cluster-logging-upgrading.adoc Outdated Show resolved Hide resolved
logging/log_collection_forwarding/log-forwarding.adoc Outdated Show resolved Hide resolved
modules/cluster-logging-upgrading-elasticsearch.adoc Outdated Show resolved Hide resolved
modules/logging-create-clf.adoc Outdated Show resolved Hide resolved
modules/logging-create-clf.adoc Outdated Show resolved Hide resolved
modules/cluster-logging-upgrading-elasticsearch.adoc Outdated Show resolved Hide resolved
modules/logging-operator-upgrading-all-ns.adoc Outdated Show resolved Hide resolved
modules/logging-operator-upgrading-all-ns.adoc Show resolved Hide resolved
modules/logging-upgrading-clo.adoc Outdated Show resolved Hide resolved
@stevsmit stevsmit 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 Nov 1, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2023
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 1, 2023

New changes are detected. LGTM label has been removed.

@abrennan89 abrennan89 merged commit 0da0032 into openshift:main Nov 1, 2023
1 check passed
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.15

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

@abrennan89: new pull request created: #67260

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/test-infra repository.

This was referenced Nov 1, 2023
Merged
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #67261

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

@abrennan89: new pull request created: #67262

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

Applying: OBSDOCS-594: Logging upgrading docs and mCLF note
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/log_collection_forwarding/log-forwarding.adoc
Falling back to patching base and 3-way merge...
Removing modules/log-forwarding-modes.adoc
Removing modules/cluster-logging-updating-logging-to-5-0.adoc
Auto-merging logging/log_collection_forwarding/log-forwarding.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-594: Logging upgrading docs and mCLF note
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: #66749 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-594: Logging upgrading docs and mCLF note
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/log_collection_forwarding/log-forwarding.adoc
M	modules/cluster-logging-updating-logging-to-current.adoc
A	modules/log-forwarding-modes.adoc
M	modules/logging-create-clf.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/logging-create-clf.adoc
CONFLICT (content): Merge conflict in modules/logging-create-clf.adoc
Auto-merging modules/cluster-logging-upgrading-elasticsearch.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-upgrading-elasticsearch.adoc
Removing modules/cluster-logging-updating-logging-to-5-0.adoc
Auto-merging logging/log_collection_forwarding/log-forwarding.adoc
CONFLICT (content): Merge conflict in logging/log_collection_forwarding/log-forwarding.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-594: Logging upgrading docs and mCLF note
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 Nov 1, 2023
Merged
Merged
@abrennan89 abrennan89 deleted the OBSDOCS-594 branch November 13, 2023 16:40
@abrennan89 abrennan89 mentioned this pull request Nov 29, 2023
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jcantrill jcantrill jcantrill left review comments

@anpingli anpingli anpingli left review comments

@JoaoBraveCoding JoaoBraveCoding JoaoBraveCoding left review comments

@stevsmit stevsmit stevsmit left review comments

Assignees

@jcantrill jcantrill

@anpingli anpingli

Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 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
10 participants
@abrennan89 @openshift-ci-robot @ocpdocs-previewbot @jcantrill @anpingli @openshift-cherrypick-robot @JoaoBraveCoding @stevsmit @bergerhoffer @openshift-merge-robot