fluent-plugin-rds-log 0.1.3 → 0.1.4

data/README.md

@@ -1,11 +1,15 @@
-# Amazon RDS (for MySQL) input plugin
+# Amazon RDS (for MySQL) input plugin for [Fluentd](http://fluentd.org)
 
 ## Overview
-***Amazon Web Services RDS(MySQL) general_log and slow_log input plugin.  
+- Amazon Web Services RDS(MySQL) general_log and slow_log input plugin.  
 
 ##Installation
 
     $ fluent-gem install fluent-plugin-rds-log
+*Maybe, you also need the following packages*
+- MySQL-shared
+- MySQL-shared-compat
+- MySQL-devel
 
 ## RDS Setting
 
@@ -23,12 +27,13 @@
 <source>
   type rds_log
   log_type <slow_log | general_log>
-  host [RDS Hostname]
-  username [RDS Username]
-  password [RDS Password]
-  refresh_interval [number]
-  auto_reconnect [true|false]
-  tag [tag-name]
+  host <RDS Hostname1>,<RDS Hostname2>,<RDS Hostname3>.. # multiple database servers(comma separated)
+  username <RDS Username>
+  password <RDS Password>
+  refresh_interval <number>
+  auto_reconnect <true|false>
+  tag <tag-name>
+  add_host false # add database hostname in record
 </source>
 ```
 
@@ -44,6 +49,7 @@
   refresh_interval 30
   auto_reconnect true
   tag rds-general-log
+  add_host false # add database hostname in record
 </source>
 
 <match rds-general-log>

data/fluent-plugin-rds-log.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-rds-log"
-  gem.version       = "0.1.3"
+  gem.version       = "0.1.4"
   gem.authors       = ["shinsaka"]
   gem.email         = ["shinx1265@gmail.com"]
   gem.description   = "Amazon RDS slow_log and general_log input plugin for Fluent event collector"

data/fluent.conf.sample

@@ -0,0 +1,16 @@
+<source>
+  type rds_log
+  log_type general_log
+  host endpoint.abcdefghijkl.ap-northeast-1.rds.amazonaws.com
+  username testuser
+  password testuser
+  refresh_interval 30
+  auto_reconnect true
+  tag rds-general-log
+  add_host true
+</source>
+
+<match rds-general-log>
+  type file
+  path /tmp/rds-general-log
+</match>

data/lib/fluent/plugin/in_rds_log.rb

@@ -9,6 +9,7 @@ class Fluent::Rds_LogInput < Fluent::Input
   config_param :log_type, :string,  :default => nil
   config_param :refresh_interval, :integer, :default => 30
   config_param :auto_reconnect, :bool, :default => true
+  config_param :add_host, :bool, :default => false
 
    def initialize
     super
@@ -34,43 +35,56 @@ class Fluent::Rds_LogInput < Fluent::Input
   end
 
   private
-  def connect
+  def connect_all
+    @clients = {}
+    @host.split(',').each do |host|
+      @clients[host] = connect(host)
+    end
+  end
+
+  def connect(host)
     begin
-      $log.info "fluent-plugin-rds-log: connecting RDS"
-      @client = Mysql2::Client.new({
-        :host => @host,
+      $log.info "fluent-plugin-rds-log: connecting RDS [#{host}]"
+      client = Mysql2::Client.new({
+        :host => host,
         :port => @port,
         :username => @username,
         :password => @password,
         :reconnect => @auto_reconnect,
         :database => 'mysql'
       })
-      $log.info "fluent-plugin-rds-log: connected RDS"
+      $log.info "fluent-plugin-rds-log: connected RDS [#{host}]"
+      return client
     rescue
-      $log.error "fluent-plugin-rds-log: cannot connect RDS"
+      $log.error "fluent-plugin-rds-log: cannot connect RDS [#{host}]"
     end
   end
+
   def watch
-    connect
+    connect_all
     while true
       sleep @refresh_interval
-      output
+      @host.split(',').each do |host|
+        output(host)
+      end
     end
   end
 
-  def output
-    if @client.nil?
-      connect
-      if @client.nil?
+  def output(host)
+    client = @clients[host]
+    if client.nil?
+      client = connect(host)
+      if client.nil?
         return
       end
     end
 
-    @client.query("CALL mysql.rds_rotate_#{@log_type}")
+    client.query("CALL mysql.rds_rotate_#{@log_type}")
 
-    output_log_data = @client.query("SELECT * FROM mysql.#{@log_type}_backup", :cast => false)
+    output_log_data = client.query("SELECT * FROM mysql.#{@log_type}_backup", :cast => false)
     output_log_data.each do |row|
       row.delete_if{|key,value| value == ''}
+      row['host'] = host if @add_host
       Fluent::Engine.emit(tag, Fluent::Engine.now, row)
     end
   end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-log
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
+  prerelease: 
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,15 +46,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.0.4
 description: Amazon RDS slow_log and general_log input plugin for Fluent event collector
@@ -67,31 +74,33 @@ files:
 - README.md
 - Rakefile
 - fluent-plugin-rds-log.gemspec
+- fluent.conf.sample
 - lib/fluent/plugin/in_rds_log.rb
 - test/helper.rb
 - test/plugin/test_in_rds_slowlog.rb
 homepage: https://github.com/shinsaka/fluent-plugin-rds-log
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Amazon RDS slow_log and general_log input plugin for Fluent event collector
 test_files:
 - test/helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e09e5f921b755de90de08e2ec681fa267890c87d
-  data.tar.gz: 7092cd06d100b40f961a7df30f28dae565658a7c
-SHA512:
-  metadata.gz: bcc594b7aa25171c88e3eb99d3cd52b4a57ee2bad1bb8c71ca23bec3ad560ca98af35d035d200895743d195c3d0deae1804885fbdfadb2c346e7cb35c8fcab90
-  data.tar.gz: e1df1249f8398e9585e5e895fd7ef20f4b1dfb70fca9caab9757c676030629b9e52f19df6b0a223e031d33cf994a40a66f787f6c698d37effcfef2abec07f518