fluentd-ui 0.4.5 → 1.0.0.alpha.1

data/config/routes.rb

@@ -11,6 +11,7 @@ Rails.application.routes.draw do
         put "start"
         put "stop"
         put "restart"
+        put "reload"
         get "log_tail"
       end
 

data/config/spring.rb

@@ -0,0 +1,6 @@
+%w[
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+].each { |path| Spring.watch(path) }

data/config/webpack/development.js

@@ -0,0 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+
+const environment = require('./environment')
+
+module.exports = environment.toWebpackConfig()

data/config/webpack/environment.js

@@ -0,0 +1,20 @@
+const { environment } = require('@rails/webpacker')
+const vue =  require('./loaders/vue')
+const webpack = require('webpack');
+
+// Get a pre-configured plugin
+const manifestPlugin = environment.plugins.get('Manifest')
+manifestPlugin.opts.writeToFileEmit = false
+
+// Add an additional plugin of your choosing : ProvidePlugin
+environment.plugins.prepend(
+  'Provide',
+  new webpack.ProvidePlugin({
+      $: 'jquery/dist/jquery',
+      jQuery: 'jquery/dist/jquery',
+      Popper: 'popper.js/dist/popper'
+  })
+);
+
+environment.loaders.append('vue', vue)
+module.exports = environment

data/config/webpack/loaders/vue.js

@@ -0,0 +1,13 @@
+const { dev_server: devServer } = require('@rails/webpacker').config
+
+const isProduction = process.env.NODE_ENV === 'production'
+const inDevServer = process.argv.find(v => v.includes('webpack-dev-server'))
+const extractCSS = !(inDevServer && (devServer && devServer.hmr)) || isProduction
+
+module.exports = {
+  test: /\.vue(\.erb)?$/,
+  use: [{
+    loader: 'vue-loader',
+    options: { extractCSS }
+  }]
+}

data/config/webpack/production.js

@@ -0,0 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'production'
+
+const environment = require('./environment')
+
+module.exports = environment.toWebpackConfig()

data/config/webpack/test.js

@@ -0,0 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+
+const environment = require('./environment')
+
+module.exports = environment.toWebpackConfig()

data/config/webpacker.yml

@@ -0,0 +1,69 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  source_path: app/javascript
+  source_entry_path: packs
+  public_output_path: packs
+  cache_path: tmp/cache/webpacker
+
+  # Additional paths webpack should lookup modules
+  # ['app/assets', 'engine/foo/app/assets']
+  resolved_paths: []
+
+  # Reload manifest.json on all requests so we reload latest compiled packs
+  cache_manifest: false
+
+  extensions:
+    - .vue
+    - .js
+    - .sass
+    - .scss
+    - .css
+    - .module.sass
+    - .module.scss
+    - .module.css
+    - .png
+    - .svg
+    - .gif
+    - .jpeg
+    - .jpg
+
+development:
+  <<: *default
+  compile: true
+
+  # Reference: https://webpack.js.org/configuration/dev-server/
+  dev_server:
+    https: false
+    host: localhost
+    port: 3035
+    public: localhost:3035
+    hmr: false
+    # Inline should be set to true if using HMR
+    inline: true
+    overlay: true
+    compress: true
+    disable_host_check: true
+    use_local_ip: false
+    quiet: false
+    headers:
+      'Access-Control-Allow-Origin': '*'
+    watch_options:
+      ignored: /node_modules/
+
+
+test:
+  <<: *default
+  compile: true
+
+  # Compile test packs to a separate directory
+  public_output_path: packs-test
+
+production:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Cache manifest.json for performance
+  cache_manifest: true

data/fluentd-ui.gemspec

@@ -19,21 +19,30 @@ Gem::Specification.new do |spec|
     #       And spec.files required for building a .gem only.
     #       Thus git ls-files only invoked with `rake build` command
     spec.files         = `git ls-files`.split($/)
+    # Add pre-compiled assets
+    Dir.chdir(__dir__) do
+      Dir.glob("public/assets/.sprockets-manifest-*.json") do |file|
+        spec.files << file
+      end
+      Dir.glob("public/{assets,packs}/*") do |file|
+        spec.files << file
+      end
+    end
   end
   spec.executables   = ["fluentd-ui"]
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd", [">= 0.10.56", "< 0.14"]
-  spec.add_dependency 'rails', '~> 4.2.0'
-  spec.add_dependency 'sucker_punch', "~> 1.6.0"
+  spec.add_dependency "fluentd", [">= 1.0.0", "< 2"]
+  spec.add_dependency 'rails', '~> 5.2.0'
+  spec.add_dependency "bootsnap", ">= 1.1.0"
+  spec.add_dependency 'sucker_punch', "~> 2.0.4"
   spec.add_dependency 'addressable'
   spec.add_dependency "font-awesome-rails"
-  spec.add_dependency 'sass-rails', '~> 4.0.3'
+  spec.add_dependency 'sass-rails', '~> 5.0.7'
   spec.add_dependency "haml-rails", "~> 1.0"
-  spec.add_dependency 'jquery-rails', "~> 4.3.1"
   spec.add_dependency 'jbuilder', '~> 2.0'
-  spec.add_dependency "draper", '~> 2.1'
+  spec.add_dependency "draper", '~> 3.0'
   spec.add_dependency "bundler"
   spec.add_dependency "httpclient", "~> 2.5" # same as td-agent
   spec.add_dependency "settingslogic"
@@ -43,4 +52,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "kramdown-haml"
   spec.add_dependency "rubyzip", "~> 1.1" # API changed as Zip::ZipFile -> Zip::File since v1.0.0
   spec.add_dependency "diff-lcs"
+  spec.add_dependency "webpacker"
 end

data/lib/fluentd-ui/version.rb

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

data/lib/regexp_preview/single_line.rb

@@ -16,11 +16,11 @@ module RegexpPreview
         @regexp = nil
         @time_format = nil
       else # apache, nginx, etc
-        definition = Fluent::TextParser::TEMPLATE_REGISTRY.lookup(format).call
-        raise "Unknown format '#{format}'" unless definition
-        definition.configure(Fluent::Config::Element.new('ROOT', '', {}, [])) # NOTE: SyslogParser define @regexp in configure method so call it to grab Regexp object
-        @regexp = definition.patterns["format"]
-        @time_format = definition.patterns["time_format"]
+        parser_plugin = Fluent::Plugin.new_parser(format)
+        raise "Unknown format '#{format}'" unless parser_plugin
+        parser_plugin.configure(Fluent::Config::Element.new('ROOT', '', {}, [])) # NOTE: SyslogParser define @regexp in configure method so call it to grab Regexp object
+        @regexp = parser_plugin.instance_variable_get(:@regexp)
+        @time_format = parser_plugin.time_format
       end
     end
 

data/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "fluentd-ui",
+  "private": true,
+  "dependencies": {
+    "@rails/webpacker": "3.5",
+    "codemirror": "^5.37.0",
+    "es6-promise": "^4.2.4",
+    "jquery": "^3.3.1",
+    "lodash": "^4.17.10",
+    "popper.js": "^1.14.3",
+    "startbootstrap-sb-admin": "^4.0.0",
+    "vue": "^2.5.16",
+    "vue-loader": "14.2.2",
+    "vue-template-compiler": "^2.5.16"
+  },
+  "devDependencies": {
+    "webpack-dev-server": "2.11.2"
+  }
+}

data/spec/controllers/application_controller_spec.rb

@@ -6,24 +6,20 @@ describe DummyController do
   controller DummyController do
     skip_before_action :login_required
     def index
-      render :text => "Hello World"
+      render plain: "Hello World"
     end
   end
 
   describe '#set_locale' do
     let!(:default_locale) { :en }
-    let!(:available_locales) { [:en, :ja] }
 
     before do
-      I18n.stub(:default_locale).and_return(default_locale)
-      I18n.stub(:available_locales).and_return(available_locales)
-
       I18n.locale = I18n.default_locale #initialize
     end
 
     context 'with params[:lang]' do
       before do
-        get 'index', lang: param_lang
+        get 'index', params: { lang: param_lang }
       end
 
       context 'and in available_locales' do

data/spec/controllers/fluentd/agents_controller_spec.rb

@@ -24,6 +24,11 @@ describe Fluentd::AgentsController do
       expect(@agent).to receive(:restart).and_return true
       put :restart
     end
+
+    it "reaload" do
+      expect(@agent).to receive(:reload).and_return true
+      put :reload
+    end
   end
 
   describe "when the action does not succeed" do
@@ -45,5 +50,12 @@ describe Fluentd::AgentsController do
       expect(log).to receive(:tail).with(1)
       put :restart
     end
+
+    it "reload" do
+      expect(@agent).to receive(:reload).and_return false
+      expect(@agent).to receive(:log).and_return(log)
+      expect(log).to receive(:tail).with(1)
+      put :reload
+    end
   end
 end

data/spec/controllers/polling_controller_spec.rb

@@ -7,7 +7,7 @@ describe PollingController do
     end
 
     after do
-      response.should be_success
+      response.should be_successful
     end
 
     it 'may find nothing' do

data/spec/factories/fluentd.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :fluentd do
     dir = Rails.root.join("tmp/fluentd-test").to_s
     FileUtils.mkdir_p(dir)

data/spec/factories/plugins.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :plugin do
     gem_name "fluent-plugin-dummy"
     version "1.2.3"

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     name "admin"
     password "changeme"

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

@@ -35,16 +35,17 @@ describe "histories", stub: :daemon do
 
     it 'show histories#show' do
       page.should have_css('h1', text: I18n.t('fluentd.settings.histories.show.page_title'))
