search

openshift / origin-aggregated-logging

139 stars 230 forks source link

LOG-1499: Vendor fluent-plugin-elasticsearch v5.0.5 to drop messages #2146

Closed jcantrill closed 3 years ago

jcantrill commented 3 years ago

Description

This PR:

/assign @alanconway

Links

https://issues.redhat.com/browse/LOG-1499

jcantrill commented 3 years ago

/retest

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/master/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

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

openshift-bot commented 3 years ago

/retest

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

openshift-bot commented 3 years ago

/retest

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

openshift-bot commented 3 years ago

/retest

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

jcantrill commented 3 years ago

/cherrypick release-5.1

openshift-cherrypick-robot commented 3 years ago

@jcantrill: #2146 failed to apply on top of branch "release-5.1":

Applying: LOG-1499: Vendor fluent-plugin-elasticsearch v5.0.5 to drop messages that are not consumable
.git/rebase-apply/patch:2983: 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
Falling back to patching base and 3-way merge...
Removing fluentd/vendored_gem_src/fluent-plugin-elasticsearch/gemfiles/Gemfile.without.ilm
Auto-merging fluentd/rh-manifest.txt
CONFLICT (content): Merge conflict in 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-1499: Vendor fluent-plugin-elasticsearch v5.0.5 to drop messages that are not consumable
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/2146#issuecomment-878389846): >/cherrypick release-5.1 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.