RHDEVDOCS-2697 by rolfedh · Pull Request #29671 · openshift/openshift-docs

rolfedh · 2021-02-22T22:06:54Z

"do not configure the Log Forwarding API" statement is too general.
https://issues.redhat.com/browse/RHDEVDOCS-2697
[enterprise-4.6][enterprise-4.7][enterprise-4.8]

netlify · 2021-02-22T22:09:31Z

Deploy preview for osdocs ready!

Built with commit 51f7de6

https://deploy-preview-29671--osdocs.netlify.app

jtudelag · 2021-02-23T09:23:47Z

@rolfedh this is much more clear now, thanks!!

But I think there is room for clarification (avoid contrary statements), here it is mentioned as well:

If you want to forward all logs to only the internal OpenShift Container Platform Elasticsearch instance, do not configure the Log Forwarding API.

rolfedh · 2021-02-23T10:28:13Z

@rolfedh this is much more clear now, thanks!!

But I think there is room for clarification (avoid contrary statements), here it is mentioned as well:

If you want to forward all logs to only the internal OpenShift Container Platform Elasticsearch instance, do not configure the Log Forwarding API.

Thanks for spotting that one, too. Updated.

ahardin-rh · 2021-02-23T21:47:31Z

Just a few minor style suggestions from me! 👍

… too general.

rolfedh · 2021-02-23T23:17:44Z

@anpingli Would you review and mark this "lgtm?" Thank you.

anpingli

/lgtm

ahardin-rh · 2021-02-24T21:04:39Z

/cherrypick enterprise-4.6

ahardin-rh · 2021-02-24T21:04:49Z

/cherrypick enterprise-4.7

ahardin-rh · 2021-02-24T21:04:56Z

/cherrypick enterprise-4.8

openshift-cherrypick-robot · 2021-02-24T21:06:33Z

@ahardin-rh: #29671 failed to apply on top of branch "enterprise-4.6":

