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.

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

throw exceptions on HTTPTooManyRequests and HTTPServerError so FluentD will retry #1845

Merged
merged 6 commits into from
Mar 26, 2020
Merged

throw exceptions on HTTPTooManyRequests and HTTPServerError so FluentD will retry #1845

merged 6 commits into from
Mar 26, 2020

Conversation

wardbekker
Copy link
Member

@wardbekker wardbekker commented Mar 24, 2020

What this PR does / why we need it:

Align retry behaviour with promtail. Trigger an explicit exception for HTTPTooManyRequests (429) and HTTPServerError (5xx) in the Output#write, so fluentD can retry as specified here https://docs.fluentd.org/output#control-retrying.

Checklist

  • Documentation added
  • Tests updated

@wardbekker
Copy link
Member Author

Not sure why circleCI is failing on a helm chart test, seems unrelated?

@cyriltovena
Copy link
Contributor

Not sure why circleCI is failing on a helm chart test, seems unrelated?

Yeah not your fault, I fixed that on your branch.

Enabled: true
Style/HashTransformValues:
Enabled: true

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add a newline at the end please ?

Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

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

LGTM with one question.

wardbekker and others added 3 commits March 26, 2020 17:13
…i_output_spec.rb


spelling fix

Co-Authored-By: Cyril Tovena <cyril.tovena@gmail.com>
@cyriltovena cyriltovena merged commit 7413f11 into grafana:master Mar 26, 2020
@cyriltovena
Copy link
Contributor

Forgot about bumping the gem version can you send a PR and I’ll deploy it.

slim-bean pushed a commit that referenced this pull request Apr 1, 2020
…D will retry (#1845)

* throw exceptions on HTTPTooManyRequests and HTTPServerError to trigger retry

* fixed variable naming

* Update fluentd/fluent-plugin-grafana-loki/spec/gems/fluent/plugin/loki_output_spec.rb

spelling fix

Co-Authored-By: Cyril Tovena <cyril.tovena@gmail.com>

* removed newline

Co-authored-by: Cyril Tovena <cyril.tovena@gmail.com>

(cherry picked from commit 7413f11)
Signed-off-by: Edward Welch <edward.welch@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants