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

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

@@ -6,6 +6,6 @@
     = raw t("fluentd.settings.#{target_plugin_name}.option_guide")
 
 - if lookup_context.exists?("form", controller.controller_path, true)
-  = render "#{controller.controller_path}/form"
+  = render "#{controller.controller_path}/form", setting: @setting, fluentd: @fluentd
 - else
-  = render "shared/settings/form"
+  = render "shared/settings/form", setting: @setting, fluentd: @fluentd

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

@@ -0,0 +1,22 @@
+= render "shared/vue/config_field"
+
+%script{type: "text/x-template", id: "vue-aws-credential"}
+  .form-group.card.bg-light.mb-3
+    .card-body
+      %label{"for" => "aws-credential"}
+        AWS credential
+      %select{"id" => "aws-credential",
+              "class" => "form-control mb-3",
+              "v-model" => "credentialType",
+              "v-on:change" => "onChange"}
+        %option{"v-for" => "option in options",
+                "v-bind:value" => "option",
+                "v-bind:selected" => "credentialType===option"}
+          {{ option }}
+      %template{"v-for" => "option in credentialOptions"}
+        %template{"v-if" => 'credentialType==="simple"'}
+          %config-field{"v-bind:plugin-type" => '"output"',
+                        "v-bind:option" => "option"}
+        %template(v-else)
+          %config-field{"v-bind:plugin-type" => 'credentialType',
+                        "v-bind:option" => "option"}

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

@@ -0,0 +1,49 @@
+%script{type: "text/x-template", id: "vue-config-field"}
+  .form-group
+    %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 | humanize }}
+      %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 | humanize }}
+    %template(v-else)
+      %label{"v-bind:for" => "inputId(pluginType, option)",
+             "data-toggle" => "tooltip",
+             "data-placement" => "right",
+             "v-bind:title" => "option.desc"}
+        {{ option.name | humanize }}
+      %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-model.lazy" => "textValue",
+               "type" => "text",
+               "class" => "form-control"}

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

@@ -0,0 +1,13 @@
+- add_javascript_pack_tag("out_forward_setting")
+
+= render "shared/vue/owned_plugin_form"
+= render "shared/vue/transport_config"
+
+#out-forward-setting
+  %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'"}
+  %transport-config{"v-bind:plugin-type" => "'#{setting.plugin_type}'",
+                    "v-bind:plugin-name" => "'#{setting.plugin_name}'"}

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

@@ -0,0 +1,19 @@
+- add_javascript_pack_tag("out_s3_setting")
+
+= render "shared/vue/aws_credential"
+= render "shared/vue/owned_plugin_form"
+
+#out-s3-setting
+  %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'"}
+  %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'"}
+  %aws-credential{"v-bind:id" => "'aws-credential'",
+                  "v-bind:plugin-type" => "'output'",
+                  "v-bind:plugin-name" => "'s3'"}

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

@@ -1,4 +1,5 @@
 = render "shared/vue/parser_multiline_form"
+= render "shared/vue/config_field"
 
 %script{type: "text/x-template", id: "vue-owned-plugin-form"}
   .form-group.card.bg-light.mb-3{"v-bind:id" => "id"}
@@ -18,51 +19,10 @@
                              "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"}
+      %template(v-else){"v-for" => "option in commonOptions"}
+        %config-field{"v-bind:plugin-type" => "pluginType",
+                      "v-bind:option" => "option",
+                      "v-bind:initial-expression" => "expression",
+                      "v-bind:initial-time-format" => "timeFormat",
+                      "v-bind:initial-text-value" => "initialParams[option.name]",
+                      "v-on:change-parse-config" => "onChangeParseConfig"}

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

@@ -0,0 +1,20 @@
+= render "shared/vue/config_field"
+
+%script{type: "text/x-template", id: "vue-transport-config"}
+  .form-group.card.card-body.bg-light
+    %h4
+      Transport
+    .form-group
+      %select{"class" => "form-control",
+              "v-model" => "transportType",
+              "v-on:change" => "onChange"}
+        %option{"v-for" => "option in options",
+                "v-bind:value" => "option",
+                "v-bind:selected" => "transportType === option"}
+          {{ option | toUpper }}
+    %p{"v-if" => 'transportType === "tcp"'}
+      Nothing to configure
+    %template(v-else)
+      %template{"v-for" => "option in tlsOptions"}
+        %config-field{"v-bind:plugin-type" => "pluginType",
+                      "v-bind:option" => "option"}

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

@@ -0,0 +1,30 @@
+- add_javascript_pack_tag("transport_section")
+
+= render "shared/vue/config_field"
+
+#transport-section.form-group.card.card-body.bg-light{"pluginType" => setting.plugin_type,
+                                                      "pluginName" => setting.plugin_name}
+  %label
+    Transport
+  .form-group
+    %select{"class" => "form-control",
+            "v-model" => "transportType",
+            "v-on:change" => "onChange"}
+      %option{"v-for" => "option in options",
+              "v-bind:value" => "option",
+              "v-bind:selected" => "transportType === option"}
+        {{ option | toUpper }}
+    %p{"v-if" => 'transportType === "tcp"'}
+      Nothing to configure
+    %template(v-else)
+      %template{"v-for" => "option in commonOptions"}
+        %config-field{"v-bind:plugin-type" => "pluginType",
+                      "v-bind:option" => "option"}
+      .card.card-body.bg-light
+        %h4{"data-toggle" => "collapse", "href" => "#transport-advanced-setting"}
+          = icon('fa-caret-down')
+          = t('terms.advanced_setting') + '(TLS)'
+        #transport-advanced-setting.collapse
+          %template{"v-for" => "option in advancedOptions"}
+            %config-field{"v-bind:plugin-type" => "pluginType",
+                          "v-bind:option" => "option"}

data/config/initializers/dig.rb

@@ -0,0 +1,8 @@
+unless {}.respond_to?(:dig)
+  begin
+    # backport_dig is faster than dig_rb so prefer backport_dig.
+    require 'backport_dig'
+  rescue LoadError
+    require 'dig_rb'
+  end
+end

data/config/initializers/dummy_logger.rb

@@ -0,0 +1 @@
+$log ||= DummyLogger.logger

data/config/initializers/types.rb

@@ -2,6 +2,7 @@ ActiveModel::Type.register(:array, Fluentd::Setting::Type::Array)
 ActiveModel::Type.register(:enum, Fluentd::Setting::Type::Enum)
 ActiveModel::Type.register(:bool, Fluentd::Setting::Type::Bool)
 ActiveModel::Type.register(:hash, Fluentd::Setting::Type::Hash)
-ActiveModel::Type.register(:regexp, Fluentd::Setting::Type::Hash)
+ActiveModel::Type.register(:object, Fluentd::Setting::Type::Object)
+ActiveModel::Type.register(:regexp, Fluentd::Setting::Type::Regexp)
 ActiveModel::Type.register(:size, Fluentd::Setting::Type::Size)
 ActiveModel::Type.register(:section, Fluentd::Setting::Type::Section)

data/config/locales/translation_ja.yml

@@ -111,7 +111,7 @@ ja:
       setup_in_monitor_agent: 監視エージェント
       setup_in_http: http
       setup_in_forward: 転送（他Fluentdからの受信）
-      setup_out_td: Treasure Data
+      setup_out_tdlog: Treasure Data
       setup_out_stdout: 標準出力（ログ）
       setup_out_mongo: MongoDB
       setup_out_forward: 転送
@@ -163,7 +163,7 @@ ja:
           <a target="_blank" href="http://docs.fluentd.org/articles/out_s3">out_s3プラグインの解説</a>もご参照ください。
         show:
           page_title: AWS S3書き出し設定
-      out_td:
+      out_tdlog:
         option_guide: |
           fluent-plugin-tdプラグインのインストールが必要です。<br />
         show:

data/fluentd-ui.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "fluentd", [">= 1.0.0", "< 2"]
   spec.add_dependency 'rails', '~> 5.2.0'
+  spec.add_dependency "dig_rb", "~> 1.0.0"
   spec.add_dependency "bootsnap", ">= 1.1.0"
   spec.add_dependency 'sucker_punch', "~> 2.0.4"
   spec.add_dependency 'addressable'

data/gemfiles/ruby2.2.gemfile

@@ -0,0 +1,28 @@
+source "https://rubygems.org"
+
+group :development, :test do
+  gem "rake"
+  gem "pry"
+  gem "pry-rails"
+  gem "rspec-rails", "~> 3.0"
+end
+
+group :development do
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'i18n_generators', '2.1.1'
+  gem 'better_errors'
+  gem 'web-console', '~> 3.6'
+  gem 'binding_of_caller'
+end
+
+group :test do
+  gem "factory_bot_rails"
+  gem "capybara", "~> 3.1.1"
+  gem "capybara-screenshot"
+  gem "simplecov", "~> 0.16.1", require: false
+  gem "webmock", "~> 3.3.0"
+  gem "timecop"
+  gem "selenium-webdriver", "~> 3.12.0"
+end
+
+gemspec path: ".."

