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

RHDEVDOCS-4102 - Logging corrections from Support Engineering Feedback #50781

Merged
merged 1 commit into from Oct 17, 2022
Merged

RHDEVDOCS-4102 - Logging corrections from Support Engineering Feedback #50781

merged 1 commit into from Oct 17, 2022

Conversation

libander
Copy link
Contributor

@libander libander commented Sep 23, 2022 •
edited by openshift-ci bot

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 23, 2022
@libander libander force-pushed the RHDEVDOCS-4102-main branch 2 times, most recently from 65da402 to e764c01 Compare September 25, 2022 19:53
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 25, 2022
@libander libander changed the title RHDEVDOCS-4102-main RHDEVDOCS-4102 - Logging corrections from Support Engineering Feedback Sep 29, 2022
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 29, 2022
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 29, 2022 •
edited

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

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

periklis
periklis reviewed Sep 29, 2022
View reviewed changes
Copy link

@periklis periklis left a comment

Choose a reason for hiding this comment

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

Looks good to me 🚀

@libander libander requested review from periklis and jcantrill and removed request for periklis September 29, 2022 18:07
@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 29, 2022
periklis
periklis reviewed Sep 30, 2022
View reviewed changes
Copy link

@periklis periklis left a comment

Choose a reason for hiding this comment

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

Looks good to me

jc-berger
jc-berger approved these changes Oct 4, 2022
View reviewed changes
Copy link
Contributor

@jc-berger jc-berger left a comment

Choose a reason for hiding this comment

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

/lgtm

I consulted the openshift checklist when conducting this peer review: https://docs.google.com/document/d/1WN7k72PKxcPA__erp5TK-CefmS_sVwE3r40PvpmNk3E/edit#heading=h.mgz8v4w1kg86

@openshift-ci
Copy link

openshift-ci bot commented Oct 4, 2022

@jc-berger: changing LGTM is restricted to collaborators

In response to this:

/lgtm

I consulted the openshift checklist when conducting this peer review: https://docs.google.com/document/d/1WN7k72PKxcPA__erp5TK-CefmS_sVwE3r40PvpmNk3E/edit#heading=h.mgz8v4w1kg86

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.

@libander libander requested review from kabirbhartiRH and removed request for jcantrill October 12, 2022 22:05
anpingli
anpingli reviewed Oct 13, 2022
View reviewed changes
Copy link

@anpingli anpingli left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 13, 2022
@bburt-rh bburt-rh 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 labels Oct 14, 2022
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 17, 2022
@openshift-ci
Copy link

openshift-ci bot commented Oct 17, 2022

New changes are detected. LGTM label has been removed.

@libander libander requested review from bburt-rh and removed request for kabirbhartiRH October 17, 2022 17:39
@bburt-rh bburt-rh merged commit 7ef9cbd into openshift:main Oct 17, 2022
@bburt-rh
Copy link
Contributor

/cherry-pick enterprise-4.8

@bburt-rh
Copy link
Contributor

/cherry-pick enterprise-4.9

@openshift-cherrypick-robot
Copy link

@bburt-rh: #50781 failed to apply on top of branch "enterprise-4.8":

Applying: RHDEVDOCS-4102 - w/SME feedback & QE & peer review
Using index info to reconstruct a base tree...
M	logging/cluster-logging-external.adoc
M	logging/cluster-logging-release-notes.adoc
M	logging/cluster-logging-upgrading.adoc
M	logging/cluster-logging.adoc
M	modules/cluster-logging-clo-status-comp.adoc
M	modules/cluster-logging-clo-status.adoc
M	modules/cluster-logging-collector-tolerations.adoc
M	modules/cluster-logging-collector-tuning.adoc
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploying-about.adoc
M	modules/cluster-logging-elasticsearch-exposing.adoc
M	modules/cluster-logging-elasticsearch-ha.adoc
M	modules/cluster-logging-elasticsearch-persistent-storage-empty.adoc
M	modules/cluster-logging-elasticsearch-storage.adoc
M	modules/cluster-logging-elasticsearch-tolerations.adoc
M	modules/cluster-logging-eventrouter-deploy.adoc
M	modules/cluster-logging-kibana-tolerations.adoc
M	modules/cluster-logging-log-store-status-viewing.adoc
M	modules/cluster-logging-logstore-limits.adoc
A	modules/cluster-logging-loki-about.adoc
A	modules/cluster-logging-loki-deploy.adoc.git/rebase-apply/patch:138: trailing whitespace.
//ENG-Feedback: How can we reformat this to accurately reflect 5.4? 
.git/rebase-apply/patch:392: trailing whitespace.
1x.extra-small is for demo purposes only, and is not supported. 
warning: 2 lines add whitespace errors.

