fluentd-ui 0.3.11 → 0.3.12

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

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+describe "out_forward", stub: :daemon do
+  before { login_with exists_user }
+
+  let(:type) { "out_forward" }
+  let(:page_url) { send("daemon_setting_#{type}_path") }
+  let(:form_values) { {
+    Match: "*",
+    Name: "name",
+    Host: "host",
+    Port: "9999",
+    Path: "/dev/null",
+  } }
+
+  it "Updated config after submit" do
+    daemon.agent.config.should_not include("type file") # out_forward's Secondary hidden field
+    form_values.each_pair do |k,v|
+      daemon.agent.config.should_not include(v)
+    end
+    visit page_url
+    within("#new_fluentd_setting_#{type}") do
+      form_values.each_pair do |k,v|
+        fill_in k, with: v
+      end
+    end
+    click_button I18n.t("fluentd.common.finish")
+    form_values.each_pair do |k,v|
+      daemon.agent.config.should include(v)
+    end
+    daemon.agent.config.should include("type file") # out_forward's Secondary hidden field
+  end
+
+  it "Click to append Server fields", js: true do
+    visit page_url
+    all(".js-multiple").length.should == 1
+    first(".js-multiple .js-append").click
+    all(".js-multiple").length.should == 2
+  end
+end

data/spec/features/fluentd/setting/{ranning_backup_spec.rb → running_backup_spec.rb}

@@ -43,6 +43,42 @@ describe "running_backup", stub: :daemon do
         page.should have_text(I18n.t('messages.config_successfully_copied', brand: 'fluentd') )
         page.should have_text(backup_content)
       end
+
+      describe "configtest" do
+        let(:backup_content){ config }
+        let(:daemon) { build(:fluentd, variant: "fluentd_gem") } # To use fluentd_gem for real dry-run checking
+        before do
+          click_link I18n.t("terms.configtest")
+        end
+
+        context "invalid configfile" do
+          let(:config) { <<-CONFIG }
+          <source>
+            type aaaaaaaaaaaa
+          </source>
+          CONFIG
+
+          it do
+            page.should_not have_css('.alert-success')
+            page.should have_css('.alert-danger')
+            page.should have_text(%Q|Unknown input plugin 'aaaaaaaaaaaa'|)
+          end
+        end
+
+        context "valid configfile" do
+          let(:config) { <<-CONFIG }
+          <source>
+            type syslog
+            tag syslog
+          </source>
+          CONFIG
+
+          it do
+            page.should have_css('.alert-success')
+            page.should_not have_css('.alert-danger')
+          end
+        end
+      end
     end
   end
 end

data/spec/features/setting_spec.rb

@@ -17,7 +17,7 @@ describe 'setting', stub: :daemon do
     page.should have_css('h1', text: I18n.t('fluentd.settings.show.page_title'))
     page.should have_link(I18n.t('terms.edit'))
     page.should have_css('pre', text: 'GREAT CONFIG HERE')
-    expect(all('.row li').count).to eq Settings.histories_count_in_preview #links to hisotries#show
+    expect(all('.row tr').count).to eq Settings.histories_count_in_preview + 1 # links to hisotries#show + 1 table header
     page.should have_link(I18n.t('fluentd.settings.show.link_to_histories'))
     page.should have_text(I18n.t('fluentd.settings.running_backup.title'))
   end
@@ -29,7 +29,7 @@ describe 'setting', stub: :daemon do
   end
 
   it 'will go to histories#show' do
-    all('.row li a').first.click
+    all('.row tr td a').first.click
 
     page.should have_css('h1', text: I18n.t('fluentd.settings.histories.show.page_title'))
   end

data/spec/models/fluentd/agent_spec.rb

@@ -22,6 +22,7 @@ describe Fluentd::Agent do
     end
 
     describe "#start" do
+      before { instance.config_write "" } # ensure valid config
       before { instance.stub(:running?).and_return(running) }
 
       context "running" do
@@ -95,6 +96,29 @@ describe Fluentd::Agent do
     describe "#restart" do
       it_should_behave_like "Restart strategy"
     end