-      page.should have_text(last_backup_file.content)
+
+      page.should has_text?(last_backup_file.content)
     end
 
     describe 'diff' do
       context 'has diff' do
         it 'shows diff between current and target' do
-          page.should have_text("-   type http")
-          page.should have_text("+   type forward")
-          page.should have_text("-   port 8899")
-          page.should have_text("+   port 24224")
+          page.should has_text?("-   type http")
+          page.should has_text?("+   type forward")
+          page.should has_text?("-   port 8899")
+          page.should has_text?("+   port 24224")
         end
       end
 
@@ -64,7 +65,7 @@ describe "histories", stub: :daemon do
 
       page.should have_css('h1', text: I18n.t('fluentd.settings.show.page_title'))
       page.should have_text(I18n.t('messages.config_successfully_copied', brand: 'fluentd') )
-      page.should have_text(last_backup_file.content)
+      page.should has_text?(last_backup_file.content)
     end
 
     describe "configtest" do

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

@@ -39,9 +39,10 @@ describe "running_backup", stub: :daemon do
       describe 'diff' do
         context 'has diff' do
           it 'shows diff between current and running' do
-            expect(page).to have_text("-   type http")
-            expect(page).to have_text("-   port 8899")
-            expect(page).to have_text("+   Running backup file content")
+            diff = page.first(".diff pre").native.inner_text
+            expect(diff).to include("-   type http")
+            expect(diff).to include("-   port 8899")
+            expect(diff).to include("+ Running backup file content")
           end
         end
 

data/spec/features/setting_spec.rb

@@ -50,6 +50,7 @@ describe 'setting', stub: :daemon do
 
   describe "config" do
     before do
+      Fluentd::Agent::TdAgent.any_instance.stub(:dryrun).with(an_instance_of(String)).and_return(true)
       daemon.agent.config_write conf
       click_link I18n.t('terms.edit')
     end

data/spec/features/source_and_output_spec.rb

@@ -54,17 +54,17 @@ describe "source_and_output", js: true, stub: :daemon do
     it do
       page.should_not have_content(I18n.t("fluentd.settings.source_and_output.setting_empty"))
 
-      page.should have_css('.input .panel .panel-heading')
-      page.should have_css('.output .panel .panel-heading')
+      page.should have_css('.input .card .card-header')
+      page.should have_css('.output .card .card-header')
     end
 
-    it ".panel-body is hidden by default and click .panel-heading for display"  do
-      page.should_not have_css('.input .panel .panel-body')
-      page.should_not have_css('.output .panel .panel-body')
-      all(".input .panel .panel-heading").first.click
-      page.should have_css('.input .panel .panel-body')
-      all(".output .panel .panel-heading").first.click
-      page.should have_css('.output .panel .panel-body')
+    it ".card-body is hidden by default and click .card-header for display"  do
+      page.should_not have_css('.input .card .card-body')
+      page.should_not have_css('.output .card .card-body')
+      all(".input .card .card-header").first.click
+      page.should have_css('.input .card .card-body')
+      all(".output .card .card-header").first.click
+      page.should have_css('.output .card .card-body')
     end
 
     it "display plugin name" do
@@ -94,7 +94,7 @@ describe "source_and_output", js: true, stub: :daemon do
     CONF
 
     before do
-      all(".input .panel .panel-heading").first.click
+      all(".input .card .card-header").first.click
     end
 
     it "click edit button transform textarea, then click cancel button to be reset" do
@@ -136,20 +136,20 @@ describe "source_and_output", js: true, stub: :daemon do
     end
 
     it "click delete button transform textarea" do
-      page.should have_css('.input .panel-body')
-      confirm_dialog(true) do
+      page.should have_css('.input .card-body')
+      accept_confirm do
         find(".btn", text: I18n.t('terms.destroy')).click
       end
-      page.should_not have_css('.input .panel-body')
+      page.should_not have_css('.input .card-body')
       daemon.agent.config.strip.should == ""
     end
 
     it "click delete button then cancel it" do
-      page.should have_css('.input .panel-body')
-      confirm_dialog(false) do
+      page.should have_css('.input .card-body')
+      dismiss_confirm do
         find(".btn", text: I18n.t('terms.destroy')).click
       end
-      page.should have_css('.input .panel-body')
+      page.should have_css('.input .card-body')
       daemon.agent.config.strip.should == config_contents.strip
     end
   end

data/spec/lib/regexp_preview/single_line_spec.rb

@@ -88,7 +88,7 @@ describe RegexpPreview::SingleLine do
 
         include_examples "should set regexp and time_format from selected format" do
           let(:regexp) do
-            /^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$/
+            /^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)"(?:\s+(?<http_x_forwarded_for>[^ ]+))?)?$/
           end
           let(:time_format) { "%d/%b/%Y:%H:%M:%S %z" }
         end