fluent-plugin-nais 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd6a65da5a4221b783faf8089b5238302aafda16
-  data.tar.gz: 73e0daf5476b7c78d576736a4497b9aa185e746f
+  metadata.gz: 5c8b1bbfea21d0cfb5e2dead45ffcdec6ceb2ef4
+  data.tar.gz: '089fe10867da708cd1f9f5e21bb6d566412b4e99'
 SHA512:
-  metadata.gz: deb7dfdd9f28b4f879a04b0d14fc00bfe85f92624e5ca9849283a177a8d04b36bceee1ea3b6e4e008007c1c9a5170de2848de1bf10d6753f66ff113ee593e432
-  data.tar.gz: 13b9e96d04b37a53e8f84797f381304ba4031df9a2a8a938efd51947f4fc0463936e00ad1e7312ccba7adcc5dd790a47c91720e07660ab8b76abd5f52756dc91
+  metadata.gz: 0c5ed03576b7bdea6ddbae2fc08af3f0d3a95e07415e5401fdf106005871967fa99d6757734f9e7a689585156b76b19c9667047386bea76460a6b0d176f74bc8
+  data.tar.gz: '009e6e30e4e613aa3967fadee16104d0d31f9f63491a9299ea2535acc157845bf59bd431f01316241835b5305bdd38a9a635c69ee297be9f18f618d0b8663c77'

data/fluent-plugin-nais.gemspec

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

data/lib/fluent/plugin/filter_nais_flatten_record.rb

@@ -5,13 +5,15 @@ require 'nais/log/parser'
 module Fluent::Plugin
   class NaisFlattenFilter < Filter
     Fluent::Plugin.register_filter('nais_flatten_record', self)
-      
+    config_param :keep, :string, default: ""
+
     def configure(conf)
       super
+      @re = @keep == "" ? nil : Regexp.new(@keep)
     end
       
     def filter(tag, time, record)
-      ::Nais::Log::Parser.flatten_hash(record)
+      ::Nais::Log::Parser.flatten_hash(record, "", @re)
     end
     
   end

data/lib/fluent/plugin/filter_nais_kubeapiserver.rb

@@ -1,5 +1,6 @@
 require "fluent/plugin/nais/version"
 require 'fluent/plugin/filter'
+require 'nais/log/parser'
 
 module Fluent
   module Plugin
@@ -12,7 +13,7 @@ module Fluent
           record['level'] = 'Audit'
           if record.has_key?('user')
             if record['user'].has_key?('username')
-              if m = record['user']['username'].match(/^https:\/\/sts\.windows\.net.*\#(.*)/)
+              if m = record['user']['username'].match(/^https:\/\/sts\.windows\.net.*\#(.+)/)
                 record['x_username'] = record['user']['username']
                 record['user'] = m[1]
               else
@@ -22,7 +23,16 @@ module Fluent
           end
           record['method'] = record.delete('verb') if record.has_key?('verb')
           record['uri'] = record.delete('requestURI') if record.has_key?('requestURI')
-          record['remote_ip'] = record.delete('sourceIPs') if record.has_key?('sourceIPs')
+          record.merge!(::Nais::Log::Parser.parse_uri(record['uri']))
+          if record.has_key?('sourceIPs')
+            ips = record['sourceIPs'].is_a?(Array) ? record['sourceIPs'] : [ record['sourceIPs'] ]
+            ok = true
+            ips.each{|ip|
+              ok = (ip.is_a?(String) && ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ ? true : false)
+              break unless ok
+            }
+            record['remote_ip'] = record.delete('sourceIPs') if ok
+          end
           record['@timestamp'] = record.delete('stageTimestamp') if record.has_key?('stageTimestamp')
           record.delete('apiVersion')
           record['message'] = record['method'] + ' ' + record['uri'] unless record.has_key?('message')

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

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Nais
-      VERSION = "0.24.0"
+      VERSION = "0.25.0"
     end
   end
 end

metadata

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