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

data/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

data/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

data/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

data/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

data/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

data/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

data/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

data/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

data/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

data/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"

data/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)

data/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")

data/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"

data/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)

data/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')

data/app/views/shared/_global_nav.html.erb

@@ -1,6 +1,6 @@
 <ul class="navbar-nav navbar-sidenav" id="side-menu">
-  <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Fluentd">
-    <a class="section">
+  <li class="nav-item">
+    <a class="section" data-toggle="tooltip" data-placement="right" title="Fluentd">
       <%= icon("fa-puzzle-piece fa-fw") << "fluentd" %>
     </a>
     <ul class="sidenav-second-level">
@@ -29,8 +29,8 @@
   </li>
 
   <% if fluentd_exists? %>
-  <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Plugins">
-    <a class="section">
+  <li class="nav-item">
+    <a class="section" data-toggle="tooltip" data-placement="right" title="Plugins">
       <%= icon("fa-cogs fa-fw") << t('terms.plugins') %>
     </a>
     <ul class="sidenav-second-level">
@@ -47,8 +47,8 @@
   </li>
   <% end %>
 
-  <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Misc">
-    <a class="section">
+  <li class="nav-item">
+    <a class="section" data-toggle="tooltip" data-placement="right" title="Misc">
       <%= icon('fa-coffee fa-fw') << t('terms.misc') %>
     </a>
     <ul class="sidenav-second-level">
@@ -67,8 +67,8 @@
     </ul>
   </li>
 
-  <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Language">
-    <a class="section">
+  <li class="nav-item">
+    <a class="section" data-toggle="tooltip" data-placement="right" title="Language">
       <%= icon('fa-font') << t('terms.languages') %>
     </a>
     <ul class="sidenav-second-level">

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

@@ -1,18 +1,49 @@
 = render "shared/setting_errors"
+= render "shared/vue/owned_plugin_form"
 
-- # NOTE: plugin_setting_form_action_url is defined at SettingConcern
-= form_for(@setting, url: plugin_setting_form_action_url(@fluentd), html: {class: "ignore-rails-error-div"}) do |f|
-  - @setting.common_options.each do |key|
-    = field(f, key)
+= javascript_pack_tag("plugin_setting")
 
-  - if @setting.advanced_options.present?
-    .card.bg-light
-      .card-body
+#plugin-setting
+  - # NOTE: plugin_setting_form_action_url is defined at SettingConcern
+  = form_with(model: @setting, scope: :setting, url: plugin_setting_form_action_url(@fluentd), class: "ignore-rails-error-div", builder: FluentdFormBuilder) do |form|
+    - @setting.common_options.each do |key|
+      = form.field(key)
+
+    - if @setting.have_buffer_section?
+      %owned-plugin-form{"v-bind:id" => "'buffer-section'",
+                         "v-bind:options-json" => "'#{Fluent::Plugin::BUFFER_REGISTRY.map.keys.to_json}'",
+                         "v-bind:initial-plugin-name" => "'#{@setting.buffer_type}'",
+                         "v-bind:plugin-type" => "'buffer'",
+                         "v-bind:plugin-label" => "'Buffer'"}
+
+    - if @setting.have_storage_section?
+      %owned-plugin-form{"v-bind:id" => "'storage-section'",
+                         "v-bind:options-json" => "'#{Fluent::Plugin::STORAGE_REGISTRY.map.keys.to_json}'",
+                         "v-bind:initial-plugin-name" => "'#{@setting.storage_type}'",
+                         "v-bind:plugin-type" => "'storage'",
+                         "v-bind:plugin-label" => "'Storage'"}
+
+    - if @setting.have_parse_section?
+      %owned-plugin-form{"v-bind:id" => "'parse-section'",
+                         "v-bind:options-json" => "'#{Fluent::Plugin::PARSER_REGISTRY.map.keys.to_json}'",
+                         "v-bind:initial-plugin-name" => "'#{@setting.parse_type}'",
+                         "v-bind:plugin-type" => "'parse'",
+                         "v-bind:plugin-label" => "'Parse'"}
+
+    - if @setting.have_format_section?
+      %owned-plugin-form{"v-bind:id" => "'format-section'",
+                         "v-bind:options-json" => "'#{Fluent::Plugin::FORMATTER_REGISTRY.map.keys.to_json}'",
+                         "v-bind:initial-plugin-name" => "'#{@setting.format_type}'",
+                         "v-bind:plugin-type" => "'format'",
+                         "v-bind:plugin-label" => "'Format'"}
+
+    - if @setting.advanced_options.present?
+      .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|
-            = field(f, key)
-  = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary float-right"
+            = form.field(key)
 
+    = form.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary float-right mt-3"

data/app/views/shared/settings/show.html.haml

@@ -5,4 +5,7 @@
   .card-body.bg-light
     = raw t("fluentd.settings.#{target_plugin_name}.option_guide")
 
