fluent-plugin-nais 0.10.5 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a0ced6ea64301715f1502a4c01b23c0d24e4835
-  data.tar.gz: 1266797a875ff32826ed331e804d5722abd8a2a4
+  metadata.gz: 5b9e1201483827187da8dd5bea131086a4a0fd75
+  data.tar.gz: c484d519e98a1bdf9db7d11e8896116dd0284c3b
 SHA512:
-  metadata.gz: 7114222b03b1742fd7f7d95702e15c06ea78c9673d8e294f3fea90840065537feb418d8310d43651aced69e25f6f1777d5a8ecbb93806ee4bf1700dd06540d2d
-  data.tar.gz: cca7f1dedeff7be44669be30eca2e591f9b170e5dd14c1e1352baf7c8e0f81afc1a17c7a061d23700659ef02c812f1547a293e99c25ef100aaae03f120b11093
+  metadata.gz: 62e41b5fac586ad0ff813150dc4aa0783c76198d1462f763786c62f85c3b0b63fd5f563556301fef1d10b4ce7ad0114ec56c49e398cf0b5346a8714c3a72fa63
+  data.tar.gz: b4960488c01c52145aa63cd7e715158200b4eea6f3c1d3589b2871dc13f91fe118894546b16ff6fd6dda3d3cd0ca4a631ff4fad544d0197b7366160757a2e1c7

data/fluent-plugin-nais.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'fluentd', '~> 0.14'
-  spec.add_dependency 'nais-log-parser', '>= 0.13.1'
+  spec.add_dependency 'nais-log-parser', '>= 0.14.0'
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fluent/plugin/filter_nais_logformat.rb

@@ -39,17 +39,10 @@ module Fluent::Plugin
         elsif fmt == 'influxdb'
           r = ::Nais::Log::Parser.parse_influxdb(record['log'])
           unless r.nil?
+            r['log'] = r.delete('message')
             if r['component'] == 'httpd'
-              r['log'] = r.delete('request') unless r['request'].nil?
-              r['request'] = r.delete('request_id') unless r['request_id'].nil?
               level = ::Nais::Log::Parser.loglevel_from_http_response(r['response_code'])
               r['level'] = level unless level.nil?
-            else
-              if r.has_key?('timestamp')
-                r['log'] = record['log'].sub(/^\S+ \S+ \S+ /, '')
-              else
-                r['log'] = record['log'].sub(/^\S+ /, '')
-              end
             end
           end
         elsif fmt == 'log15'

data/lib/fluent/plugin/nais/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Nais
-      VERSION = "0.10.5"
+      VERSION = "0.11.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nais
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.11.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement