fluent-plugin-mysql-query 0.1.1 → 0.2.1

data/README.md

@@ -22,18 +22,21 @@ gem install fluent-plugin-mysql-query
 `````
 <source>
   type            mysql_query
-  server          localhost           # Optional (default: localhost)
+  host            localhost           # Optional (default: localhost)
   port            3306                # Optional (default: 3306)
   username        nagios              # Optional (default: root)
   password        passw0rd            # Optional (default nopassword)
   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)
+  # record hostname into message.
+  record_hostname yes                 # Optional (default: no)
+  # multi row results into nested record or separated message.
+  nest_result     yes                 # Optional (default: no)
+  nest_key        data                # Optional (default: result)
+  # record the number of lines of a query result
+  row_count       yes                 # Optional (default: no)
+  row_count_key   row_count           # Optional (default: row_count)
 </source>
 
 <match input.mysql>
@@ -47,16 +50,22 @@ 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
+record_hostname: yes, nest_result: yes, nest_key: data
 `````
 input.mysql: {"hostname":"myhost.example.com","data":[{"Variable_name":"thread_cache_size","Value":"16"},{"Variable_name":"thread_stack","Value":"262144"}]}
 `````
+record_hostname: yes, nest_result: yes, nest_key: data, row_count: yes, row_count_key: row_count
+`````
+input.mysql: {"hostname":"myhost.example.com","row_count":2,"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());
+* SHOW SLAVE STATUS;
+* SHOW INNODB STATUS;
 
 ## TODO
 patches welcome!

data/fluent-plugin-mysql-query.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-mysql-query"
-  s.version     = "0.1.1"
+  s.version     = "0.2.1"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-mysql-query"

data/lib/fluent/plugin/in_mysql_query.rb

@@ -18,6 +18,8 @@ module Fluent
     config_param :query, :string
     config_param :nest_result, :string, :default => nil
     config_param :nest_key, :string, :default => 'result'
+    config_param :row_count, :string, :default => nil
+    config_param :row_count_key, :string, :default => 'row_count'
     config_param :record_hostname, :string, :default => nil
 
     def configure(conf)
@@ -25,6 +27,7 @@ module Fluent
       @hostname = get_mysql_hostname
       @interval = Config.time_value(@interval)
       @nest_result = Config.bool_value(@nest_result) || false
+      @row_count = Config.bool_value(@row_count) || false
       @record_hostname = Config.bool_value(@record_hostname) || false
       $log.info "adding mysql_query job: [#{@query}] interval: #{@interval}sec"
     end
@@ -43,6 +46,7 @@ module Fluent
         record = Hash.new
         record.store('hostname', @hostname) if @record_hostname
         result = get_exec_result
+        record.store(@row_count_key, result.size) if @row_count
         if (@nest_result)
           record.store(@nest_key, result)
           Engine.emit(tag, Engine.now, record)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql-query
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &11556900 !ruby/object:Gem::Requirement
+  requirement: &10854720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11556900
+  version_requirements: *10854720
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &11555420 !ruby/object:Gem::Requirement
+  requirement: &10846780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11555420
+  version_requirements: *10846780
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &11554560 !ruby/object:Gem::Requirement
+  requirement: &10846340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11554560
+  version_requirements: *10846340
 description: 
 email:
 - y.ken.studio@gmail.com