fluent-plugin-mongo-slow-query 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 073b844f677ea653c53e0ab6dba3acd74bed13b3
-  data.tar.gz: a3772a54e28b746268facbef28785ee247fb0339
+  metadata.gz: 284e26c6dc167bed1678ea14f4efb320be3148e5
+  data.tar.gz: a50274330aa6b8fe11eb052d4fa2414cf095ba1d
 SHA512:
-  metadata.gz: 679b03443566dee67ac0d7b211071bcfba1b10a36369b9031bc906eb201d09de796a71b634ef7a8d541379a6562aad4635bcd3900f127320d73d73810e0f61a6
-  data.tar.gz: 50b3432e8542aa08a2cd5fda521a9def447a79f62672591d3fd98926546db135e56b2c9ec3ba7e9afa597bb45bbfdec270873dfcb0b073fd3c794a3af9c0bca5
+  metadata.gz: fdc3f9ef96cc3e558831772744e8709d10a6e1b42df55435a2a2bf732c67f926acefbdda555372b969c3d9634508fc688ad144d8059912a142fa8a98e124f865
+  data.tar.gz: da2a2a1938f10227c0a62f2106d378ea69ced0c930a07f4eebf7cc62d77c0fb08abe73c73fa8982430f6e75561d119de834d50df8843e7962b3c5fce39985c28

data/lib/fluent/plugin/in_mongo_slow_query.rb

@@ -10,16 +10,27 @@ module Fluent
         # 'conf' is a Hash that includes configuration parameters.
         # If the configuration is invalid, raise Fluent::ConfigError.
         def configure(conf)
-            unless conf.has_key?("format")
-                #conf["format"] = '/(?<time>[^ ]+ [^ ]+ [^ ]+ [^ ]+) \[\w+\] (?<op>[^ ]+) (?<ns>[^ ]+) ((query: (?<query>{.+}) update: (?<update>{.*}))|(query: (?<query>{.+}))) .* (?<ms>\d+)ms/'
-                conf["format"] = '/(?<time>.*) \[\w+\] (?<op>[^ ]+) (?<ns>[^ ]+) ((query: (?<query>{.+}) update: {.*})|(query: (?<query>{.+}))) .* (?<ms>\d+)ms/'
-                $log.warn "load default format: ", conf["format"]
-            end
+            #unless conf.has_key?("format")
+            #    conf["format"] = '/(?<time>.*) \[\w+\] (?<op>[^ ]+) (?<ns>[^ ]+) (?<detail>((query: (?<query>{.+}) update: {.*})|(query: (?<query>{.+})))) .* (?<ms>\d+)ms/'
+            #    $log.warn "load default format: ", conf["format"]
+            #end
 
-            unless conf.has_key?("time_format")
-                conf["time_format"] = '%a %b %d %H:%M:%S.%L'
-                $log.warn "load default time_format: ", conf["time_format"]
-            end
+            # load default format that degisned for MongoDB
+            conf["format"] = '/(?<time>.*) \[\w+\] (?<op>[^ ]+) (?<ns>[^ ]+) ((?<detail>(query: (?<query>\{.+\}) update: \{.*\}))|((?<detail>(query: (?<query>\{.+\}))) planSummary: .*)|((?<detail>query: (?<query>\{.+\})))) .* (?<ms>\d+)ms/'
+
+            # not set "time_format"
+            # default use Ruby's DateTime.parse() to pase time
+            #
+            # be compatible for v2.2, 2.4 and 2.6
+            # difference of time format
+            # 2.2: Wed Sep 17 10:00:00 [conn] ...
+            # 2.4: Wed Sep 17 10:00:00.123 [conn] ...
+            # 2.6: 2014-09-17T10:00:43.506+0800  [conn] ...
+            #unless conf.has_key?("time_format")
+            #    #conf["time_format"] = '%a %b %d %H:%M:%S'
+            #    #conf["time_format"] = '%a %b %d %H:%M:%S.%L'
+            #    #$log.warn "load default time_format: ", conf["time_format"]
+            #end
             super
         end
 
@@ -30,10 +41,9 @@ module Fluent
                     line.chomp!  # remove \n
                     time, record = parse_line(line)
                     if time && record
-                        # get prototype
-                        if record.has_key?("query")
-                            record["query"] = get_query_prototype(record["query"])
-                        end
+                        record["query"] = get_query_prototype(record["query"])
+                        record["ms"] = record["ms"].to_i
+                        record["ts"] = time
                         #if record.has_key?("update")
                         #    record["update"] = get_query_prototype(record["update"])
                         #end
@@ -89,7 +99,17 @@ module Fluent
 
         # convert query to JSON
         def to_json(query)
-            res = query.gsub(/( [^ ]+?: )/) {|fieldname| fieldname_format(fieldname)}
+            res = query
+            # conversion for fieldname
+            res = res.gsub(/( [^ ]+?: )/) {|fieldname| fieldname_format(fieldname)}
+            # conversion for ObjectId
+            res = res.gsub(/ObjectId\([^ ]+?\)/) {|objectid| to_string(objectid)}
+            # conversion for Timestamp
+            res = res.gsub(/Timestamp \d+\|\d+/) {|timestamp| to_string(timestamp)}
+            # conversion for Date
+            res = res.gsub(/new Date\(\d+\)/) {|date| to_string(date)}
+            # filter regex
+            res = res.gsub(/\/\^.*\//) {|pattern| to_string(pattern)}
             return res
         end
 
@@ -98,5 +118,14 @@ module Fluent
         def fieldname_format(fieldname)
             return ' "%s": ' % fieldname.strip.chomp(':')
         end
+
+        # convert value of special type to string
+        # so that convert query to json
+        def to_string(str)
+            res = str
+            res = res.gsub(/"/, '\"')
+            res = '"%s"' % res
+            return res
+        end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo-slow-query
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - caosiyang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies: []
 description: fluent plugin for mongo slow query
 email: csy3228@gmail.com