M	modules/cluster-logging-manual-rollout-rolling.adoc
M	modules/cluster-logging-uninstall.adoc
M	modules/cluster-logging-updating-logging-to-5-0.adoc
M	modules/cluster-logging-visualizer-kibana.adoc
M	modules/infrastructure-moving-logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/infrastructure-moving-logging.adoc
CONFLICT (content): Merge conflict in modules/infrastructure-moving-logging.adoc
Auto-merging modules/cluster-logging-visualizer-kibana.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-visualizer-kibana.adoc
Auto-merging modules/cluster-logging-updating-logging-to-5-0.adoc
Auto-merging modules/cluster-logging-uninstall.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-uninstall.adoc
Auto-merging modules/cluster-logging-manual-rollout-rolling.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-manual-rollout-rolling.adoc
CONFLICT (modify/delete): modules/cluster-logging-loki-deploy.adoc deleted in HEAD and modified in RHDEVDOCS-4102 - w/SME feedback & QE & peer review. Version RHDEVDOCS-4102 - w/SME feedback & QE & peer review of modules/cluster-logging-loki-deploy.adoc left in tree.
CONFLICT (modify/delete): modules/cluster-logging-loki-about.adoc deleted in HEAD and modified in RHDEVDOCS-4102 - w/SME feedback & QE & peer review. Version RHDEVDOCS-4102 - w/SME feedback & QE & peer review of modules/cluster-logging-loki-about.adoc left in tree.
Auto-merging modules/cluster-logging-logstore-limits.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-logstore-limits.adoc
Auto-merging modules/cluster-logging-log-store-status-viewing.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-log-store-status-viewing.adoc
Auto-merging modules/cluster-logging-kibana-tolerations.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-kibana-tolerations.adoc
Auto-merging modules/cluster-logging-eventrouter-deploy.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-eventrouter-deploy.adoc
Auto-merging modules/cluster-logging-elasticsearch-tolerations.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-elasticsearch-tolerations.adoc
Auto-merging modules/cluster-logging-elasticsearch-storage.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-elasticsearch-storage.adoc
Auto-merging modules/cluster-logging-elasticsearch-persistent-storage-empty.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-elasticsearch-persistent-storage-empty.adoc
Auto-merging modules/cluster-logging-elasticsearch-ha.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-elasticsearch-ha.adoc
Auto-merging modules/cluster-logging-elasticsearch-exposing.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-elasticsearch-exposing.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
Auto-merging modules/cluster-logging-collector-tuning.adoc
Auto-merging modules/cluster-logging-collector-tolerations.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-collector-tolerations.adoc
Auto-merging modules/cluster-logging-clo-status.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-clo-status.adoc
Auto-merging modules/cluster-logging-clo-status-comp.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-clo-status-comp.adoc
Auto-merging logging/cluster-logging.adoc
Auto-merging logging/cluster-logging-upgrading.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-upgrading.adoc
Auto-merging logging/cluster-logging-release-notes.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-release-notes.adoc
Auto-merging logging/cluster-logging-external.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 RHDEVDOCS-4102 - w/SME feedback & QE & peer review
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:

/cherry-pick enterprise-4.8

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.

@bburt-rh
Copy link
Contributor

/cherry-pick enterprise-4.10

@openshift-cherrypick-robot
Copy link

@bburt-rh: #50781 failed to apply on top of branch "enterprise-4.9":

