fluent-plugin-nais 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '088d42902132a64e080f5892e045e26408b344d6'
-  data.tar.gz: a1edd1c16515fa778d510d49b9928597133f73eb
+  metadata.gz: 4416fb906c89fd3d36e929f15681b6bc531a62e7
+  data.tar.gz: 431ac16c27e69af77f1cc864ecf3ffc8742c576b
 SHA512:
-  metadata.gz: b332324a0f4ff4c7e0672d6f99782a97bec7084c3c68f854e9c3358953755e7e8f5c3970640afabac518011f684b87f3e2fc5568b6b075e8f71d335f36b856c4
-  data.tar.gz: 3a0bbe8fcc1e99ac1eae855b20066ff71587157c24dc25b2a67e1322a3f3be3e315fd9520ebf97125c78128195ef6322eb9eab0e2d55acfcd808e478bd68a3ee
+  metadata.gz: 7fcae511ef4fb9c1909789f9cad69f5d6de11fa61170b54e212fb3607b929984f1a2fd425ce13bbe531ad75ad2de7ec51597ae7542fb89de50863ab95034016b
+  data.tar.gz: 4c0f4b59f253f4a3519e3b01e61faffc54b9eaf29670ea2d5a5264dbfe2b895b71412bc0b0f13bf3925f73a1394c202a3ed403278c163c1ee3b9c8aad43c7a5a

data/fluent-plugin-nais.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fluentd', '~> 1.1'
-  spec.add_dependency 'nais-log-parser', '>= 0.30.0'
+  spec.add_dependency 'fluentd', '~> 1.2'
+  spec.add_dependency 'nais-log-parser', '>= 0.31.0'
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fluent/plugin/filter_nais_remap_kubernetes.rb

@@ -1,17 +1,36 @@
 require "fluent/plugin/nais/version"
 require 'fluent/plugin/filter'
-require 'nais/log/parser'
 
 module Fluent::Plugin
   class NaisRemapKubernetesFilter < Filter
     Fluent::Plugin.register_filter('nais_remap_kubernetes', self)
+    config_param :labels, :string, default: ""
       
     def configure(conf)
       super
     end
       
     def filter(tag, time, record)
-      ::Nais::Log::Parser.remap_kubernetes_fields(record)
+      record["category"] = record.delete("stream") if record.has_key?("stream")
+      if record["docker"].is_a?(Hash)
+        record["container"] = record["docker"]["container_id"]
+        record.delete("docker")
+      end
+      if record["kubernetes"].is_a?(Hash)
+        record["host"] = record["kubernetes"]["host"]
+        record["namespace"] = record["kubernetes"]["namespace_name"]
+        record["application"] = record["kubernetes"]["container_name"]
+        record["pod"] = record["kubernetes"]["pod_name"]
+        if record["kubernetes"]["labels"].is_a?(Hash)
+          unless @labels.nil? || @labels == ""
+            @labels.split(',').each {|label|
+              record[label] = record["kubernetes"]["labels"][label] if record["kubernetes"]["labels"].has_key?(label)
+            }
+          end
+        end
+        record.delete("kubernetes")
+      end
+      record
     end
     
   end

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

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Nais
-      VERSION = "0.30.0"
+      VERSION = "0.31.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nais
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: nais-log-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement