Skip to content

Conversation

@rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Feb 22, 2021

"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]

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

netlify bot commented Feb 22, 2021

Deploy preview for osdocs ready!

Built with commit 51f7de6

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

@jtudelag
Copy link

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

rolfedh commented Feb 23, 2021

@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 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 ahardin-rh added this to the Next Release milestone Feb 23, 2021
@ahardin-rh
Copy link
Contributor

Just a few minor style suggestions from me! 👍

@openshift-ci-robot 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
@rolfedh
Copy link
Contributor Author

rolfedh commented Feb 23, 2021

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

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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 24, 2021
@ahardin-rh ahardin-rh merged commit 7e226a7 into openshift:master Feb 24, 2021
@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.6

@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.7

@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 24, 2021

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

openshift-cherrypick-robot commented Feb 24, 2021

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

openshift-cherrypick-robot commented Feb 24, 2021

@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.

bmcelvee added a commit that referenced this pull request Mar 4, 2021
bmcelvee added a commit that referenced this pull request Mar 4, 2021
bmcelvee added a commit that referenced this pull request Mar 4, 2021
@yuvalk yuvalk mentioned this pull request Mar 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants