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

Fixes fluentd new push path API. #1363

Merged
merged 2 commits into from
Dec 5, 2019

Conversation

cyriltovena
Copy link
Contributor

What this PR does / why we need it:

Fixes the current 1.2.3 fluentd Loki plugin. We change the push path (#1326) but the API has actually change.

I have not bump the version as I'm planning to replace the current not working released version.

I've also:

Output of rake:

rake spec
Running RuboCop...
Inspecting 7 files
.......

7 files inspected, no offenses detected
/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/bin/ruby -I/Library/Ruby/Gems/2.6.0/gems/rspec-support-3.8.2/lib:/Library/Ruby/Gems/2.6.0/gems/rspec-core-3.8.2/lib /Library/Ruby/Gems/2.6.0/gems/rspec-core-3.8.2/exe/rspec --pattern spec/\*\*\{,/\*/\*\*\}/\*_spec.rb
SimpleCov started successfully!

Fluent::Plugin::LokiOutput
  loads config
  converts syslog output to loki output
  converts syslog output with extra labels to loki output
  converts multiple syslog output lines to loki output
  converts multiple syslog output lines with extra labels to loki output
  formats record hash as key_value
  formats record hash as json
  extracts record key as label
  extracts nested record key as label
  extracts nested record key as label and drop key after
  formats as simple string when only 1 record key
  order by timestamp then index when received unordered

Finished in 0.02656 seconds (files took 1.04 seconds to load)
12 examples, 0 failures

Coverage report generated for RSpec to /Users/ctovena/go/src/github.com/grafana/loki/fluentd/fluent-plugin-grafana-loki/coverage. 148 / 148 LOC (100.0%) covered.

Which issue(s) this PR fixes:
Fixes #1347

Special notes for your reviewer:

Checklist

  • [x ] Tests updated

@cyriltovena
Copy link
Contributor Author

/cc @tarokkk @dawidmalina

- also add tests for ordering.
- improve nanoseconds precision.
- fixes all lint/style issue.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
@dawidmalina
Copy link
Contributor

LGTM

Copy link
Contributor

@tarokkk tarokkk left a comment

Choose a reason for hiding this comment

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

Looks much better 👍 Thanks for the lint work as well ;)

@tarokkk
Copy link
Contributor

tarokkk commented Dec 5, 2019

Although I think we need to update gem version

@cyriltovena
Copy link
Contributor Author

Although I think we need to update gem version

No idea if I can force push, but I guess it's cleaner to bump it.

@tarokkk
Copy link
Contributor

tarokkk commented Dec 5, 2019

I mean we need to bump it, you can't force push gems on the gem repo

@cyriltovena
Copy link
Contributor Author

well I didn't know, will do ! Thanks

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
@cyriltovena cyriltovena merged commit 2b7f375 into grafana:master Dec 5, 2019
@cyriltovena cyriltovena deleted the fluentd-new-api branch December 5, 2019 17:30
cyriltovena pushed a commit to cyriltovena/loki that referenced this pull request Jun 11, 2021
…rors

Improve tracing info on DynamoDB query errors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Push results in expecting IDENTIFIER
4 participants