fluentd-ui 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6f137ac8e1059590ba4eab9a088b202cc722397be835af16284d4c6d088e73
-  data.tar.gz: e62688373e36af8d8ce2a1afb3fb29f71fe450a519962380891b223d58ea1341
+  metadata.gz: be7de017082475652832bd83534a77e2e537ef4edafb79332a76bb4e2c364f88
+  data.tar.gz: 5cbf21ac7f5aed68aeb319af32515a5abc00d76183d63fcbc716c3d3da39908e
 SHA512:
-  metadata.gz: fc05861a183d2d2eee8cda2e53b922b931145eb3087e0f11c323482762bf5ccff6e02c8efe1f0e939bd5b2bd03295750e09dea9bb7c0f63bb33e79748eaea2ca
-  data.tar.gz: 0140571fd3ceb851aea8ddc765811d17bf863c47276e3cff3ace9c4bf8a15a5852f2e130fe6477ac099f91a8b65a8dafe9c7953720b7d6f2edb65c9e9ce587ee
+  metadata.gz: 11dbeaaa1f4c2ce5a07d7e66719f308ec64fa12fb48824cfbc05ab472e7a6f9b2b7ed601a466eaf266c8bf1d791f4862d43949d06d1adc33ff83b7aa41d00ec7
+  data.tar.gz: 874ea532e955403d02fe332cba270f2788b67be71f4eb5a19ab8646807dfeaddba5013ad994321325f345df70b30f023539a8fa253e1357e03fb9a1bc1d262f1

data/.eslintrc.js

