fluent-plugin-rds-log 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f633e9b5d80f11e10825cac2bd9e29b079637ef
-  data.tar.gz: 16c9681a9a0a56839fbe035b4988cd15d3ac5855
+  metadata.gz: da64c20018f36f4d7caf310b578c50b0790617ae
+  data.tar.gz: f4cded66ac824cfe5bbdb6336b87f1fee536e76c
 SHA512:
-  metadata.gz: 049cde9472c2d179129911c9694519af1b3efdff348dcad275fc59f2fe60addfdc7b938ee447a539dcce010c1a9a8ee8fac4f032112391953e4b18495601cae7
-  data.tar.gz: 9ee61866b3ab4b921bdb1f90237b49f229beccbe9dbe2b3582f4c8e260731e24e2aca8956075916f9890bbcc29330053755e804ddab94ffc7ff4799a1e0df42e
+  metadata.gz: 7711fd2858cfdd41ca01aadb5db3071d29adab5c4ab33c0bc3166e0e6e83341b09e7f5a809aefe0a7718a55257ac52966ea904416df972f9d56fb93f6678d96b
+  data.tar.gz: dd7afd322ab1de2cdce5ff50d5210711017ad09946f30445b3a5eb9af65bad6e204082eff78addb912f53f2bcbc78db8e63f1911dd915053c6bdc5874aa0fb39

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in fluent-plugin-rds-slowlog.gemspec
+# Specify your gem's dependencies in fluent-plugin-rds-log.gemspec
 gemspec

data/README.md

@@ -1,69 +1,54 @@
-# fluent-plugin-rds-log (DEBUGGING NOW!!)
+# Amazon RDS (for MySQL) input plugin
+
+## Overview
+***Amazon Web Services RDS(MySQL) general_log and slow_log input plugin.  
+
+##Installation
+
+    $ fluent-gem install fluent-plugin-rds-log
 
 ## RDS Setting
 
 [Working with MySQL Database Log Files / aws documentation](http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.Concepts.MySQL.html)
 
+- Set the `log_output` parameter to `TABLE` to write the logs to a database table.
 - Set the `slow_query_log` parameter to `1`
+- Set the `general_log` parameter to `1`
 - setting `min_examined_row_limit`
 - setting `long_query_time`
 
-## Overview
-***AWS RDS slow_log*** input plugin.  
-
-1. **"SELECT * FROM slow_log"**
-2. **"CALL mysql.rds_rotate_slow_log"**
-
-every 10 seconds from AWS RDS.
-
 ## Configuration
 
 ```config
 <source>
-  type rds_slowlog
-  tag rds-slowlog
+  type rds_log
+  log_type <slow_log | general_log>
   host [RDS Hostname]
   username [RDS Username]
   password [RDS Password]
-  log_type {slow_log|general_log}
-  refresh_interval 30
+  refresh_interval [number]
+  auto_reconnect [true|false]
+  tag [tag-name]
 </source>
 ```
 
-### Example GET RDS slow_log
+### Example GET RDS general_log
 
 ```config
 <source>
-  type rds_slowlog
-  tag rds-slowlog
-  host [RDS Hostname]
-  username [RDS Username]
-  password [RDS Password]
-  log_type slow_log
-  refresh_interval 10
+  type rds_log
+  log_type general_log
+  host endpoint.abcdefghijkl.ap-northeast-1.rds.amazonaws.com
+  username rds_user
+  password rds_password
+  refresh_interval 30
+  auto_reconnect true
+  tag rds-general-log
 </source>
 
-<match rds-slowlog>
-  type copy
- <store>
+<match rds-general-log>
   type file
-  path /var/log/slow_log
- </store>
+  path /var/log/rds-general-log
 </match>
 ```
 
-#### output data format
-
-```
-2013-03-08T16:04:43+09:00       rds-slowlog     {"start_time":"2013-03-08 07:04:38","user_host":"rds_db[rds_db] @  [192.0.2.10]","query_time":"00:00:00","lock_time":"00:00:00","rows_sent":"3000","rows_examined":"3000","db":"rds_db","last_insert_id":"0","insert_id":"0","server_id":"100000000","sql_text":"select foo from bar"}
-2013-03-08T16:04:43+09:00       rds-slowlog     {"start_time":"2013-03-08 07:04:38","user_host":"rds_db[rds_db] @  [192.0.2.10]","query_time":"00:00:00","lock_time":"00:00:00","rows_sent":"3000","rows_examined":"3000","db":"rds_db","last_insert_id":"0","insert_id":"0","server_id":"100000000","sql_text":"Quit"}
-```
-
-#### if not connect
-
-- td-agent.log
-
-```
-2013-06-29 00:32:55 +0900 [error]: fluent-plugin-rds-log: cannot connect RDS
-```
-

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.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["shinsaka"]
   gem.email         = ["shinx1265@gmail.com"]
   gem.description   = "Amazon RDS slow_log and general_log input plugin for Fluent event collector"

data/lib/fluent/plugin/in_rds_log.rb

@@ -8,6 +8,7 @@ class Fluent::Rds_LogInput < Fluent::Input
   config_param :password, :string,  :default => nil
   config_param :log_type, :string,  :default => nil
   config_param :refresh_interval, :integer, :default => 30
+  config_param :auto_reconnect, :bool, :default => true
 
    def initialize
     super
@@ -25,6 +26,7 @@ class Fluent::Rds_LogInput < Fluent::Input
         :port => @port,
         :username => @username,
         :password => @password,
+        :reconnect => @auto_reconnect
         :database => 'mysql'
       })
     rescue
@@ -56,6 +58,7 @@ class Fluent::Rds_LogInput < Fluent::Input
 
     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 == ''}
       Fluent::Engine.emit(tag, Fluent::Engine.now, row)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-log
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd