fluentd-ui 1.0.0.alpha.2 → 1.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72809f1d9f4e9c2ec00cb5cfc89c21151d278fc47c9b60caa3bc8746532e281
-  data.tar.gz: 60222c373826c90c8cce959bcad61f6bcf2f893b94c5ff4f82d5e591ac85d84e
+  metadata.gz: 371bb07d552eafadfce633dfec5adb819f3035e0d1c2f741a02935aacc5224ab
+  data.tar.gz: 62b220afde0c306b9d86ecddf71cefe85afe2008e4b08a80ab8fc01166002272
 SHA512:
-  metadata.gz: d1ced5aaa01552d4520490efdd02bf9cd977e686e1034791f69eb8b4c4bfc1ae694ee387ca21e5d77e9e1b9fdc2ca529a2b8a0774f13086a007e75b481485e1c
-  data.tar.gz: 50fdfc479a24f2f967e26c90eb631a2b62fcdb0d6f6a54a001652493a04b1b41a61900c4c6fcde4994457dbe2c0b6827f689c4972e2282d18278c7e2fc5d38a4
+  metadata.gz: 834685ca65b72e54d287fdbcd74abed5df9b2d856c04126364de5e4714597e3f099bec3d38cd933496c15e7cbaac3b1271760a5c6070be1afebb2814c1a5a94c
+  data.tar.gz: 9880d835ba57727cb5a10816e49cae0e4854062fe88cde847231ca630f73eab3232238925e8e457ae610d11c306ab1bc55369a4106236febf1bbf2d873bdd984

data/ChangeLog.md

@@ -1,3 +1,8 @@
+## Release 1.0.0.alpha.3 - 2018/06/18
+
+* [improvement] Support Fluentd v1 [#238](https://github.com/fluent/fluentd-ui/pull/238)
+* [maintenance] Update document [#237](https://github.com/fluent/fluentd-ui/pull/237)
+
 ## Release 1.0.0-alpha.2 - 2018/05/24
 
 * [fixed] Update HTML classes [#234](https://github.com/fluent/fluentd-ui/pull/234)

data/Gemfile.lock

@@ -1,12 +1,16 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (1.0.0.alpha.2)
+    fluentd-ui (1.0.0.alpha.3)
       addressable
       bootsnap (>= 1.1.0)
       bundler
       diff-lcs
       draper (~> 3.0)
+      fluent-plugin-elasticsearch (~> 2.10)
+      fluent-plugin-mongo (~> 1.1)
+      fluent-plugin-s3 (~> 1.1)
+      fluent-plugin-td (~> 1.0)
       fluentd (>= 1.0.0, < 2)
       font-awesome-rails
       haml-rails (~> 1.0)
@@ -74,6 +78,24 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     arel (9.0.0)
+    aws-eventstream (1.0.0)
+    aws-partitions (1.87.0)
+    aws-sdk-core (3.21.2)
+      aws-eventstream (~> 1.0)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.5.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.13.0)
+      aws-sdk-core (~> 3, >= 3.21.2)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-sqs (1.3.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.0.2)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -83,6 +105,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.3.0)
       msgpack (~> 1.0)
+    bson (4.3.0)
     builder (3.2.3)
     capybara (3.0.2)
       addressable
@@ -112,14 +135,39 @@ GEM
       activemodel-serializers-xml (~> 1.0)
       activesupport (~> 5.0)
       request_store (~> 1.0)
+    elasticsearch (6.0.2)
+      elasticsearch-api (= 6.0.2)
+      elasticsearch-transport (= 6.0.2)
+    elasticsearch-api (6.0.2)
+      multi_json
+    elasticsearch-transport (6.0.2)
+      faraday
+      multi_json
     erubi (1.7.1)
     erubis (2.7.0)
+    excon (0.62.0)
     factory_bot (4.8.2)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.8.2)
       factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
+    faraday (0.15.2)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.23)
+    fluent-plugin-elasticsearch (2.10.1)
+      elasticsearch
+      excon
+      fluentd (>= 0.14.20)
+    fluent-plugin-mongo (1.1.1)
+      fluentd (>= 0.14.12, < 2)
+      mongo (~> 2.2.0)
+    fluent-plugin-s3 (1.1.3)
+      aws-sdk-s3 (~> 1.0)
+      aws-sdk-sqs (~> 1.0)
+      fluentd (>= 0.14.2, < 2)
+    fluent-plugin-td (1.0.0)
+      fluentd (>= 0.14.13, < 2)
+      td-client (~> 1.0)
     fluentd (1.2.1)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
@@ -159,6 +207,7 @@ GEM
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
+    jmespath (1.4.0)
     json (2.1.0)
     kramdown (1.16.2)
     kramdown-haml (0.0.3)
@@ -181,8 +230,11 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
+    mongo (2.2.7)
+      bson (~> 4.0)
     msgpack (1.2.4)
     multi_json (1.13.1)
+    multipart-post (2.0.0)
     nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
@@ -286,6 +338,9 @@ GEM
     strptime (0.2.3)
     sucker_punch (2.0.4)
       concurrent-ruby (~> 1.0.0)
+    td-client (1.0.6)
+      httpclient (>= 2.7)
+      msgpack (>= 0.5.6, < 2)
     temple (0.8.0)
     thor (0.20.0)
     thread_safe (0.3.6)

data/README.md

@@ -17,9 +17,9 @@ fluentd-ui is a browser-based [fluentd](http://www.fluentd.org) and [td-agent](h
 ## Requirements
 
 - ruby 2.2.2 or later (since v1.0.0)
-- fluentd v1.0.0 or later
+- fluentd v1.0.0 or later (also supports td-agent 3)
+  - Currently, fluentd v1 and td-agent 3 support is in alpha state
 
-Currently, fluentd-ui doesn't support fleuntd v1 and td-agent 3.
 And some additional packages (Debian / Ubuntu)
 
 - build-essential

data/app/controllers/api/config_definitions_controller.rb

@@ -0,0 +1,55 @@
+class Api::ConfigDefinitionsController < ApplicationController
+  before_action :login_required
+
+  def index
+    name = params[:name]
+    type = params[:type]
+    prefix = case type
+             when "input"
+               "in"
+             when "output"
+               "out"
+             when "filter"
+               "filter"
+             when "parse"
+               "parser"
+             when "format"
+               "formatter"
+             when "parser", "formatter", "buffer", "storage"
+               type
+             end
+
+    target_class = Fluentd::Setting.const_get("#{prefix}_#{name}".classify)
+    target = target_class.new
+
+    common_options = target.common_options.map do |key|
+      h = {
+        name: key,
+        type: target.column_type(key),
+        desc: target.desc(key),
+        default: target.default(key)
+      }
+      h[:list] = target.list_of(key) if target.column_type(key) == :enum
+      h
+    end
+
+    advanced_options = target.advanced_options.map do |key|
+      h = {
+        name: key,
+        type: target.column_type(key),
+        desc: target.desc(key),
+        default: target.default(key)
+      }
+      h[:list] = target.list_of(key) if target.column_type(key) == :enum
+      h
+    end
+
+    options = {
+      type: type,
+      name: name,
+      commonOptions: common_options,
+      advancedOptions: advanced_options
+    }
+    render json: options
+  end
+end

data/app/controllers/api_controller.rb

@@ -19,9 +19,12 @@ class ApiController < ApplicationController
   end
 
   def regexp_preview
-    preview = RegexpPreview.processor(params[:format]).new(params[:file], params[:format], params)
+    plugin_config = prepare_plugin_config || {}
+    preview = RegexpPreview.processor(params[:parse_type]).new(params[:file], params[:parse_type], plugin_config)
 
-    render json: preview.matches_json
+    render json: preview.matches
+  rescue Fluent::ConfigError => ex
+    render json: { error: "#{ex.class}: #{ex.message}" }
   end
 
   def grok_to_regexp
@@ -29,5 +32,19 @@ class ApiController < ApplicationController
     grok.load_patterns
     render text: grok.convert_to_regexp(params[:grok_str]).source
   end
-end
 
+  private
+
+  def prepare_plugin_config
+    plugin_config = params[:plugin_config]
+    case params[:parse_type]
+    when "multiline"
+      plugin_config[:formats].lines.each.with_index do |line, index|
+        plugin_config["format#{index + 1}"] = line.chomp
+      end
+      plugin_config
+    else
+      plugin_config
+    end
+  end
+end

data/app/controllers/concerns/setting_concern.rb

@@ -10,11 +10,19 @@ module SettingConcern
 
   def show
     @setting = target_class.new(initial_params)
+    @buffer = @setting.create_buffer
+    @storage = @setting.create_storage
+    @parser = @setting.create_parser
+    @formatter = @setting.create_formatter
+    @_used_param = {}
+    @_used_section = {}
     render "shared/settings/show"
   end
 
   def finish
     @setting = target_class.new(setting_params)
+    @_used_param = {}
+    @_used_section = {}
     unless @setting.valid?
       return render "shared/settings/show"
     end
@@ -32,7 +40,7 @@ module SettingConcern
   private
 
   def setting_params
-    params.require(target_class.to_s.underscore.gsub("/", "_")).permit(*target_class.const_get(:KEYS))
+    params.require(:setting).permit(*target_class.permit_params)
   end
 
   def initial_params
@@ -40,7 +48,15 @@ module SettingConcern
   end
 
   def target_plugin_name
-    target_class.to_s.split("::").last.underscore
+    prefix = case target_class.plugin_type
+             when "input"
+               "in"
+             when "output"
+               "out"
+             else
+               target_class.plugin_type
+             end
+    "#{prefix}_#{target_class.plugin_name}"
   end
 
   def plugin_setting_form_action_url(*args)

data/app/controllers/fluentd/settings/in_tail_controller.rb

@@ -4,8 +4,8 @@ class Fluentd::Settings::InTailController < ApplicationController
 
   def after_file_choose
     @setting = Fluentd::Setting::InTail.new({
-      :path => params[:path],
-      :tag => nil,
+      path: params[:path],
+      tag: nil
     })
   end
 
@@ -38,20 +38,28 @@ class Fluentd::Settings::InTailController < ApplicationController
       return render "after_format"
     end
 
-    if @fluentd.agent.configuration.to_s.include?(@setting.to_conf.strip)
+    if @fluentd.agent.configuration.to_s.include?(@setting.to_config.to_s.strip)
       @setting.errors.add(:base, :duplicated_conf)
       return render "after_format"
     end
 
-    @fluentd.agent.config_append @setting.to_conf
+    @fluentd.agent.config_append @setting.to_config.to_s
     @fluentd.agent.restart if @fluentd.agent.running?
     redirect_to daemon_setting_path(@fluentd)
   end
 
+  def target_class
+    Fluentd::Setting::InTail
+  end
+
   private
 
   def setting_params
-    params.require(:setting).permit(:path, :format, :regexp, *Fluentd::Setting::InTail.known_formats, :tag, :rotate_wait, :pos_file, :read_from_head, :refresh_interval)
+    permit_params = target_class._types.keys
+    permit_params << :parse_type
+    section_class = Fluentd::Setting.const_get("parser_#{params.dig(:setting, :parse_type)}".classify)
+    permit_params << { parse: section_class._types.keys }
+    params.require(:setting).permit(*permit_params)
   end
 
 end

data/app/controllers/fluentd/settings/out_forward_controller.rb

@@ -6,13 +6,4 @@ class Fluentd::Settings::OutForwardController < ApplicationController
   def target_class
     Fluentd::Setting::OutForward
   end
-
-  def setting_params
-    params.require(:fluentd_setting_out_forward).permit(*Fluentd::Setting::OutForward::KEYS).merge(
-      params.require(:fluentd_setting_out_forward).permit(
-        :server => Fluentd::Setting::OutForward::Server::KEYS,
-        :secondary => Fluentd::Setting::OutForward::Secondary::KEYS,
-      ),
-    )
-  end
 end

data/app/controllers/fluentd/settings/out_s3_controller.rb

@@ -6,9 +6,4 @@ class Fluentd::Settings::OutS3Controller < ApplicationController
   def target_class
     Fluentd::Setting::OutS3
   end
-
-  def setting_params
-    params.require(:fluentd_setting_out_s3).permit(*Fluentd::Setting::OutS3::KEYS)
-  end
-
 end

data/app/controllers/fluentd/settings/out_tdlog_controller.rb

@@ -0,0 +1,9 @@
+class Fluentd::Settings::OutTdlogController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::OutTdlog
+  end
+end

data/app/form_builders/fluentd_form_builder.rb

@@ -0,0 +1,83 @@
+class FluentdFormBuilder < ActionView::Helpers::FormBuilder
+  include ActionView::Helpers::TagHelper
+  include ActionView::Context
+
+  def field(key, options = {})
+    plugin_class = object.class
+    content_tag(:div, class: "form-group") do
+      if plugin_class._sections[key]
+        render_section(key, options)
+      else
+        resolve_field(key, options)
+      end
+    end
+  end
+
+  private
+
+  def resolve_field(key, options = {})
+    plugin_class = object.class
+    column_type = plugin_class.column_type(key)
+    case column_type
+    when :enum
+      enum_field(key, options)
+    when :bool
+      bool_field(key, options)
+    else
+      other_field(key, options)
+    end
+  end
+
+  def enum_field(key, options)
+    label(key, nil, data: { toggle: "tooltip", placement: "right" }, title: object.desc(key)) +
+      select(key, object.list_of(key), options, { class: "enum" })
+  end
+
+  def bool_field(key, options)
+    check_box(key, options, "true", "false") + " " +
+      label(key, nil, data: { toggle: "tooltip", placement: "right" }, title: object.desc(key))
+  end
+
+  def other_field(key, options)
+    return unless object.respond_to?(key)
+    label(key, nil, data: { toggle: "tooltip", placement: "right" }, title: object.desc(key)) +
+      text_field(key, class: "form-control", **options)
+  end
+
+  def render_section(key, options)
+    section_class = object.class._sections[key]
+    children = object.__send__(key) || { "0" => {} }
+    html = ""
+
+    children.each do |index, child|
+      html << content_tag("div", class: "js-nested-column #{section_class.multi ? "js-multiple" : ""}") do
+        _html = ""
+        _html << append_and_remove_links if section_class.multi
+        _html << label(key, nil, data: { toggle: "tooltip", placement: "right" }, title: object.desc(key))
+        _html << section_fields(key, index, section_class, child)
+        _html.html_safe
+      end
+    end
+    html.html_safe
+  end
+
+  def section_fields(key, index, section_class, child)
+    section = section_class.new(child)
+    fields("#{key}[#{index}]", model: section) do |section_form|
+      html = ""
+      section_class._types.keys.each do |section_key|
+        html << section_form.field(section_key)
+      end
+      html.html_safe
+    end
+  end
+
+  def append_and_remove_links
+    %Q!<a class="btn btn-xs btn-default js-append">#{icon('fa-plus')}</a> ! +
+    %Q!<a class="btn btn-xs btn-default js-remove" style="display:none">#{icon('fa-minus')}</a> !
+  end
+
+  def icon(classes, inner=nil)
+    %Q!<i class="fa #{classes}">#{inner}</i> !.html_safe
+  end
+end