-= render "shared/settings/form"
+- if lookup_context.exists?("form", controller.controller_path, true)
+  = render "#{controller.controller_path}/form"
+- else
+  = render "shared/settings/form"

data/app/views/shared/vue/_in_tail_parse.html.haml

@@ -0,0 +1,20 @@
+- add_javascript_pack_tag("in_tail_parse")
+
+= render "shared/vue/owned_plugin_form"
+
+#in-tail-parse{"path" => setting.path}
+  %owned-plugin-form{"v-bind:id" => "'parse-section'",
+                     "v-bind:options-json" => "'#{Fluent::Plugin::PARSER_REGISTRY.map.keys.to_json}'",
+                     "v-bind:initial-plugin-name" => "'#{setting.parse_type || setting.guess_parse_type}'",
+                     "v-bind:plugin-type" => "'parse'",
+                     "v-bind:plugin-label" => "'Parse'",
+                     "v-on:change-parse-config" => "onChangeParseConfig",
+                     "v-on:change-plugin-name" => "onChangePluginName",
+                     "v-on:change-formats" => "onChangeFormats"}
+
+  .card.mb-3
+    %pre{"class" => "card-body", "v-html" => "highlightedLines"}
+
+  .card.md-3
+    %p.card-body.pb-0
+      =raw(t("fluentd.settings.in_tail_option_guide"))

data/app/views/shared/vue/_owned_plugin_form.html.haml

@@ -0,0 +1,68 @@
+= render "shared/vue/parser_multiline_form"
+
+%script{type: "text/x-template", id: "vue-owned-plugin-form"}
+  .form-group.card.bg-light.mb-3{"v-bind:id" => "id"}
+    .card-body
+      %label{"v-bind:for" => "selectId(pluginType)"}
+        {{ pluginLabel }}
+      %select{"v-bind:id" => "selectId(pluginType)",
+              "v-bind:class" => "selectClass(pluginType)",
+              "v-bind:name" => "selectName(pluginType)",
+              "v-model" => "pluginName",
+              "v-on:change" => "onChange"}
+        %option{"v-for" => "option in options",
+                "v-bind:value" => "option",
+                "v-bind:selected" => "pluginName===option"}
+          {{ option }}
+      %parser-multiline-form{"v-if" => 'pluginName==="multiline"',
+                             "v-bind:plugin-type" => "pluginType",
+                             "v-bind:common-options" => "commonOptions",
+                             "v-on:change-formats" => "onChangeFormats"}
+      .form-group(v-else){"v-for" => "option in commonOptions"}
+        %template{"v-if" => 'option.type==="enum"'}
+          %label{"v-bind:for" => "inputId(pluginType, option)",
+                 "data-toggle" => "tooltip",
+                 "data-placement" => "right",
+                 "v-bind:title" => "option.desc"}
+            {{ option.name }}
+          %select{"v-bind:id" => "inputId(pluginType, option)",
+                  "v-bind:name" => "inputName(pluginType, option)",
+                  "class" => "form-control"}
+            %option{"v-for" => "item in option.list",
+                    "v-bind:value" => "item",
+                    "v-bind:selected" => "option.default === item"}
+              {{ item }}
+        %template{"v-else-if" => 'option.type==="bool"'}
+          %input{"v-bind:id" => "inputId(pluginType, option)",
+                 "v-bind:name" => "inputName(pluginType, option)",
+                 "v-bind:checked" => "checked(option.default)",
+                 "type" => "checkbox"}
+          %label{"v-bind:for" => "inputId(pluginType, option)",
+                 "data-toggle" => "tooltip",
+                 "data-placement" => "right",
+                 "v-bind:title" => "option.desc"}
+            {{ option.name }}
+        %template(v-else)
+          %label{"v-bind:for" => "inputId(pluginType, option)",
+                 "data-toggle" => "tooltip",
+                 "data-placement" => "right",
+                 "v-bind:title" => "option.desc"}
+            {{ option.name }}
+          %template{"v-if" => 'option.name === "expression"'}
+            %input{"v-bind:id" => "inputId(pluginType, option)",
+                   "v-bind:name" => "inputName(pluginType, option)",
+                   "v-model.lazy" => "expression",
+                   "type" => "text",
+                   "class" => "form-control"}
+          %template{"v-else-if" => 'option.name === "time_format"'}
+            %input{"v-bind:id" => "inputId(pluginType, option)",
+                   "v-bind:name" => "inputName(pluginType, option)",
+                   "v-model.lazy" => "timeFormat",
+                   "type" => "text",
+                   "class" => "form-control"}
+          %template(v-else)
+            %input{"v-bind:id" => "inputId(pluginType, option)",
+                   "v-bind:name" => "inputName(pluginType, option)",
+                   "v-bind:value" => "option.default",
+                   "type" => "text",
+                   "class" => "form-control"}