mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2025-08-20 05:51:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #159 from fluent/remove_out_s3_warn_parameters

Browse Source 
Fix #157 remove parameters causing warn on fluentd
This commit is contained in:
uu59 2015-03-11 13:36:52 +09:00
commit 5cf8d17e82
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/fluentd/setting/out_s3.rb
View File

@ -8,7 +8,7 @@ class Fluentd
:match, :match,
:aws_key_id, :aws_sec_key, :s3_bucket, :s3_region, :path, :aws_key_id, :aws_sec_key, :s3_bucket, :s3_region, :path,
# :reduced_redundancy, :check_apikey_on_start, :command_parameter, # not configurable? # :reduced_redundancy, :check_apikey_on_start, :command_parameter, # not configurable?
:format, :include_time_key, :time_key, :delimiter, :label_delimiter, :add_newline, :output_tag, :output_time, :format, :include_time_key, :time_key, :delimiter, :label_delimiter,
:time_slice_format, :time_slice_wait, :time_format, :utc, :store_as, :proxy_uri, :use_ssl, :time_slice_format, :time_slice_wait, :time_format, :utc, :store_as, :proxy_uri, :use_ssl,
:buffer_type, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval, :buffer_type, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval,
:retry_wait, :retry_limit, :max_retry_wait, :num_threads, :retry_wait, :retry_limit, :max_retry_wait, :num_threads,
@ -19,7 +19,7 @@ class Fluentd
choice :format, %w(out_file json ltsv single_value) choice :format, %w(out_file json ltsv single_value)
choice :store_as, %w(gzip lzo lzma2 json txt) choice :store_as, %w(gzip lzo lzma2 json txt)
choice :buffer_type, %w(memory file) choice :buffer_type, %w(memory file)
booleans :include_time_key, :add_newline, :use_ssl, :output_tag, :output_time booleans :include_time_key, :use_ssl
flags :utc flags :utc
validates :match, presence: true validates :match, presence: true
@ -28,8 +28,6 @@ class Fluentd
def self.initial_params def self.initial_params
{ {
s3_region: "us-west-1", s3_region: "us-west-1",
output_tag: true,
output_time: true,
use_ssl: true, use_ssl: true,
} }
end end
@ -43,7 +41,7 @@ class Fluentd
def advanced_options def advanced_options
[ [
:format, :output_tag, :output_time, :include_time_key, :time_key, :delimiter, :label_delimiter, :format, :include_time_key, :time_key, :delimiter, :label_delimiter,
:utc, :time_slice_format, :time_slice_wait, :store_as, :proxy_uri, :utc, :time_slice_format, :time_slice_wait, :store_as, :proxy_uri,
:buffer_type, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval, :buffer_type, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval,
:retry_wait, :retry_limit, :max_retry_wait, :num_threads, :retry_wait, :retry_limit, :max_retry_wait, :num_threads,