+
+    describe "#dryrun" do
+      subject { instance.dryrun }
+
+      describe "valid/invalid" do
+        before { instance.stub(:system).and_return(ret) }
+
+        context "valid config" do
+          let(:ret) { true }
+          it { should be_truthy }
+        end
+
+        context "invalid config" do
+          let(:ret) { false }
+          it { should be_falsy }
+        end
+      end
+
+      it "invoke #system" do
+        instance.should_receive(:system).with(/--dry-run/)
+        subject
+      end
+    end
   end
 
   describe "TdAgent" do
@@ -106,6 +130,7 @@ describe Fluentd::Agent do
       before do
         instance.stub(:detached_command).and_return(true)
         instance.stub(:pid_from_launchctl).and_return(true)
+        instance.config_write "" # ensure valid config
       end
 
       after do
@@ -128,6 +153,30 @@ describe Fluentd::Agent do
         expect(File.read(backup_file)).to eq File.read(instance.config_file)
       end
     end
+
+    describe "#dryrun" do
+      subject { instance.dryrun }
+
+      describe "valid/invalid" do
+        before { instance.stub(:detached_command).and_return(ret) }
+
+        context "valid config" do
+          let(:ret) { true }
+          it { should be_truthy }
+        end
+
+        context "invalid config" do
+          let(:ret) { false }
+          it { should be_falsy }
+        end
+      end
+
+      it "invoke #system" do
+        # --dry-run check on Mac, configtest for Unix
+        instance.should_receive(:detached_command).with(/(--dry-run|configtest)/)
+        subject
+      end
+    end
   end
 end
 

data/spec/support/fixtures/error3.log

@@ -0,0 +1,7 @@
+2014-05-27 10:54:37 +0900 [info]: listening fluent socket on 0.0.0.0:24224
+2014-05-27 10:54:37 +0900 [error]: unexpected error error_class=Errno::EADDRINUSE error=#<Errno::EADDRINUSE: 1 Address already in use - bind(2) for "0.0.0.0" port 24224>
+2014-05-27 10:55:40 +0900 [error]: unexpected error error_class=Errno::EADDRINUSE error=#<Errno::EADDRINUSE: 2 Address already in use - bind(2) for "0.0.0.0" port 24224>
+  2014-05-27 10:55:40 +0900 [error]: /Users/uu59/.rbenv/versions/2.1.0/lib/ruby/gems/2.1.0/gems/cool.io-1.2.4/lib/cool.io/server.rb:57:in `initialize'
+  2014-05-27 10:55:40 +0900 [error]: /Users/uu59/.rbenv/versions/2.1.0/lib/ruby/gems/2.1.0/gems/cool.io-1.2.4/lib/cool.io/server.rb:57:in `new'
+2014-05-27 11:28:12 +0900 [error]: unexpected error error_class=Errno::EADDRINUSE error=#<Errno::EADDRINUSE: 3 Address already in use - bind(2) for "0.0.0.0" port 24224>
+  2014-05-27 11:28:12 +0900 [error]: /Users/uu59/.rbenv/versions/2.1.0/lib/ruby/gems/2.1.0/gems/cool.io-1.2.4/lib/cool.io/server.rb:57:in `initialize'

data/spec/support/fluentd_agent_common_behavior.rb

@@ -108,6 +108,20 @@ shared_examples_for "Fluentd::Agent has common behavior" do |klass|
           one.should >= two
         end
       end
+
+      context "have 3 errors log includeing sequential 2 error log" do
+        let(:logfile) { File.expand_path("./spec/support/fixtures/error3.log", Rails.root) }
+        subject { instance.recent_errors(3) }
+
+        it "count 3 errors" do
+          subject[0][:subject].should include("3 Address already in use - bind(2)")
+          subject[0][:notes].size.should be 1
+          subject[1][:subject].should include("2 Address already in use - bind(2)")
+          subject[1][:notes].size.should be 2
+          subject[2][:subject].should include("1 Address already in use - bind(2)")
+          subject[2][:notes].size.should be 0
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -300,6 +300,7 @@ files:
 - app/controllers/application_controller.rb
 - app/controllers/concerns/.keep
 - app/controllers/concerns/setting_concern.rb
+- app/controllers/concerns/setting_history_concern.rb
 - app/controllers/fluentd/agents_controller.rb
 - app/controllers/fluentd/settings/histories_controller.rb
 - app/controllers/fluentd/settings/in_forward_controller.rb
@@ -307,6 +308,7 @@ files:
 - app/controllers/fluentd/settings/in_monitor_agent_controller.rb
 - app/controllers/fluentd/settings/in_syslog_controller.rb
 - app/controllers/fluentd/settings/in_tail_controller.rb
+- app/controllers/fluentd/settings/notes_controller.rb
 - app/controllers/fluentd/settings/out_elasticsearch_controller.rb
 - app/controllers/fluentd/settings/out_forward_controller.rb
 - app/controllers/fluentd/settings/out_mongo_controller.rb
@@ -326,11 +328,11 @@ files:
 - app/decorators/plugin_decorator.rb
 - app/helpers/application_helper.rb
 - app/helpers/fluentd/settings_helper.rb
-- app/helpers/miscs_helper.rb
 - app/helpers/settings_helper.rb
 - app/mailers/.keep
 - app/models/.keep
 - app/models/concerns/.keep
+- app/models/concerns/fluentd/setting_archive/archivable.rb
 - app/models/fluent_gem.rb
 - app/models/fluentd.rb
 - app/models/fluentd/agent.rb
@@ -342,7 +344,6 @@ files:
 - app/models/fluentd/agent/td_agent/macosx.rb
 - app/models/fluentd/agent/td_agent/unix.rb
 - app/models/fluentd/setting.rb
-- app/models/fluentd/setting/backup_file.rb
 - app/models/fluentd/setting/common.rb
 - app/models/fluentd/setting/config.rb
 - app/models/fluentd/setting/in_forward.rb
@@ -356,6 +357,8 @@ files:
 - app/models/fluentd/setting/out_s3.rb
 - app/models/fluentd/setting/out_stdout.rb
 - app/models/fluentd/setting/out_td.rb
+- app/models/fluentd/setting_archive/backup_file.rb
+- app/models/fluentd/setting_archive/note.rb
 - app/models/plugin.rb
 - app/models/settings.rb
 - app/models/user.rb
@@ -450,7 +453,6 @@ files:
 - config/routes.rb
 - config/secrets.yml
 - db/schema.rb
-- db/seeds.rb
 - docs/screenshots/01.png
 - docs/screenshots/02.png
 - docs/screenshots/03.png
@@ -482,21 +484,24 @@ files:
 - public/fluentd.png
 - public/robots.txt
 - public/td-logo.png
-- spec/controllers/plugins_controller_spec.rb
+- spec/controllers/application_controller_spec.rb
+- spec/controllers/fluentd/agents_controller_spec.rb
+- spec/controllers/misc_controller_spec.rb
 - spec/controllers/polling_controller_spec.rb
 - spec/controllers/sessions_controller_spec.rb
-- spec/controllers/tutorials_controller_spec.rb
 - spec/decorators/plugin_decorator_spec.rb
 - spec/factories/fluentd.rb
 - spec/factories/plugins.rb
 - spec/factories/user.rb
 - spec/features/dashboard_spec.rb
-- spec/features/fluentd/setting/hisotries_spec.rb
+- spec/features/fluentd/setting/histories_spec.rb
 - spec/features/fluentd/setting/in_forward_spec.rb
 - spec/features/fluentd/setting/in_http_spec.rb
 - spec/features/fluentd/setting/in_monitor_agent_spec.rb
+- spec/features/fluentd/setting/notes_spec.rb
+- spec/features/fluentd/setting/out_forward_spec.rb
 - spec/features/fluentd/setting/out_stdout_spec.rb
-- spec/features/fluentd/setting/ranning_backup_spec.rb
+- spec/features/fluentd/setting/running_backup_spec.rb
 - spec/features/fluentd_status_spec.rb
 - spec/features/fluentd_ui_update_available_spec.rb
 - spec/features/out_elasticsearch_spec.rb
@@ -525,6 +530,7 @@ files:
 - spec/support/config_histories.rb
 - spec/support/fixtures/error0.log
 - spec/support/fixtures/error2.log
+- spec/support/fixtures/error3.log
 - spec/support/fluentd_agent_common_behavior.rb
 - spec/support/fluentd_agent_restart_strategy.rb
 - spec/support/javascript_macro.rb
@@ -697,21 +703,24 @@ signing_key:
 specification_version: 4
 summary: Web UI for Fluentd
 test_files:
-- spec/controllers/plugins_controller_spec.rb
+- spec/controllers/application_controller_spec.rb
+- spec/controllers/fluentd/agents_controller_spec.rb
+- spec/controllers/misc_controller_spec.rb
 - spec/controllers/polling_controller_spec.rb
 - spec/controllers/sessions_controller_spec.rb
-- spec/controllers/tutorials_controller_spec.rb
 - spec/decorators/plugin_decorator_spec.rb
 - spec/factories/fluentd.rb
 - spec/factories/plugins.rb
 - spec/factories/user.rb
 - spec/features/dashboard_spec.rb
-- spec/features/fluentd/setting/hisotries_spec.rb
+- spec/features/fluentd/setting/histories_spec.rb
 - spec/features/fluentd/setting/in_forward_spec.rb
 - spec/features/fluentd/setting/in_http_spec.rb
 - spec/features/fluentd/setting/in_monitor_agent_spec.rb
+- spec/features/fluentd/setting/notes_spec.rb
+- spec/features/fluentd/setting/out_forward_spec.rb
 - spec/features/fluentd/setting/out_stdout_spec.rb
-- spec/features/fluentd/setting/ranning_backup_spec.rb
+- spec/features/fluentd/setting/running_backup_spec.rb
 - spec/features/fluentd_status_spec.rb
 - spec/features/fluentd_ui_update_available_spec.rb
 - spec/features/out_elasticsearch_spec.rb
@@ -740,6 +749,7 @@ test_files:
 - spec/support/config_histories.rb
 - spec/support/fixtures/error0.log
 - spec/support/fixtures/error2.log
+- spec/support/fixtures/error3.log
 - spec/support/fluentd_agent_common_behavior.rb
 - spec/support/fluentd_agent_restart_strategy.rb
 - spec/support/javascript_macro.rb

data/app/helpers/miscs_helper.rb

@@ -1,2 +0,0 @@
-module MiscsHelper
-end

data/db/seeds.rb

@@ -1,7 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-#   Mayor.create(name: 'Emanuel', city: cities.first)

data/spec/controllers/plugins_controller_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe PluginsController do
-
-end

data/spec/controllers/tutorials_controller_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe TutorialsController, :type => :controller do
-
-end

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

@@ -1,48 +0,0 @@
-require "spec_helper"
-
-describe "histories", stub: :daemon do
-  let!(:exists_user) { build(:user) }
-  include_context 'daemon has some config histories'
-
-  before do
-    login_with exists_user
-  end
-
-  describe 'index' do
-    before do
-      visit '/daemon/setting/histories'
-    end
-
-    it 'show histories#index' do
-      page.should have_css('h1', text: I18n.t('fluentd.settings.histories.index.page_title'))
-      expect(all('.row li').count).to eq 9 #links to hisotries#show
-    end
-
-    it 'will go to histories#show' do
-      all('.row li a').first.click
-
-      page.should have_css('h1', text: I18n.t('fluentd.settings.histories.show.page_title'))
-    end
-  end
-
-  describe 'show' do
-    let(:last_backup_file) { Fluentd::Setting::BackupFile.new(daemon.agent.backup_files_in_new_order.first) }
-
-    before do
-      visit "/daemon/setting/histories/#{last_backup_file.file_id}"
-    end
-
-    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)
-    end
-
-    it 'update config and redirect to setting#show' do
-      click_link I18n.t("terms.reuse")
-
-      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)
-    end
-  end
-end