fluentd-ui 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6d045b90f722b9793cbf8e23abcfc7a9d78b00a898001bbdbd0c3c590a4de9a
-  data.tar.gz: 0dc77c43a23e146587351f375c0aaa976fafbd5cefcf1c10e053f611f1efee42
+  metadata.gz: df6f137ac8e1059590ba4eab9a088b202cc722397be835af16284d4c6d088e73
+  data.tar.gz: e62688373e36af8d8ce2a1afb3fb29f71fe450a519962380891b223d58ea1341
 SHA512:
-  metadata.gz: f79d69613ea99bc156ba20899c0334b6919238181b5635acde0f31e5119f7c33bd749a2a5aee8195923fe29b0bb9152074ab9e2b2c85eec87e6f30503e73d47d
-  data.tar.gz: 49938a1d5aa8b4704deedc1c0a237b539a11661067a24a0c9fda5ca7e14dce96c504a3374257056d92e39bc13d1c1557b92f1c4aeecf80549a69d57ddb8f81eb
+  metadata.gz: fc05861a183d2d2eee8cda2e53b922b931145eb3087e0f11c323482762bf5ccff6e02c8efe1f0e939bd5b2bd03295750e09dea9bb7c0f63bb33e79748eaea2ca
+  data.tar.gz: 0140571fd3ceb851aea8ddc765811d17bf863c47276e3cff3ace9c4bf8a15a5852f2e130fe6477ac099f91a8b65a8dafe9c7953720b7d6f2edb65c9e9ce587ee

data/ChangeLog.md

