diff --git a/app/models/fluentd/setting/out_td.rb b/app/models/fluentd/setting/out_td.rb index 8636411..41931e2 100644 --- a/app/models/fluentd/setting/out_td.rb +++ b/app/models/fluentd/setting/out_td.rb @@ -12,30 +12,20 @@ class Fluentd attr_accessor(*KEYS) + booleans :use_ssl + flags :auto_create_table + validates :match, presence: true - validates :api_key, presence: true + validates :apikey, presence: true validates :auto_create_table, presence: true validates :use_ssl, presence: true + def plugin_name + "tdlog" + end + def to_conf - <<-XML.strip_heredoc.gsub(/^[ ]*\n/m, "") - - type tdlog - #{print_if_present :apikey} - #{auto_create_table.present? ? "auto_create_table" : ""} - use_ssl #{use_ssl.present? ? "true" : "false"} - #{print_if_present :database} - #{print_if_present :table} - #{print_if_present :endpoint} - - #{print_if_present :connect_timeout} - #{print_if_present :read_timeout} - #{print_if_present :send_timeout} - #{print_if_present :flush_interval} - #{print_if_present :buffer_type} - #{print_if_present :buffer_path} - - XML + to_config end end end diff --git a/app/views/fluentd/settings/out_td/_form.html.haml b/app/views/fluentd/settings/out_td/_form.html.haml index c516efb..68026cf 100644 --- a/app/views/fluentd/settings/out_td/_form.html.haml +++ b/app/views/fluentd/settings/out_td/_form.html.haml @@ -2,51 +2,25 @@ = msg = form_for(@setting, url: finish_fluentd_setting_out_td_path(@fluentd), html: {class: "ignore-rails-error-div"}) do |f| - .form-group - = f.label :match - = f.text_field :match - .form-group - = f.label :apikey - = f.text_field :apikey - .form-group - = f.label :auto_create_table - = f.check_box :auto_create_table, {}, "true", "false" - .form-group - = f.label :use_ssl - = f.check_box :use_ssl, {}, "true", "false" - .form-group - = f.label :database - = f.text_field :database - .form-group - = f.label :table - = f.text_field :table - .form-group - = f.label :endpoint - = f.text_field :endpoint + = 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 - .form-group - = f.label :connect_timeout - = f.text_field :connect_timeout - .form-group - = f.label :read_timeout - = f.text_field :read_timeout - .form-group - = f.label :send_timeout - = f.text_field :send_timeout - .form-group - = f.label :flush_interval - = f.text_field :flush_interval - .form-group - = f.label :buffer_type - = f.text_field :buffer_type - .form-group - = f.label :buffer_path - = f.text_field :buffer_path + = field(f, :connect_timeout) + = field(f, :read_timeout) + = field(f, :send_timeout) + = field(f, :flush_interval) + = field(f, :buffer_type) + = field(f, :buffer_path) = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary pull-right" = f.submit t('terms.prev'), class: "btn btn-lg btn-default", name: "back"