fluentd-ui 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c09cfb98883bb3c80a27c04bfe231f1a40c119a
-  data.tar.gz: ff5fbe4ce229bbf22d59ac298b66c9703f7e505d
+  metadata.gz: dc93f563d3aa8095d2689a544d43a5dca19ba9ba
+  data.tar.gz: f947b3d3b364ceecf025d2b455ab121109bf320a
 SHA512:
-  metadata.gz: 38fbc9c08c258d01ab468fd8475353a8fb920a07ab2a45ce390d6867ea41ee21ae21e09898579551429d20b230c96721f03f7f6cbb486697ba2b7a230d3d5420
-  data.tar.gz: e40d853952c4edb4e63980c43aafea3beb9954551158d6a6b2637613344731837b2af18745052129bd23063cebb7edeb40f5de813a6777f30a39df71c1ec0d7a
+  metadata.gz: aeaea39c8258a781b4cf2f99f5ee6a30974673a2d0fb14a5c7cdc4e408b185dc28a97f90529fc4364270f97233229ad96dc98f1064234d7be3bc8c713da38df1
+  data.tar.gz: afce6cad466ace12346a56bcc5783f153cf69e2dc1b3edfe9842d239e5d030b1150fdf5e07631752042eac5a93da22ef83985e338af81ea0b575c040512dc676

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.1.3 - 2014/08/13
+
+* [feature] Add out_elasticsearch setting
+
 Release 0.1.2 - 2014/08/07
 
 * [fixed] Can't login if password changed from default
@@ -7,7 +11,6 @@ Release 0.1.1 - 2014/08/07
 * [fixed] Can't install a gem on some environment #70
 * [fixed] Can't setup in_tail if recognized as binary file selected #71
 
-
 Release 0.1.0 - 2014/08/01
 
 * First release!

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.1.2)
+    fluentd-ui (0.1.3)
       addressable
       bcrypt (~> 3.1.5)
       bundler

data/README.md

@@ -1,5 +1,9 @@
 # fluentd-ui
 
+[![build status](https://circleci.com/gh/fluent/fluentd-ui.png?style=shield&circle-token=a739a52ae9ae6774ab2192d4236a5f93ac29e11e)](https://circleci.com/gh/fluent/fluentd-ui)
+[![Gem Version](https://badge.fury.io/rb/fluentd-ui.svg)](http://badge.fury.io/rb/fluentd-ui)
+[![Code Climate](https://codeclimate.com/github/fluent/fluentd-ui/badges/gpa.svg)](https://codeclimate.com/github/fluent/fluentd-ui)
+
 fluentd-ui is a browser-based [fluentd](http://fluentd.org/) and [td-agent](http://docs.treasuredata.com/articles/td-agent) manager that supports following operations.
 
 * Install, uninstall, and upgrade fluentd plugins

data/app/controllers/concerns/setting_concern.rb

@@ -0,0 +1,34 @@
+module SettingConcern
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :login_required
+    before_action :find_fluentd
+  end
+
+  def show
+    @setting = target_class.new(initial_params)
+  end
+
+  def finish
+    @setting = target_class.new(setting_params)
+    unless @setting.valid?
+      return render "show"
+    end
+
+    @fluentd.agent.config_append @setting.to_config
+    if @fluentd.agent.running?
+      unless @fluentd.agent.restart
+        @setting.errors.add(:base, @fluentd.agent.log_tail(1).first)
+        return render "show"
+      end
+    end
+    redirect_to daemon_setting_path(@fluentd)
+  end
+
+  private
+
+  def setting_params
+    params.require(target_class.to_s.underscore.gsub("/", "_")).permit(*target_class.const_get(:KEYS))
+  end
+end

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

@@ -1,34 +1,16 @@
 class Fluentd::Settings::InSyslogController < ApplicationController
-  before_action :login_required
-  before_action :find_fluentd
-
-  def show
-    @setting = Fluentd::Setting::InSyslog.new({
-      bind: "0.0.0.0",
-      port: 5140,
-    })
-  end
-
-  def finish
-    @setting = Fluentd::Setting::InSyslog.new(setting_params)
-    unless @setting.valid?
-      return render "show"
-    end
-
-    @fluentd.agent.config_append @setting.to_config
-    if @fluentd.agent.running?
-      unless @fluentd.agent.restart
-        @setting.errors.add(:base, @fluentd.agent.log_tail(1).first)
-        return render "show"
-      end
-    end
-    redirect_to daemon_setting_path(@fluentd)
-  end
+  include SettingConcern
 
   private
 
-  def setting_params
-    params.require(:fluentd_setting_in_syslog).permit(*Fluentd::Setting::InSyslog::KEYS)
+  def target_class
+    Fluentd::Setting::InSyslog
   end
 
+  def initial_params
+    {
+      bind: "0.0.0.0",
+      port: 5140,
+    }
+  end
 end

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

@@ -0,0 +1,21 @@
+class Fluentd::Settings::OutElasticsearchController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::OutElasticsearch
+  end
+
+  def initial_params
+    {
+      host: "127.0.0.1",
+      port: 9200,
+      index_name: "via_fluentd",
+      type_name: "via_fluentd",
+      logstash_format: true,
+      include_tag_key: false,
+      utc_index: true,
+    }
+  end
+end

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

@@ -1,35 +1,12 @@
 class Fluentd::Settings::OutForwardController < ApplicationController
-  before_action :login_required
-  before_action :find_fluentd
+  include SettingConcern
 
-  def show
-    @setting = Fluentd::Setting::OutForward.new({
-      secondary: {
-        "0" => {
-          type: "file",
-        }
-      }
-    })
-  end
-
-  def finish
-    @setting = Fluentd::Setting::OutForward.new(setting_params)
-    unless @setting.valid?
-      return render "show"
-    end
+  private
 
-    @fluentd.agent.config_append @setting.to_config
-    if @fluentd.agent.running?
-      unless @fluentd.agent.restart
-        @setting.errors.add(:base, @fluentd.agent.log_tail(1).first)
-        return render "show"
-      end
-    end
-    redirect_to daemon_setting_path(@fluentd)
+  def target_class
+    Fluentd::Setting::OutForward
   end
 
-  private
-
   def setting_params
     params.require(:fluentd_setting_out_forward).permit(*Fluentd::Setting::OutForward::KEYS).merge(
       params.require(:fluentd_setting_out_forward).permit(
@@ -39,4 +16,13 @@ class Fluentd::Settings::OutForwardController < ApplicationController
     )
   end
 
+  def initial_params
+    {
+      secondary: {
+        "0" => {
+          type: "file",
+        }
+      }
+    }
+  end
 end

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

@@ -1,36 +1,18 @@
 class Fluentd::Settings::OutMongoController < ApplicationController
-  before_action :login_required
-  before_action :find_fluentd
+  include SettingConcern
 
-  def show
-    @setting = Fluentd::Setting::OutMongo.new({
+  private
+
+  def target_class
+    Fluentd::Setting::OutMongo
+  end
+
+  def initial_params
+    {
       host: "127.0.0.1",
       port: 27017,
       capped: true,
       capped_size: "100m",
-    })
-  end
-
-  def finish
-    @setting = Fluentd::Setting::OutMongo.new(setting_params)
-    unless @setting.valid?
-      return render "show"
-    end
-
-    @fluentd.agent.config_append @setting.to_config
-    if @fluentd.agent.running?
-      unless @fluentd.agent.restart
-        @setting.errors.add(:base, @fluentd.agent.log_tail(1).first)
-        return render "show"
-      end
-    end
-    redirect_to daemon_setting_path(@fluentd)
-  end
-
-  private
-
-  def setting_params
-    params.require(:fluentd_setting_out_mongo).permit(*Fluentd::Setting::OutMongo::KEYS)
+    }
   end
-
 end

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

@@ -1,36 +1,18 @@
 class Fluentd::Settings::OutTdController < ApplicationController
-  before_action :login_required
-  before_action :find_fluentd
+  include SettingConcern
 
-  def show
-    @setting = Fluentd::Setting::OutTd.new({
+  private
+
+  def target_class
+    Fluentd::Setting::OutTd
+  end
+
+  def initial_params
+    {
       buffer_type: "file",
       buffer_path: "/var/log/td-agent/buffer/td",
       auto_create_table: true,
       match: "td.*.*",
-    })
-  end
-
-  def finish
-    @setting = Fluentd::Setting::OutTd.new(setting_params)
-    unless @setting.valid?
-      return render "show"
-    end
-
-    @fluentd.agent.config_append @setting.to_config
-    if @fluentd.agent.running?
-      unless @fluentd.agent.restart
-        @setting.errors.add(:base, @fluentd.agent.log_tail(1).first)
-        return render "show"
-      end
-    end
-    redirect_to daemon_setting_path(@fluentd)
-  end
-
-  private
-
-  def setting_params
-    params.require(:fluentd_setting_out_td).permit(*Fluentd::Setting::OutTd::KEYS)
+    }
   end
-
 end

data/app/controllers/users_controller.rb

@@ -5,10 +5,6 @@ class UsersController < ApplicationController
   end
 
   def update
-    unless @user.authenticate(user_params[:current_password])
-      @user.errors.add(:current_password, :wrong_password)
-      return render :show
-    end
     unless @user.update_attributes(user_params)
       return render :show
     end

data/app/models/fluentd/setting/out_elasticsearch.rb

@@ -0,0 +1,24 @@
+class Fluentd
+  module Setting
+    class OutElasticsearch
+      include Common
+
+      KEYS = [
+        :match,
+        :host, :port, :index_name, :type_name,
+        :logstash_format, :logstash_prefix, :logstash_dateformat, :utc_index,
+        :hosts, :request_timeout, :include_tag_key
+      ].freeze
+
+      attr_accessor(*KEYS)
+
+      booleans :logstash_format, :utc_index, :include_tag_key
+
+      validates :match, presence: true
+      validates :host, presence: true
+      validates :port, presence: true
+      validates :index_name, presence: true
+      validates :type_name, presence: true
+    end
+  end
+end

data/app/views/fluentd/settings/out_elasticsearch/_form.html.haml

@@ -0,0 +1,23 @@
+= render "shared/setting_errors"
+
+= form_for(@setting, url: finish_daemon_setting_out_elasticsearch_path(@fluentd), html: {class: "ignore-rails-error-div"}) do |f|
+  = field(f, :match)
+  = field(f, :host)
+  = field(f, :port)
+  = field(f, :logstash_format)
+  = field(f, :index_name)
+  = field(f, :type_name)
+
+  .well.well-sm
+    %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"}
+      = icon('fa-caret-down')
+      = t('terms.advanced_setting')
+    #advanced-setting.collapse
+      = field(f, :hosts)
+      = field(f, :logstash_prefix)
+      = field(f, :logstash_dateformat)
+      = field(f, :utc_index)
+      = field(f, :request_timeout)
+      = field(f, :include_tag_key)
+  = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right"
+

data/app/views/fluentd/settings/out_elasticsearch/show.html.haml

@@ -0,0 +1,6 @@
+- page_title t(".page_title")
+
+.well
+  = raw t('fluentd.settings.out_elasticsearch.option_guide')
+
+= render "form"

data/app/views/fluentd/settings/source_and_output.html.haml

@@ -39,6 +39,10 @@
           = link_to(daemon_setting_out_mongo_path(@fluentd)) do
             = icon('fa-file-text-o fa-lg')
             = t("fluentd.common.setup_out_mongo")
+        %p
+          = link_to(daemon_setting_out_elasticsearch_path(@fluentd)) do
+            = icon('fa-file-text-o fa-lg')
+            = t("fluentd.common.setup_out_elasticsearch")
         %p
           = link_to(daemon_setting_out_forward_path(@fluentd)) do
             = icon('fa-file-text-o fa-lg')

data/config/locales/translation_en.yml

@@ -97,6 +97,7 @@ en:
       setup_out_mongo: MongoDB
       setup_out_forward: Forwarding
       setup_out_s3: Amazon S3
+      setup_out_elasticsearch: Elasticsearch
       finish: Update & Restart
       fluentd_info: Setting info
       recent_errors: "Errors within recent %{days} days"
@@ -144,6 +145,11 @@ en:
           For each config parameter, pelase refer to the <a href="http://docs.fluentd.org/articles/out_td" target="_blank">Treasure Data output plugin</a> documentation page.
         show:
           page_title: Add Output to Treasure Data
+      out_elasticsearch:
+        option_guide: |
+          For each config parameter, pelase refer to the <a target="_blank" href="https://github.com/uken/fluent-plugin-elasticsearch">Elasticsearch output plugin</a>  documentation page.
+        show:
+          page_title: Add Output to Elasticsearch
       out_mongo:
         option_guide: |
           For each config parameter, pelase refer to the <a href="http://docs.fluentd.org/articles/out_mongo" target="_blank">MongoDB output plugin</a> documentation page.

data/config/locales/translation_ja.yml

@@ -96,6 +96,7 @@ ja:
       setup_out_mongo: MongoDB
       setup_out_forward: 転送
       setup_out_s3: AWS S3
+      setup_out_elasticsearch: Elasticsearch
       finish: 設定する
       fluentd_info: 設定情報
       recent_errors: "直近 %{days} 日内のエラー"
@@ -143,6 +144,12 @@ ja:
           fluent-plugin-tdプラグインのインストールが必要です。<br />
         show:
           page_title: Treasure Data書き出し設定
+      out_elasticsearch:
+        option_guide: |
+          fluent-plugin-elasticsearchプラグインのインストールが必要です。<br />
+          <a target="_blank" href="https://github.com/uken/fluent-plugin-elasticsearch">out_elasticsearchプラグインの解説</a>もご参照ください。
+        show:
+          page_title: Elasticsearch設定
       out_mongo:
         option_guide: |
           fluent-plugin-mongoプラグインのインストールが必要です。<br />

data/config/routes.rb

@@ -43,6 +43,10 @@ Rails.application.routes.draw do
         resource :out_forward, only: [:show], module: :settings, controller: :out_forward do
           post "finish"
         end
+
+        resource :out_elasticsearch, only: [:show], module: :settings, controller: :out_elasticsearch do
+          post "finish"
+        end
       end
     end
   end

data/db/seeds.rb

@@ -5,7 +5,3 @@
 #
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
-
-unless User.exists?
-  User.create!(name: "admin", password: Settings.default_password)
-end

data/lib/file_reverse_reader.rb

@@ -36,8 +36,7 @@ class FileReverseReader
 
   def binary_file?
     sample = io.read(1024) || ""
-    sample2 = sample.force_encoding('ascii-8bit').encode('us-ascii', :undef => :replace, :invalid => :replace, :replace => "")
-    sample != sample2 # maybe binary file
+    !sample.force_encoding('us-ascii').valid_encoding?
   ensure
     io.rewind
   end

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

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

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe "out_elasticsearch" do
+  let(:exists_user) { build(:user) }
+  let(:daemon) { build(:fluentd, variant: "td-agent") }
+  let(:match) { "test.out_elasticsearch.#{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")
+  end
+
+  it "Shown form" do
+    visit location
+    page.should have_css('input[name="fluentd_setting_out_elasticsearch[match]"]')
+  end
+
+  it "Updated config after submit", js: true do
+    daemon.agent.config.should_not include(match)
+    visit location
+    within('#new_fluentd_setting_out_elasticsearch') do
+      fill_in "Match", with: match
+      fill_in "Index name", with: "index"
+      fill_in "Type name", with: "type_name"
+    end
+    click_button I18n.t("fluentd.common.finish")
+    daemon.agent.config.should include(match)
+  end
+end

data/spec/features/sessions_spec.rb

@@ -1,8 +1,9 @@
 describe "sessions" do
   let(:exists_user) { build(:user) }
+  let(:submit_label) { I18n.t("terms.sign_in") }
+  let(:after_sign_in_location) { daemon_path }
 
-  describe "the sign in process" do
-    let(:submit_label) { I18n.t("terms.sign_in") }
+  describe "sign in with default password" do
     before do
       visit '/sessions/new'
       within("form") do
@@ -12,18 +13,18 @@ describe "sessions" do
       click_button submit_label
     end
 
-    context "sign in with exists user" do
+    context "correct credentials" do
       let(:user) { exists_user }
       it "login success, then redirect to root_path, and redirect_to daemon_path from root_path" do
-        current_path.should == daemon_path
+        current_path.should == after_sign_in_location
       end
     end
 
-    context "sign in with non-exists user" do
+    context "wrong credentials" do
       let(:user) { build(:user, password: "passw0rd") }
 
       it "current location is not root_path" do
-        current_path.should_not == root_path
+        current_path.should_not == after_sign_in_location
       end
 
       it "display form for retry" do
@@ -32,6 +33,41 @@ describe "sessions" do
     end
   end
 
+  describe "sign in with modified password" do
+    let(:user) { build(:user, password: password) }
+    let(:new_password) { "newpassword" }
+    let(:old_password) { Settings.default_password }
+
+    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
+    end
+
+    after do
+      # reset password to the default
+      FileUtils.rm_rf(User::ENCRYPTED_PASSWORD_FILE)
+    end
+
+    context "correct password" do
+      let(:password) { new_password }
+      it "login success" do
+        current_path.should == after_sign_in_location
+      end
+    end
+
+    context "wrong password" do
+      let(:password) { old_password }
+      it "login failed" do
+        current_path.should_not == after_sign_in_location
+      end
+    end
+  end
+
   describe "sign out process" do
     let(:submit_label) { I18n.t("terms.sign_in") }
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -296,9 +296,11 @@ files:
 - app/controllers/api_controller.rb
 - app/controllers/application_controller.rb
 - app/controllers/concerns/.keep
+- app/controllers/concerns/setting_concern.rb
 - app/controllers/fluentd/agents_controller.rb
 - app/controllers/fluentd/settings/in_syslog_controller.rb
 - app/controllers/fluentd/settings/in_tail_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
 - app/controllers/fluentd/settings/out_s3_controller.rb
@@ -333,6 +335,7 @@ files:
 - app/models/fluentd/setting/common.rb
 - app/models/fluentd/setting/in_syslog.rb
 - app/models/fluentd/setting/in_tail.rb
+- app/models/fluentd/setting/out_elasticsearch.rb
 - app/models/fluentd/setting/out_forward.rb
 - app/models/fluentd/setting/out_mongo.rb
 - app/models/fluentd/setting/out_s3.rb
@@ -354,6 +357,8 @@ files:
 - app/views/fluentd/settings/in_tail/after_format.html.haml
 - app/views/fluentd/settings/in_tail/confirm.html.haml
 - app/views/fluentd/settings/in_tail/show.html.haml
+- app/views/fluentd/settings/out_elasticsearch/_form.html.haml
+- app/views/fluentd/settings/out_elasticsearch/show.html.haml
 - app/views/fluentd/settings/out_forward/_form.html.haml
 - app/views/fluentd/settings/out_forward/show.html.haml
 - app/views/fluentd/settings/out_mongo/_form.html.haml
@@ -462,6 +467,7 @@ files:
 - spec/factories/fluentd.rb
 - spec/factories/plugins.rb
 - spec/factories/user.rb
+- spec/features/fluentd/setting/out_elasticsearch_spec.rb
 - spec/features/fluentd/setting/out_forward_spec.rb
 - spec/features/fluentd/setting/out_td_spec.rb
 - spec/features/sessions_spec.rb
@@ -622,6 +628,7 @@ test_files:
 - spec/factories/fluentd.rb
 - spec/factories/plugins.rb
 - spec/factories/user.rb
+- spec/features/fluentd/setting/out_elasticsearch_spec.rb
 - spec/features/fluentd/setting/out_forward_spec.rb
 - spec/features/fluentd/setting/out_td_spec.rb
 - spec/features/sessions_spec.rb