Applying: RHDEVDOCS-4102 - w/SME feedback & QE & peer review
.git/rebase-apply/patch:138: trailing whitespace.
//ENG-Feedback: How can we reformat this to accurately reflect 5.4? 
.git/rebase-apply/patch:392: trailing whitespace.
1x.extra-small is for demo purposes only, and is not supported. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	logging/cluster-logging-external.adoc
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploying-about.adoc
M	modules/cluster-logging-eventrouter-deploy.adoc
A	modules/cluster-logging-loki-about.adoc
M	modules/cluster-logging-loki-deploy.adoc
M	modules/cluster-logging-manual-rollout-rolling.adoc
M	modules/infrastructure-moving-logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/infrastructure-moving-logging.adoc
Auto-merging modules/cluster-logging-manual-rollout-rolling.adoc
Auto-merging modules/cluster-logging-loki-deploy.adoc
CONFLICT (modify/delete): modules/cluster-logging-loki-about.adoc deleted in HEAD and modified in RHDEVDOCS-4102 - w/SME feedback & QE & peer review. Version RHDEVDOCS-4102 - w/SME feedback & QE & peer review of modules/cluster-logging-loki-about.adoc left in tree.
Auto-merging modules/cluster-logging-eventrouter-deploy.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-eventrouter-deploy.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
Auto-merging logging/cluster-logging-external.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 RHDEVDOCS-4102 - w/SME feedback & QE & peer review
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:

/cherry-pick enterprise-4.9

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.

@bburt-rh
Copy link
Contributor

/cherry-pick enterprise-4.11

@bburt-rh
Copy link
Contributor

/cherry-pick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@bburt-rh: #50781 failed to apply on top of branch "enterprise-4.10":

Applying: RHDEVDOCS-4102 - w/SME feedback & QE & peer review
.git/rebase-apply/patch:138: trailing whitespace.
//ENG-Feedback: How can we reformat this to accurately reflect 5.4? 
.git/rebase-apply/patch:392: trailing whitespace.
1x.extra-small is for demo purposes only, and is not supported. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploying-about.adoc
M	modules/cluster-logging-manual-rollout-rolling.adoc
M	modules/infrastructure-moving-logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/infrastructure-moving-logging.adoc
Auto-merging modules/cluster-logging-manual-rollout-rolling.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-cli.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 RHDEVDOCS-4102 - w/SME feedback & QE & peer review
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:

/cherry-pick enterprise-4.10

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

@bburt-rh: #50781 failed to apply on top of branch "enterprise-4.11":

Applying: RHDEVDOCS-4102 - w/SME feedback & QE & peer review
.git/rebase-apply/patch:138: trailing whitespace.
//ENG-Feedback: How can we reformat this to accurately reflect 5.4? 
.git/rebase-apply/patch:392: trailing whitespace.
1x.extra-small is for demo purposes only, and is not supported. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploying-about.adoc
M	modules/cluster-logging-manual-rollout-rolling.adoc
M	modules/infrastructure-moving-logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/infrastructure-moving-logging.adoc
Auto-merging modules/cluster-logging-manual-rollout-rolling.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-cli.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 RHDEVDOCS-4102 - w/SME feedback & QE & peer review
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:

/cherry-pick 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

@bburt-rh: #50781 failed to apply on top of branch "enterprise-4.12":

Applying: RHDEVDOCS-4102 - w/SME feedback & QE & peer review
.git/rebase-apply/patch:138: trailing whitespace.
//ENG-Feedback: How can we reformat this to accurately reflect 5.4? 
.git/rebase-apply/patch:392: trailing whitespace.
1x.extra-small is for demo purposes only, and is not supported. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploying-about.adoc
M	modules/cluster-logging-manual-rollout-rolling.adoc
M	modules/infrastructure-moving-logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/infrastructure-moving-logging.adoc
Auto-merging modules/cluster-logging-manual-rollout-rolling.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-cli.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 RHDEVDOCS-4102 - w/SME feedback & QE & peer review
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:

/cherry-pick 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.

@bburt-rh bburt-rh mentioned this pull request Oct 19, 2022
Merged
This was referenced Oct 20, 2022
Closed
Merged
Merged
Merged
Merged
Closed
@cbremble cbremble mentioned this pull request Jan 31, 2023
Closed
@libander libander deleted the RHDEVDOCS-4102-main branch May 2, 2024 05:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@periklis periklis periklis left review comments

@jcantrill jcantrill jcantrill left review comments

@anpingli anpingli anpingli left review comments

@kabirbhartiRH kabirbhartiRH kabirbhartiRH left review comments

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

@jc-berger jc-berger jc-berger approved these changes

Assignees

@anpingli anpingli

Labels
branch/enterprise-4.8 branch/enterprise-4.9 branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs peer-review-done Signifies that the peer review team has reviewed this PR qe-approved Signifies that QE has signed off on 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
10 participants
@libander @ocpdocs-previewbot @bburt-rh @openshift-cherrypick-robot @periklis @jcantrill @anpingli @jc-berger @kabirbhartiRH @openshift-merge-robot