fluent-plugin-mysql-query 0.0.1 → 0.1.1

data/README.md

@@ -1,7 +1,7 @@
 fluent-plugin-mysql-query
 ===========================
 
-Fluentd Input plugin to execute mysql command intervaled.
+Fluentd Input plugin to execute mysql query for stationary measurement.
 
 ## Installation
 
@@ -29,7 +29,11 @@ gem install fluent-plugin-mysql-query
   interval        30s                 # Optional (default: 1m)
   tag             input.mysql         # Required
   query           SHOW VARIABLES LIKE 'Thread_%' # Required
+  # inserting hostname into record.
   record_hostname yes                 # Optional (yes/no)
+  # multi row results to be nested or separated record.
+  nest_result     no                  # Optional (yes/no)
+  nest_keyname    data                # Optional (default: result)
 </source>
 
 <match input.mysql>
@@ -38,14 +42,24 @@ gem install fluent-plugin-mysql-query
 `````
 
 ### Output Sample
+record_hostname: yes, nest_result: no
 `````
 input.mysql: {"hostname":"myhost.example.com","Variable_name":"thread_cache_size","Value":"16"}
 input.mysql: {"hostname":"myhost.example.com","Variable_name":"thread_stack","Value":"262144"}
 `````
+record_hostname: yes, nest_result: yes, nest_keyname: data
+`````
+input.mysql: {"hostname":"myhost.example.com","data":[{"Variable_name":"thread_cache_size","Value":"16"},{"Variable_name":"thread_stack","Value":"262144"}]}
+`````
+
+### Example Query
+* SHOW VARIABLES LIKE 'Thread_%';
+* SELECT MAX(id) AS max_foo_id FROM foo_table;
+* SHOW FULL PROCESSLIST;
+* INSERT INTO log (data, created_at) VALUES((SELECT MAX(id) FROM foo_table), NOW());
 
 ## TODO
 patches welcome!
-* support results into array option
 * support result_key_downcase option
 
 ## Copyright

data/fluent-plugin-mysql-query.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-mysql-query"
-  s.version     = "0.0.1"
+  s.version     = "0.1.1"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-mysql-query"
-  s.summary     = %q{Fluentd Input plugin to execute mysql query with custom intervals.}
+  s.summary     = %q{Fluentd Input plugin to execute mysql query for stationary measurement.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/fluent/plugin/in_mysql_query.rb

@@ -14,15 +14,18 @@ module Fluent
     config_param :database, :string, :default => nil
     config_param :encoding, :string, :default => 'utf8'
     config_param :interval, :string, :default => '1m'
-    config_param :record_hostname, :string, :default => nil
     config_param :tag, :string
     config_param :query, :string
+    config_param :nest_result, :string, :default => nil
+    config_param :nest_key, :string, :default => 'result'
+    config_param :record_hostname, :string, :default => nil
 
     def configure(conf)
       super
-      @interval = Config.time_value(@interval)
-      @record_hostname = @record_hostname || false
       @hostname = get_mysql_hostname
+      @interval = Config.time_value(@interval)
+      @nest_result = Config.bool_value(@nest_result) || false
+      @record_hostname = Config.bool_value(@record_hostname) || false
       $log.info "adding mysql_query job: [#{@query}] interval: #{@interval}sec"
     end
 
@@ -35,14 +38,18 @@ module Fluent
     end
 
     def run
-      loop do 
-        con = query(@query)
-        con.each do |row|
-          tag = "#{@tag}".gsub('__HOSTNAME__', @hostname).gsub('${hostname}', @hostname)
-          record = Hash.new
-          record.store('hostname', @hostname) if @record_hostname
-          record.merge!(row)
+      loop do
+        tag = "#{@tag}".gsub('__HOSTNAME__', @hostname).gsub('${hostname}', @hostname)
+        record = Hash.new
+        record.store('hostname', @hostname) if @record_hostname
+        result = get_exec_result
+        if (@nest_result)
+          record.store(@nest_key, result)
           Engine.emit(tag, Engine.now, record)
+        else
+          result.each do |data|
+            Engine.emit(tag, Engine.now, record.merge(data))
+          end
         end
         sleep @interval
       end
@@ -63,7 +70,7 @@ module Fluent
     def query(query)
       @mysql ||= get_connection
       begin
-        return @mysql.query(query)
+        return @mysql.query(query, :cast => false, :cache_rows => false)
       rescue Exception => e
         $log.info "#{e.inspect}"
       end
@@ -74,5 +81,14 @@ module Fluent
         return row.fetch('Value')
       end
     end
+
+    def get_exec_result
+      result = Array.new
+      stmt = query(@query)
+      stmt.each do |row|
+        result.push(row)
+      end
+      return result
+    end
   end
 end

data/test/plugin/test_in_mysql_query.rb

@@ -35,7 +35,7 @@ class MysqlQueryInputTest < Test::Unit::TestCase
     assert_equal 3306, d.instance.port
     assert_equal 30, d.instance.interval
     assert_equal 'input.mysql', d.instance.tag
-    assert_equal 'yes', d.instance.record_hostname
+    assert_equal true, d.instance.record_hostname
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql-query
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &8375040 !ruby/object:Gem::Requirement
+  requirement: &11556900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8375040
+  version_requirements: *11556900
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &8373740 !ruby/object:Gem::Requirement
+  requirement: &11555420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8373740
+  version_requirements: *11555420
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &8372580 !ruby/object:Gem::Requirement
+  requirement: &11554560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8372580
+  version_requirements: *11554560
 description: 
 email:
 - y.ken.studio@gmail.com
@@ -83,7 +83,7 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Fluentd Input plugin to execute mysql query with custom intervals.
+summary: Fluentd Input plugin to execute mysql query for stationary measurement.
 test_files:
 - test/helper.rb
 - test/plugin/test_in_mysql_query.rb