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.

Sign up for GitHub

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

Jump to bottom

Fix rubocop violation for fluentd/fluent-plugin-loki #1646

Merged
merged 6 commits into from
Feb 6, 2020
Merged

Fix rubocop violation for fluentd/fluent-plugin-loki #1646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1d132c
Don't use sudo to install bundler
takanabe Feb 6, 2020
c01a15a
Fix rubocop viloation: kind_of? -> is_a?
takanabe Feb 6, 2020
42c1407
Fix rubocop violation
takanabe Feb 6, 2020
3e16c0f
Fix rubocup violation: or -> ||
takanabe Feb 6, 2020
f732f02
Fix rubocop violation: use single quoate
takanabe Feb 6, 2020
8377d68
Ignore rubocop violation: configure method is still not complex
takanabe Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fluentd/fluent-plugin-grafana-loki/bin/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ set -euo pipefail
IFS=$'\n\t'
set -vx

sudo gem install bundle
gem install bundler
bundle install
7 changes: 4 additions & 3 deletions fluentd/fluent-plugin-grafana-loki/lib/fluent/plugin/out_loki.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,14 @@ class LokiOutput < Fluent::Plugin::Output # rubocop:disable Metrics/ClassLength
config_set_default :chunk_keys, []
end

def configure(conf)
def configure(conf) # rubocop:disable Metrics/CyclomaticComplexity
compat_parameters_convert(conf, :buffer)
super
@uri = URI.parse(@url + '/loki/api/v1/push')
unless @uri.kind_of?(URI::HTTP) or @uri.kind_of?(URI::HTTPS)
raise Fluent::ConfigError, "url parameter must be valid HTTP"
unless @uri.is_a?(URI::HTTP) || @uri.is_a?(URI::HTTPS)
raise Fluent::ConfigError, 'url parameter must be valid HTTP'
end

@record_accessors = {}
conf.elements.select { |element| element.name == 'label' }.each do |element|
element.each_pair do |k, v|
Expand Down