search

openshift / origin-aggregated-logging

139 stars 231 forks source link

LOG-1569: Vendor fluent-plugin-elasticsearch v5.0.5 to drop messages #2155

Closed jcantrill closed 3 years ago

jcantrill commented 3 years ago

Description

This PR:

Vendors a new version of the elasticsearch plugin which drops log entries the server will never be capable of consuming The plugin will unblock a particular chunk and allow the remaining messages to be evaluated and submitted /assign @alanconway

Links

openshift-ci[bot] commented 3 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alanconway, jcantrill

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/origin-aggregated-logging/blob/release-5.1/OWNERS)~~ [alanconway,jcantrill] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-bot commented 3 years ago

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot commented 3 years ago

/retest-required

Please review the full test history for this PR and help us cut down flakes.

jcantrill commented 3 years ago

/retest

jcantrill commented 3 years ago

/hold

jcantrill commented 3 years ago

/cherrypick release-5.0

openshift-cherrypick-robot commented 3 years ago

@jcantrill: #2155 failed to apply on top of branch "release-5.0":

Applying: LOG-1569: Vendor fluent-plugin-elasticsearch v5.0.5 to drop messages
.git/rebase-apply/patch:2883: trailing whitespace.
cloud_id test-dep:ZXVyb3BlLXdlc3QxLmdjcC5jbG91ZC5lcy5pbyRiYZTA1Ng== 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M   fluentd/Gemfile.lock
M   fluentd/rh-manifest.txt
A   fluentd/vendored_gem_src/oj/oj.gemspec
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fluentd/vendored_gem_src/oj/oj.gemspec deleted in HEAD and modified in LOG-1569: Vendor fluent-plugin-elasticsearch v5.0.5 to drop messages. Version LOG-1569: Vendor fluent-plugin-elasticsearch v5.0.5 to drop messages of fluentd/vendored_gem_src/oj/oj.gemspec left in tree.
Removing fluentd/vendored_gem_src/fluent-plugin-elasticsearch/gemfiles/Gemfile.without.ilm
Auto-merging fluentd/rh-manifest.txt
Auto-merging fluentd/Gemfile.lock
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 LOG-1569: Vendor fluent-plugin-elasticsearch v5.0.5 to drop messages
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](https://github.com/openshift/origin-aggregated-logging/pull/2155#issuecomment-884475592): >/cherrypick release-5.0 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.