fluentd-ui 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eac024b627f727c53f8429ab3bb81b2fcb75875
-  data.tar.gz: 5ecc8f5e6a65da1879b456fb727c0ef31a62deff
+  metadata.gz: cd82626dac8fa5a41f6a2f86269c6a312da42528
+  data.tar.gz: 111ca2fe63f517dff32c5d3102ae51dc325b29ad
 SHA512:
-  metadata.gz: 84004c0b946e7844e380cda52be386e74cf44f14892b1803d5000151ca54d7b06453b05ddfe87204c06c93c30bfbccae2a792d2317fa8d04d142ccbabb313735
-  data.tar.gz: 4ff2e1e07a0d5d8522b4f39e6b496723893bf330ccb94172820b6ba529803633dc8ab71f66f8866ce13cc5c4d58f67235073a2451f5ffea911a15522224996bf
+  metadata.gz: a24ea27306a2f29f56d11915cfe75d34645aba7ecf3fdc4fdb6babc5170781a7e0c234a475b375a334d285bd67c6103165e43220ef2780835953c46e10fb38f3
+  data.tar.gz: d91e0b3c499494c524c58bd92d056ee7841a9b70d20c278bedaf83329974e4a71a2f05d191c0c93fc8fc719caffbe51f8c1c263958767e100fb1230286f55b45

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.3.1 - 2014/11/05
+
+* [maintenance] Update dependencies
+* [maintenance] Add dep:list rake task to help package td-agent
+
+
 Release 0.3.0 - 2014/10/22
 
 * [feature] Potentially support for multiple user name (not have UI to do it)

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.0)
+    fluentd-ui (0.3.1)
       addressable
       bundler
       draper (~> 1.3)
-      fluentd (~> 0.10.51)
+      fluentd (~> 0.10.56)
       font-awesome-rails
       haml-rails (~> 0.5.3)
       httpclient
@@ -14,7 +14,7 @@ PATH
       kramdown (> 1.0.0)
       kramdown-haml
       puma
-      rails (= 4.1.4)
+      rails (~> 4.1.7)
       rubyzip (~> 1.1)
       sass-rails (~> 4.0.3)
       settingslogic
@@ -24,27 +24,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.4)
-      actionpack (= 4.1.4)
-      actionview (= 4.1.4)
-      mail (~> 2.5.4)
-    actionpack (4.1.4)
-      actionview (= 4.1.4)
-      activesupport (= 4.1.4)
+    actionmailer (4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.7)
+      actionview (= 4.1.7)
+      activesupport (= 4.1.7)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.4)
-      activesupport (= 4.1.4)
+    actionview (4.1.7)
+      activesupport (= 4.1.7)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.4)
-      activesupport (= 4.1.4)
+    activemodel (4.1.7)
+      activesupport (= 4.1.7)
       builder (~> 3.1)
-    activerecord (4.1.4)
-      activemodel (= 4.1.4)
-      activesupport (= 4.1.4)
+    activerecord (4.1.7)
+      activemodel (= 4.1.7)
+      activesupport (= 4.1.7)
       arel (~> 5.0.0)
-    activesupport (4.1.4)
+    activesupport (4.1.7)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -68,7 +68,7 @@ GEM
       safe_yaml (~> 1.0.0)
     database_cleaner (1.2.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.19)
+    domain_name (0.5.22)
       unf (>= 0.0.5, < 1.0.0)
     draper (1.4.0)
       actionpack (>= 3.0)
@@ -76,17 +76,19 @@ GEM
       activesupport (>= 3.0)
       request_store (~> 1.0)
     erubis (2.7.0)
-    factory_girl (4.4.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.4.1)
-      factory_girl (~> 4.4.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    fluentd (0.10.53)
+    fluentd (0.10.56)
       cool.io (>= 1.1.1, < 2.0.0, != 1.2.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
       msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
       sigdump (~> 0.2.2)
+      tzinfo (>= 1.0.0)
+      tzinfo-data (>= 1.0.0)
       yajl-ruby (~> 1.0)
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
@@ -101,42 +103,41 @@ GEM
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     http_parser.rb (0.6.0)
-    httpclient (2.5.1)
-    i18n (0.6.9)
+    httpclient (2.5.3.1)
+    i18n (0.6.11)
     i18n_generators (1.2.1)
       mechanize
       rails (>= 3.0.0)
-    jbuilder (2.1.3)
+    jbuilder (2.2.4)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    kramdown (1.4.2)
+    kramdown (1.5.0)
     kramdown-haml (0.0.3)
       haml
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mechanize (2.7.2)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mechanize (2.7.3)
       domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0.0)
-      mime-types (~> 1.17, >= 1.17.2)
+      http-cookie (~> 1.0)
+      mime-types (~> 2.0)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
       net-http-persistent (~> 2.5, >= 2.5.2)
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     mini_portile (0.6.0)
-    minitest (5.4.0)
-    msgpack (0.5.8)
+    minitest (5.4.2)
+    msgpack (0.5.9)
     multi_json (1.10.1)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.2.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     ntlm-http (0.1.1)
     poltergeist (1.5.1)
@@ -144,39 +145,38 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.5)
-    pry (0.10.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (2.9.1)
+    puma (2.9.2)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.4)
-      actionmailer (= 4.1.4)
-      actionpack (= 4.1.4)
-      actionview (= 4.1.4)
-      activemodel (= 4.1.4)
-      activerecord (= 4.1.4)
-      activesupport (= 4.1.4)
+    rails (4.1.7)
+      actionmailer (= 4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
+      activemodel (= 4.1.7)
+      activerecord (= 4.1.7)
+      activesupport (= 4.1.7)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.4)
+      railties (= 4.1.7)
       sprockets-rails (~> 2.0)
-    railties (4.1.4)
-      actionpack (= 4.1.4)
-      activesupport (= 4.1.4)
+    railties (4.1.7)
+      actionpack (= 4.1.7)
+      activesupport (= 4.1.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
     request_store (1.1.0)
     rspec-collection_matchers (1.0.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.1)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
+    rspec-mocks (2.99.2)
     rspec-rails (2.99.0)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
@@ -187,12 +187,12 @@ GEM
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
     rubyzip (1.1.6)
-    safe_yaml (1.0.3)
+    safe_yaml (1.0.4)
     sass (3.2.19)
-    sass-rails (4.0.3)
+    sass-rails (4.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 2.12)
       sprockets-rails (~> 2.0)
     settingslogic (2.0.9)
     sigdump (0.2.2)
@@ -200,16 +200,16 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.5.0)
-    sprockets (2.11.0)
+    slop (3.6.0)
+    sprockets (2.11.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.2.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     sucker_punch (1.0.5)
       celluloid (~> 0.15.2)
     thor (0.19.1)
@@ -217,11 +217,10 @@ GEM
     tilt (1.4.1)
     timecop (0.7.1)
     timers (1.1.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2014.9)
+      tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.6)
@@ -229,7 +228,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     webrobots (0.1.1)
-    websocket-driver (0.3.3)
+    websocket-driver (0.3.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.2.1)

data/app/controllers/concerns/setting_concern.rb

@@ -4,10 +4,13 @@ module SettingConcern
   included do
     before_action :login_required
     before_action :find_fluentd
+    helper_method :target_plugin_name, :plugin_setting_form_action_url
   end
 
+
   def show
     @setting = target_class.new(initial_params)
+    render "shared/settings/show"
   end
 
   def finish
@@ -31,4 +34,16 @@ module SettingConcern
   def setting_params
     params.require(target_class.to_s.underscore.gsub("/", "_")).permit(*target_class.const_get(:KEYS))
   end
+
+  def initial_params
+    target_class.initial_params
+  end
+
+  def target_plugin_name
+    target_class.to_s.split("::").last.underscore
+  end
+
+  def plugin_setting_form_action_url(*args)
+    send("finish_daemon_setting_#{target_plugin_name}_path", *args)
+  end
 end

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

@@ -6,11 +6,4 @@ class Fluentd::Settings::InSyslogController < ApplicationController
   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

@@ -6,16 +6,4 @@ class Fluentd::Settings::OutElasticsearchController < ApplicationController
   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

@@ -15,14 +15,4 @@ class Fluentd::Settings::OutForwardController < ApplicationController
       ),
     )
   end
-
-  def initial_params
-    {
-      secondary: {
-        "0" => {
-          type: "file",
-        }
-      }
-    }
-  end
 end

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

@@ -6,13 +6,4 @@ class Fluentd::Settings::OutMongoController < ApplicationController
   def target_class
     Fluentd::Setting::OutMongo
   end
-
-  def initial_params
-    {
-      host: "127.0.0.1",
-      port: 27017,
-      capped: true,
-      capped_size: "100m",
-    }
-  end
 end

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

@@ -1,34 +1,12 @@
 class Fluentd::Settings::OutS3Controller < ApplicationController
-  before_action :login_required
-  before_action :find_fluentd
+  include SettingConcern
 
-  def show
-    @setting = Fluentd::Setting::OutS3.new({
-      s3_endpoint: "s3-us-west-1.amazonaws.com",
-      output_tag: true,
-      output_time: true,
-      use_ssl: true,
-    })
-  end
-
-  def finish
-    @setting = Fluentd::Setting::OutS3.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::OutS3
   end
 
-  private
-
   def setting_params
     params.require(:fluentd_setting_out_s3).permit(*Fluentd::Setting::OutS3::KEYS)
   end

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

@@ -11,6 +11,23 @@ class Fluentd
       attr_accessor(*KEYS)
 
       validates :tag, presence: true
+
+      def self.initial_params
+        {
+          bind: "0.0.0.0",
+          port: 5140,
+        }
+      end
+
+      def common_options
+        [
+          :tag, :bind, :port, :types,
+        ]
+      end
+
+      def advanced_options
+        []
+      end
     end
   end
 end

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

@@ -19,6 +19,32 @@ class Fluentd
       validates :port, presence: true
       validates :index_name, presence: true
       validates :type_name, presence: true
+
+      def self.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
+
+      def common_options
+        [
+          :match, :host, :port, :logstash_format,
+          :index_name, :type_name,
+        ]
+      end
+
+      def advanced_options
+        [
+          :hosts, :logstash_prefix, :logstash_dateformat,
+          :utc_index, :request_timeout, :include_tag_key,
+        ]
+      end
     end
   end
 end