diff --git a/app/controllers/fluentd/settings/out_td_controller.rb b/app/controllers/fluentd/settings/out_td_controller.rb index a78825b..990bc19 100644 --- a/app/controllers/fluentd/settings/out_td_controller.rb +++ b/app/controllers/fluentd/settings/out_td_controller.rb @@ -6,8 +6,8 @@ class Fluentd::Settings::OutTdController < ApplicationController @setting = Fluentd::Setting::OutTd.new({ buffer_type: "file", buffer_path: "/var/log/td-agent/buffer/td", - use_ssl: true, auto_create_table: true, + match: "td.*.*", }) end diff --git a/app/models/fluentd/setting/out_td.rb b/app/models/fluentd/setting/out_td.rb index dd24039..46920f6 100644 --- a/app/models/fluentd/setting/out_td.rb +++ b/app/models/fluentd/setting/out_td.rb @@ -6,19 +6,17 @@ class Fluentd KEYS = [ :match, - :apikey, :auto_create_table, :use_ssl, :database, :table, :endpoint, - :connect_timeout, :read_timeout, :send_timeout, :flush_interval, :buffer_type, :buffer_path, + :apikey, :auto_create_table, :database, :table, + :flush_interval, :buffer_type, :buffer_path, ].freeze attr_accessor(*KEYS) - booleans :use_ssl flags :auto_create_table validates :match, presence: true validates :apikey, presence: true validates :auto_create_table, presence: true - validates :use_ssl, presence: true def plugin_name "tdlog" diff --git a/app/views/fluentd/settings/out_td/_form.html.haml b/app/views/fluentd/settings/out_td/_form.html.haml index c5df913..c41dfde 100644 --- a/app/views/fluentd/settings/out_td/_form.html.haml +++ b/app/views/fluentd/settings/out_td/_form.html.haml @@ -4,19 +4,14 @@ = field(f, :match) = field(f, :apikey) = field(f, :auto_create_table) - = field(f, :use_ssl) = field(f, :database) = field(f, :table) - = field(f, :endpoint) .well.well-sm %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"} = icon('fa-caret-down') = t('terms.advanced_setting') #advanced-setting.collapse - = field(f, :connect_timeout) - = field(f, :read_timeout) - = field(f, :send_timeout) = field(f, :flush_interval) = field(f, :buffer_type) = field(f, :buffer_path)