fluentd-ui 1.0.1 → 1.1.0

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

@@ -7,6 +7,7 @@ class Fluentd
 
       def common_options
         [
+          :label,
           :bind, :port
         ]
       end

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

@@ -23,7 +23,7 @@ class Fluentd
 
       def common_options
         [
-          :bind, :port, :add_http_headers, :add_remote_addr
+          :label, :bind, :port, :add_http_headers, :add_remote_addr
         ]
       end
 

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

@@ -17,7 +17,7 @@ class Fluentd
 
       def common_options
         [
-          :bind, :port, :tag
+          :label, :bind, :port, :tag
         ]
       end
     end

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

@@ -19,7 +19,7 @@ class Fluentd
 
       def common_options
         [
-          :tag, :bind, :port
+          :label, :tag, :bind, :port
         ]
       end
 

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

@@ -26,6 +26,7 @@ class Fluentd
 
       def common_options
         [
+          :label,
           :pattern, :host, :port, :logstash_format,
           :index_name, :type_name,
         ]

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

@@ -33,7 +33,7 @@ class Fluentd
 
       def common_options
         [
-          :pattern, :server, :secondary,
+          :label, :pattern, :server, :secondary,
         ]
       end
 

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

@@ -25,6 +25,7 @@ class Fluentd
 
       def common_options
         [
+          :label,
           :pattern, :host, :port, :database, :collection,
           :tag_mapped, :user, :password,
         ]

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

@@ -26,6 +26,7 @@ class Fluentd
 
       def common_options
         [
+          :label,
           :pattern,
           :s3_region, :s3_bucket, :use_ssl, :path,
         ]

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

@@ -26,7 +26,7 @@ class Fluentd
 
       def common_options
         [
-          :pattern, :output_type
+          :label, :pattern, :output_type
         ]
       end
 

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

@@ -22,7 +22,7 @@ class Fluentd
 
       def common_options
         [
-          :pattern, :apikey, :auto_create_table, :database, :table,
+          :label, :pattern, :apikey, :auto_create_table, :database, :table,
         ]
       end
 

data/app/views/api/settings/_element.json.jbuilder

@@ -1,4 +1,6 @@
-json.id element_id(element)
+json.id element_id(current_label, element)
+json.current_label current_label || "ROOT"
+json.label element["@label"] || element["label"]
 json.name element.name
 json.type element["@type"] || element["type"]
 json.arg element.arg

data/app/views/api/settings/index.json.jbuilder

@@ -1,3 +1,11 @@
-json.array! @config.elements do |elm|
-  json.partial! "api/settings/element", element: elm
+@config.group_by_label.each do |label_name, types|
+  json.set!(label_name) do
+    types.each do |type, elements|
+      json.set!(type) do
+        json.array!(elements) do |element|
+          json.partial! "api/settings/element", current_label: label_name, element: element
+        end
+      end
+    end
+  end
 end

data/app/views/api/settings/show.json.jbuilder

@@ -1 +1 @@
-json.partial! "api/settings/element", element: @section
+json.partial! "api/settings/element", current_label: params[:label], element: @target_element

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

@@ -0,0 +1,18 @@
+= 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)
+
+  = render "shared/vue/filter_grep_setting", setting: setting
+
+  .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/filter_record_transformer/_form.html.haml

@@ -0,0 +1,20 @@
+= 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)
+
+  .form-group
+    = f.label(:record, nil, data: { toggle: "tooltip", placement: "right"}, title: "considered to be new key-value pairs")
+    = f.text_area(:record, class: "form-control")
+
+  .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

@@ -19,6 +19,7 @@
       = f.hidden_field(key)
       = f.field(key, disabled: true)
 
+= form.field(:label)
 = form.field(:tag)
 = form.field(:pos_file)
 

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

@@ -2,20 +2,28 @@
 - page_title t('.page_title')
 
 .row.fluentd-setting-inout
-  .col-xl-4
+  .col-xl-3
     .card.card-primary
       .card-header
         %h4= t('.in')
       .card-body
-        - %w|tail syslog monitor_agent http forward|.each do |type|
+        - %w(tail syslog monitor_agent http forward).each do |type|
           %p
             = link_to(send("daemon_setting_in_#{type}_path", @fluentd)) do
               = icon('fa-file-text-o fa-lg')
               = t("fluentd.common.setup_in_#{type}")
   .col-xl-1.arrow-right
     = icon "fa-arrow-circle-right"
-  .col-xl-2
-    = image_tag "/fluentd-logo.png", style: "max-width: 100%"
+  .col-xl-3
+    .card.card-primary
+      .card-header
+        %h4= t('.filter')
+      .card-body
+        - %w(grep parser record_transformer stdout).each do |type|
+          %p
+            = link_to(send("daemon_setting_filter_#{type}_path", @fluentd)) do
+              = icon('fa-file-text-o -fa-lg')
+              = t("fluentd.common.setup_filter_#{type}")
   .col-xl-1.arrow-right
     = icon "fa-arrow-circle-right"
   .col-xl-4
@@ -23,7 +31,7 @@
       .card-header
         %h4= t('.out')
       .card-body
-        - %w|stdout tdlog 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')
@@ -38,25 +46,49 @@
       %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-6.input
+    .col-xl-4.input
       %h3= t('.in')
-      %div{"v-if" => "loaded && sections.sources.length == 0"}
+    .col-xl-4.filter
+      %h3= t('.filter')
+    .col-xl-4.output
+      %h3= t('.out')
+
+  .row{"v-for" => "(elements, label) in sections"}
+    .col-xl-4.input
+      %h5 {{ label }}
+      %div{"v-if" => "loaded && !elements.sources || elements.sources.length == 0"}
         %p.empty= t('.setting_empty')
-      %setting-section{"v-if" => "loaded && sections.sources.length > 0",
-                       "v-for" => "source in sections.sources",
+      %setting-section{"v-if" => "loaded && elements.sources && elements.sources.length > 0",
+                       "v-for" => "source in elements.sources",
                        "v-bind:key" => "source.id",
+                       "v-bind:initial-label" => "source.current_label",
                        "v-bind:initial-id" => "source.id",
                        "v-bind:initial-content" => "source.content",
                        "v-bind:initial-type" => "source.type",
                        "v-bind:initial-name" => "source.name",
                        "v-bind:initial-arg" => "source.arg"}
-    .col-xl-6.output
-      %h3= t('.out')
-      %div{"v-if" => "loaded && sections.matches.length == 0"}
+    .col-xl-4.filter
+      %h5 {{ label }}
+      %div{"v-if" => "loaded && !elements.filters || elements.filters.length == 0"}
+        %p.empty= t('.setting_empty')
+      %setting-section{"v-if" => "loaded && elements.filters.length > 0",
+                       "v-for" => "filter in elements.filters",
+                       "v-bind:key" => "filter.id",
+                       "v-bind:initial-label" => "filter.current_label",
+                       "v-bind:initial-id" => "filter.id",
+                       "v-bind:initial-content" => "filter.content",
+                       "v-bind:initial-type" => "filter.type",
+                       "v-bind:initial-name" => "filter.name",
+                       "v-bind:initial-arg" => "filter.arg"}
+
+    .col-xl-4.output
+      %h5 {{ label }}
+      %div{"v-if" => "loaded && !elements.matches || elements.matches.length == 0"}
         %p.empty= t('.setting_empty')
-      %setting-section{"v-if" => "loaded && sections.matches.length > 0",
-                       "v-for" => "match in sections.matches",
+      %setting-section{"v-if" => "loaded && elements.matches.length > 0",
+                       "v-for" => "match in elements.matches",
                        "v-bind:key" => "match.id",
+                       "v-bind:initial-label" => "match.current_label",
                        "v-bind:initial-id" => "match.id",
                        "v-bind:initial-content" => "match.content",
                        "v-bind:initial-type" => "match.type",

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

@@ -0,0 +1,19 @@
+- add_javascript_pack_tag("filter_grep_setting")
+
+= render "shared/vue/grep_container"
+
+#filter-grep-setting
+  %div
+    %template{"v-for" => "(enabled, i) in containers.and"}
+      %grep-container{"v-if" => "enabled",
+                      "v-bind:container-type" => '"and"',
+                      "v-bind:index" => "i",
+                      "v-on:add-grep-container" => "addGrepContainer",
+                      "v-on:remove-grep-container" => "removeGrepContainer"}
+  %div
+    %template{"v-for" => "(enabled, i) in containers.or"}
+      %grep-container{"v-if" => "enabled",
+                      "v-bind:container-type" => '"or"',
+                      "v-bind:index" => "i",
+                      "v-on:add-grep-container" => "addGrepContainer",
+                      "v-on:remove-grep-container" => "removeGrepContainer"}

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

@@ -0,0 +1,32 @@
+= render "shared/vue/grep_pattern"
+%script{type: "text/x-template", id: "vue-grep-container"}
+  .form-group.card
+    .card-header
+      %a.btn.btn-xs{"v-on:click" => "add", "v-if" => "index == 0"}
+        = icon("fa-plus")
+      %a.btn.btn-xs{"v-on:click" => "remove", "v-if" => "index != 0"}
+        = icon("fa-minus")
+      %label
+        {{ containerType | humanize }}
+      %label.pl-4.pr-2
+        %input{"type" => "radio",
+               "value" => "regexp",
+               "v-bind:name" => "inputName(index)",
+               "v-model" => "grepType"}
+        Regexp
+      %label
+        %input{"type" => "radio",
+               "value" => "exclude",
+               "v-bind:name" => "inputName(index)",
+               "v-model" => "grepType"}
+        Exclude
+    .card-body
+      .row
+        %template{"v-for" => "(enabled, i) in patterns"}
+          %grep-pattern.col-xl-3{"v-if" => "enabled",
+                                 "v-bind:container-type" => "containerType",
+                                 "v-bind:grep-type" => "grepType",
+                                 "v-bind:index" => "index",
+                                 "v-bind:subIndex" => "i",
+                                 "v-on:add-grep-pattern" => "addGrepPattern",
+                                 "v-on:remove-grep-pattern" => "removeGrepPattern"}

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

@@ -0,0 +1,24 @@
+%script{type: "text/x-template", id: "vue-grep-pattern"}
+  %div
+    %a.btn.btn-xs{"v-on:click" => "add", "v-if" => "subIndex == 0"}
+      = icon("fa-plus")
+    %a.btn.btn-xs{"v-on:click" => "remove", "v-if" => "subIndex != 0"}
+      = icon("fa-minus")
+    %label
+      {{ grepType | humanize }}
+    .form-group
+      %label{"data" => {"toggle" => "tooltip", "placement" => "right"},
+             "title" => "The field name to which the regular expression is applied."}
+        Key
+        %input.form-control{"v-bind:id" => 'inputId("key", index, subIndex)',
+                            "v-bind:name" => 'inputName("key", index, subIndex)',
+                            "v-model:lazy" => "key",
+                            "type" => "text"}
+    .form-group
+      %label{"data" => {"toggle" => "tooltip", "placement" => "right"},
+             "title" => "The regular expression"}
+        Pattern
+        %input.form-control{"v-bind:id" => 'inputId("pattern", index, subIndex)',
+                            "v-bind:name" => 'inputName("pattern", index, subIndex)',
+                            "v-model:lazy" => "pattern",
+                            "type" => "text"}

data/app/views/shared/vue/_setting.html.erb

@@ -6,12 +6,12 @@
   <div class="card-header" data-toggle="collapse" v-bind:href="'#'+id" v-bind:title="content">
     <i class="fa fa-caret-down"></i>
     {{ type }}
-    <span v-if="name == 'match'">({{ arg }})</span>
+    <span v-if="!_.isEmpty(arg) && (name == 'match' || name == 'filter')">({{ arg }})</span>
   </div>
   <div class="card-body collapse" v-bind:id="id">
     <pre v-if="mode != 'edit'">{{ content }}</pre>
     <p v-if="mode == 'edit'">
-      <textarea v-config-editor class="form-control" v-model="content" v-bind:disabled="processing"></textarea>
+      <textarea v-config-editor class="form-control" v-model.lazy="content" v-bind:disabled="processing"></textarea>
     </p>
     <p class="float-right">
       <button v-if="mode != 'edit'" class="btn btn-secondary" v-on:click="onEdit"><%= t('terms.edit') %></button>

data/config/locales/translation_en.yml

@@ -113,6 +113,10 @@ en:
       setup_in_monitor_agent: Monitoring Agent
       setup_in_http: http
       setup_in_forward: Forwarding (receiving from another fluentd)
+      setup_filter_grep: Filtering (grep)
+      setup_filter_parser: Parse field
+      setup_filter_record_transformer: Transform
+      setup_filter_stdout: stdout(log)
       setup_out_td: Treasure Data
       setup_out_mongo: MongoDB
       setup_out_stdout: stdout (log)
@@ -145,6 +149,7 @@ en:
         page_title: Add Source and Output
         in: Source
         out: Output
+        filter: Filter
         current: Current setting
         setting_empty: Not exists
       show:
@@ -155,19 +160,19 @@ en:
         page_title: Edit Config File
       out_forward:
         option_guide: |
-          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/out_forward" target="_blank">Forward output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="https://docs.fluentd.org/articles/out_forward" target="_blank">Forward output plugin</a> documentation page.
         secondary_note: |
           All servers are unavailable, store data as a file to specified path.
         show:
           page_title: Add Output to another Fluentd
       out_s3:
         option_guide: |
-          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/out_s3" target="_blank">Amazon S3 output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="https://docs.fluentd.org/articles/out_s3" target="_blank">Amazon S3 output plugin</a> documentation page.
         show:
           page_title: Add Output to Amazon S3
       out_td:
         option_guide: |
-          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/out_td" target="_blank">Treasure Data output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="https://docs.fluentd.org/articles/out_td" target="_blank">Treasure Data output plugin</a> documentation page.
         show:
           page_title: Add Output to Treasure Data
       out_elasticsearch:
@@ -177,40 +182,64 @@ en:
           page_title: Add Output to Elasticsearch
       out_mongo:
         option_guide: |
-          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/out_mongo" target="_blank">MongoDB output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="https://docs.fluentd.org/articles/out_mongo" target="_blank">MongoDB output plugin</a> documentation page.
         show:
           page_title: Add Output to MongoDB
       out_stdout:
         option_guide: |
-          Print events to STDOUT (or fluentd log file if launched with daemon mode). Please refer to the <a href="http://docs.fluentd.org/articles/out_stdout" target="_blank">stdout output plugin</a> documentation page.
+          Print events to STDOUT (or fluentd log file if launched with daemon mode). Please refer to the <a href="https://docs.fluentd.org/articles/out_stdout" target="_blank">stdout output plugin</a> documentation page.
+        show:
+          page_title: stdout (log)
+      filter_grep:
+        option_guide: |
+          "Grep" events by the value of specified fields.<br />
+          Please refer to the <a target="_blank" href="https://docs.fluentd.org/articles/filter_grep">filter_grep plugin</a> documentation page.
+        show:
+          page_title: Add filter to grep records
+      filter_parser:
+        option_guide: |
+          Parse string field in event records and mutates its event record with parsed result.<br />
+          Please refer to the <a target="_blank" href="https://docs.fluentd.org/articles/filter_parser">filter_parser plugin</a> documentation page.
+        show:
+          page_title: Add filter to parse records
+      filter_record_transformer:
+        option_guide: |
+          Mutage/Transform incoming event streams in a versatile manner.<br />
+          Please refer to the <a target="_blank" href="https://docs.fluentd.org/articles/filter_record_transformer">filter_record_transformer plugin</a> documentation page.
+        show:
+          page_title: Add filter to transform records
+      filter_stdout:
+        option_guide: |
+          Print events to STDOUT (or logs if launched with daemon mode).<br />
+          Please refer to the <a target="_blank" href="https://docs.fluentd.org/articles/filter_stdout>filter_stdout plugin</a> documentation page.
         show:
           page_title: stdout (log)
       in_syslog:
         option_guide: |
-          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/in_syslog" target="_blank">MongoDB output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="https://docs.fluentd.org/articles/in_syslog" target="_blank">MongoDB output plugin</a> documentation page.
         show:
           page_title: Add Input from Syslog Protocol
       in_monitor_agent:
         option_guide: |
           Monitoring agent returns current fluentd/td-agent setting as JSON via HTTP. <br />
-          Please see refer to the <a target="_blank" href="http://docs.fluentd.org/articles/monitoring">Monitoring Agent</a> documentation page.
+          Please see refer to the <a target="_blank" href="https://docs.fluentd.org/articles/monitoring">Monitoring Agent</a> documentation page.
         show:
           page_title: Monitoring Agent (monitor_agent)
       in_http:
         option_guide: |
           Retrieve records from http POST.<br />
           The URL path becomes the tag of the Fluentd event log and the POSTed body element becomes the record itself.<br />
-          Please see refer to the <a target="_blank" href="http://docs.fluentd.org/articles/in_http">http Input Plugin</a> documentation page.
+          Please see refer to the <a target="_blank" href="https://docs.fluentd.org/articles/in_http">http Input Plugin</a> documentation page.
         show:
           page_title: Add http Input Plugin
       in_forward:
         option_guide: |
           Listen to a TCP socket to receive the event stream and an UDP socket to receive heartbeat messages.
-          Please see refer to the <a target="_blank" href="http://docs.fluentd.org/articles/in_forward">forward Input Plugin</a> documentation page.
+          Please see refer to the <a target="_blank" href="https://docs.fluentd.org/articles/in_forward">forward Input Plugin</a> documentation page.
         show:
           page_title: Add forward Input Plugin
       in_tail_option_guide: |
-          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/in_tail" target="_blank">Tail input plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="https://docs.fluentd.org/articles/in_tail" target="_blank">Tail input plugin</a> documentation page.
       in_tail:
         notice_for_permission: "Please check permission or group setting for %{user} user can read it."
         notice_for_multiline_limit: "Please input Regexp(s) separated by newline. blank lines are ignored. Lines more than 20 are dropped."