fluentd-ui 0.3.9 → 0.3.10

data/config/locales/translation_en.yml

@@ -9,6 +9,8 @@ en:
     fluentd_restart_failed: Failed to restart fluentd
     fluentd_start_stop_delay_notice: "'%{action} daemon' is accepted. That operation could take a minute for complete."
     password_successfully_updated: "Your password has been changed successfully."
+    fluentd_status_running: Running
+    fluentd_status_stopped: Stopped
 
   terms: &terms
     name: Name
@@ -97,8 +99,12 @@ en:
       page_title: "%{label}"
       setup_in_tail: File
       setup_in_syslog: Syslog Protocol
+      setup_in_monitor_agent: Monitoring Agent
+      setup_in_http: http
+      setup_in_forward: Forwarding (receiving from another fluentd)
       setup_out_td: Treasure Data
       setup_out_mongo: MongoDB
+      setup_out_stdout: stdout (log)
       setup_out_forward: Forwarding
       setup_out_s3: Amazon S3
       setup_out_elasticsearch: Elasticsearch
@@ -109,7 +115,7 @@ en:
       destroy_fluentd_setting: "Delete %{brand} setting"
       destroy_fluentd_setting_warning: |
         Delete %{brand} setting.
-        
+
         <p>Running %{brand} will be stopped, but log and config file are still exists.</p>
     show:
       page_title: Dashboard
@@ -161,11 +167,35 @@ en:
           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.
         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.
+        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.
         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.
+        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.
+        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.
+        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.
       in_tail:

data/config/locales/translation_ja.yml

@@ -9,6 +9,8 @@ ja:
     fluentd_restart_failed: "%{brand}の再起動に失敗しました。"
     fluentd_start_stop_delay_notice: "デーモンの%{action}を受け付けました。処理が完了するまで時間がかかる場合があります。"
     password_successfully_updated: "パスワードを変更しました。"
+    fluentd_status_running: 稼働中
+    fluentd_status_stopped: 停止中
 
   terms: &terms
     name: アカウント名
@@ -96,7 +98,11 @@ ja:
       page_title: "%{label}"
       setup_in_tail: ファイル
       setup_in_syslog: syslogプロトコル
+      setup_in_monitor_agent: 監視エージェント
+      setup_in_http: http
+      setup_in_forward: 転送（他Fluentdからの受信）
       setup_out_td: Treasure Data
+      setup_out_stdout: 標準出力（ログ）
       setup_out_mongo: MongoDB
       setup_out_forward: 転送
       setup_out_s3: AWS S3
@@ -108,7 +114,7 @@ ja:
       destroy_fluentd_setting: "%{brand}の設定情報を削除"
       destroy_fluentd_setting_warning: |
         %{brand}の設定を削除します。
-        
+
         <p>起動中の%{brand}は停止し、ログや設定ファイルはそのまま残存します。</p>
     show:
       page_title: "ダッシュボード"
@@ -162,11 +168,39 @@ ja:
           <a target="_blank" href="http://docs.fluentd.org/ja/articles/out_mongo">out_mongoプラグインの解説</a>もご参照ください。
         show:
           page_title: MongoDB書き出し設定
+      out_stdout:
+        option_guide: |
+          標準出力（デーモンとして起動しているときはログファイル）へイベントを書き出します。<br />
+          <a target="_blank" href="http://docs.fluentd.org/ja/articles/out_stdout">out_stdoutプラグインの解説</a>もご参照ください。
+        show:
+          page_title: 標準出力（ログ）
       in_syslog:
         option_guide: |
           <a target="_blank" href="http://docs.fluentd.org/ja/articles/in_syslog">in_syslogプラグイン解説ページ</a>もご参照ください。
         show:
           page_title: Syslog読み込み設定
+      in_monitor_agent:
+        option_guide: |
+          HTTP経由で現在稼働中のfluentdが使用しているconfigやプラグインをJSONやLTSV形式で取得できます。<br />
+          <a target="_blank" href="http://docs.fluentd.org/ja/articles/monitoring">監視エージェント</a>のページもご参照ください。
+        show:
+          page_title: 監視エージェント設定(monitor_agent)
+      in_http:
+        option_guide: |
+          http POSTからレコードを取得可能にします。<br />
+          URLパスはFluentdイベントログのタグとなり、ポストされたbody要素はレコードそのものになります。<br />
+          <a target="_blank" href="http://docs.fluentd.org/ja/articles/in_http">httpインプットプラグイン解説ページ</a>もご参照ください。
+        show:
+          page_title: http入力設定
+      in_forward:
+        option_guide: |
+          TCPソケットをリッスンし、イベントストリームを受信します。<br />
+          UDPソケットもリッスンし、ハートビートメッセージを受信します。<br />
+          他のFluentdインスタンス、fluent-catコマンドまたはクライアントライブラリーからイベントログを受信するために使用されます。<br />
+          <a target="_blank" href="http://docs.fluentd.org/ja/articles/in_forward">forwardインプットプラグイン解説ページ</a>もご参照ください。
+        show:
+          page_title: forward入力設定
+
       in_tail_option_guide: |
         <a target="_blank" href="http://docs.fluentd.org/ja/articles/in_tail">in_tailプラグインの解説ページ</a>や
         <a target="_blank" href="http://fluentular.herokuapp.com/">Fluentular</a>もご参照ください。

data/config/routes.rb

@@ -28,6 +28,22 @@ Rails.application.routes.draw do
           post "finish"
         end
 
+        resource :in_monitor_agent, only: [:show], module: :settings, controller: :in_monitor_agent do
+          post "finish"
+        end
+
+        resource :in_http, only: [:show], module: :settings, controller: :in_http do
+          post "finish"
+        end
+
+        resource :in_forward, only: [:show], module: :settings, controller: :in_forward do
+          post "finish"
+        end
+
+        resource :out_stdout, only: [:show], module: :settings, controller: :out_stdout do
+          post "finish"
+        end
+
         resource :out_mongo, only: [:show], module: :settings, controller: :out_mongo do
           post "finish"
         end

data/lib/file_reverse_reader.rb

@@ -36,7 +36,7 @@ class FileReverseReader
 
   def binary_file?
     sample = io.read(1024) || ""
-    !sample.force_encoding('us-ascii').valid_encoding?
+    !sample.force_encoding('utf-8').valid_encoding?
   ensure
     io.rewind
   end
@@ -44,6 +44,7 @@ class FileReverseReader
   private
 
   def split_each_line(buf, &block)
+    return unless buf.force_encoding('utf-8').valid_encoding?
     buf.split($/).reverse.each do |line|
       block.call(line)
     end

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

data/spec/features/dashboard_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe 'dashboard' do
+  let!(:exists_user) { build(:user) }
+
+  before { login_with exists_user }
+
+  context 'no configuration' do
+    before { visit '/' }
+
+    it do
+      page.should have_css('h1', text: 'fluentd')
+      page.should have_link(I18n.t('terms.setup', target: 'fluentd'))
+      page.should have_link(I18n.t('terms.setup', target: 'td-agent'))
+    end
+  end
+
+  context 'fluentd is stop', stub: :daemon do
+    before { visit '/' }
+
+    it do
+      page.should have_css('h1', text: I18n.t('fluentd.show.page_title'))
+      page.should have_css('h4', text: I18n.t('fluentd.common.stopped'))
+      page.should have_css('h4', text: I18n.t('fluentd.common.fluentd_info'))
+    end
+  end
+
+  context 'fluentd is running', stub: :daemon do
+    before do
+      # XXX i have no idea to not use stub...
+      Fluentd::Agent::TdAgent.any_instance.stub(:running?).and_return(true)
+
+      visit '/'
+    end
+
+    it do
+      page.should have_css('h1', text: I18n.t('fluentd.show.page_title'))
+      page.should have_css('h4', text: I18n.t('fluentd.common.running'))
+      page.should have_css('h4', text: I18n.t('fluentd.common.fluentd_info'))
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "in_forward", stub: :daemon do
+  before { login_with exists_user }
+  it_should_behave_like "configurable daemon settings", "in_forward", "port", "12345"
+
+end

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

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "in_http", stub: :daemon do
+  before { login_with exists_user }
+  it_should_behave_like "configurable daemon settings", "in_http", "port", "12345"
+
+end

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

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "in_monitor_agent", stub: :daemon do
+  before { login_with exists_user }
+  it_should_behave_like "configurable daemon settings", "in_monitor_agent", "port", "12345"
+
+end

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

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "out_stdout", stub: :daemon do
+  before { login_with exists_user }
+  it_should_behave_like "configurable daemon settings", "out_stdout", "match", "stdout.**"
+
+end