Applying: [RHDEVDOCS-2697](https://issues.redhat.com/browse/RHDEVDOCS-2697) "do not configure the Log Forwarding API" statement is too general.
.git/rebase-apply/patch:57: trailing whitespace.
* `audit` - Logs generated by auditd, the node audit system, which are stored in the  */var/log/audit/audit.log* file, and the audit logs from the Kubernetes apiserver and the OpenShift apiserver. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	logging/cluster-logging-external.adoc
M	logging/cluster-logging.adoc
M	modules/cluster-logging-collector-log-forwarding-about.adoc
M	modules/cluster-logging-manual-rollout-rolling.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-manual-rollout-rolling.adoc
Auto-merging modules/cluster-logging-collector-log-forwarding-about.adoc
Auto-merging logging/cluster-logging.adoc
Auto-merging logging/cluster-logging-external.adoc
CONFLICT (content): Merge conflict in 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-2697](https://issues.redhat.com/browse/RHDEVDOCS-2697) "do not configure the Log Forwarding API" statement is too general.
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".

Details

In response to this:

/cherrypick enterprise-4.6

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 · 2021-02-24T21:06:39Z

@ahardin-rh: #29671 failed to apply on top of branch "enterprise-4.7":

Applying: [RHDEVDOCS-2697](https://issues.redhat.com/browse/RHDEVDOCS-2697) "do not configure the Log Forwarding API" statement is too general.
.git/rebase-apply/patch:57: trailing whitespace.
* `audit` - Logs generated by auditd, the node audit system, which are stored in the  */var/log/audit/audit.log* file, and the audit logs from the Kubernetes apiserver and the OpenShift apiserver. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	logging/cluster-logging-external.adoc
M	logging/cluster-logging.adoc
M	modules/cluster-logging-manual-rollout-rolling.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-manual-rollout-rolling.adoc
Auto-merging logging/cluster-logging.adoc
Auto-merging logging/cluster-logging-external.adoc
CONFLICT (content): Merge conflict in 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-2697](https://issues.redhat.com/browse/RHDEVDOCS-2697) "do not configure the Log Forwarding API" statement is too general.
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".

Details

In response to this:

/cherrypick enterprise-4.7

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 · 2021-02-24T21:06:44Z

@ahardin-rh: #29671 failed to apply on top of branch "enterprise-4.8":

Applying: [RHDEVDOCS-2697](https://issues.redhat.com/browse/RHDEVDOCS-2697) "do not configure the Log Forwarding API" statement is too general.
.git/rebase-apply/patch:57: trailing whitespace.
* `audit` - Logs generated by auditd, the node audit system, which are stored in the  */var/log/audit/audit.log* file, and the audit logs from the Kubernetes apiserver and the OpenShift apiserver. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	logging/cluster-logging-external.adoc
M	logging/cluster-logging.adoc
M	modules/cluster-logging-manual-rollout-rolling.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-manual-rollout-rolling.adoc
Auto-merging logging/cluster-logging.adoc
Auto-merging logging/cluster-logging-external.adoc
CONFLICT (content): Merge conflict in 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-2697](https://issues.redhat.com/browse/RHDEVDOCS-2697) "do not configure the Log Forwarding API" statement is too general.
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".

Details

In response to this:

/cherrypick 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.

Manually CP RHDEVDOCS-2697 #29671 to 4.8

Manually CP RHDEVDOCS-2697 #29671 to 4.7

Manually CP RHDEVDOCS-2697 #29671 to 4.6

rolfedh requested review from aburdenthehand, codyhoag, jeana-redhat and vikram-redhat as code owners February 22, 2021 22:06

openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 22, 2021

ahardin-rh reviewed Feb 23, 2021

View reviewed changes

Comment thread logging/cluster-logging-external.adoc Outdated

ahardin-rh reviewed Feb 23, 2021

View reviewed changes

Comment thread modules/cluster-logging-collector-log-forwarding-about.adoc Outdated

ahardin-rh added branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR labels Feb 23, 2021

ahardin-rh added this to the Next Release milestone Feb 23, 2021

RHDEVDOCS-2697 "do not configure the Log Forwarding API" statement is…

51f7de6

… too general.

openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 23, 2021

anpingli reviewed Feb 24, 2021

View reviewed changes

openshift-ci-robot assigned anpingli Feb 24, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 24, 2021

adellape added the branch/enterprise-4.8 label Feb 24, 2021

ahardin-rh merged commit 7e226a7 into openshift:master Feb 24, 2021

This was referenced Mar 4, 2021

Manually CP RHDEVDOCS-2697 #29671 to 4.8 #30120

Merged

Manually CP RHDEVDOCS-2697 #29671 to 4.7 #30122

Merged

Manually CP RHDEVDOCS-2697 #29671 to 4.6 #30124

Merged

bmcelvee added a commit that referenced this pull request Mar 4, 2021

Merge pull request #30120 from rolfedh/CP-RHDEVDOCS-2697-48

704fb4d

Manually CP RHDEVDOCS-2697 #29671 to 4.8

bmcelvee added a commit that referenced this pull request Mar 4, 2021

Merge pull request #30122 from rolfedh/CP-RHDEVDOCS-2697-47

64e033e

Manually CP RHDEVDOCS-2697 #29671 to 4.7

bmcelvee added a commit that referenced this pull request Mar 4, 2021

Merge pull request #30124 from rolfedh/CP-RHDEVDOCS-2697-46

2602475

Manually CP RHDEVDOCS-2697 #29671 to 4.6

yuvalk mentioned this pull request Mar 18, 2021

cnf 4.6 references #30640

Closed

Conversation

rolfedh commented Feb 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify Bot commented Feb 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jtudelag commented Feb 23, 2021

Uh oh!

rolfedh commented Feb 23, 2021

Uh oh!

Uh oh!

Uh oh!

ahardin-rh commented Feb 23, 2021

Uh oh!

rolfedh commented Feb 23, 2021

Uh oh!

anpingli left a comment

Choose a reason for hiding this comment

Uh oh!

ahardin-rh commented Feb 24, 2021

Uh oh!

ahardin-rh commented Feb 24, 2021

Uh oh!

ahardin-rh commented Feb 24, 2021

Uh oh!

openshift-cherrypick-robot commented Feb 24, 2021 • edited by openshift-ci-robot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-cherrypick-robot commented Feb 24, 2021 • edited by openshift-ci-robot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-cherrypick-robot commented Feb 24, 2021 • edited by openshift-ci-robot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

rolfedh commented Feb 22, 2021 •

edited

Loading

netlify Bot commented Feb 22, 2021 •

edited

Loading

openshift-cherrypick-robot commented Feb 24, 2021 •

edited by openshift-ci-robot

Loading

openshift-cherrypick-robot commented Feb 24, 2021 •

edited by openshift-ci-robot

Loading

openshift-cherrypick-robot commented Feb 24, 2021 •

edited by openshift-ci-robot

Loading