fluent-plugin-rds-slowlog 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f911129eaa88bdb7e6637df787ccfb7b5c42a9d
-  data.tar.gz: 3889a1524f662e638f104adce831750700481b64
+  metadata.gz: db90bf646e818655b609cd6ce8f33f8995596dfa
+  data.tar.gz: 16113ed4766d26efcfbf5478bba553d914af5338
 SHA512:
-  metadata.gz: ffc66003262cb3c9c7492835064f7e4fa8e7e0e25575eb3d596a96aa54349cf61f75441aee4bc3179a59c419fab4da509b8ebcaf191d86e435edc8bca233972c
-  data.tar.gz: d5c3bd047eb583eae7073a038b123d99943dc4057b760cf432558a38a4fc881acdaa4ae3484b5d795ef91705c078eacb65500761bb563f145d987ff2660d4aa0
+  metadata.gz: ca01b38aaa6d05181f8394f78071beff0b34a973c666b397d183cdb25e643aca4112d586f31d912613f160d0cefcbf076ff0ae55ba9f51582b6a333ba7e9c025
+  data.tar.gz: 326da4ace80776fd2f80f1729fa6f351e952014a72967bc8f6b2e2e3cc7216ff1293fb483c4f3eb6683f5f27fb8573b3b5823fa5d3688ebbd1b7f52675108f0e

data/README.md

@@ -14,6 +14,7 @@
 
 1. **"CALL mysql.rds_rotate_slow_log"**
 2. **"SELECT * FROM slow_log_backup"**
+3. **"INSERT INTO yourdb.slow_log_custom_backup SELECT * FROM slow_log_backup"** (if you want to take a backup)
 
 every 10 seconds from AWS RDS.
 
@@ -26,6 +27,7 @@ every 10 seconds from AWS RDS.
   host [RDS Hostname]
   username [RDS Username]
   password [RDS Password]
+  backup_table [Your Backup Tablename]
 </source>
 ```
 
@@ -39,6 +41,7 @@ every 10 seconds from AWS RDS.
   username [RDS Username]
   password [RDS Password]
   interval 10
+  backup_table [Your Backup Tablename]
 </source>
 
 <match rds-slowlog>

data/fluent-plugin-rds-slowlog.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-rds-slowlog"
-  gem.version       = "0.0.6"
+  gem.version       = "0.0.7"
   gem.authors       = ["kenjiskywalker", "winebarrel"]
   gem.email         = ["git@kenjiskywalker.org", "sgwr_dts@yahoo.co.jp"]
   gem.description   = "Amazon RDS slow_log input plugin for Fluent event collector"

data/lib/fluent/plugin/in_rds_slowlog.rb

@@ -11,12 +11,13 @@ class Fluent::Rds_SlowlogInput < Fluent::Input
     define_method("router") { Fluent::Engine }
   end
 
-  config_param :tag,      :string
-  config_param :host,     :string,  :default => nil
-  config_param :port,     :integer, :default => 3306
-  config_param :username, :string,  :default => nil
-  config_param :password, :string,  :default => nil, :secret => true
-  config_param :interval, :integer, :default => 10
+  config_param :tag,          :string
+  config_param :host,         :string,  :default => nil
+  config_param :port,         :integer, :default => 3306
+  config_param :username,     :string,  :default => nil
+  config_param :password,     :string,  :default => nil, :secret => true
+  config_param :interval,     :integer, :default => 10
+  config_param :backup_table, :string,  :default => nil
 
   def initialize
     super
@@ -40,6 +41,10 @@ class Fluent::Rds_SlowlogInput < Fluent::Input
 
   def start
     super
+    if @backup_table
+      @client.query("CREATE TABLE IF NOT EXISTS #{@backup_table} LIKE slow_log")
+    end
+
     @loop = Coolio::Loop.new
     timer = TimerWatcher.new(@interval, true, log, &method(:output))
     @loop.attach(timer)
@@ -70,6 +75,10 @@ class Fluent::Rds_SlowlogInput < Fluent::Input
       row.each_key {|key| row[key].force_encoding(Encoding::ASCII_8BIT) if row[key].is_a?(String)}
       router.emit(tag, Fluent::Engine.now, row)
     end
+
+    if @backup_table
+      @client.query("INSERT INTO #{@backup_table} SELECT * FROM slow_log_backup")
+    end
   end
 
   class TimerWatcher < Coolio::TimerWatcher

data/test/plugin/test_in_rds_slowlog.rb

@@ -36,6 +36,7 @@ class Rds_SlowlogInputTest < Test::Unit::TestCase
       client = mysql2_client
       client.query("DROP USER test_rds_user@localhost")
       client.query("DROP PROCEDURE `mysql`.`rds_rotate_slow_log`")
+      client.query("DROP TABLE `mysql`.`slow_log_custom_backup`")
     end
 
     def insert_slow_log_sql
@@ -87,6 +88,7 @@ class Rds_SlowlogInputTest < Test::Unit::TestCase
     username test_rds_user
     password test_rds_password
     interval 0
+    backup_table mysql.slow_log_custom_backup
   ]
 
   def create_driver(conf = CONFIG)
@@ -100,6 +102,7 @@ class Rds_SlowlogInputTest < Test::Unit::TestCase
     assert_equal 'test_rds_user', d.instance.username
     assert_equal 'test_rds_password', d.instance.password
     assert_equal 0, d.instance.interval
+    assert_equal 'mysql.slow_log_custom_backup', d.instance.backup_table
   end
 
   def test_output
@@ -116,4 +119,26 @@ class Rds_SlowlogInputTest < Test::Unit::TestCase
       ["rds-slowlog", 1432492200, {"start_time"=>"2015-09-29 15:43:45", "user_host"=>"root@localhost", "query_time"=>"00:00:00", "lock_time"=>"00:00:00", "rows_sent"=>"0", "rows_examined"=>"0", "db"=>"employees", "last_insert_id"=>"0", "insert_id"=>"0", "server_id"=>"1", "sql_text"=>"SELECT 2", "thread_id"=>"0"}],
     ], records
   end
+
+  def test_backup
+    d = create_driver
+    d.run
+
+    records = []
+    client = self.class.mysql2_client
+    slow_logs = client.query('SELECT * FROM `mysql`.`slow_log_custom_backup`', :cast => false)
+    slow_logs.each do |row|
+      row.each_key {|key| row[key].force_encoding(Encoding::ASCII_8BIT) if row[key].is_a?(String)}
+      records.push(row)
+    end
+
+    unless self.class.has_thread_id?
+      records.each {|r| r["thread_id"] = "0" }
+    end
+
+    assert_equal [
+      {"start_time"=>"2015-09-29 15:43:44", "user_host"=>"root@localhost", "query_time"=>"00:00:00", "lock_time"=>"00:00:00", "rows_sent"=>"0", "rows_examined"=>"0", "db"=>"employees", "last_insert_id"=>"0", "insert_id"=>"0", "server_id"=>"1", "sql_text"=>"SELECT 1", "thread_id"=>"0"},
+      {"start_time"=>"2015-09-29 15:43:45", "user_host"=>"root@localhost", "query_time"=>"00:00:00", "lock_time"=>"00:00:00", "rows_sent"=>"0", "rows_examined"=>"0", "db"=>"employees", "last_insert_id"=>"0", "insert_id"=>"0", "server_id"=>"1", "sql_text"=>"SELECT 2", "thread_id"=>"0"},
+    ], records
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-slowlog
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - kenjiskywalker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd