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: Clean up unnecessary sections of logging docs #67669

Merged
merged 1 commit into from Nov 9, 2023
Merged

OBSDOCS-152: Clean up unnecessary sections of logging docs #67669

merged 1 commit into from Nov 9, 2023

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Nov 9, 2023 •
edited

Version(s):
4.11+

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

Link to docs preview:

QE review:
Not required. No content has been changed as a result of this PR. Unused files have been deleted and two modules have been moved.

DISCLAIMER
There is probably content here that is duplicated or can be removed from the install docs.
I intend to follow up with a clean up for the install docs as part of the restructuring, but would prefer not to try to include this all in one pull request for the sake of making reviewing easier.
I would like to keep the scope of this PR to removing the duplicated "Administration" sections and temporarily moving the two modules included in these sections to a single place in the install and Loki sections.

@abrennan89 abrennan89 added this to the Continuous Release milestone Nov 9, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 9, 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:

  • 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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 9, 2023
@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 Nov 9, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 9, 2023 •
edited

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

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

@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 9, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 9, 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:

  • 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 Nov 9, 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:

  • QE has approved this change.

DISCLAIMER There is probably content here that is duplicated or can be removed from the install docs. I intend to follow up with a clean up for the install docs as part of the restructuring, but would prefer not to try to include this all in one pull request for the sake of making reviewing easier.

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 Nov 9, 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:

  • QE has approved this change.

DISCLAIMER
There is probably content here that is duplicated or can be removed from the install docs.
I intend to follow up with a clean up for the install docs as part of the restructuring, but would prefer not to try to include this all in one pull request for the sake of making reviewing easier.
I would like to keep the scope of this PR to removing the duplicated "Administration" sections and temporarily moving the two modules included in these sections to a single place in the install and Loki sections.

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 Nov 9, 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:

  • QE has approved this change.

DISCLAIMER
There is probably content here that is duplicated or can be removed from the install docs.
I intend to follow up with a clean up for the install docs as part of the restructuring, but would prefer not to try to include this all in one pull request for the sake of making reviewing easier.
I would like to keep the scope of this PR to removing the duplicated "Administration" sections and temporarily moving the two modules included in these sections to a single place in the install and Loki sections.

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 Nov 9, 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:

  • QE has approved this change.

DISCLAIMER
There is probably content here that is duplicated or can be removed from the install docs.
I intend to follow up with a clean up for the install docs as part of the restructuring, but would prefer not to try to include this all in one pull request for the sake of making reviewing easier.
I would like to keep the scope of this PR to removing the duplicated "Administration" sections and temporarily moving the two modules included in these sections to a single place in the install and Loki sections.

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 Nov 9, 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. No content has been changed as a result of this PR. Unused files have been deleted and two modules have been moved.

DISCLAIMER
There is probably content here that is duplicated or can be removed from the install docs.
I intend to follow up with a clean up for the install docs as part of the restructuring, but would prefer not to try to include this all in one pull request for the sake of making reviewing easier.
I would like to keep the scope of this PR to removing the duplicated "Administration" sections and temporarily moving the two modules included in these sections to a single place in the install and Loki sections.

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-152: Clean up unnecessary sections of logging docs OBSDOCS-152: Clean up unnecessary sections of logging docs Nov 9, 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 Nov 9, 2023
@abrennan89 abrennan89 added the peer-review-needed Signifies that the peer review team needs to review this PR label Nov 9, 2023
@mjpytlak mjpytlak 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 9, 2023
mjpytlak
mjpytlak reviewed Nov 9, 2023
View reviewed changes
Copy link
Contributor

@mjpytlak mjpytlak left a comment

Choose a reason for hiding this comment

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

Peer review lgtm @abrennan89

@abrennan89 abrennan89 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 9, 2023
@abrennan89 abrennan89 merged commit f1d29d9 into openshift:main Nov 9, 2023
1 check passed
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.15

@openshift-cherrypick-robot
Copy link

@abrennan89: #67669 failed to apply on top of branch "enterprise-4.15":