@@ -1,3 +1,8 @@
+## Release 1.1.0 - 2018/09/25
+
+* [maintenance] Suppress JavaScript warnings [#265](https://github.com/fluent/fluentd-ui/pull/265)
+* [improvement] Support filter plugins and label feature [#262](https://github.com/fluent/fluentd-ui/pull/262)
+
 ## Release 1.0.1 - 2018/09/14
 
 * [maintenance] Update rubyzip [#263](https://github.com/fluent/fluentd-ui/pull/263)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (1.0.1)
+    fluentd-ui (1.1.0)
       addressable
       bootsnap (>= 1.1.0)
       bundler

data/app/controllers/api/settings_controller.rb

@@ -2,7 +2,7 @@ class Api::SettingsController < ApplicationController
   before_action :login_required
   before_action :find_fluentd
   before_action :set_config
-  before_action :set_section, only: [:show, :update, :destroy]
+  before_action :set_target_element, only: [:show, :update, :destroy]
   helper_method :element_id
 
   def index
@@ -12,26 +12,38 @@ class Api::SettingsController < ApplicationController
   end
 
   def update
+    label_name = params[:label]
     coming = Fluent::Config::V1Parser.parse(params[:content], @fluentd.config_file)
-    current = @section
-    index = @config.elements.index current
-    unless index
+    coming_element = coming.elements.first
+
+    unless @target_element
       render_404
       return
     end
-    @config.elements[index] = coming.elements.first
+
+    @target_element.elements = coming_element.elements
+    @target_element.merge(coming_element)
+
     @config.write_to_file
-    redirect_to api_setting_path(id: element_id(coming.elements.first))
+    redirect_to api_setting_path(id: element_id(label_name, @target_element),
+                                 label: label_name,
+                                 pluginType: params[:pluginType])
   end
 
   def destroy
-    unless @config.elements.index(@section)
+    if params[:label] == "ROOT" || params[:pluginType] == "source"
+      name = params[:pluginType]
+      arg = params[:arg]
+    else
+      name = "label"
+      arg = params[:label]
+    end
+    if @config.delete_element(name, arg, @target_element)
+      @config.write_to_file
+      head :no_content # 204
+    else
       render_404
-      return
     end
-    @config.elements.delete @section
-    @config.write_to_file
-    head :no_content # 204
   end
 
   private
@@ -40,17 +52,35 @@ class Api::SettingsController < ApplicationController
     @config = Fluentd::Setting::Config.new(@fluentd.config_file)
   end
 
-  def set_section
-    @section = @config.elements.find do |elm|
-      element_id(elm) == params[:id]
+  def set_target_element
+    id = params[:id]
+    plugin_type = params[:pluginType]
+    label_name = params[:label]
+    return unless id
+    elements = @config.group_by_label.dig(label_name, element_type(plugin_type))
+    @target_element = elements.find do |elm|
+      element_id(label_name, elm) == id
     end
   end
 
-  def element_id(element)
-    index = @config.elements.index(element)
+  def element_id(label_name, element)
+    element_type = element_type(element.name)
+    elements = @config.group_by_label.dig(label_name, element_type)
+    index = elements.index(element)
     "#{"%06d" % index}#{Digest::MD5.hexdigest(element.to_s)}"
   end
 
+  def element_type(name)
+    case name
+    when "source"
+      :sources
+    when "filter"
+      :filters
+    when "match"
+      :matches
+    end
+  end
+
   def render_404
     render nothing: true, status: 404
   end

data/app/controllers/concerns/setting_concern.rb

@@ -23,7 +23,7 @@ module SettingConcern
       return render "shared/settings/show"
     end
 
-    @fluentd.agent.config_append @setting.to_config
+    @fluentd.agent.config_merge(@setting.to_config.to_s)
     if @fluentd.agent.running?
       unless @fluentd.agent.restart
         @setting.errors.add(:base, @fluentd.agent.log.tail(1).first)

data/app/controllers/fluentd/settings/filter_grep_controller.rb

@@ -0,0 +1,9 @@
+class Fluentd::Settings::FilterGrepController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::FilterGrep
+  end
+end

data/app/controllers/fluentd/settings/filter_parser_controller.rb

@@ -0,0 +1,9 @@
+class Fluentd::Settings::FilterParserController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::FilterParser
+  end
+end

data/app/controllers/fluentd/settings/filter_record_transformer_controller.rb

@@ -0,0 +1,14 @@
+class Fluentd::Settings::FilterRecordTransformerController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::FilterRecordTransformer
+  end
+
+  def setting_params
+    permit_params = target_class.permit_params + [:record]
+    params.require(:setting).permit(*permit_params)
+  end
+end

data/app/controllers/fluentd/settings/filter_stdout_controller.rb

@@ -0,0 +1,9 @@
+class Fluentd::Settings::FilterStdoutController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::FilterStdout
+  end
+end

data/app/javascript/packs/filter_grep_setting.js

@@ -0,0 +1,39 @@
+/* global _ */
+"use strict";
+import "lodash/lodash";
+
+import GrepContainer from "./grep_container";
+
+$(document).ready(() => {
+  new Vue({
+    el: "#filter-grep-setting",
+    components: {
+      "grep-container": GrepContainer,
+    },
+    data: function() {
+      return {
+        containers: {
+          and: [true],
+          or: [true]
+        }
+      };
+    },
+    mounted: function() {
+      this.$on("add-grep-container", this.addGrepContainer);
+      this.$on("remove-grep-container", this.removeGrepContainer);
+    },
+    methods: {
+      addGrepContainer: function(containerType, index) {
+        const found = this.containers[containerType].indexOf(false);
+        if (found < 0) {
+          this.$set(this.containers[containerType], this.containers[containerType].length, true);
+        } else {
+          this.$set(this.containers[containerType], found, true);
+        }
+      },
+      removeGrepContainer: function(containerType, index) {
+        this.$set(this.containers[containerType], index, false);
+      }
+    }
+  });
+});

data/app/javascript/packs/grep_container.js

@@ -0,0 +1,53 @@
+/* global _ */
+"use strict";
+import "lodash/lodash";
+import GrepPattern from "./grep_pattern";
+
+const GrepContainer = {
+  template: "#vue-grep-container",
+  components: {
+    "grep-pattern": GrepPattern
+  },
+  props: [
+    "containerType", // and/or
+    "index",
+  ],
+  data: function() {
+    return {
+      grepType: "regexp",
+      patterns: [true],
+    }
+  },
+  filters: {
+    humanize: function(value) {
+      return _.capitalize(value.replace(/_/g, " "));
+    }
+  },
+  methods: {
+    add: function(event) {
+      this.$emit("add-grep-container", this.containerType, this.index);
+    },
+    remove: function(event) {
+      this.$emit("remove-grep-container", this.containerType, this.index);
+    },
+    addGrepPattern: function(grepType, index) {
+      const found = this.patterns.indexOf(false);
+      if (found < 0) {
+        this.$set(this.patterns, this.patterns.length, true);
+      } else {
+        this.$set(this.patterns, found, true);
+      }
+    },
+    removeGrepPattern: function(grepType, index) {
+      console.log(index);
+      console.log(this.patterns);
+      this.$set(this.patterns, index, false);
+      console.log(this.patterns);
+    },
+    inputName: function(index) {
+      return `setting[${this.containerType}[${this.index}]][grep_type]`;
+    }
+  }
+};
+
+export { GrepContainer as default };

data/app/javascript/packs/grep_pattern.js

@@ -0,0 +1,43 @@
+/* global _ */
+"use strict";
+import "lodash/lodash";
+
+const GrepPattern = {
+  template: "#vue-grep-pattern",
+  props: [
+    "containerType", // and/or
+    "grepType", // regexp/exclude
+    "index",  // the index of and/or
+    "subIndex", // the index of regexp/exclude
+  ],
+  data: function() {
+    return {
+      key: null,
+      pattern: null,
+    }
+  },
+
+  filters: {
+    humanize: function(value) {
+      return _.capitalize(value.replace(/_/g, " "));
+    }
+  },
+
+  methods: {
+    add: function(event) {
+      this.$emit("add-grep-pattern", this.grepType, this.subIndex);
+    },
+    remove: function(event) {
+      this.$emit("remove-grep-pattern", this.grepType, this.subIndex);
+    },
+    inputId: function(name, index, subIndex) {
+      return `setting_${this.containerType}_${index}_${this.grepType}_${subIndex}__${name}`;
+    },
+
+    inputName: function(name, index, subIndex) {
+      return `setting[${this.containerType}[${index}]][${this.grepType}[${subIndex}]][${name}]`;
+    }
+  }
+};
+
+export { GrepPattern as default };

data/app/javascript/packs/owned_plugin_form.js

@@ -43,19 +43,21 @@ const OwnedPluginForm = {
     this.options = JSON.parse(this.optionsJson);
     this.initialParams = JSON.parse(this.initialParamsJson || "{}");
     this.pluginName = this.initialPluginName;
-    this.$on("hook:updated", () => {
-      console.log("hook:updated");
-      this.$nextTick(() => {
-        $("[data-toggle=tooltip]").tooltip("dispose");
-        $("[data-toggle=tooltip]").tooltip("enable");
-      });
-    });
     this.$once("data-loaded", () => {
       this.updateSection();
     });
     this.$emit("data-loaded");
   },
 
+  updated: function() {
+    this.$nextTick(() => {
+      if ($("[data-toggle=tooltip]").tooltip) {
+        $("[data-toggle=tooltip]").tooltip("dispose");
+        $("[data-toggle=tooltip]").tooltip("enable");
+      }
+    });
+  },
+
   methods: {
     onChange: function() {
       this.updateSection();

data/app/javascript/packs/settings.js

@@ -6,11 +6,19 @@ import "lodash/lodash";
 $(document).ready(() => {
   const SettingSection = {
     template: "#vue-setting-section",
-    props: ["initialId", "initialContent", "initialType", "initialName", "initialArg"],
+    props: [
+      "initialLabel",
+      "initialId",
+      "initialContent",
+      "initialType",
+      "initialName",
+      "initialArg"
+    ],
     data: function() {
       return {
         mode: "default",
         processing: false,
+        current_label: null,
         id: null,
         content: null,
         type: null,
@@ -20,6 +28,7 @@ $(document).ready(() => {
     },
     created: function() {
       this.initialState();
+      this.current_label = this.initialLabel;
       this.id = this.initialId;
       this.content = this.initialContent;
       this.type = this.initialType;
@@ -55,6 +64,8 @@ $(document).ready(() => {
           method: "POST",
           data: {
             _method: "PATCH",
+            label: this.current_label,
+            pluginType: this.name,
             id: this.id,
             content: this.content
           },
@@ -80,7 +91,10 @@ $(document).ready(() => {
           method: "POST",
           data: {
             _method: "DELETE",
-            id: this.id
+            label: this.current_label,
+            pluginType: this.name,
+            arg: this.arg,
+            id: this.id,
           },
           headers: {
             "X-CSRF-Token": this.token
@@ -102,8 +116,11 @@ $(document).ready(() => {
         loaded: false,
         loading: false,
         sections: {
-          sources: [],
-          matches: []
+          "ROOT": {
+            sources: [],
+            filters: [],
+            matches: []
+          }
         }
       };
     },
@@ -115,20 +132,21 @@ $(document).ready(() => {
     methods: {
       update: function() {
         this.loading = true;
-        $.getJSON(`${relativeUrlRoot}/api/settings`, (data)=> {
-          var sources = [];
-          var matches = [];
-          data.forEach((v)=> {
-            if(v.name === "source"){
-              sources.push(v);
-            }else{
-              matches.push(v);
-            }
+        $.getJSON(`${relativeUrlRoot}/api/settings`, (data) => {
+          console.log(data);
+          _.each(data, (elements, label) => {
+            this.$set(this.sections, label, elements);
           });
-          this.sections.sources = sources;
-          this.sections.matches = matches;
+          _.each(this.sections, (elements, label) => {
+            if (_.isEmpty(data[label])) {
+              this.$delete(this.sections, label);
+            }
+          })
+          if (_.isEmpty(data["ROOT"])) {
+            this.$set(this.sections, "ROOT", []);
+          }
           this.loaded = true;
-          setTimeout(()=> {
+          setTimeout(() => {
             this.loading = false;
           }, 500);
         });