data/spec/features/fluentd_status_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe 'dashboard' do
+  let!(:exists_user) { build(:user) }
+
+  before { login_with exists_user }
+
+  context 'no configuration' do
+    before { visit '/' }
+
+    it do
+      page.should_not have_css(".fluentd-status")
+    end
+  end
+
+  context 'fluentd is stop', stub: :daemon do
+    before { visit '/' }
+
+    it do
+      page.should have_css(".fluentd-status .stopped")
+    end
+  end
+
+  context 'fluentd is running', stub: :daemon do
+    before do
+      # XXX i have no idea to not use stub...
+      Fluentd::Agent::TdAgent.any_instance.stub(:running?).and_return(true)
+
+      visit '/'
+    end
+
+    it do
+      page.should have_css(".fluentd-status .running")
+    end
+  end
+end

data/spec/features/{fluentd/setting/out_elasticsearch_spec.rb → out_elasticsearch_spec.rb}

@@ -1,22 +1,12 @@
 require "spec_helper"
 
-describe "out_elasticsearch" do
+describe "out_elasticsearch", stub: :daemon do
   let(:exists_user) { build(:user) }
-  let(:daemon) { build(:fluentd, variant: "td-agent") }
-  let(:match) { "test.out_elasticsearch.#{Time.now.to_i}.*" }
+  let(:match) { "test.out_forward.#{Time.now.to_i}.*" }
   let(:location) { daemon_setting_out_elasticsearch_path }
 
   before do
-    Fluentd.stub(:instance).and_return(daemon)
-    Fluentd::Agent::TdAgent.any_instance.stub(:detached_command).and_return(true)
-    daemon.agent.config_write ""
-
-    visit '/sessions/new'
-    within("form") do
-      fill_in 'session_name', :with => exists_user.name
-      fill_in 'session_password', :with => exists_user.password
-    end
-    click_button I18n.t("terms.sign_in")
+    login_with exists_user
   end
 
   it "Shown form" do

data/spec/features/{fluentd/setting/out_forward_spec.rb → out_forward_spec.rb}

@@ -1,21 +1,11 @@
 require "spec_helper"
 
-describe "out_forward" do
+describe "out_forward", stub: :daemon do
   let(:exists_user) { build(:user) }
-  let(:daemon) { build(:fluentd, variant: "td-agent") }
   let(:match) { "test.out_forward.#{Time.now.to_i}.*" }
 
   before do
-    Fluentd.stub(:instance).and_return(daemon)
-    Fluentd::Agent::TdAgent.any_instance.stub(:detached_command).and_return(true)
-    daemon.agent.config_write ""
-    
-    visit '/sessions/new'
-    within("form") do
-      fill_in 'session_name', :with => exists_user.name
-      fill_in 'session_password', :with => exists_user.password
-    end
-    click_button I18n.t("terms.sign_in")
+    login_with exists_user
   end
 
   it "Shown form" do

data/spec/features/{fluentd/setting/out_td_spec.rb → out_td_spec.rb}

@@ -1,21 +1,11 @@
 require "spec_helper"
 
-describe "out_td" do
+describe "out_td", stub: :daemon do
   let(:exists_user) { build(:user) }
-  let(:daemon) { build(:fluentd, variant: "td-agent") }
   let(:api_key) { "dummydummy" }
 
   before do
-    Fluentd.stub(:instance).and_return(daemon)
-    Fluentd::Agent::TdAgent.any_instance.stub(:detached_command).and_return(true)
-    daemon.agent.config_write ""
-    
-    visit '/sessions/new'
-    within("form") do
-      fill_in 'session_name', :with => exists_user.name
-      fill_in 'session_password', :with => exists_user.password
-    end
-    click_button I18n.t("terms.sign_in")
+    login_with exists_user
   end
 
   it "Shown form with filled in td.*.* on match" do

data/spec/features/sessions_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "sessions" do
   let(:exists_user) { build(:user) }
   let(:submit_label) { I18n.t("terms.sign_in") }
@@ -5,12 +7,7 @@ describe "sessions" do
 
   describe "sign in with default password" do
     before do
-      visit '/sessions/new'
-      within("form") do
-        fill_in 'session_name', :with => user.name
-        fill_in 'session_password', :with => user.password
-      end
-      click_button submit_label
+      login_with user
     end
 
     context "correct credentials" do
@@ -40,12 +37,8 @@ describe "sessions" do
 
     before do
       exists_user.update_attributes(current_password: Settings.default_password, password: new_password, password_confirmation: new_password)
-      visit '/sessions/new'
-      within("form") do
-        fill_in 'session_name', :with => user.name
-        fill_in 'session_password', :with => user.password
-      end
-      click_button submit_label
+
+      login_with user
     end
 
     after do
@@ -71,12 +64,7 @@ describe "sessions" do
   describe "sign out process" do
     let(:submit_label) { I18n.t("terms.sign_in") }
     before do
-      visit '/sessions/new'
-      within("form") do
-        fill_in 'session_name', :with => exists_user.name
-        fill_in 'session_password', :with => exists_user.password
-      end
-      click_button submit_label
+      login_with exists_user
     end
 
     before do

data/spec/features/setting_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'setting', stub: :daemon do
+  let!(:exists_user) { build(:user) }
+
+  before do
+    login_with exists_user
+
+    daemon.agent.config_write 'GREAT CONFIG HERE'
+
+    visit '/daemon/setting'
+  end
+
+  it 'shows setting' 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')
+  end
+
+  it 'edits setting' do
+    click_link I18n.t('terms.edit')
+
+    page.should have_css('h1', text: I18n.t('fluentd.settings.edit.page_title'))
+    page.should have_css('p.text-danger', text: I18n.t('terms.notice_restart_for_config_edit', brand: 'fluentd'))
+
+    fill_in 'config', with: 'YET ANOTHER CONFIG'
+
+    click_button I18n.t('terms.update')
+
+    current_path.should == '/daemon/setting'
+    page.should have_css('pre', text: 'YET ANOTHER CONFIG')
+  end
+end

data/spec/features/shared_examples/configurable_daemon_settings.rb

@@ -0,0 +1,17 @@
+shared_examples_for "configurable daemon settings" do |type, form_name, form_value|
+  it "Shown form with filled in td.*.* on match" do
+    visit send("daemon_setting_#{type}_path")
+    page.should have_css("input[name=\"fluentd_setting_#{type}[#{form_name}]\"]")
+  end
+
+  it "Updated config after submit" do
+    daemon.agent.config.should_not include(form_value)
+    visit send("daemon_setting_#{type}_path")
+    within("#new_fluentd_setting_#{type}") do
+      fill_in form_name.capitalize, with: form_value
+    end
+    click_button I18n.t("fluentd.common.finish")
+    daemon.agent.config.should include(form_value)
+  end
+
+end

data/spec/features/{fluentd/setting/source_and_output_spec.rb → source_and_output_spec.rb}

@@ -1,21 +1,10 @@
 require "spec_helper"
 
-describe "source_and_output", js: true do
+describe "source_and_output", js: true, stub: :daemon do
   let(:exists_user) { build(:user) }
-  let(:daemon) { build(:fluentd, variant: "td-agent") }
 
   before do
-    Fluentd.stub(:instance).and_return(daemon)
-    Fluentd::Agent::TdAgent.any_instance.stub(:detached_command).and_return(true)
-  end
-
-  before do
-    visit '/sessions/new'
-    within("form") do
-      fill_in 'session_name', :with => exists_user.name
-      fill_in 'session_password', :with => exists_user.password
-    end
-    click_button I18n.t("terms.sign_in")
+    login_with exists_user
   end
 
   before do

data/spec/lib/file_reverse_reader_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require "enumerator"
 require 'spec_helper'
 
@@ -50,23 +52,41 @@ describe FileReverseReader do
 
   describe "#tail" do
     let(:logfile) { File.expand_path("./tmp/log.log", Rails.root) }
-    let(:log_lines) { 100 }
-    before { File.open(logfile, "w"){|f| f.write("foo\n" * log_lines) } }
-    subject { instance.tail(count) }
+    before { File.open(logfile, "wb"){|f| f.write(content) } }
 
-    context "2" do
-      let(:count) { 2 }
-      it { subject.to_a.size.should == count }
-    end
+    describe "count" do
+      let(:log_lines) { 100 }
+      let(:content) { "foo\n" * log_lines }
+      subject { instance.tail(count) }
+
+      context "2" do
+        let(:count) { 2 }
+        it { subject.to_a.size.should == count }
+      end
+
+      context "50" do
+        let(:count) { 50 }
+        it { subject.to_a.size.should == count }
+      end
 
-    context "50" do
-      let(:count) { 50 }
-      it { subject.to_a.size.should == count }
+      context "over log lines" do
+        let(:count) { log_lines + 100 }
+        it { subject.to_a.size.should == log_lines }
+      end
     end
 
-    context "over log lines" do
-      let(:count) { log_lines + 100 }
-      it { subject.to_a.size.should == log_lines }
+    describe "non-ascii encoding" do
+      subject { instance.tail }
+
+      context "compatible with utf-8" do
+        let(:content) { "utf8あいう\n" }
+        it { subject.to_a.should == [content.strip] }
+      end
+
+      context "incompatible with utf-8" do
+        let(:content) { "eucあいう\n".encode('euc-jp') }
+        it { subject.to_a.should == [] }
+      end
     end
   end
 end

data/spec/models/fluent_gem_spec.rb

@@ -64,12 +64,6 @@ describe FluentGem do
       GEM
       it { subject.to_a.should == gem_list.lines.to_a }
     end
-
-    context "failed" do
-      let(:gem_list) { "" }
-      before { $?.stub(:exitstatus).and_return(128) }
-      it { expect{ subject }.to raise_error(FluentGem::GemError) }
-    end
   end
 
   describe "#run" do

data/spec/models/fluentd/agent/local_common_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'fileutils'
+
+describe 'Fluentd::Agent::LocalCommon' do
+  subject { target_class.new.tap{|t| t.pid_file = pid_file_path} }
+
+  let!(:target_class) { Struct.new(:pid_file){ include Fluentd::Agent::LocalCommon } }
+  let!(:pid_file_path) { Rails.root.join('tmp', 'fluentd-test', 'local_common_test.pid').to_s }
+
+  describe '#pid' do
+    context 'no pid file exists' do
+      its(:pid) { should be_nil }
+    end
+
+    context 'empty pid file given' do
+      before { FileUtils.touch pid_file_path }
+      after  { FileUtils.rm pid_file_path }
+
+      its(:pid) { should be_nil }
+    end
+
+    context 'valid pid file given' do
+      before { File.write pid_file_path, '9999' }
+      after  { FileUtils.rm pid_file_path }
+
+      its(:pid) { should eq(9999) }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,10 +12,12 @@ end
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
+require 'rspec/its'
 require 'webmock/rspec'
 WebMock.disable_net_connect!(allow_localhost: true)
 require 'capybara/poltergeist'
 Capybara.javascript_driver = :poltergeist
+require 'capybara-screenshot/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -35,6 +37,7 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.include LoginMacro
   config.include JavascriptMacro
+  config.include StubDaemon
 
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of

data/spec/support/login_macro.rb

@@ -2,8 +2,8 @@ module LoginMacro
   def login_with(user)
     visit '/sessions/new'
     within("form") do
-      fill_in 'session_name', :with => exists_user.name
-      fill_in 'session_password', :with => exists_user.password
+      fill_in 'session_name', :with => user.name
+      fill_in 'session_password', :with => user.password
     end
     click_button I18n.t("terms.sign_in")
   end