Applying: OBSDOCS-152: Clean up unnecessary sections of logging docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	_unused_topics/cluster-logging-configuring-node-selector.adoc
A	_unused_topics/cluster-logging-elasticsearch-admin.adoc
A	_unused_topics/cluster-logging-exported-fields-collectd.adoc
M	_unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc
A	_unused_topics/cluster-logging-exported-fields-docker.adoc
A	_unused_topics/cluster-logging-kibana-console-launch.adoc
A	_unused_topics/cluster-logging-uninstall-cluster-ops.adoc
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): _unused_topics/cluster-logging-uninstall-cluster-ops.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-uninstall-cluster-ops.adoc in HEAD. Version HEAD of modules/cluster-logging-uninstall-cluster-ops.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-kibana-console-launch.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-kibana-console-launch.adoc in HEAD. Version HEAD of modules/cluster-logging-kibana-console-launch.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-docker.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-docker.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-docker.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-collectd.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-collectd.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-collectd.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-configuring-node-selector.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-configuring-node-selector.adoc in HEAD. Version HEAD of modules/cluster-logging-configuring-node-selector.adoc left in tree.
Removing logging/v5_7/snippets
Removing logging/v5_7/modules
Removing logging/v5_7/logging-5-7-reference.adoc
Removing logging/v5_7/logging-5-7-administration.adoc
Removing logging/v5_7/images
Removing logging/v5_7/_attributes
Removing logging/v5_6/snippets
Removing logging/v5_6/modules
Removing logging/v5_6/logging-5-6-administration.adoc
Removing logging/v5_6/images
Removing logging/v5_6/_attributes
Removing logging/v5_5/snippets
Removing logging/v5_5/modules
Removing logging/v5_5/logging-5-5-administration.adoc
Removing logging/v5_5/images
Removing logging/v5_5/_attributes
Removing _unused_topics/cluster-logging-exported-fields-tlog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-systemd.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-rsyslog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-kubernetes.2021-06-04.adoc
CONFLICT (modify/delete): _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and modified in HEAD. Version HEAD of _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc left in tree.
Removing _unused_topics/cluster-logging-exported-fields-container.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-aushape.2021-06-04.adoc
Removing _unused_topics/cluster-logging-collector-envvar.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: Clean up unnecessary sections of logging docs
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.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.

@abrennan89 abrennan89 mentioned this pull request Nov 9, 2023
Merged
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link

@abrennan89: #67669 failed to apply on top of branch "enterprise-4.14":

Applying: OBSDOCS-152: Clean up unnecessary sections of logging docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	_unused_topics/cluster-logging-configuring-node-selector.adoc
A	_unused_topics/cluster-logging-elasticsearch-admin.adoc
A	_unused_topics/cluster-logging-exported-fields-collectd.adoc
M	_unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc
A	_unused_topics/cluster-logging-exported-fields-docker.adoc
A	_unused_topics/cluster-logging-kibana-console-launch.adoc
A	_unused_topics/cluster-logging-uninstall-cluster-ops.adoc
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): _unused_topics/cluster-logging-uninstall-cluster-ops.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-uninstall-cluster-ops.adoc in HEAD. Version HEAD of modules/cluster-logging-uninstall-cluster-ops.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-kibana-console-launch.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-kibana-console-launch.adoc in HEAD. Version HEAD of modules/cluster-logging-kibana-console-launch.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-docker.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-docker.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-docker.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-collectd.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-collectd.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-collectd.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-configuring-node-selector.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-configuring-node-selector.adoc in HEAD. Version HEAD of modules/cluster-logging-configuring-node-selector.adoc left in tree.
Removing logging/v5_7/snippets
Removing logging/v5_7/modules
Removing logging/v5_7/logging-5-7-reference.adoc
Removing logging/v5_7/logging-5-7-administration.adoc
Removing logging/v5_7/images
Removing logging/v5_7/_attributes
Removing logging/v5_6/snippets
Removing logging/v5_6/modules
Removing logging/v5_6/logging-5-6-administration.adoc
Removing logging/v5_6/images
Removing logging/v5_6/_attributes
Removing logging/v5_5/snippets
Removing logging/v5_5/modules
Removing logging/v5_5/logging-5-5-administration.adoc
Removing logging/v5_5/images
Removing logging/v5_5/_attributes
Removing _unused_topics/cluster-logging-exported-fields-tlog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-systemd.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-rsyslog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-kubernetes.2021-06-04.adoc
CONFLICT (modify/delete): _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and modified in HEAD. Version HEAD of _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc left in tree.
Removing _unused_topics/cluster-logging-exported-fields-container.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-aushape.2021-06-04.adoc
Removing _unused_topics/cluster-logging-collector-envvar.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: Clean up unnecessary sections of logging docs
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.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 mentioned this pull request Nov 9, 2023
Merged
@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: #67669 failed to apply on top of branch "enterprise-4.13":

