fluent-plugin-mysqlslowquery 0.0.1 → 0.0.2

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/README.md

@@ -2,21 +2,18 @@
 
 Fluent input plugin for  MySQL slow query log file.
 
-##How to use
-
-Puts in_mysql_slow_query.rb to plugin directory.
+##Installation
 
 ```shell
-% cp in_mysql_slow_query.rb path/to/fluent/plugin
+% gem install fluent-plugin-mysqlslowquery
 ```
 
-Edit setting file.
+##How to use
 
-```shell
-% edit fluent.conf
-```
+Edit conf file.
 
-```
+```conf
+#/etc/fluentd/fluent.conf
 <source>
   type mysql_slow_query
   path /path/to/mysqld-slow.log

data/fluent-plugin-mysqlslowquery.gemspec

@@ -13,7 +13,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-mysqlslowquery"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.1"
+  gem.version       = "0.0.2"
   gem.add_development_dependency "fluentd"
+  gem.add_development_dependency "myslog"
   gem.add_runtime_dependency "fluentd"
+  gem.add_runtime_dependency "myslog"
 end

data/lib/fluent/plugin/in_mysql_slow_query.rb

@@ -1,33 +1,50 @@
-class MySQLSlowQueryInput < Fluent::TailInput
-  Fluent::Plugin.register_input('mysql_slow_query', self)
+#
+# in_mysql_slow_query
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require "myslog"
+
+module Fluent
+
+class MySQLSlowQueryInput < TailInput
+  Plugin.register_input('mysql_slow_query', self)
 
   def configure_parser(conf)
-    @_time = Time.new.to_i
-    @_record = {}
+    @parser = MySlog.new
   end
 
-  def parse_line(line)
-    if line.start_with?("#")
-      if line[2, 5] == "Time:"
-        remain = line[7..-1].strip
-        @_time = Time.strptime(remain, '%y%m%d %H:%M:%S').to_i
-      elsif line[2, 10] == "User@Host:"
-        remain = line[12..-1].split("@").map{|s| s.strip}
-        @_record["user"] = remain[0]
-        @_record["host"] = remain[1]
-      elsif line[2, 11] == "Query_time:"
-        sl = line.split
-        @_record["query_time"] = sl[2].to_f
-        @_record["lock_time"] = sl[4].to_f
-        @_record["rows_sent"] = sl[6].to_i
-        @_record["rows_examined"] = sl[8].to_i
+  def receive_lines(lines)
+    es = MultiEventStream.new
+    @parser.divide(lines).each do |record|
+      begin
+        record = @parser.parse_record(record)
+        if time = record.delete(:date)
+          time = time.to_i
+        else
+          time = Time.now.to_i
+        end
+        es.add(time, record)
+      rescue
+        $log.warn record, :error=>$!.to_s
+        $log.debug_backtrace
       end
-    elsif not line.upcase.start_with?('USE') and not line.upcase.start_with?('SET')
-      @_record["sql"] = line
-      n_record = @_record.clone
-      @_record = {}
-      return @_time, n_record
     end
-    return nil, nil
+
+    unless es.empty?
+      Engine.emit_stream(@tag, es)
+    end
   end
 end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysqlslowquery
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000Z
+date: 2012-06-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70320037856180 !ruby/object:Gem::Requirement
+  requirement: &70358293308920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70320037856180
+  version_requirements: *70358293308920
+- !ruby/object:Gem::Dependency
+  name: myslog
+  requirement: &70358293308140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70358293308140
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70320037855740 !ruby/object:Gem::Requirement
+  requirement: &70358293307240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70358293307240
+- !ruby/object:Gem::Dependency
+  name: myslog
+  requirement: &70358293306100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70320037855740
+  version_requirements: *70358293306100
 description: Fluent input plugin for MySQL slow query log file.
 email:
 - taka84u9@gmail.com
@@ -41,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
 - README.md
 - Rakefile
 - fluent-plugin-mysqlslowquery.gemspec
@@ -70,3 +93,4 @@ signing_key:
 specification_version: 3
 summary: Fluent input plugin for MySQL slow query log file.
 test_files: []
+has_rdoc: