fluentd-ui 1.0.0.alpha.3 → 1.0.0.beta.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.3
+  version: 1.0.0.beta.1
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -45,6 +45,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: dig_rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bootsnap
   requirement: !ruby/object:Gem::Requirement
@@ -364,6 +378,7 @@ extra_rdoc_files: []
 files:
 - ".babelrc"
 - ".editorconfig"
+- ".eslintrc.js"
 - ".gitignore"
 - ".postcssrc.yml"
 - ".rspec"
@@ -414,17 +429,22 @@ files:
 - app/decorators/plugin_decorator.rb
 - app/form_builders/fluentd_form_builder.rb
 - app/helpers/application_helper.rb
-- app/helpers/settings_helper.rb
 - app/javascript/packs/application.js
+- app/javascript/packs/aws_credential.js
 - app/javascript/packs/codemirror.js
+- app/javascript/packs/config_field.js
 - app/javascript/packs/fluent_log.js
 - app/javascript/packs/in_tail_parse.js
 - app/javascript/packs/nested_settings.js
 - app/javascript/packs/notification.js
+- app/javascript/packs/out_forward_setting.js
+- app/javascript/packs/out_s3_setting.js
 - app/javascript/packs/owned_plugin_form.js
 - app/javascript/packs/parser_multiline_form.js
 - app/javascript/packs/plugin_setting.js
 - app/javascript/packs/settings.js
+- app/javascript/packs/transport_config.js
+- app/javascript/packs/transport_section.js
 - app/javascript/packs/treeview.js
 - app/javascript/stylesheets/application.scss
 - app/jobs/all_plugin_check_update_job.rb
@@ -442,8 +462,9 @@ files:
 - app/models/concerns/fluentd/setting/plugin.rb
 - app/models/concerns/fluentd/setting/plugin_config.rb
 - app/models/concerns/fluentd/setting/plugin_parameter.rb
+- app/models/concerns/fluentd/setting/registry_loader.rb
+- app/models/concerns/fluentd/setting/section_config.rb
 - app/models/concerns/fluentd/setting/section_parser.rb
-- app/models/concerns/fluentd/setting/section_validator.rb
 - app/models/concerns/fluentd/setting_archive/archivable.rb
 - app/models/fluent_gem.rb
 - app/models/fluentd.rb
@@ -499,6 +520,7 @@ files:
 - app/models/fluentd/setting/type/bool.rb
 - app/models/fluentd/setting/type/enum.rb
 - app/models/fluentd/setting/type/hash.rb
+- app/models/fluentd/setting/type/object.rb
 - app/models/fluentd/setting/type/regexp.rb
 - app/models/fluentd/setting/type/section.rb
 - app/models/fluentd/setting/type/size.rb
@@ -517,7 +539,6 @@ files:
 - app/views/fluentd/errors.html.haml
 - app/views/fluentd/log.html.haml
 - app/views/fluentd/new.html.haml
-- app/views/fluentd/settings/_form.html.haml
 - app/views/fluentd/settings/edit.html.haml
 - app/views/fluentd/settings/histories/_list.html.haml
 - app/views/fluentd/settings/histories/index.html.haml
@@ -528,6 +549,8 @@ files:
 - app/views/fluentd/settings/in_tail/after_format.html.haml
 - app/views/fluentd/settings/in_tail/confirm.html.haml
 - app/views/fluentd/settings/in_tail/show.html.haml
+- app/views/fluentd/settings/out_forward/_form.html.haml
+- app/views/fluentd/settings/out_s3/_form.html.haml
 - app/views/fluentd/settings/running_backup/show.html.haml
 - app/views/fluentd/settings/show.html.haml
 - app/views/fluentd/settings/source_and_output.html.haml
@@ -550,12 +573,18 @@ files:
 - app/views/shared/settings/_diff.html.erb
 - app/views/shared/settings/_form.html.haml
 - app/views/shared/settings/show.html.haml
+- app/views/shared/vue/_aws_credential.html.haml
+- app/views/shared/vue/_config_field.html.haml
 - app/views/shared/vue/_fluent_log.html.erb
 - app/views/shared/vue/_in_tail_parse.html.haml
 - app/views/shared/vue/_notification.html.erb
+- app/views/shared/vue/_out_forward_setting.html.haml
+- app/views/shared/vue/_out_s3_setting.html.haml
 - app/views/shared/vue/_owned_plugin_form.html.haml
 - app/views/shared/vue/_parser_multiline_form.html.haml
 - app/views/shared/vue/_setting.html.erb
+- app/views/shared/vue/_transport_config.html.haml
+- app/views/shared/vue/_transport_section.html.haml
 - app/views/shared/vue/_treeview.html.erb
 - app/views/tutorials/chapter1.html.erb
 - app/views/tutorials/chapter2.html.haml
@@ -588,6 +617,8 @@ files:
 - config/initializers/backtrace_silencers.rb
 - config/initializers/content_security_policy.rb
 - config/initializers/cookies_serializer.rb
+- config/initializers/dig.rb
+- config/initializers/dummy_logger.rb
 - config/initializers/filter_parameter_logging.rb
 - config/initializers/fluentd_ui_update_check.rb
 - config/initializers/inflections.rb
@@ -624,7 +655,9 @@ files:
 - docs/screenshots/plugin.gif
 - docs/screenshots/setting.gif
 - fluentd-ui.gemspec
+- gemfiles/ruby2.2.gemfile
 - lib/assets/.keep
+- lib/dummy_logger.rb
 - lib/file_reverse_reader.rb
 - lib/fluentd-ui.rb
 - lib/fluentd-ui/command.rb
@@ -643,7 +676,7 @@ files:
 - public/404.html
 - public/422.html
 - public/500.html
-- public/assets/.sprockets-manifest-8ea9bd6b345c819e44a7d505e705cea2.json
+- public/assets/.sprockets-manifest-d4bcbf913b3d249ea8bf167d3e16dd5c.json
 - public/assets/application-db8ee881ff43fff5b8f3a6c96c92c2c62428cc6340162b5fde8d0cbf80c03d2f.css
 - public/assets/application-db8ee881ff43fff5b8f3a6c96c92c2c62428cc6340162b5fde8d0cbf80c03d2f.css.gz
 - public/assets/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2
@@ -658,43 +691,61 @@ files:
 - public/fluentd-logo-right-text.png
 - public/fluentd-logo.png
 - public/fluentd.png
-- public/packs/application-3f916ccb17fbe565e2e0.js
-- public/packs/application-3f916ccb17fbe565e2e0.js.gz
-- public/packs/application-3f916ccb17fbe565e2e0.js.map
 - public/packs/application-d41d8cd98f00b204e9800998ecf8427e.css
 - public/packs/application-d41d8cd98f00b204e9800998ecf8427e.css.map
-- public/packs/codemirror-041ca43e0b5b8c8fd229.js
-- public/packs/codemirror-041ca43e0b5b8c8fd229.js.gz
-- public/packs/codemirror-041ca43e0b5b8c8fd229.js.map
-- public/packs/fluent_log-5ae2f8a6f0a00f5c5269.js
-- public/packs/fluent_log-5ae2f8a6f0a00f5c5269.js.gz
-- public/packs/fluent_log-5ae2f8a6f0a00f5c5269.js.map
-- public/packs/in_tail_parse-bd6d9909edb67fc2679d.js
-- public/packs/in_tail_parse-bd6d9909edb67fc2679d.js.gz
-- public/packs/in_tail_parse-bd6d9909edb67fc2679d.js.map
+- public/packs/application-d9c1a8fd897e89f4339b.js
+- public/packs/application-d9c1a8fd897e89f4339b.js.gz
+- public/packs/application-d9c1a8fd897e89f4339b.js.map
+- public/packs/aws_credential-b4452e1117b0c532dc5b.js
+- public/packs/aws_credential-b4452e1117b0c532dc5b.js.gz
+- public/packs/aws_credential-b4452e1117b0c532dc5b.js.map
+- public/packs/codemirror-ee4da72eacbf03f4a8a6.js
+- public/packs/codemirror-ee4da72eacbf03f4a8a6.js.gz
+- public/packs/codemirror-ee4da72eacbf03f4a8a6.js.map
+- public/packs/config_field-f5bced5c699aea7c0ab8.js
+- public/packs/config_field-f5bced5c699aea7c0ab8.js.gz
+- public/packs/config_field-f5bced5c699aea7c0ab8.js.map
+- public/packs/fluent_log-1a50e9efd568574f6edb.js
+- public/packs/fluent_log-1a50e9efd568574f6edb.js.gz
+- public/packs/fluent_log-1a50e9efd568574f6edb.js.map
+- public/packs/in_tail_parse-3560e8785b8cb75ea466.js
+- public/packs/in_tail_parse-3560e8785b8cb75ea466.js.gz
+- public/packs/in_tail_parse-3560e8785b8cb75ea466.js.map
 - public/packs/manifest.json
 - public/packs/manifest.json.gz
-- public/packs/nested_settings-f3419e02d29deef26a0b.js
-- public/packs/nested_settings-f3419e02d29deef26a0b.js.gz
-- public/packs/nested_settings-f3419e02d29deef26a0b.js.map
-- public/packs/notification-c0a8f5aab7c22b5b0883.js
-- public/packs/notification-c0a8f5aab7c22b5b0883.js.gz
-- public/packs/notification-c0a8f5aab7c22b5b0883.js.map
-- public/packs/owned_plugin_form-e9fdd3c56d889df5dc9c.js
-- public/packs/owned_plugin_form-e9fdd3c56d889df5dc9c.js.gz
-- public/packs/owned_plugin_form-e9fdd3c56d889df5dc9c.js.map
-- public/packs/parser_multiline_form-e3a5a75e7ff674412a69.js
-- public/packs/parser_multiline_form-e3a5a75e7ff674412a69.js.gz
-- public/packs/parser_multiline_form-e3a5a75e7ff674412a69.js.map
-- public/packs/plugin_setting-b81359fe41b042b4f508.js
-- public/packs/plugin_setting-b81359fe41b042b4f508.js.gz
-- public/packs/plugin_setting-b81359fe41b042b4f508.js.map
-- public/packs/settings-2ee0ee40542bd3614bf8.js
-- public/packs/settings-2ee0ee40542bd3614bf8.js.gz
-- public/packs/settings-2ee0ee40542bd3614bf8.js.map
-- public/packs/treeview-8f2fa05fb5d2f9a3e5e1.js
-- public/packs/treeview-8f2fa05fb5d2f9a3e5e1.js.gz
-- public/packs/treeview-8f2fa05fb5d2f9a3e5e1.js.map
+- public/packs/nested_settings-2313b8ea59398970c904.js
+- public/packs/nested_settings-2313b8ea59398970c904.js.gz
+- public/packs/nested_settings-2313b8ea59398970c904.js.map
+- public/packs/notification-f768826be3e0288d203f.js
+- public/packs/notification-f768826be3e0288d203f.js.gz
+- public/packs/notification-f768826be3e0288d203f.js.map
+- public/packs/out_forward_setting-2ebc255e3b4891700e66.js
+- public/packs/out_forward_setting-2ebc255e3b4891700e66.js.gz
+- public/packs/out_forward_setting-2ebc255e3b4891700e66.js.map
+- public/packs/out_s3_setting-c2eedb503f4fb371e42f.js
+- public/packs/out_s3_setting-c2eedb503f4fb371e42f.js.gz
+- public/packs/out_s3_setting-c2eedb503f4fb371e42f.js.map
+- public/packs/owned_plugin_form-52fca2df13bbf399f7a7.js
+- public/packs/owned_plugin_form-52fca2df13bbf399f7a7.js.gz
+- public/packs/owned_plugin_form-52fca2df13bbf399f7a7.js.map
+- public/packs/parser_multiline_form-cca4bfb7c59eb3f2ede8.js
+- public/packs/parser_multiline_form-cca4bfb7c59eb3f2ede8.js.gz
+- public/packs/parser_multiline_form-cca4bfb7c59eb3f2ede8.js.map
+- public/packs/plugin_setting-32ba7f4e6c6de0e11658.js
+- public/packs/plugin_setting-32ba7f4e6c6de0e11658.js.gz
+- public/packs/plugin_setting-32ba7f4e6c6de0e11658.js.map
+- public/packs/settings-4d636bb21519790524e9.js
+- public/packs/settings-4d636bb21519790524e9.js.gz
+- public/packs/settings-4d636bb21519790524e9.js.map
+- public/packs/transport_config-b705288a973da0417b6f.js
+- public/packs/transport_config-b705288a973da0417b6f.js.gz
+- public/packs/transport_config-b705288a973da0417b6f.js.map
+- public/packs/transport_section-7d8d57db27f97637dbd8.js
+- public/packs/transport_section-7d8d57db27f97637dbd8.js.gz
+- public/packs/transport_section-7d8d57db27f97637dbd8.js.map
+- public/packs/treeview-bef4810c6ab5bec914a4.js
+- public/packs/treeview-bef4810c6ab5bec914a4.js.gz
+- public/packs/treeview-bef4810c6ab5bec914a4.js.map
 - public/robots.txt
 - public/td-logo.png
 - spec/controllers/application_controller_spec.rb

data/app/helpers/settings_helper.rb

@@ -1,144 +0,0 @@
-module SettingsHelper
-  def field(form, key, opts = {})
-    html = '<div class="form-group">'
-
-    field_resolver(html, form, key, opts)
-
-    html << "</div>"
-    html.html_safe
-  end
-
-  private
-
-  def field_resolver(html, form, key, opts)
-    plugin_class = form.object.class
-    type = plugin_class.column_type(key)
-    if type && !@_used_param.key?(key)
-      case type
-      when :enum
-        enum_field(html, form, key, opts)
-      when :bool
-        bool_field(html, form, key, opts)
-      else
-        other_field(html, form, key, opts)
-      end
-      @_used_param[key] = true
-    end
-    if plugin_class._sections[key] && !@_used_section.key?(key)
-      section_field(html, form, key, opts)
-      @_used_section[key] = true
-    end
-  end
-
-  def section_field(html, form, key, opts = {})
-    klass = form.object.class._sections[key]
-    children = form.object.__send__(key) || { "0" => {} }
-    # <parse>/<format> section is not multiple in most cases
-    multi = if [:parse, :format].include?(key)
-              false
-            else
-              klass.multi
-            end
-
-    children.each do |index, child|
-      open_section_div(html, multi) do |_html|
-        _html << append_and_remove_links if multi
-        _html << h(form.label(key))
-        _html << section_fields(form, key, index, klass, child)
-      end
-    end
-  end
-
-  def open_section_div(html, multi)
-    html << %Q!<div class="js-nested-column #{ multi ? "js-multiple" : "" } well well-sm">!
-    yield html
-    html << "</div>"
-  end
-
-  def section_fields(form, key, index, klass, child)
-    html = ""
-    object = klass.new(child)
-    form.fields_for("#{key}[#{index}]", object) do |ff|
-      klass._types.keys.each do |kk|
-        if kk == :type
-          html << owned_plugin_type_field(ff, kk, key)
-        else
-          html << field(ff, kk)
-        end
-      end
-    end
-    html
-  end
-
-  def nested_field(html, form, key, opts = {})
-    klass    = child_data(form, key)[:class]
-    options  = child_data(form, key)[:options]
-    children = form.object.send(key) || {"0" => {}}
-
-    children.each_pair do |index, child|
-      html << open_nested_div(options[:multiple])
-      html << append_and_remove_links if options[:multiple]
-      html << h(form.label(key))
-      html << nested_fields(form, key, index, klass, child)
-      html << "</div>"
-    end
-  end
-
-  def open_nested_div(multiple)
-    %Q!<div class="js-nested-column #{ multiple ? "js-multiple" : "" } well well-sm">!
-  end
-
-  def nested_fields(form, key, index, klass, child)
-    nested_html = ""
-    form.fields_for("#{key}[#{index}]", klass.new(child)) do |ff|
-      klass::KEYS.each do |k|
-        nested_html << field(ff, k)
-      end
-    end
-
-    nested_html
-  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 child_data(form, key)
-    form.object.class.children[key]
-  end
-
-  def enum_field(html, form, key, opts = {})
-    html << h(form.label(key))
-    html << " " # NOTE: Adding space for padding
-    html << form.select(key, form.object.list_of(key), opts, { class: "enum" })
-  end
-
-  def bool_field(html, form, key, opts = {})
-    html << form.check_box(key, {}, "true", "false")
-    html << " " # NOTE: Adding space for padding
-    html << h(form.label(key))
-  end
-
-  def other_field(html, form, key, opts = {})
-    return unless form.object.respond_to?(key)
-    html << h(form.label(key))
-    html << form.text_field(key, class: "form-control")
-  end
-
-  def owned_plugin_type_field(form, key, plugin_type)
-    registry_type = case plugin_type
-                    when :parse
-                      "PARSER_REGISTRY"
-                    when :format
-                      "FORMATTER_REGISTRY"
-                    end
-    plugin_registry = Fluent::Plugin.const_get("#{registry_type}")
-    html = '<div class="form-group">'
-    html << form.label(key)
-    html << " " # NOTE: Adding space for padding
-    html << form.select(key, plugin_registry.map.keys, {}, { class: "owned" })
-    html << '</div>'
-    html
-  end
-end

data/app/models/concerns/fluentd/setting/section_validator.rb

@@ -1,21 +0,0 @@
-class Fluentd
-  module Setting
-    module SectionValidator
-      extend ActiveSupport::Concern
-
-      included do
-        validate :validate_sections
-      end
-
-      def validate_sections
-        self._section_params.each do |name, sections|
-          sections.each do |section|
-            if section.invalid?
-              errors.add(name, :invalid, message: section.errors.full_messages)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/app/views/fluentd/settings/_form.html.haml

@@ -1,43 +0,0 @@
-
-- @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-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-group
-  = f.label :pos_file
-  = f.text_field :pos_file, class: "form-control"
-.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-group
-      = f.label :read_from_head
-      = f.check_box :read_from_head, class: "form-control"
-    .form-group
-      = f.label :refresh_interval
-      = f.text_field :refresh_interval, class: "form-control"
-