')
+ _.each(matches, (match) => {
+ const colors = ["#ff9", "#cff", "#fcf", "#dfd"]
+ const whole = match.whole
+ let html = ""
+ let _matches = []
+ let lastPos = 0
+
+ _.each(match.matches, (m) => {
+ let matched = m.matched
+ if (!matched) {
+ return
+ }
+ // Ignore empty matched with "foobar".match(/foo(.*?)bar/)[1] #=> ""
+ if (matched.length === 0) {
+ return
+ }
+ // rotate color
+ let currentColor = colors.shift()
+ colors.push(currentColor)
+
+ // create highlighted range HTML
+ let $highlighted = $("
").text(matched)
+ $highlighted.attr({
+ "class": "regexp-preview",
+ "data-toggle": "tooltip",
+ "data-placement": "top",
+ "title": m.key,
+ 'style': 'background-color:' + currentColor
+ })
+ let highlightedHtml = $highlighted.wrap("").parent().html()
+ let pos = {
+ start: m.pos[0],
+ end: m.pos[1]
+ }
+ if (pos.start > 0) {
+ html += _.escape(whole.substring(lastPos, pos.start))
+ }
+ html += highlightedHtml
+ lastPos = pos.end
+ })
+ html += whole.substring(lastPos)
+
+ $container.append(html)
+ $container.append("
# http://docs.fluentd.org/articles/in_forward
- type forward
+ @type forward
port 24224
# http://docs.fluentd.org/articles/in_http
- type http
+ @type http
port 9880
- type monitor_agent
+ @type monitor_agent
port 24220
- type debug_agent
+ @type debug_agent
port 24230
# http://docs.fluentd.org/articles/out_stdout
- type stdout
+ @type stdout
CONF
diff --git a/app/models/fluentd/setting/buffer_file.rb b/app/models/fluentd/setting/buffer_file.rb
new file mode 100644
index 000000000..6be83f0ad
--- /dev/null
+++ b/app/models/fluentd/setting/buffer_file.rb
@@ -0,0 +1,23 @@
+class Fluentd
+ module Setting
+ class BufferFile
+ include Fluentd::Setting::Plugin
+
+ register_plugin("buffer", "file")
+
+ def self.initial_params
+ {
+ path: ""
+ }
+ end
+
+ def common_options
+ [
+ :path,
+ :file_permission,
+ :dir_permission
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/buffer_memory.rb b/app/models/fluentd/setting/buffer_memory.rb
new file mode 100644
index 000000000..9abe3a9f3
--- /dev/null
+++ b/app/models/fluentd/setting/buffer_memory.rb
@@ -0,0 +1,17 @@
+class Fluentd
+ module Setting
+ class BufferMemory
+ include Fluentd::Setting::Plugin
+
+ register_plugin("buffer", "memory")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ []
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/common.rb b/app/models/fluentd/setting/common.rb
deleted file mode 100644
index faadc8e25..000000000
--- a/app/models/fluentd/setting/common.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-class Fluentd
- module Setting
- module Common
- extend ActiveSupport::Concern
- include ActiveModel::Model
-
- module ClassMethods
- attr_accessor :values, :types, :children, :hidden_values
-
- def choice(key, values)
- @values ||= {}
- @values[key] = values
- set_type(:choice, [key])
- end
-
- def hidden(key)
- set_type(:hidden, [key])
- end
-
- def nested(key, klass, options = {})
- # e.g.:
- #
- # type forward
- #
- # ..
- #
- #
- @children ||= {}
- @children[key] = {
- class: klass,
- options: options,
- }
- set_type(:nested, [key])
- end
-
- def booleans(*keys)
- # e.g.:
- # use_ssl true
- # include_time_key false
- set_type(:boolean, keys)
- end
-
- def flags(*keys)
- # e.g.:
- # tag_mapped
- # utc
- set_type(:flag, keys)
- end
-
- private
-
- def set_type(type, keys)
- @types ||= {}
- keys.each do |key|
- @types[key] = type
- end
- end
- end
-
- def children_of(key)
- meta = self.class.children[key]
- return unless meta
- klass = meta[:class]
- data = send(key) || {"0" => {}}
- children = []
- data.each_pair do |index, attrs|
- children << klass.new(attrs)
- end
- children
- end
-
- def child_class(key)
- self.class.children[key][:class]
- end
-
- def values_of(key)
- self.class.values.try(:[], key) || []
- end
-
- def column_type(key)
- self.class.types.try(:[], key) || "string"
- end
-
- def conf(key)
- case column_type(key)
- when :boolean
- boolenan(key)
- when :flag
- flag(key)
- when :nested
- return "" unless send(key)
- klass = child_class(key)
- send(key).map do |(_, child)|
- # send("servers")
- #
- # "servers" => {
- # "0" => {
- # "name" => "foo",
- # "host" => "bar",
- # ..
- # },
- # "1" => {
- # ..
- # }
- # }
- child_instance = klass.new(child)
- unless child_instance.empty_value?
- "\n" + child_instance.to_config(key).gsub(/^/m, " ")
- end
- end.join
- else # including :hidden
- print_if_present(key)
- end
- end
-
- def plugin_type_name
- # Fluentd::Setting::OutS3 -> s3
- # Override this method if not above style
- try(:plugin_name) || self.class.to_s.split("::").last.sub(/(In|Out)/, "").downcase
- end
-
- def print_if_present(key)
- # e.g.:
- # path /var/log/td/aaa
- # user nobody
- # retry_limit 3
- send(key).present? ? "#{key} #{send(key)}" : ""
- end
-
- def boolenan(key)
- send(key).presence == "true" ? "#{key} true" : "#{key} false"
- end
-
- def flag(key)
- send(key).presence == "true" ? key.to_s : ""
- end
-
- def empty_value?
- config = ""
- self.class.const_get(:KEYS).each do |key|
- config << conf(key)
- end
- config.empty?
- end
-
- def input_plugin?
- self.class.to_s.match(/::In|^In/)
- end
-
- def output_plugin?
- not input_plugin?
- end
-
- def to_config(elm_name = nil)
- indent = " "
- if elm_name
- config = "<#{elm_name}>\n"
- else
- if input_plugin?
- config = "\n"
- else
- config = "\n"
- end
- config << "#{indent}type #{plugin_type_name}\n"
- end
- self.class.const_get(:KEYS).each do |key|
- next if key == :match
- config << indent
- config << conf(key)
- config << "\n"
- end
- if elm_name
- config << "\n"
- else
- if input_plugin?
- config << " \n"
- else
- config << "\n"
- end
- end
- config.gsub(/^[ ]*\n/m, "")
- end
- end
- end
-end
diff --git a/app/models/fluentd/setting/formatter_csv.rb b/app/models/fluentd/setting/formatter_csv.rb
new file mode 100644
index 000000000..c567f0ef6
--- /dev/null
+++ b/app/models/fluentd/setting/formatter_csv.rb
@@ -0,0 +1,21 @@
+class Fluentd
+ module Setting
+ class FormatterCsv
+ include Fluentd::Setting::Plugin
+
+ register_plugin("formatter", "csv")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :delimiter,
+ :fields,
+ :add_newline
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/formatter_hash.rb b/app/models/fluentd/setting/formatter_hash.rb
new file mode 100644
index 000000000..dc61f45fc
--- /dev/null
+++ b/app/models/fluentd/setting/formatter_hash.rb
@@ -0,0 +1,19 @@
+class Fluentd
+ module Setting
+ class FormatterHash
+ include Fluentd::Setting::Plugin
+
+ register_plugin("formatter", "hash")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :add_newline
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/formatter_json.rb b/app/models/fluentd/setting/formatter_json.rb
new file mode 100644
index 000000000..87c2d4b6f
--- /dev/null
+++ b/app/models/fluentd/setting/formatter_json.rb
@@ -0,0 +1,25 @@
+class Fluentd
+ module Setting
+ class FormatterJson
+ include Fluentd::Setting::Plugin
+
+ register_plugin("formatter", "json")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :add_newline
+ ]
+ end
+
+ def advanced_options
+ [
+ :json_parser
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/formatter_ltsv.rb b/app/models/fluentd/setting/formatter_ltsv.rb
new file mode 100644
index 000000000..84189a13b
--- /dev/null
+++ b/app/models/fluentd/setting/formatter_ltsv.rb
@@ -0,0 +1,21 @@
+class Fluentd
+ module Setting
+ class FormatterLtsv
+ include Fluentd::Setting::Plugin
+
+ register_plugin("formatter", "ltsv")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :delimiter,
+ :label_delimiter,
+ :add_newline
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/formatter_msgpack.rb b/app/models/fluentd/setting/formatter_msgpack.rb
new file mode 100644
index 000000000..482cfb406
--- /dev/null
+++ b/app/models/fluentd/setting/formatter_msgpack.rb
@@ -0,0 +1,13 @@
+class Fluentd
+ module Setting
+ class FormatterMsgpack
+ include Fluentd::Setting::Plugin
+
+ register_plugin("formatter", "msgpack")
+
+ def self.initial_params
+ {}
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/formatter_out_file.rb b/app/models/fluentd/setting/formatter_out_file.rb
new file mode 100644
index 000000000..40239bdf1
--- /dev/null
+++ b/app/models/fluentd/setting/formatter_out_file.rb
@@ -0,0 +1,21 @@
+class Fluentd
+ module Setting
+ class FormatterOutFile
+ include Fluentd::Setting::Plugin
+
+ register_plugin("formatter", "out_file")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :output_time,
+ :output_tag,
+ :delimiter
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/formatter_single_value.rb b/app/models/fluentd/setting/formatter_single_value.rb
new file mode 100644
index 000000000..9839093ea
--- /dev/null
+++ b/app/models/fluentd/setting/formatter_single_value.rb
@@ -0,0 +1,20 @@
+class Fluentd
+ module Setting
+ class FormatterSingleValue
+ include Fluentd::Setting::Plugin
+
+ register_plugin("formatter", "single_value")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :message_key,
+ :add_newline
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/formatter_stdout.rb b/app/models/fluentd/setting/formatter_stdout.rb
new file mode 100644
index 000000000..1e392370c
--- /dev/null
+++ b/app/models/fluentd/setting/formatter_stdout.rb
@@ -0,0 +1,19 @@
+class Fluentd
+ module Setting
+ class FormatterStdout
+ include Fluentd::Setting::Plugin
+
+ register_plugin("formatter", "stdout")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :output_type
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/formatter_tsv.rb b/app/models/fluentd/setting/formatter_tsv.rb
new file mode 100644
index 000000000..24c0b1f17
--- /dev/null
+++ b/app/models/fluentd/setting/formatter_tsv.rb
@@ -0,0 +1,21 @@
+class Fluentd
+ module Setting
+ class FormatterTsv
+ include Fluentd::Setting::Plugin
+
+ register_plugin("formatter", "tsv")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :keys,
+ :delimiter,
+ :add_newline
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/in_forward.rb b/app/models/fluentd/setting/in_forward.rb
index 70627ad5a..db1e5e3fb 100644
--- a/app/models/fluentd/setting/in_forward.rb
+++ b/app/models/fluentd/setting/in_forward.rb
@@ -1,17 +1,9 @@
class Fluentd
module Setting
class InForward
- include ActiveModel::Model
- include Common
+ include Fluentd::Setting::Plugin
- KEYS = [
- :bind, :port, :linger_timeout, :chunk_size_limit, :chunk_size_warn_limit, :log_level
- ].freeze
-
- attr_accessor(*KEYS)
-
- validates :bind, presence: true
- validates :port, presence: true
+ register_plugin("input", "forward")
def self.initial_params
{
@@ -20,7 +12,6 @@ def self.initial_params
linger_timeout: 0,
chunk_size_limit: nil,
chunk_size_warn_limit: nil,
- log_level: "info",
}
end
@@ -30,15 +21,14 @@ def common_options
]
end
- def advanced_options
+ def hidden_options
[
- :linger_timeout, :chunk_size_limit, :chunk_size_warn_limit, :log_level
+ # We don't support TLS configuration via fluentd-ui for now.
+ :transport,
+ :backlog,
+ :blocking_timeout,
]
end
-
- def plugin_name
- "forward"
- end
end
end
end
diff --git a/app/models/fluentd/setting/in_http.rb b/app/models/fluentd/setting/in_http.rb
index 788a37dda..be3052880 100644
--- a/app/models/fluentd/setting/in_http.rb
+++ b/app/models/fluentd/setting/in_http.rb
@@ -1,17 +1,9 @@
class Fluentd
module Setting
class InHttp
- include ActiveModel::Model
- include Common
+ include Fluentd::Setting::Plugin
- KEYS = [
- :bind, :port, :body_size_limit, :keepalive_timeout, :add_http_headers, :format, :log_level
- ].freeze
-
- attr_accessor(*KEYS)
-
- validates :bind, presence: true
- validates :port, presence: true
+ register_plugin("input", "http")
def self.initial_params
{
@@ -20,26 +12,28 @@ def self.initial_params
body_size_limit: "32m",
keepalive_timeout: "10s",
add_http_headers: false,
- format: "default",
- log_level: "info",
+ parse_type: "in_http",
+ parse: {
+ "0" => {
+ "type" => "in_http"
+ }
+ }
}
end
def common_options
[
- :bind, :port
+ :bind, :port, :add_http_headers, :add_remote_addr
]
end
- def advanced_options
+ def hidden_options
[
- :body_size_limit, :keepalive_timeout, :add_http_headers, :format, :log_level
+ :parse,
+ :backlog,
+ :blocking_timeout,
]
end
-
- def plugin_name
- "http"
- end
end
end
end
diff --git a/app/models/fluentd/setting/in_monitor_agent.rb b/app/models/fluentd/setting/in_monitor_agent.rb
index 672b604a1..6e6167ca4 100644
--- a/app/models/fluentd/setting/in_monitor_agent.rb
+++ b/app/models/fluentd/setting/in_monitor_agent.rb
@@ -1,38 +1,25 @@
class Fluentd
module Setting
class InMonitorAgent
- include ActiveModel::Model
- include Common
+ include Fluentd::Setting::Plugin
- KEYS = [
- :bind, :port
- ].freeze
-
- attr_accessor(*KEYS)
-
- validates :bind, presence: true
- validates :port, presence: true
+ register_plugin("input", "monitor_agent")
def self.initial_params
{
bind: "0.0.0.0",
port: 24220,
+ emit_interval: 60,
+ include_config: true,
+ include_retry: true
}
end
def common_options
[
- :bind, :port
+ :bind, :port, :tag
]
end
-
- def advanced_options
- []
- end
-
- def plugin_name
- "monitor_agent"
- end
end
end
end
diff --git a/app/models/fluentd/setting/in_syslog.rb b/app/models/fluentd/setting/in_syslog.rb
index 2fef577ff..8ed0f9d8c 100644
--- a/app/models/fluentd/setting/in_syslog.rb
+++ b/app/models/fluentd/setting/in_syslog.rb
@@ -1,32 +1,34 @@
class Fluentd
module Setting
class InSyslog
- include ActiveModel::Model
- include Common
+ include Fluentd::Setting::Plugin
- KEYS = [
- :port, :bind, :tag, :types
- ].freeze
-
- attr_accessor(*KEYS)
-
- validates :tag, presence: true
+ register_plugin("input", "syslog")
def self.initial_params
{
bind: "0.0.0.0",
port: 5140,
+ parse_type: "syslog",
+ parse: {
+ "0" => {
+ "type" => "syslog"
+ }
+ },
+ protocol_type: :udp,
}
end
def common_options
[
- :tag, :bind, :port, :types,
+ :tag, :bind, :port
]
end
- def advanced_options
- []
+ def hidden_options
+ [
+ :parse
+ ]
end
end
end
diff --git a/app/models/fluentd/setting/in_tail.rb b/app/models/fluentd/setting/in_tail.rb
index 90084c1fc..89de568d0 100644
--- a/app/models/fluentd/setting/in_tail.rb
+++ b/app/models/fluentd/setting/in_tail.rb
@@ -1,38 +1,16 @@
+require "fluent/plugin/parser_multiline"
+
class Fluentd
module Setting
class InTail
- MULTI_LINE_MAX_FORMAT_COUNT = 20
-
- include ActiveModel::Model
- attr_accessor :path, :tag, :format, :regexp, :time_format, :rotate_wait, :pos_file, :read_from_head, :refresh_interval
-
- validates :path, presence: true
- validates :tag, presence: true
- #validates :format, presence: true
+ include Fluentd::Setting::Plugin
- def self.known_formats
- {
- :apache2 => [:time_format],
- :nginx => [:time_format],
- :syslog => [:time_format],
- :tsv => [:keys, :time_key],
- :csv => [:keys, :time_key],
- :ltsv => [:delimiter, :time_key],
- :json => [:time_key],
- :regexp => [:time_format, :regexp],
- :multiline => [:format_firstline] + (1..MULTI_LINE_MAX_FORMAT_COUNT).map{|n| "format#{n}".to_sym }
- # TODO: Grok could generate Regexp including \d, \s, etc. fluentd config parser raise error with them for escape sequence check.
- # TBD How to handle Grok/Regexp later, just comment out for hide
- # :grok => [:grok_str],
- }
- end
- attr_accessor *known_formats.values.flatten.compact.uniq
+ register_plugin("input", "tail")
+ # TODO support formatN ???
- def known_formats
- self.class.known_formats
- end
+ MULTI_LINE_MAX_FORMAT_COUNT = ::Fluent::Plugin::MultilineParser::FORMAT_MAX_NUM
- def guess_format
+ def guess_parse_type
case path
when /\.json$/
:json
@@ -53,43 +31,6 @@ def guess_format
end
end
- def extra_format_options
- self.class.known_formats[format.to_sym] || []
- end
-
- def format_specific_conf
- return "" if %w(grok regexp).include?(format)
-
- indent = " " * 2
- format_specific_conf = ""
-
- if format.to_sym == :multiline
- known_formats[:multiline].each do |key|
- value = send(key)
- if value.present?
- format_specific_conf << "#{indent}#{key} /#{value}/\n"
- end
- end
- else
- extra_format_options.each do |key|
- format_specific_conf << "#{indent}#{key} #{send(key)}\n"
- end
- end
-
- format_specific_conf
- end
-
- def certain_format_line
- case format
- when "grok"
- "format /#{grok.convert_to_regexp(grok_str).source.gsub("/", "\\/")}/ # grok: '#{grok_str}'"
- when "regexp"
- "format /#{regexp}/"
- else
- "format #{format}"
- end
- end
-
def grok
@grok ||=
begin
@@ -98,24 +39,6 @@ def grok
grok
end
end
-
- def to_conf
- # NOTE: Using strip_heredoc makes more complex for format_specific_conf indent
- <<-CONFIG.gsub(/^[ ]*\n/m, "")
-
- type tail
- path #{path}
- tag #{tag}
- #{certain_format_line}
-#{format_specific_conf}
-
- #{read_from_head.to_i.zero? ? "" : "read_from_head true"}
- #{pos_file.present? ? "pos_file #{pos_file}" : ""}
- #{rotate_wait.present? ? "rotate_wait #{rotate_wait}" : ""}
- #{refresh_interval.present? ? "refresh_interval #{refresh_interval}" : ""}
-
- CONFIG
- end
end
end
end
diff --git a/app/models/fluentd/setting/out_elasticsearch.rb b/app/models/fluentd/setting/out_elasticsearch.rb
index bf9e78926..b1566f38b 100644
--- a/app/models/fluentd/setting/out_elasticsearch.rb
+++ b/app/models/fluentd/setting/out_elasticsearch.rb
@@ -1,24 +1,9 @@
class Fluentd
module Setting
class OutElasticsearch
- include Common
+ include Fluentd::Setting::Plugin
- KEYS = [
- :match,
- :host, :port, :index_name, :type_name,
- :logstash_format, :logstash_prefix, :logstash_dateformat, :utc_index,
- :hosts, :request_timeout, :include_tag_key
- ].freeze
-
- attr_accessor(*KEYS)
-
- booleans :logstash_format, :utc_index, :include_tag_key
-
- validates :match, presence: true
- validates :host, presence: true
- validates :port, presence: true
- validates :index_name, presence: true
- validates :type_name, presence: true
+ register_plugin("output", "elasticsearch")
def self.initial_params
{
@@ -29,20 +14,26 @@ def self.initial_params
logstash_format: true,
include_tag_key: false,
utc_index: true,
+ buffer_type: "file",
+ buffer: {
+ "0" => {
+ "type" => "file",
+ "path" => "/var/log/td-agent/buffer/elasticsearch",
+ }
+ },
}
end
def common_options
[
- :match, :host, :port, :logstash_format,
+ :pattern, :host, :port, :logstash_format,
:index_name, :type_name,
]
end
- def advanced_options
+ def hidden_options
[
- :hosts, :logstash_prefix, :logstash_dateformat,
- :utc_index, :request_timeout, :include_tag_key,
+ :secondary, :inject, :buffer
]
end
end
diff --git a/app/models/fluentd/setting/out_forward.rb b/app/models/fluentd/setting/out_forward.rb
index 1b259901d..d6bdcc350 100644
--- a/app/models/fluentd/setting/out_forward.rb
+++ b/app/models/fluentd/setting/out_forward.rb
@@ -1,91 +1,47 @@
class Fluentd
module Setting
class OutForward
- class Server
- include Common
- KEYS = [
- :name, :host, :port, :weight, :standby
- ].freeze
+ include Fluentd::Setting::Plugin
- attr_accessor(*KEYS)
+ register_plugin("output", "forward")
- flags :standby
-
- validates :host, presence: true
- validates :port, presence: true
- end
-
- class Secondary
- include Common
- KEYS = [
- :type, :path
- ].freeze
-
- attr_accessor(*KEYS)
-
- hidden :type
- validates :path, presence: true
- end
-
- include Common
-
- KEYS = [
- :match,
- :send_timeout, :recover_wait, :heartbeat_type, :heartbeat_interval,
- :phi_threshold, :hard_timeout,
- :server, :secondary
- ].freeze
-
- attr_accessor(*KEYS)
- choice :heartbeat_type, %w(udp tcp)
- nested :server, Server, multiple: true
- nested :secondary, Secondary
-
- validates :match, presence: true
- validate :validate_has_at_least_one_server
- validate :validate_nested_values
-
- def validate_has_at_least_one_server
- if children_of(:server).reject{|s| s.empty_value? }.blank?
- errors.add(:base, :out_forward_blank_server)
- end
- end
-
- def validate_nested_values
- self.class.children.inject(true) do |result, (key, _)|
- children_of(key).each do |child|
- if !child.empty_value? && !child.valid?
- child.errors.full_messages.each do |message|
- errors.add(:base, "(#{key})#{message}")
- end
- result = false
- end
- result
- end
- result
- end
+ config_section :secondary do
+ config_param :path, :string
end
def self.initial_params
{
+ buffer_type: "memory",
+ buffer: {
+ "0" => {
+ "type" => "memory",
+ }
+ },
secondary: {
"0" => {
- type: "file",
+ "type" => "file",
}
}
}
end
+ # TODO overwrite this method to support transport parameter and transport section
+ # def self.permit_params
+ # super
+ # end
+
def common_options
[
- :match, :server, :secondary,
+ :pattern, :server, :secondary,
]
end
- def advanced_options
+ def hidden_options
[
- :send_timeout, :recover_wait, :heartbeat_type, :heartbeat_interval,
- :phi_threshold, :hard_timeout,
+ :inject, :buffer,
+ :host, :port,
+ # We don't support TLS configuration via fluentd-ui for now.
+ :transport, :tls_version, :tls_ciphers, :tls_insecure_mode, :tls_verify_hostname, :tls_cert_path
]
end
end
diff --git a/app/models/fluentd/setting/out_mongo.rb b/app/models/fluentd/setting/out_mongo.rb
index 62093f48e..6338cb91d 100644
--- a/app/models/fluentd/setting/out_mongo.rb
+++ b/app/models/fluentd/setting/out_mongo.rb
@@ -1,34 +1,20 @@
class Fluentd
module Setting
class OutMongo
- include Common
+ include Fluentd::Setting::Plugin
- KEYS = [
- :match,
- :host, :port, :database, :collection, :capped, :capped_size, :capped_max, :user, :password, :tag_mapped,
- :buffer_type, :buffer_path, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval, :retry_wait, :retry_limit, :max_retry_wait, :num_threads,
- ].freeze
+ register_plugin("output", "mongo")
+ config_param(:capped, :bool, default: false)
+ config_param(:capped_size, :size, default: nil)
- attr_accessor(*KEYS)
-
- flags :capped, :tag_mapped
-
- validates :match, presence: true
- validates :host, presence: true
- validates :port, presence: true
+ # NOTE: fluent-plugin-mongo defines database parameter as required parameter
+ # But Fluentd tells us that the database parameter is not required.
validates :database, presence: true
- validate :validate_capped
validate :validate_collection
- validates :buffer_path, presence: true, if: ->{ buffer_type == "file" }
-
- def validate_capped
- return true if capped.blank?
- errors.add(:capped_size, :blank) if capped_size.blank?
- end
def validate_collection
if tag_mapped.blank? && collection.blank?
- errors.add(:collection, :blank)
+ errors.add(:collection, :blank)
end
end
@@ -38,20 +24,28 @@ def self.initial_params
port: 27017,
capped: true,
capped_size: "100m",
- }
+ buffer_type: "file",
+ buffer: {
+ "0" => {
+ "type" => "file",
+ "path" => "/var/log/td-agent/buffer/mongo",
+ }
+ },
+ }
end
def common_options
[
- :match, :host, :port, :database, :collection,
+ :pattern, :host, :port, :database, :collection,
:tag_mapped, :user, :password,
]
end
- def advanced_options
+ def hidden_options
[
- :capped, :capped_size, :capped_max, :buffer_type, :buffer_path, :buffer_queue_limit, :buffer_chunk_limit,
- :flush_interval, :retry_wait, :retry_limit, :max_retry_wait, :num_threads,
+ :secondary, :inject, :buffer,
+ :include_tag_key,
+ :include_time_key
]
end
end
diff --git a/app/models/fluentd/setting/out_s3.rb b/app/models/fluentd/setting/out_s3.rb
index 28fdc3985..fedca81aa 100644
--- a/app/models/fluentd/setting/out_s3.rb
+++ b/app/models/fluentd/setting/out_s3.rb
@@ -1,51 +1,39 @@
class Fluentd
module Setting
class OutS3
- include ActiveModel::Model
- include Common
+ include Fluentd::Setting::Plugin
- KEYS = [
- :match,
- :aws_key_id, :aws_sec_key, :s3_bucket, :s3_region, :path,
- # :reduced_redundancy, :check_apikey_on_start, :command_parameter, # not configurable?
- :format, :include_time_key, :time_key, :delimiter, :label_delimiter,
- :time_slice_format, :time_slice_wait, :time_format, :utc, :store_as, :proxy_uri, :use_ssl,
- :buffer_type, :buffer_path, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval,
- :retry_wait, :retry_limit, :max_retry_wait, :num_threads,
- ].freeze
-
- attr_accessor(*KEYS)
-
- choice :format, %w(out_file json ltsv single_value)
- choice :store_as, %w(gzip lzo lzma2 json txt)
- choice :buffer_type, %w(memory file)
- booleans :include_time_key, :use_ssl
- flags :utc
-
- validates :match, presence: true
- validates :s3_bucket, presence: true
- validates :buffer_path, presence: true, if: ->{ buffer_type == "file" }
+ register_plugin("output", "s3")
def self.initial_params
{
s3_region: "us-west-1",
- use_ssl: true,
+ buffer_type: "file",
+ buffer: {
+ "0" => {
+ "type" => "file",
+ "path" => "/var/log/td-agent/buffer/s3",
+ }
+ },
+ format_type: "out_file",
+ format: {
+ "0" => {
+ "type" => "out_file"
+ }
+ }
}
end
def common_options
[
- :match, :aws_key_id, :aws_sec_key,
+ :pattern, :aws_key_id, :aws_sec_key,
:s3_region, :s3_bucket, :use_ssl, :path,
]
end
- def advanced_options
+ def hidden
[
- :format, :include_time_key, :time_key, :delimiter, :label_delimiter,
- :utc, :time_slice_format, :time_slice_wait, :store_as, :proxy_uri,
- :buffer_type, :buffer_path, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval,
- :retry_wait, :retry_limit, :max_retry_wait, :num_threads,
+ :secondary, :inject, :buffer
]
end
end
diff --git a/app/models/fluentd/setting/out_stdout.rb b/app/models/fluentd/setting/out_stdout.rb
index 51ba3196a..0337b97f0 100644
--- a/app/models/fluentd/setting/out_stdout.rb
+++ b/app/models/fluentd/setting/out_stdout.rb
@@ -1,36 +1,39 @@
class Fluentd
module Setting
class OutStdout
- include Common
+ include Fluentd::Setting::Plugin
- KEYS = [:match, :output_type].freeze
-
- attr_accessor(*KEYS)
-
- choice :output_type, %w(json hash)
-
- validates :match, presence: true
- validates :output_type, inclusion: { in: %w(json hash) }
+ register_plugin("output", "stdout")
def self.initial_params
{
- match: "debug.**",
- output_type: "json",
+ pattern: "debug.**",
+ buffer_type: "memory",
+ buffer: {
+ "0" => {
+ "type" => "memory",
+ }
+ },
+ format_type: "stdout",
+ format: {
+ "0" => {
+ "@type" => "stdout",
+ "output_type" => "json"
+ }
+ }
}
end
def common_options
[
- :match, :output_type
+ :pattern, :output_type
]
end
- def advanced_options
- []
- end
-
- def plugin_name
- "stdout"
+ def hidden_options
+ [
+ :secondary, :inject, :buffer
+ ]
end
end
end
diff --git a/app/models/fluentd/setting/out_td.rb b/app/models/fluentd/setting/out_td.rb
deleted file mode 100644
index 38554ffd4..000000000
--- a/app/models/fluentd/setting/out_td.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-class Fluentd
- module Setting
- class OutTd
- include ActiveModel::Model
- include Common
-
- KEYS = [
- :match,
- :apikey, :auto_create_table, :database, :table,
- :flush_interval, :buffer_type, :buffer_path,
- ].freeze
-
- attr_accessor(*KEYS)
-
- flags :auto_create_table
-
- validates :match, presence: true
- validates :apikey, presence: true
- validates :auto_create_table, presence: true
- validates :buffer_path, presence: true, if: ->{ buffer_type == "file" }
-
- def plugin_name
- "tdlog"
- end
-
- def self.initial_params
- {
- buffer_type: "file",
- buffer_path: "/var/log/td-agent/buffer/td",
- auto_create_table: true,
- match: "td.*.*",
- }
- end
-
- def common_options
- [
- :match, :apikey, :auto_create_table, :database, :table,
- ]
- end
-
- def advanced_options
- [
- :flush_interval, :buffer_type, :buffer_path,
- ]
- end
- end
- end
-end
diff --git a/app/models/fluentd/setting/out_tdlog.rb b/app/models/fluentd/setting/out_tdlog.rb
new file mode 100644
index 000000000..65177a7a8
--- /dev/null
+++ b/app/models/fluentd/setting/out_tdlog.rb
@@ -0,0 +1,35 @@
+class Fluentd
+ module Setting
+ class OutTdlog
+ include Fluentd::Setting::Plugin
+
+ register_plugin("output", "tdlog")
+
+ def self.initial_params
+ {
+ pattern: "td.*.*",
+ buffer_type: "file",
+ buffer: {
+ "0" => {
+ "@type" => "file",
+ "path" => "/var/log/td-agent/buffer/td",
+ }
+ },
+ auto_create_table: true,
+ }
+ end
+
+ def common_options
+ [
+ :pattern, :apikey, :auto_create_table, :database, :table,
+ ]
+ end
+
+ def hidden_options
+ [
+ :secondary
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_apache.rb b/app/models/fluentd/setting/parser_apache.rb
new file mode 100644
index 000000000..6bdf6c498
--- /dev/null
+++ b/app/models/fluentd/setting/parser_apache.rb
@@ -0,0 +1,13 @@
+class Fluentd
+ module Setting
+ class ParserApache
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "apache")
+
+ def self.initial_params
+ {}
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_apache2.rb b/app/models/fluentd/setting/parser_apache2.rb
new file mode 100644
index 000000000..76480ae6b
--- /dev/null
+++ b/app/models/fluentd/setting/parser_apache2.rb
@@ -0,0 +1,13 @@
+class Fluentd
+ module Setting
+ class ParserApache2
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "apache2")
+
+ def self.initial_params
+ {}
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_apache_error.rb b/app/models/fluentd/setting/parser_apache_error.rb
new file mode 100644
index 000000000..43fa488ee
--- /dev/null
+++ b/app/models/fluentd/setting/parser_apache_error.rb
@@ -0,0 +1,13 @@
+class Fluentd
+ module Setting
+ class ParserApacheError
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "apache_error")
+
+ def self.initial_params
+ {}
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_csv.rb b/app/models/fluentd/setting/parser_csv.rb
new file mode 100644
index 000000000..45ee3220d
--- /dev/null
+++ b/app/models/fluentd/setting/parser_csv.rb
@@ -0,0 +1,22 @@
+class Fluentd
+ module Setting
+ class ParserCsv
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "csv")
+
+ def self.initial_params
+ {
+ keys: nil,
+ delimiter: ","
+ }
+ end
+
+ def common_options
+ [
+ :keys, :delimiter
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_in_http.rb b/app/models/fluentd/setting/parser_in_http.rb
new file mode 100644
index 000000000..b48bb143a
--- /dev/null
+++ b/app/models/fluentd/setting/parser_in_http.rb
@@ -0,0 +1,13 @@
+class Fluentd
+ module Setting
+ class ParserInHttp
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "in_http")
+
+ def self.initial_params
+ {}
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_json.rb b/app/models/fluentd/setting/parser_json.rb
new file mode 100644
index 000000000..168c12739
--- /dev/null
+++ b/app/models/fluentd/setting/parser_json.rb
@@ -0,0 +1,25 @@
+class Fluentd
+ module Setting
+ class ParserJson
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "json")
+
+ def self.initial_params
+ {
+ json_parser: "oj"
+ }
+ end
+
+ def common_options
+ []
+ end
+
+ def advanced_options
+ [
+ :json_parser
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_ltsv.rb b/app/models/fluentd/setting/parser_ltsv.rb
new file mode 100644
index 000000000..b4cc82937
--- /dev/null
+++ b/app/models/fluentd/setting/parser_ltsv.rb
@@ -0,0 +1,30 @@
+class Fluentd
+ module Setting
+ class ParserLtsv
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "ltsv")
+
+ def self.initial_params
+ {
+ delimiter: "\t",
+ delimiter_pattern: nil,
+ label_delimiter: ":"
+ }
+ end
+
+ def common_options
+ [
+ :delimiter,
+ :label_delimiter
+ ]
+ end
+
+ def advanced_options
+ [
+ :delimiter_pattern
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_msgpack.rb b/app/models/fluentd/setting/parser_msgpack.rb
new file mode 100644
index 000000000..c89070ef0
--- /dev/null
+++ b/app/models/fluentd/setting/parser_msgpack.rb
@@ -0,0 +1,13 @@
+class Fluentd
+ module Setting
+ class ParserMsgpack
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "msgpack")
+
+ def self.initial_params
+ {}
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_multiline.rb b/app/models/fluentd/setting/parser_multiline.rb
new file mode 100644
index 000000000..0cc7e551f
--- /dev/null
+++ b/app/models/fluentd/setting/parser_multiline.rb
@@ -0,0 +1,24 @@
+class Fluentd
+ module Setting
+ class ParserMultiline
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "multiline")
+
+ FORMAT_MAX_NUM = 20
+
+ (1..FORMAT_MAX_NUM).each do |n|
+ config_param("format#{n}", :string)
+ end
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [:format_firstline] +
+ (1..FORMAT_MAX_NUM).to_a.map{|n| "format#{n}".to_sym }
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_nginx.rb b/app/models/fluentd/setting/parser_nginx.rb
new file mode 100644
index 000000000..f06d5e055
--- /dev/null
+++ b/app/models/fluentd/setting/parser_nginx.rb
@@ -0,0 +1,13 @@
+class Fluentd
+ module Setting
+ class ParserNginx
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "nginx")
+
+ def self.initial_params
+ {}
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_none.rb b/app/models/fluentd/setting/parser_none.rb
new file mode 100644
index 000000000..d914200b2
--- /dev/null
+++ b/app/models/fluentd/setting/parser_none.rb
@@ -0,0 +1,19 @@
+class Fluentd
+ module Setting
+ class ParserNone
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "none")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :message_key
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_regexp.rb b/app/models/fluentd/setting/parser_regexp.rb
new file mode 100644
index 000000000..b1b9f2355
--- /dev/null
+++ b/app/models/fluentd/setting/parser_regexp.rb
@@ -0,0 +1,26 @@
+class Fluentd
+ module Setting
+ class ParserRegexp
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "regexp")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :expression
+ ]
+ end
+
+ def hidden_options
+ [
+ :ignorecase,
+ :multiline
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_syslog.rb b/app/models/fluentd/setting/parser_syslog.rb
new file mode 100644
index 000000000..d3f9eeee5
--- /dev/null
+++ b/app/models/fluentd/setting/parser_syslog.rb
@@ -0,0 +1,29 @@
+class Fluentd
+ module Setting
+ class ParserSyslog
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "syslog")
+ # Overwrite type of time_format
+ config_param(:time_format, :string)
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :time_format,
+ :with_priority,
+ ]
+ end
+
+ def advanced_options
+ [
+ :message_format,
+ :rfc5424_time_format
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/parser_tsv.rb b/app/models/fluentd/setting/parser_tsv.rb
new file mode 100644
index 000000000..fbb31258b
--- /dev/null
+++ b/app/models/fluentd/setting/parser_tsv.rb
@@ -0,0 +1,19 @@
+class Fluentd
+ module Setting
+ class ParserTsv
+ include Fluentd::Setting::Plugin
+
+ register_plugin("parser", "tsv")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :keys, :delimiter
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/section.rb b/app/models/fluentd/setting/section.rb
new file mode 100644
index 000000000..41b8f1001
--- /dev/null
+++ b/app/models/fluentd/setting/section.rb
@@ -0,0 +1,38 @@
+class Fluentd
+ module Setting
+ class Section
+ class << self
+ def inherited(klass)
+ klass.instance_eval do
+ include ActiveModel::Model
+ include ActiveModel::Attributes
+ include Fluentd::Setting::Configurable
+ include Fluentd::Setting::SectionParser
+ include Fluentd::Setting::PluginParameter
+
+ class_attribute :_klass, :_block, :_blocks
+ class_attribute :section_name, :required, :multi, :alias
+ self._klass = klass
+ self._blocks = []
+ end
+ end
+
+ def init
+ _klass.instance_eval(&_block)
+ _blocks.each do |b|
+ _klass.instance_eval(&b)
+ end
+ end
+
+ # Don't overwrite options
+ def merge(**options, &block)
+ _blocks << block
+ end
+
+ def section?
+ true
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/storage_local.rb b/app/models/fluentd/setting/storage_local.rb
new file mode 100644
index 000000000..a6cc0f1f3
--- /dev/null
+++ b/app/models/fluentd/setting/storage_local.rb
@@ -0,0 +1,22 @@
+class Fluentd
+ module Setting
+ class StorageLocal
+ include Fluentd::Setting::Plugin
+
+ register_plugin("storage", "local")
+
+ def self.initial_params
+ {}
+ end
+
+ def common_options
+ [
+ :path,
+ :mode,
+ :dir_mode,
+ :pretty_print
+ ]
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/type/array.rb b/app/models/fluentd/setting/type/array.rb
new file mode 100644
index 000000000..e032fc449
--- /dev/null
+++ b/app/models/fluentd/setting/type/array.rb
@@ -0,0 +1,17 @@
+class Fluentd
+ module Setting
+ module Type
+ class Array < ActiveModel::Type::Value
+ def type
+ :array
+ end
+
+ private
+
+ def cast_value(value)
+ value
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/type/bool.rb b/app/models/fluentd/setting/type/bool.rb
new file mode 100644
index 000000000..b953d9be4
--- /dev/null
+++ b/app/models/fluentd/setting/type/bool.rb
@@ -0,0 +1,18 @@
+class Fluentd
+ module Setting
+ module Type
+ class Bool < ActiveModel::Type::Value
+ def type
+ :bool
+ end
+
+ private
+
+ def cast_value(value)
+ # TODO Use type converter method of Fluentd
+ value
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/type/enum.rb b/app/models/fluentd/setting/type/enum.rb
new file mode 100644
index 000000000..c2f2bd8fc
--- /dev/null
+++ b/app/models/fluentd/setting/type/enum.rb
@@ -0,0 +1,17 @@
+class Fluentd
+ module Setting
+ module Type
+ class Enum < ActiveModel::Type::Value
+ def type
+ :enum
+ end
+
+ private
+
+ def cast_value(value)
+ value
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/type/hash.rb b/app/models/fluentd/setting/type/hash.rb
new file mode 100644
index 000000000..cbdfbeb06
--- /dev/null
+++ b/app/models/fluentd/setting/type/hash.rb
@@ -0,0 +1,17 @@
+class Fluentd
+ module Setting
+ module Type
+ class Hash < ActiveModel::Type::Value
+ def type
+ :hash
+ end
+
+ private
+
+ def cast_value(value)
+ value
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/type/regexp.rb b/app/models/fluentd/setting/type/regexp.rb
new file mode 100644
index 000000000..8210b14a4
--- /dev/null
+++ b/app/models/fluentd/setting/type/regexp.rb
@@ -0,0 +1,17 @@
+class Fluentd
+ module Setting
+ module Type
+ class Regexp < ActiveModel::Type::Value
+ def type
+ :regexp
+ end
+
+ private
+
+ def cast_value(value)
+ value
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/type/section.rb b/app/models/fluentd/setting/type/section.rb
new file mode 100644
index 000000000..2ece24d32
--- /dev/null
+++ b/app/models/fluentd/setting/type/section.rb
@@ -0,0 +1,17 @@
+class Fluentd
+ module Setting
+ module Type
+ class Section < ActiveModel::Type::Value
+ def type
+ :section
+ end
+
+ private
+
+ def cast_value(value)
+ value
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/type/size.rb b/app/models/fluentd/setting/type/size.rb
new file mode 100644
index 000000000..46d8dd7aa
--- /dev/null
+++ b/app/models/fluentd/setting/type/size.rb
@@ -0,0 +1,17 @@
+class Fluentd
+ module Setting
+ module Type
+ class Size < ActiveModel::Type::Value
+ def type
+ :size
+ end
+
+ private
+
+ def cast_value(value)
+ value
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/fluentd/setting/type/time.rb b/app/models/fluentd/setting/type/time.rb
new file mode 100644
index 000000000..80f1796b9
--- /dev/null
+++ b/app/models/fluentd/setting/type/time.rb
@@ -0,0 +1,17 @@
+class Fluentd
+ module Setting
+ module Type
+ class Time < ActiveModel::Type::Value
+ def type
+ :fluentd_time
+ end
+
+ private
+
+ def cast_value(value)
+ value
+ end
+ end
+ end
+ end
+end
diff --git a/app/views/api/settings/_element.json.jbuilder b/app/views/api/settings/_element.json.jbuilder
index bc58a7d26..018ca1a69 100644
--- a/app/views/api/settings/_element.json.jbuilder
+++ b/app/views/api/settings/_element.json.jbuilder
@@ -1,6 +1,6 @@
json.id element_id(element)
json.name element.name
-json.type element["type"]
+json.type element["@type"] || element["type"]
json.arg element.arg
json.settings element
json.content element.to_s
diff --git a/app/views/fluentd/settings/in_forward/_form.html.haml b/app/views/fluentd/settings/in_forward/_form.html.haml
new file mode 100644
index 000000000..6ea374144
--- /dev/null
+++ b/app/views/fluentd/settings/in_forward/_form.html.haml
@@ -0,0 +1,16 @@
+= render "shared/setting_errors"
+
+- # NOTE: plugin_setting_form_action_url is defined at SettingConcern
+= form_with(model: @setting, scope: "setting", url: plugin_setting_form_action_url(@fluentd), local: true, class: "ignore-rails-error-div", builder: FluentdFormBuilder) do |f|
+ - @setting.common_options.each do |key|
+ = f.field(key)
+
+ .card.card-body.bg-light
+ %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"}
+ = icon('fa-caret-down')
+ = t('terms.advanced_setting')
+ #advanced-setting.collapse
+ - @setting.advanced_options.each do |key|
+ = f.field(key)
+
+ = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right"
diff --git a/app/views/fluentd/settings/in_tail/_form.html.haml b/app/views/fluentd/settings/in_tail/_form.html.haml
index df3f1f523..cd789ee8a 100644
--- a/app/views/fluentd/settings/in_tail/_form.html.haml
+++ b/app/views/fluentd/settings/in_tail/_form.html.haml
@@ -1,42 +1,35 @@
-- @setting.errors.full_messages.each do |e|
+- setting.errors.full_messages.each do |e|
.alert.alert-danger= e
.form-group
- = f.label :path
- = f.hidden_field :path
- = f.text_field :path, class: "form-control", disabled: true
+ = form.label :path
+ = form.hidden_field :path
+ = form.text_field :path, class: "form-control", disabled: true
.form-group
- = f.label :format
- = f.hidden_field :format
- = f.text_field :format, class: "form-control", disabled: true
-- if @setting.known_formats[@setting.format.to_sym]
- - @setting.known_formats[@setting.format.to_sym].each do |key|
- %label= key
- = f.hidden_field key
- = @setting.send(key)
- %br
-- else
- %label= @setting.format
- = f.hidden_field :regexp
- = @setting.regexp
-.form-group
- = f.label :tag
- = f.text_field :tag, class: "form-control"
+ = form.label :parse_type
+ = form.hidden_field :parse_type
+ = form.text_field :parse_type, class: "form-control", disabled: true
+
.form-group
- = f.label :pos_file
- = f.text_field :pos_file, class: "form-control"
+ %label= setting.parse_type
+ - parse_config = setting.create_parser
+ = hidden_field_tag("setting[parse[0]][type]", form.object.parse_type)
+ = form.fields("parse[0]", model: parse_config, builder: FluentdFormBuilder) do |f|
+ - f.object.common_options.each do |key|
+ = f.hidden_field(key)
+ = f.field(key, disabled: true)
+
+= form.field(:tag)
+= form.field(:pos_file)
+
.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 :rotate_wait
- = f.text_field :rotate_wait, class: "form-control"
+ = form.field(:rotate_wait)
.form-group
- = f.check_box :read_from_head
- = f.label :read_from_head
+ = form.field(:read_from_head)
.form-group
- = f.label :refresh_interval
- = f.text_field :refresh_interval, class: "form-control"
-
+ = form.field(:refresh_interval)
diff --git a/app/views/fluentd/settings/in_tail/after_file_choose.html.haml b/app/views/fluentd/settings/in_tail/after_file_choose.html.haml
index 74834d999..0e6db6506 100644
--- a/app/views/fluentd/settings/in_tail/after_file_choose.html.haml
+++ b/app/views/fluentd/settings/in_tail/after_file_choose.html.haml
@@ -10,7 +10,7 @@
= f.label :path
= f.hidden_field :path
= f.text_field :path, class: "form-control", disabled: true
- = render partial: "shared/vue/in_tail_format", locals: { file: f.object.path, formats: @setting.known_formats, initialSelected: f.object.format || @setting.guess_format }
+ = render "shared/vue/in_tail_parse", setting: @setting
.card
%pre.card-body= file_tail(@setting.path, Settings.in_tail_preview_line_count).join("\n")
diff --git a/app/views/fluentd/settings/in_tail/after_format.html.haml b/app/views/fluentd/settings/in_tail/after_format.html.haml
index 4c521ff12..ed3ad219a 100644
--- a/app/views/fluentd/settings/in_tail/after_format.html.haml
+++ b/app/views/fluentd/settings/in_tail/after_format.html.haml
@@ -2,9 +2,9 @@
= link_to t('fluentd.settings.in_tail.restart_from_first'), daemon_setting_in_tail_path(@fluentds)
-= form_for(@setting, as: "setting", url: confirm_daemon_setting_in_tail_path(@fluentd)) do |f|
- = render partial: "form", locals: { f: f }
+= form_with(model: @setting, scope: "setting", url: confirm_daemon_setting_in_tail_path(@fluentd), local: true, builder: FluentdFormBuilder) do |form|
+ = render partial: "form", locals: { form: form, setting: @setting }
%p
- = f.submit t('terms.next'), class: "btn btn-lg btn-primary float-right"
- = f.submit t('terms.prev'), class: "btn btn-lg btn-secondary", name: "back"
+ = form.submit t('terms.next'), class: "btn btn-lg btn-primary float-right"
+ = form.submit t('terms.prev'), class: "btn btn-lg btn-secondary", name: "back"
diff --git a/app/views/fluentd/settings/in_tail/confirm.html.haml b/app/views/fluentd/settings/in_tail/confirm.html.haml
index 76748a1ef..cf0f7719e 100644
--- a/app/views/fluentd/settings/in_tail/confirm.html.haml
+++ b/app/views/fluentd/settings/in_tail/confirm.html.haml
@@ -2,12 +2,12 @@
= link_to t('fluentd.settings.in_tail.restart_from_first'), daemon_setting_in_tail_path(@fluentd)
-= form_for(@setting, as: "setting", url: finish_daemon_setting_in_tail_path(@fluentd)) do |f|
- = render partial: "form", locals: { f: f }
+= form_with(model: @setting, scope: "setting", url: finish_daemon_setting_in_tail_path(@fluentd), local: true, builder: FluentdFormBuilder) do |form|
+ = render partial: "form", locals: { form: form, setting: @setting }
- %pre= @setting.to_conf
+ %pre= @setting.to_config
%p
- = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary float-right"
- = f.submit t('terms.prev'), class: "btn btn-lg btn-secondary", name: "back"
+ = form.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary float-right"
+ = form.submit t('terms.prev'), class: "btn btn-lg btn-secondary", name: "back"
.clearfix.float-right= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand)
diff --git a/app/views/fluentd/settings/source_and_output.html.haml b/app/views/fluentd/settings/source_and_output.html.haml
index 309674751..8c1de68b4 100644
--- a/app/views/fluentd/settings/source_and_output.html.haml
+++ b/app/views/fluentd/settings/source_and_output.html.haml
@@ -23,7 +23,7 @@
.card-header
%h4= t('.out')
.card-body
- - %w|stdout td s3 mongo elasticsearch forward|.each do |type|
+ - %w|stdout tdlog s3 mongo elasticsearch forward|.each do |type|
%p
= link_to(send("daemon_setting_out_#{type}_path", @fluentd)) do
= icon('fa-file-text-o fa-lg')
diff --git a/app/views/shared/_global_nav.html.erb b/app/views/shared/_global_nav.html.erb
index 314a08dbe..be3b492a9 100644
--- a/app/views/shared/_global_nav.html.erb
+++ b/app/views/shared/_global_nav.html.erb
@@ -1,6 +1,6 @@