Applying: OBSDOCS-152: Clean up unnecessary sections of logging docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	_unused_topics/cluster-logging-configuring-node-selector.adoc
A	_unused_topics/cluster-logging-elasticsearch-admin.adoc
A	_unused_topics/cluster-logging-exported-fields-collectd.adoc
M	_unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc
A	_unused_topics/cluster-logging-exported-fields-docker.adoc
A	_unused_topics/cluster-logging-kibana-console-launch.adoc
A	_unused_topics/cluster-logging-uninstall-cluster-ops.adoc
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): _unused_topics/cluster-logging-uninstall-cluster-ops.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-uninstall-cluster-ops.adoc in HEAD. Version HEAD of modules/cluster-logging-uninstall-cluster-ops.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-kibana-console-launch.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-kibana-console-launch.adoc in HEAD. Version HEAD of modules/cluster-logging-kibana-console-launch.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-docker.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-docker.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-docker.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-collectd.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-collectd.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-collectd.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-configuring-node-selector.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-configuring-node-selector.adoc in HEAD. Version HEAD of modules/cluster-logging-configuring-node-selector.adoc left in tree.
Removing logging/v5_7/snippets
Removing logging/v5_7/modules
Removing logging/v5_7/logging-5-7-reference.adoc
Removing logging/v5_7/logging-5-7-administration.adoc
Removing logging/v5_7/images
Removing logging/v5_7/_attributes
Removing logging/v5_6/snippets
Removing logging/v5_6/modules
Removing logging/v5_6/logging-5-6-administration.adoc
Removing logging/v5_6/images
Removing logging/v5_6/_attributes
Removing logging/v5_5/snippets
Removing logging/v5_5/modules
Removing logging/v5_5/logging-5-5-administration.adoc
Removing logging/v5_5/images
Removing logging/v5_5/_attributes
Removing _unused_topics/cluster-logging-exported-fields-tlog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-systemd.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-rsyslog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-kubernetes.2021-06-04.adoc
CONFLICT (modify/delete): _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and modified in HEAD. Version HEAD of _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc left in tree.
Removing _unused_topics/cluster-logging-exported-fields-container.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-aushape.2021-06-04.adoc
Removing _unused_topics/cluster-logging-collector-envvar.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: Clean up unnecessary sections of logging docs
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: #67669 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-152: Clean up unnecessary sections of logging docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	_unused_topics/cluster-logging-configuring-node-selector.adoc
A	_unused_topics/cluster-logging-elasticsearch-admin.adoc
A	_unused_topics/cluster-logging-exported-fields-collectd.adoc
M	_unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc
A	_unused_topics/cluster-logging-exported-fields-docker.adoc
A	_unused_topics/cluster-logging-kibana-console-launch.adoc
A	_unused_topics/cluster-logging-uninstall-cluster-ops.adoc
M	logging/cluster-logging-loki.adoc
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): _unused_topics/cluster-logging-uninstall-cluster-ops.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-uninstall-cluster-ops.adoc in HEAD. Version HEAD of modules/cluster-logging-uninstall-cluster-ops.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-kibana-console-launch.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-kibana-console-launch.adoc in HEAD. Version HEAD of modules/cluster-logging-kibana-console-launch.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-docker.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-docker.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-docker.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-collectd.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-collectd.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-collectd.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-configuring-node-selector.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-configuring-node-selector.adoc in HEAD. Version HEAD of modules/cluster-logging-configuring-node-selector.adoc left in tree.
Removing logging/v5_7/snippets
Removing logging/v5_7/modules
Removing logging/v5_7/logging-5-7-reference.adoc
Removing logging/v5_7/logging-5-7-administration.adoc
Removing logging/v5_7/images
Removing logging/v5_7/_attributes
Removing logging/v5_6/snippets
Removing logging/v5_6/modules
Removing logging/v5_6/logging-5-6-administration.adoc
Removing logging/v5_6/images
Removing logging/v5_6/_attributes
Removing logging/v5_5/snippets
Removing logging/v5_5/modules
Removing logging/v5_5/logging-5-5-administration.adoc
Removing logging/v5_5/images
Removing logging/v5_5/_attributes
Auto-merging logging/cluster-logging-loki.adoc
Removing _unused_topics/cluster-logging-exported-fields-tlog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-systemd.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-rsyslog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-kubernetes.2021-06-04.adoc
CONFLICT (modify/delete): _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and modified in HEAD. Version HEAD of _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc left in tree.
Removing _unused_topics/cluster-logging-exported-fields-container.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-aushape.2021-06-04.adoc
Removing _unused_topics/cluster-logging-collector-envvar.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: Clean up unnecessary sections of logging docs
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: #67669 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-152: Clean up unnecessary sections of logging docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
A	_unused_topics/cluster-logging-configuring-node-selector.adoc
A	_unused_topics/cluster-logging-elasticsearch-admin.adoc
A	_unused_topics/cluster-logging-exported-fields-collectd.adoc
M	_unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc
A	_unused_topics/cluster-logging-exported-fields-docker.adoc
A	_unused_topics/cluster-logging-kibana-console-launch.adoc
A	_unused_topics/cluster-logging-uninstall-cluster-ops.adoc
M	logging/cluster-logging-deploying.adoc
M	logging/cluster-logging-loki.adoc
A	logging/v5_7/logging-5-7-reference.adoc
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): _unused_topics/cluster-logging-uninstall-cluster-ops.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-uninstall-cluster-ops.adoc in HEAD. Version HEAD of modules/cluster-logging-uninstall-cluster-ops.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-kibana-console-launch.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-kibana-console-launch.adoc in HEAD. Version HEAD of modules/cluster-logging-kibana-console-launch.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-docker.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-docker.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-docker.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-exported-fields-collectd.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-exported-fields-collectd.adoc in HEAD. Version HEAD of modules/cluster-logging-exported-fields-collectd.adoc left in tree.
CONFLICT (rename/delete): _unused_topics/cluster-logging-configuring-node-selector.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to modules/cluster-logging-configuring-node-selector.adoc in HEAD. Version HEAD of modules/cluster-logging-configuring-node-selector.adoc left in tree.
Removing logging/v5_7/snippets
Removing logging/v5_7/modules
Removing logging/v5_7/logging-5-7-administration.adoc
Removing logging/v5_7/images
Removing logging/v5_7/_attributes
Removing logging/v5_6/snippets
Removing logging/v5_6/modules
Removing logging/v5_6/logging-5-6-administration.adoc
Removing logging/v5_6/images
Removing logging/v5_6/_attributes
Removing logging/v5_5/snippets
Removing logging/v5_5/modules
Removing logging/v5_5/logging-5-5-administration.adoc
Removing logging/v5_5/images
Removing logging/v5_5/_attributes
Auto-merging logging/cluster-logging-loki.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-loki.adoc
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (rename/delete): logging/v5_7/logging-5-7-reference.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and renamed to logging/api_reference/logging-5-7-reference.adoc in HEAD. Version HEAD of logging/api_reference/logging-5-7-reference.adoc left in tree.
Removing _unused_topics/cluster-logging-exported-fields-tlog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-systemd.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-rsyslog.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-kubernetes.2021-06-04.adoc
CONFLICT (modify/delete): _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc deleted in OBSDOCS-152: Clean up unnecessary sections of logging docs and modified in HEAD. Version HEAD of _unused_topics/cluster-logging-exported-fields-default.2021-06-04.adoc left in tree.
Removing _unused_topics/cluster-logging-exported-fields-container.2021-06-04.adoc
Removing _unused_topics/cluster-logging-exported-fields-aushape.2021-06-04.adoc
Removing _unused_topics/cluster-logging-collector-envvar.adoc
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-152: Clean up unnecessary sections of logging docs
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 9, 2023
Merged
Merged
Merged
@abrennan89 abrennan89 deleted the cleanup-versions branch November 13, 2023 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjpytlak mjpytlak mjpytlak left review comments

Assignees
No one assigned
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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

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