data/lib/dummy_logger.rb

@@ -0,0 +1,13 @@
+require "fluent/test/log"
+require "serverengine"
+
+module DummyLogger
+  class << self
+    def logger
+      dl_opts = {log_level: ServerEngine::DaemonLogger::INFO}
+      logdev = Fluent::Test::DummyLogDevice.new
+      logger = ServerEngine::DaemonLogger.new(logdev, dl_opts)
+      Fluent::Log.new(logger)
+    end
+  end
+end

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "1.0.0.alpha.3"
+  VERSION = "1.0.0.beta.1"
 end

data/package.json

@@ -1,6 +1,9 @@
 {
   "name": "fluentd-ui",
   "private": true,
+  "scripts": {
+    "lint": "eslint app/javascript"
+  },
   "dependencies": {
     "@rails/webpacker": "3.5",
     "codemirror": "^5.37.0",
@@ -15,6 +18,8 @@
     "vue-template-compiler": "^2.5.16"
   },
   "devDependencies": {
+    "eslint": "^5.1.0",
+    "eslint-plugin-vue": "^4.7.0",
     "webpack-dev-server": "2.11.2"
   }
 }

data/spec/features/fluentd/setting/in_forward_spec.rb

@@ -1,7 +1,6 @@
 require "spec_helper"
 
-describe "in_forward", stub: :daemon do
+describe "in_forward", stub: :daemon, js: true do
   before { login_with exists_user }
   it_should_behave_like "configurable daemon settings", "in_forward", "port", "12345"
-
 end

data/spec/features/fluentd/setting/in_http_spec.rb

@@ -1,7 +1,6 @@
 require "spec_helper"
 
-describe "in_http", stub: :daemon do
+describe "in_http", js: true, stub: :daemon do
   before { login_with exists_user }
   it_should_behave_like "configurable daemon settings", "in_http", "port", "12345"
-
 end

data/spec/features/fluentd/setting/in_monitor_agent_spec.rb

@@ -1,7 +1,6 @@
 require "spec_helper"
 
-describe "in_monitor_agent", stub: :daemon do
+describe "in_monitor_agent", js: true, stub: :daemon do
   before { login_with exists_user }
   it_should_behave_like "configurable daemon settings", "in_monitor_agent", "port", "12345"
-
 end

data/spec/features/fluentd/setting/out_forward_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "out_forward", stub: :daemon do
+describe "out_forward", js: true, stub: :daemon do
   before { login_with exists_user }
 
   let(:type) { "out_forward" }
@@ -8,9 +8,8 @@ describe "out_forward", stub: :daemon do
   let(:form_values) { {
     Pattern: "*",
     Name: "name",
-    Host: "host",
+    Host: "localhost",
     Port: "9999",
-    Path: "/dev/null",
   } }
 
   it "Updated config after submit" do
@@ -19,7 +18,7 @@ describe "out_forward", stub: :daemon do
       daemon.agent.config.should_not include(v)
     end
     visit page_url
-    within("#new_fluentd_setting_#{type}") do
+    within("form") do
       form_values.each_pair do |k,v|
         fill_in k, with: v
       end
@@ -28,7 +27,6 @@ describe "out_forward", stub: :daemon do
     form_values.each_pair do |k,v|
       daemon.agent.config.should include(v)
     end
-    daemon.agent.config.should include("type file") # out_forward's Secondary hidden field
   end
 
   it "Click to append Server fields", js: true do

data/spec/features/fluentd/setting/out_stdout_spec.rb

@@ -1,7 +1,6 @@
 require "spec_helper"
 
-describe "out_stdout", stub: :daemon do
+describe "out_stdout", js: true, stub: :daemon do
   before { login_with exists_user }
   it_should_behave_like "configurable daemon settings", "out_stdout", "pattern", "stdout.**"
-
 end

data/spec/features/out_elasticsearch_spec.rb

@@ -11,14 +11,14 @@ describe "out_elasticsearch", stub: :daemon do
 
   it "Shown form" do
     visit location
-    page.should have_css('input[name="fluentd_setting_out_elasticsearch[match]"]')
+    page.should have_css('input[name="setting[pattern]"]')
   end
 
   it "Updated config after submit", js: true do
     daemon.agent.config.should_not include(match)
     visit location
-    within('#new_fluentd_setting_out_elasticsearch') do
-      fill_in "Match", with: match
+    within('form') do
+      fill_in "Pattern", with: match
       fill_in "Index name", with: "index"
       fill_in "Type name", with: "type_name"
     end