@@ -14,7 +14,8 @@ module.exports = {
   "globals": {
     "$": true,
     "Rails": true,
-    "Vue": true
+    "Vue": true,
+    "relativeUrlRoot": true
   },
   "rules": {
     "indent": [

data/ChangeLog.md

@@ -1,3 +1,11 @@
+## Release 1.2.0 - 2018/11/05
+
+* [maintenance] Add app/javascript/packs/components [#275](https://github.com/fluent/fluentd-ui/pull/275)
+* [maintenance] Fix eslint errors [#274](https://github.com/fluent/fluentd-ui/pull/274)
+* [fixed] Set label properly [#270](https://github.com/fluent/fluentd-ui/pull/270)
+* [maintenance] Use bootstrap-vue [#269](https://github.com/fluent/fluentd-ui/pull/269) [#273](https://github.com/fluent/fluentd-ui/pull/273)
+* [fixed] Fix preview functionality in in_tail wizard [#267](https://github.com/fluent/fluentd-ui/pull/267)
+
 ## Release 1.1.0 - 2018/09/25
 
 * [maintenance] Suppress JavaScript warnings [#265](https://github.com/fluent/fluentd-ui/pull/265)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (1.1.0)
+    fluentd-ui (1.2.0)
       addressable
       bootsnap (>= 1.1.0)
       bundler
@@ -82,31 +82,31 @@ GEM
       io-like (~> 0.3.0)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.100.0)
-    aws-sdk-core (3.24.1)
+    aws-partitions (1.105.0)
+    aws-sdk-core (3.30.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.7.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-kms (1.9.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.17.0)
-      aws-sdk-core (~> 3, >= 3.21.2)
+    aws-sdk-s3 (1.21.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
-    aws-sdk-sqs (1.4.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-sqs (1.7.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
-    better_errors (2.4.0)
+    better_errors (2.5.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindex (0.5.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.3.1)
+    bootsnap (1.3.2)
       msgpack (~> 1.0)
     bson (4.3.0)
     builder (3.2.3)
@@ -122,7 +122,7 @@ GEM
       launchy
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    chromedriver-helper (1.2.0)
+    chromedriver-helper (2.1.0)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
     coderay (1.1.2)
@@ -152,29 +152,29 @@ GEM
     erubi (1.7.1)
     erubis (2.7.0)
     excon (0.62.0)
-    factory_bot (4.11.0)
+    factory_bot (4.11.1)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.11.0)
-      factory_bot (~> 4.11.0)
+    factory_bot_rails (4.11.1)
+      factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faraday (0.15.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
-    fluent-plugin-elasticsearch (2.11.5)
+    fluent-plugin-elasticsearch (2.12.0)
       elasticsearch
       excon
       fluentd (>= 0.14.20)
     fluent-plugin-mongo (1.1.2)
       fluentd (>= 0.14.12, < 2)
       mongo (~> 2.6.0)
-    fluent-plugin-s3 (1.1.4)
+    fluent-plugin-s3 (1.1.6)
       aws-sdk-s3 (~> 1.0)
       aws-sdk-sqs (~> 1.0)
       fluentd (>= 0.14.2, < 2)
     fluent-plugin-td (1.0.0)
       fluentd (>= 0.14.13, < 2)
       td-client (~> 1.0)
-    fluentd (1.2.5)
+    fluentd (1.2.6)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -230,7 +230,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mimemagic (0.3.2)
@@ -243,7 +243,7 @@ GEM
     multi_json (1.13.1)
     multipart-post (2.0.0)
     nio4r (2.3.1)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     power_assert (1.1.3)
     pry (0.11.3)
@@ -254,7 +254,7 @@ GEM
     public_suffix (3.0.3)
     puma (3.12.0)
     rack (2.0.5)
-    rack-proxy (0.6.4)
+    rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -294,7 +294,7 @@ GEM
       sexp_processor (~> 4.9)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
-    sass (3.5.7)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -337,13 +337,13 @@ GEM
     test-unit-activesupport (1.0.9)
       activesupport
       test-unit
-    test-unit-capybara (1.0.6)
+    test-unit-capybara (1.0.7)
       capybara (>= 2.1.0)
       json
       test-unit (>= 2.5.3)
     test-unit-notify (1.0.4)
       test-unit (>= 2.4.9)
-    test-unit-rails (5.2.1)
+    test-unit-rails (5.2.2)
       rails (>= 5.1.2)
       test-unit (>= 3.1.7)
       test-unit-activesupport (>= 1.0.8)
@@ -358,9 +358,9 @@ GEM
     timecop (0.9.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.5)
+    tzinfo-data (1.2018.7)
       tzinfo (>= 1.0.0)
-    web-console (3.6.2)
+    web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
@@ -405,4 +405,4 @@ DEPENDENCIES
   webmock (~> 3.3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

data/app/assets/stylesheets/application.css

@@ -12,6 +12,7 @@
  *
  *= require font-awesome
  *= require bootstrap/dist/css/bootstrap
+ *= require bootstrap-vue/dist/bootstrap-vue
  *= require startbootstrap-sb-admin/css/sb-admin.css
  *= require datatables.net-bs4/css/dataTables.bootstrap4.css
  *= require codemirror/lib/codemirror

data/app/controllers/misc_controller.rb

@@ -4,6 +4,8 @@ require "zip"
 class MiscController < ApplicationController
   after_action :update!, only: [:update_fluentd_ui]
 
+  helper_method :env_items
+
   def show
     redirect_to misc_information_path
   end
@@ -75,4 +77,10 @@ class MiscController < ApplicationController
   def update!
     FluentdUiRestart.perform_later
   end
+
+  def env_items
+    @env.map do |key, value|
+      { key: key, value: value }
+    end
+  end
 end

data/app/controllers/plugins_controller.rb

@@ -1,10 +1,12 @@
 class PluginsController < ApplicationController
+  helper_method :plugins_json
+
   def index
     redirect_to installed_plugins_path
   end
 
   def installed
-    @plugins = Plugin.installed.reject{|plugin| plugin.processing? }
+    @plugins = PluginDecorator.decorate_collection(Plugin.installed.reject{|plugin| plugin.processing? })
   end
 
   def recommended
@@ -12,14 +14,23 @@ class PluginsController < ApplicationController
   end
 
   def updated
-    @plugins = Plugin.installed.reject{|plugin| plugin.latest_version? }
+    @plugins = PluginDecorator.decorate_collection(Plugin.installed.reject{|plugin| plugin.latest_version? })
   end
 
   def install
     params[:plugins].each do |gem_name|
       GemInstallerJob.perform_later(gem_name)
     end
-    redirect_to plugins_path
+    respond_to do |format|
+      format.html do
+        redirect_to plugins_path
+      end
+      format.json do
+        plugins = PluginDecorator.decorate_collection(Plugin.recommended.select {|item| params[:plugins].include?(item.gem_name)})
+        render json: plugins.map(&:to_hash).to_json
+      end
+    end
+
   end
 
   def uninstall
@@ -41,4 +52,10 @@ class PluginsController < ApplicationController
     end
     redirect_to plugins_path
   end
+
+  private
+
+  def plugins_json
+    JSON.pretty_generate(@plugins.map(&:to_hash))
+  end
 end

data/app/decorators/plugin_decorator.rb

@@ -10,4 +10,22 @@ class PluginDecorator < Draper::Decorator
       I18n.t("terms.not_installed")
     end
   end
+
+  def to_hash
+    {
+      is_installed: installed?,
+      is_processing: processing?,
+      uninstall_button: "plugin-modal-#{gem_name}",
+      name: gem_name,
+      authors: authors,
+      summary: summary,
+      api_version: api_version,
+      category: category,
+      status: status,
+      installed_version: installed_version,
+      latest_version: latest_version,
+      is_latest_version: latest_version?,
+      rubygems_org_page: rubygems_org_page
+    }
+  end
 end

data/app/helpers/application_helper.rb

@@ -27,16 +27,6 @@ module ApplicationHelper
     }[locale] || locale
   end
 
-  def language_menu
-    html = ""
-    I18n.available_locales.each do |locale|
-      text = (locale == current_locale ? icon("fa-check") : "")
-      text << language_name(locale)
-      html << %Q|<li>#{link_to text , "?lang=#{locale}"}</li>|
-    end
-    raw html
-  end
-
   def link_to_other(text, path, **options)
     if current_page?(path)
       # NOTE: sb-admin set style for element name instead of class name, such as ".nav a". So use "a" element even if it isn't a link.

data/app/javascript/packs/application.js

@@ -7,8 +7,6 @@
 // To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate
 // layout file, like app/views/layouts/application.html.erb
 
-console.log("Hello World from Webpacker");
-
 import jQuery from "jquery/dist/jquery";
 
 window.$ = jQuery;
@@ -21,20 +19,24 @@ Rails.start();
 
 import "popper.js/dist/popper";
 import "bootstrap/dist/js/bootstrap";
-import "datatables.net/js/jquery.dataTables";
 import "startbootstrap-sb-admin/js/sb-admin";
-import "startbootstrap-sb-admin/js/sb-admin-datatables";
 
 import Vue from "vue/dist/vue.esm";
+import Vuex from "vuex/dist/vuex.esm";
+import BootstrapVue from "bootstrap-vue/dist/bootstrap-vue.esm";
+
+Vue.use(Vuex);
+Vue.use(BootstrapVue);
 
 Vue.filter("to_json", function (value) {
   return JSON.stringify(value);
 });
 
 window.Vue = Vue;
+window.Vuex = Vuex;
 
 import "../stylesheets/application.scss";
 
-$(document).ready(() => {
+window.addEventListener("load", () => {
   $("[data-toggle=tooltip]").tooltip();
 });

data/app/javascript/packs/codemirror.js

@@ -43,7 +43,7 @@ CodeMirror.defineMode("fluentd", function() {
           stream.eatWhile(/[^ \t#]/);
           state.context =  "inner-definition-keyword-appeared";
           return "variable";
-        case "inner-definition-keyword-appeared":
+        case "inner-definition-keyword-appeared": {
           let eatBuiltin = function(stream, state) {
             stream.eatWhile(/[^#]/);
             if (stream.current().match(/\\$/)) {
@@ -55,6 +55,7 @@ CodeMirror.defineMode("fluentd", function() {
           eatBuiltin(stream, state);
           state.context = "inner-definition";
           return "builtin";
+        }
         default:
           stream.eat(/[^<>#]+/);
           return "string";

data/app/javascript/packs/components/config_field.js

@@ -0,0 +1,110 @@
+/* global _ */
+"use strict";
+import "lodash/lodash";
+import store from "../store";
+
+const ConfigField = {
+  template: "#vue-config-field",
+  props: [
+    "pluginType",
+    "option",
+    "initialTextValue",
+  ],
+
+  data: function() {
+    return {
+      selectedValue: null,
+      checkboxValue: null,
+      textValue: null,
+    };
+  },
+
+  filters: {
+    humanize: function(value) {
+      return _.capitalize(value.replace(/_/g, " "));
+    }
+  },
+
+  mounted: function() {
+    if (this.option.type === "enum") {
+      this.selectedValue = this.option.default;
+    } else if (this.option.type === "bool") {
+      this.checkboxValue = this.option.default;
+    } else {
+      this.textValue = this.initialTextValue || this.option.default;
+    }
+
+    if (this.option.name === "message_format") {
+      store.commit("parserParams/setMessageFormat", this.selectedValue);
+    }
+    if (this.option.name === "rfc5424_time_format") {
+      store.commit("parserParams/setRfc5424TimeFormat", this.textValue);
+    }
+    if (this.option.name === "with_priority") {
+      store.commit("parserParams/setWithPriority", this.checkboxValue);
+    }
+    if (this.option.name === "expression") {
+      store.commit("parserParams/Expression", this.textValue);
+    }
+    if (this.option.name === "timeFormat") {
+      store.commit("parserParams/timeFormat", this.textValue);
+    }
+  },
+
+  updated: function() {
+    if (this.option.name === "expression") {
+      this.expression = this.initialExpression;
+    }
+    if (this.option.name === "time_format") {
+      this.timeFormat = this.initialTimeFormat;
+    }
+  },
+
+  methods: {
+    onChange: function(event) {
+      console.log("onChange", this.option.name,  event.target.value);
+      if (this.option.name === "message_format") {
+        store.dispatch("parserParams/updateMessageFormat", event);
+      }
+      if (this.option.name === "rfc5424_time_format") {
+        store.dispatch("parserParams/updateRfc5424TimeFormat", event);
+      }
+      if (this.option.name === "with_priority") {
+        store.dispatch("parserParams/updateWithPriority", event);
+      }
+      if (this.option.name === "expression") {
+        store.dispatch("parserParams/updateExpression", event);
+      }
+      if (this.option.name === "timeFormat") {
+        store.dispatch("parserParams/updateTimeFormat", event);
+      }
+      this.$emit("change-parse-config", {});
+    },
+    labelId: function(pluginType, option) {
+      return `label_${this.inputId(pluginType, option)}`;
+    },
+    inputId: function(pluginType, option) {
+      if (pluginType === "output") {
+        return `setting_${option.name}`;
+      } else {
+        return `setting_${_.snakeCase(pluginType)}_0__${option.name}`;
+      }
+    },
+    inputName: function(pluginType, option) {
+      if (pluginType === "output") {
+        return `setting[${option.name}]`;
+      } else {
+        return `setting[${_.snakeCase(pluginType)}[0]][${option.name}]`;
+      }
+    },
+    checked: function(checked) {
+      if (checked === true || checked === "true") {
+        return "checked";
+      } else {
+        return "";
+      }
+    }
+  }
+};
+
+export { ConfigField as default };