fluentd-ui 1.1.0 → 1.2.0

data/app/javascript/packs/transport_section.js

@@ -2,9 +2,9 @@
 "use strict";
 import "lodash/lodash";
 
-import ConfigField from "./config_field";
+import ConfigField from "./components/config_field";
 
-$(document).ready(() => {
+window.addEventListener("load", () => {
   new Vue({
     el: "#transport-section",
     components: {

data/app/javascript/packs/treeview.js

@@ -1,7 +1,7 @@
 /* global _ */
 "use strict";
 import "lodash/lodash";
-$(document).ready(() => {
+window.addEventListener("load", () => {
   new Vue({
     el: "#treeview",
     props: {

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

@@ -100,7 +100,7 @@ class Fluentd
 
         def config_argument(name, type = ActiveModel::Type::Value.new, **options)
           config_param(name, type, **options)
-          self._argument_name = name
+          set_argument_name(name)
         end
 
         def set_argument_name(name)

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

@@ -0,0 +1,22 @@
+class Fluentd
+  module Setting
+    module FormatterAdvancedOptions
+      extend ActiveSupport::Concern
+
+      def advanced_options
+        [
+          :time_type,
+          :time_format,
+          :timezone,
+          :utc,
+        ]
+      end
+
+      def hidden_options
+        [
+          :localtime
+        ]
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ class Fluentd
       extend ActiveSupport::Concern
 
       included do
-        config_argument(:label, :string)
+        config_param(:label, :string)
       end
     end
   end

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

@@ -0,0 +1,27 @@
+class Fluentd
+  module Setting
+    module ParserAdvancedOptions
+      extend ActiveSupport::Concern
+
+      def advanced_options
+        [
+          :types,
+          :null_value_pattern,
+          :null_empty_string,
+          :estimate_current_event,
+          :time_key,
+          :time_type,
+          :time_format,
+          :keep_time_key,
+          :utc,
+        ]
+      end
+
+      def hidden_options
+        [
+          :localtime
+        ]
+      end
+    end
+  end
+end

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

@@ -18,7 +18,6 @@ class Fluentd
       include Fluentd::Setting::PluginConfig
       include Fluentd::Setting::SectionParser
       include Fluentd::Setting::PluginParameter
-      include Fluentd::Setting::Label
 
       included do
         cattr_accessor :plugin_type, :plugin_name, :config_definition
@@ -33,6 +32,18 @@ class Fluentd
             include Fluentd::Setting::Pattern
           end
 
+          if ["input", "filter", "output"].include?(type)
+            include Fluentd::Setting::Label
+          end
+
+          if ["parser"].include?(type)
+            include Fluentd::Setting::ParserAdvancedOptions
+          end
+
+          if ["formatter"].include?(type)
+            include Fluentd::Setting::FormatterAdvancedOptions
+          end
+
           self.load_plugin_config do |_name, params|
             params.each do |param_name, definition|
               if definition[:section]

data/app/models/fluentd/setting/buffer_file.rb

@@ -18,6 +18,10 @@ class Fluentd
           :dir_permission
         ]
       end
+
+      def advanced_options
+        []
+      end
     end
   end
 end

data/app/models/fluentd/setting/buffer_memory.rb

@@ -12,6 +12,10 @@ class Fluentd
       def common_options
         []
       end
+
+      def advanced_options
+        []
+      end
     end
   end
 end

data/app/models/fluentd/setting/parser_ltsv.rb

@@ -21,7 +21,7 @@ class Fluentd
       end
 
       def advanced_options
-        [
+        super + [
           :delimiter_pattern
         ]
       end

data/app/models/fluentd/setting/parser_regexp.rb

@@ -16,9 +16,9 @@ class Fluentd
       end
 
       def hidden_options
-        [
+        super + [
           :ignorecase,
-          :multiline
+          :multiline,
         ]
       end
     end

data/app/models/fluentd/setting/parser_syslog.rb

@@ -12,16 +12,10 @@ class Fluentd
       end
 
       def common_options
-        [
-          :time_format,
-          :with_priority,
-        ]
-      end
-
-      def advanced_options
         [
           :message_format,
-          :rfc5424_time_format
+          :rfc5424_time_format,
+          :with_priority,
         ]
       end
     end

data/app/models/plugin.rb

@@ -41,18 +41,18 @@ class Plugin
   end
 
   def installed?
-    self.class.installed.find do |plugin|
+    self.class.installed.any? do |plugin|
       plugin.gem_name == gem_name
     end
   end
 
   def processing?
-    !!WORKING.find{|data| data[:plugin].gem_name == gem_name}
+    WORKING.any?{|data| data[:plugin].gem_name == gem_name}
   end
 
   def installed_version
-    return unless inst = installed?
-    inst.version
+    return unless installed?
+    version
   end
 
   def latest_version?

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

@@ -23,11 +23,11 @@
 = form.field(:tag)
 = form.field(:pos_file)
 
-.well.well-sm
-  %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"}
+.card.mb-3
+  %h4.card-header{"data-toggle" => "collapse", "href" => "#advanced-setting"}
     = icon('fa-caret-down')
     = t('terms.advanced_setting')
-  #advanced-setting.collapse
+  #advanced-setting.card-body.collapse
     .form-group
       = form.field(:rotate_wait)
     .form-group

data/app/views/fluentd/settings/in_tail/after_file_choose.html.haml

@@ -12,7 +12,7 @@
     = f.text_field :path, class: "form-control", disabled: true
   = render "shared/vue/in_tail_parse", setting: @setting
 
-  .card
+  .card.mb-3
     %pre.card-body= file_tail(@setting.path, Settings.in_tail_preview_line_count).join("\n")
 
   %p

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

@@ -43,18 +43,18 @@
   %h2
     = t('.current')
     .float-right
-      %button.btn.btn-outline-dark.btn-sm{"v-on:click" => "update", "v-if" => "!loading"}= icon('fa-refresh')
-      %button.btn.btn-outline-dark.btn-sm{"v-if" => "loading"}= icon('fa-spin fa-refresh')
-  .row
-    .col-xl-4.input
+      %b-btn{"variant" => "outline-dark", "size" => "sm", "v-if" => "loading"}= icon('fa-spin fa-refresh')
+      %b-btn{"variant" => "outline-dark", "size" => "sm", "v-on:click" => "update", "v-if" => "!loading"}= icon('fa-refresh')
+  %b-row
+    %b-col.input{"cols" => "4"}
       %h3= t('.in')
-    .col-xl-4.filter
+    %b-col.filter{"cols" => "4"}
       %h3= t('.filter')
-    .col-xl-4.output
+    %b-col.output{"cols" => "4"}
       %h3= t('.out')
 
-  .row{"v-for" => "(elements, label) in sections"}
-    .col-xl-4.input
+  %b-row{"v-for" => "(elements, label) in sections"}
+    %b-col.input{"cols" => "4"}
       %h5 {{ label }}
       %div{"v-if" => "loaded && !elements.sources || elements.sources.length == 0"}
         %p.empty= t('.setting_empty')
@@ -67,7 +67,7 @@
                        "v-bind:initial-type" => "source.type",
                        "v-bind:initial-name" => "source.name",
                        "v-bind:initial-arg" => "source.arg"}
-    .col-xl-4.filter
+    %b-col.filter{"cols" => "4"}
       %h5 {{ label }}
       %div{"v-if" => "loaded && !elements.filters || elements.filters.length == 0"}
         %p.empty= t('.setting_empty')
@@ -81,7 +81,7 @@
                        "v-bind:initial-name" => "filter.name",
                        "v-bind:initial-arg" => "filter.arg"}
 
-    .col-xl-4.output
+    %b-col.output{"cols" => "4"}
       %h5 {{ label }}
       %div{"v-if" => "loaded && !elements.matches || elements.matches.length == 0"}
         %p.empty= t('.setting_empty')

data/app/views/layouts/application.html.erb

@@ -13,7 +13,7 @@
     <%= stylesheet_link_tag 'application', media: 'all'%>
     <%= stylesheet_pack_tag 'application', media: 'all'%>
     <%= javascript_pack_tag 'application' %>
-    <%= javascript_pack_tag 'notification' %>
+    <%= javascript_pack_tag 'navigation' %>
     <%= content_for(:additional_javascript_pack_tag) %>
     <%= csrf_meta_tags %>
     <%= javascript_tag do %>
@@ -21,33 +21,7 @@
     <% end %>
   </head>
   <body class="fixed-nav bg-light">
-    <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top" id="mainNav">
-      <%= link_to fluentd_ui_logo, root_path, class: "navbar-brand fluentd-ui-logo" %>
-      <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="navbarResponsive">
-        <%= render partial: "shared/global_nav" %>
-        <ul class="navbar-nav ml-auto">
-          <%- if @fluentd %>
-            <li class="nav-item fluentd-note">
-              <%= @fluentd.note %>
-            </li>
-            <li class="nav-item fluentd-status">
-              <a class="nav-link" href="<%= daemon_path %>" data-toggle="tooltip" data-placement="bottom" title="fluentd <%= fluentd_status_message %>">
-                <%= fluentd_status_icon %>
-              </a>
-            </li>
-          <%- end %>
-
-          <%= render partial: "shared/vue/notification" %>
-
-          <li class="nav-item">
-            <%= link_to(icon("fa-fw fa-sign-out") + t("terms.sign_out"), sessions_path, method: :delete, class: "nav-link") %>
-          </li>
-        </ul>
-      </div>
-    </nav>
+    <%= render partial: "shared/vue/navigation" %>
 
     <div class="content-wrapper">
       <div class="container-fluid">

data/app/views/misc/information.html.haml

@@ -3,21 +3,20 @@
     = icon('fa-download')
     = t('.download_system_information')
 
-- if FluentdUI.update_available? && !FluentdUI.td_agent_ui?
-  - # NOTE: td-agent-ui shouldn't have auto update feature
-  .row
-    .col-xl-12
-      %p
-        = link_to misc_update_fluentd_ui_path, class: "btn btn-primary btn-lg", method: :post do
-          = t('.update_fluentd_ui', version: FluentdUI.latest_version, title: fluentd_ui_title)
-        = t('.update_fluentd_ui_caution', brand: fluentd_ui_brand)
+#information
+  - if FluentdUI.update_available? && !FluentdUI.td_agent_ui?
+    - # NOTE: td-agent-ui shouldn't have auto update feature
+    .row
+      .col-xl-12
+        %p
+          = link_to misc_update_fluentd_ui_path, class: "btn btn-primary btn-lg", method: :post do
+            = t('.update_fluentd_ui', version: FluentdUI.latest_version, title: fluentd_ui_title)
+          = t('.update_fluentd_ui_caution', brand: fluentd_ui_brand)
 
-.row
-  .col-xl-6.col-sm-6.mb-3
-    .card.card-default
-      .card-header
-        %h4= t("terms.version")
-      .card-body
+  .row
+    .col-xl-6.col-sm-6.mb-3
+      %b-card{"header" => t("terms.version"),
+              "header-tags" => "h4"}
         %dl{class: "dl-horizontal"}
           %dt ruby
           %dd= RUBY_DESCRIPTION
@@ -27,13 +26,11 @@
           %dt fluentd-ui
           %dd= FluentdUI::VERSION
 
-  .col-xl-6.col-sm-6.mb-3
-    .card.card-default
-      .card-header
-        %h4= t('terms.installed_plugins')
-      .card-body
+    .col-xl-6.col-sm-6.mb-3
+      %b-card{"header" => t('terms.installed_plugins'),
+              "header-tags" => "h4"}
         - if @plugins.present?
-          %table{class: "table table-hover", id: "plugins-table"}
+          %table{class: "table table-hover table-sm", id: "plugins-table"}
             %thead
               %tr
                 %th= t('plugins.common.name')
@@ -46,31 +43,38 @@
         - else
           = t "plugins.common.no_installed"
 
-.row
-  .col-xl-12.col-sm-12
-    .card.card-default
-      .card-header
-        %h4{"data-toggle" => "collapse", "href" => "#env-table"}
-          = icon('fa-caret-down')
-          = t('.env')
-      %table{class: "table table-hover collapse", id: "env-table"}
-        %thead
-          %tr
-            %th= t('.env_key')
-            %th= t('.env_value')
-        %tbody
-          - @env.each_pair do |key, value|
-            %tr
-              %td= key
-              %td= value
+  .row
+    .col-xl-12.col-sm-12
+      %b-card
+        %template{"slot" => "header"}
+          %h4{"v-b-toggle.env-table" => ""}
+            = icon('fa-caret-down')
+            = t('.env')
+        %b-collapse#env-table
+          %b-form-group.float-right(horizontal){"label" => t("terms.search")}
+            %b-input-group
+              %b-form-input{"v-model" => "filter"}
+              %b-input-group-append
+                %b-btn{ "v-bind:disabled" => "!filter", "v-on:click" => "filter = ''" }
+                  Clear
+          %b-table(stripped hover small){"v-bind:items" => "items",
+                                         "v-bind:fields" => "fields",
+                                         "v-bind:filter" => "filter"}
 
 :javascript
-  $(document).ready(function() {
-    $('#env-table').dataTable({
-      "autoWidth": false,
-      "ordering": true,
-      "paging": false,
-      "info": false,
-      "searching": false
+  window.addEventListener("load", () => {
+    new Vue({
+      name: "Information",
+      el: "#information",
+      data() {
+        return {
+          fields: {
+            key: { label: "#{t('.env_key')}", sortable: true },
+            value: { label: "#{t('.env_value')}" }
+          },
+          items: #{env_items.to_json.html_safe},
+          filter: null
+        };
+      }
     });
   });

data/app/views/plugins/installed.html.haml

@@ -1,67 +1,56 @@
 - page_title t('.page_title')
 
-%table{class: "table table-striped table-hover", id: "plugins-table"}
-  %thead
-    %tr
-      %th{scope: "col"}
-      %th{scope: "col"}= t('plugins.common.name')
-      %th{scope: "col"}= t('plugins.common.authors')
-      %th{scope: "col"}= t('plugins.common.summary')
-      %th{scope: "col"}= t('plugins.common.installed_version')
-      %th{scope: "col"}= t('plugins.common.latest_version')
-      %th{scope: "col"}
-  %tbody
-    - @plugins.each do |plugin|
-      %tr
-        %td
-          %button{class: "btn btn-danger", data: {toggle: "modal", target:" #plugin-modal-#{plugin.gem_name}"}}
-            = t "terms.uninstall"
-          .modal.fade{id: "plugin-modal-#{plugin.gem_name}"}
-            .modal-dialog
-              .modal-content
-                .modal-header
-                  %button.close{"data-dismiss" => "modal"}
-                    = raw "×"
-                  %h4.modal-title
-                    = plugin.gem_name
-                .modal-body
-                  = t('terms.confirm_body', action: t('terms.uninstall'))
-                .modal-footer
-                  = form_tag(uninstall_plugins_path, method: :patch) do
-                    %button.btn.btn-secondary{"data-dismiss" => "modal"}
-                      Close
-                    = hidden_field_tag("plugins[]", plugin.gem_name)
-                    = submit_tag t('terms.uninstall'), class: "btn btn-danger"
-        %td
-          %label{for: "plugin_#{plugin.gem_name}"}
-            = plugin.gem_name
-        %td
-          = plugin.authors
-        %td
-          = plugin.summary
-        %td
-          = plugin.installed_version
-        %td
-          = plugin.latest_version
-        %td
-          - if plugin.latest_version?
-            = t('plugins.common.latest_version')
-          - else
-            = form_tag(upgrade_plugins_path, method: :patch) do
-              = hidden_field_tag("plugins[name]", plugin.gem_name)
-              = hidden_field_tag("plugins[version]", plugin.latest_version)
-              = submit_tag t('plugins.common.install_latest_version'), class: "btn btn-primary"
+#plugin-table
+  %b-form-group.float-right(horizontal){"label" => t("terms.search")}
+    %b-input-group
+      %b-form-input{"v-model" => "filter"}
+      %b-input-group-append
+        %b-btn{ "v-bind:disabled" => "!filter", "v-on:click" => "filter = ''" }
+          = t("terms.clear")
+  %b-table(stripped hover small){"v-bind:items" => "items",
+                                 "v-bind:fields" => "fields",
+                                 "v-bind:filter" => "filter"}
+    %template{"slot" => "uninstall_button", "slot-scope" => "row"}
+      %b-button{"variant" => "danger", "v-b-modal" => "row.item.uninstall_button"}
+        = t("terms.uninstall")
+      %b-modal{"v-bind:id" => "row.item.uninstall_button",
+               "v-bind:title" => "row.item.name"}
+        = t("terms.confirm_body", action: t("terms.uninstall"))
+        %template{"slot" => "modal-footer"}
+          = form_tag(uninstall_plugins_path, method: :patch) do
+            %b-button{"v-on:click" => "show=false"}
+              Close
+            %input{"type" => "hidden", "name" => "plugins[]", "v-bind:value" => "row.item.name"}
+            %b-button{"type" => "submit", "variant" => "danger"}
+              = t("terms.uninstall")
+    %template{"slot" => "is_latest_version", "slot-scope" => "row"}
+      %template{"v-if" => "row.value"}
+        = t("plugins.common.latest_version")
+      %template(v-else)
+        = form_tag(upgrade_plugins_path, method: :patch) do
+          %input{"type" => "hidden", "name" => "plugins[name]", "v-bind:value" => "row.item.name"}
+          %input{"type" => "hidden", "name" => "plugins[version]", "v-bind:value" => "row.item.latest_version"}
+          = submit_tag(t('plugins.common.install_latest_version'), class: "btn btn-primary")
 
 :javascript
-  $(document).ready(function() {
-    $('#plugins-table').dataTable({
-      "autoWidth": false,
-      "ordering": true,
-      "paging": false,
-      "info": false,
-      "searching": true,
-      "language": {
-        "search": "#{t("terms.search")} "
+  window.addEventListener("load", () => {
+    new Vue({
+      name: "InstalledPlugins",
+      el: "#plugin-table",
+      data() {
+        return {
+          fields: {
+            uninstall_button: { label: "" },
+            name: { label: "#{t("plugins.common.name")}", sortable: true },
+            authors: { label: "#{t("plugins.common.authors")}", sortable: true },
+            summary: { label: "#{t("plugins.common.summary")}", sortable: true  },
+            installed_version: { label: "#{t("plugins.common.installed_version")}", sortable: true },
+            latest_version: { label: "#{t("plugins.common.latest_version")}", sortable: true },
+            is_latest_version: { label: "" }
+          },
+          items: #{plugins_json.html_safe},
+          filter: null
+        }
       }
     });
   });