fluent-plugin-nais 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b9e1201483827187da8dd5bea131086a4a0fd75
-  data.tar.gz: c484d519e98a1bdf9db7d11e8896116dd0284c3b
+  metadata.gz: eac0dcc3822a859a8e26fb9236717ab83e101b4f
+  data.tar.gz: 465f3c510cc76e26ecf7b2584880596bd3adee21
 SHA512:
-  metadata.gz: 62e41b5fac586ad0ff813150dc4aa0783c76198d1462f763786c62f85c3b0b63fd5f563556301fef1d10b4ce7ad0114ec56c49e398cf0b5346a8714c3a72fa63
-  data.tar.gz: b4960488c01c52145aa63cd7e715158200b4eea6f3c1d3589b2871dc13f91fe118894546b16ff6fd6dda3d3cd0ca4a631ff4fad544d0197b7366160757a2e1c7
+  metadata.gz: 3b6b820fcf129a348c84866651d9e7ac117f1c408723a7997a224a865bcd6be43fb44c8bd56f5d8c5a9812b895a727aeb000000d3dc8c0a52fb3a129f0299b3b
+  data.tar.gz: 16df5c7cd7b8bdb63b5f1fa5dcbeae164b705416e111ad847f4346c5aea5e5be2597cc797a313d2c689f9723d0cb5e8bd1096098a6716c3ff0b2ec7c2024a569

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.14.0'
+  spec.add_dependency 'nais-log-parser', '~> 0.15.0'
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fluent/plugin/filter_nais_keywords.rb

@@ -0,0 +1,23 @@
+require "fluent/plugin/nais/version"
+require 'fluent/plugin/filter'
+require 'nais/log/parser'
+
+module Fluent::Plugin
+  class NaisKeywordsFilter < Filter
+    Fluent::Plugin.register_filter('nais_keywords', self)
+    config_param :field, :string
+    config_param :regex, :string
+
+    def configure(conf)
+      super
+      @re = Regexp.new(@regex)
+    end
+      
+    def filter(tag, time, record)
+      keywords = ::Nais::Log::Parser.get_keywords(record['message'].to_s+' '+record['stack_trace'].to_s, @re)
+      record[@field] = keywords unless keywords.nil?
+      record
+    end
+    
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nais
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -28,16 +28,16 @@ dependencies:
   name: nais-log-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,8 +97,8 @@ files:
 - bin/console
 - bin/setup
 - fluent-plugin-nais.gemspec
-- lib/fluent/plugin/filter_nais_exceptions.rb
 - lib/fluent/plugin/filter_nais_flatten_record.rb
+- lib/fluent/plugin/filter_nais_keywords.rb
 - lib/fluent/plugin/filter_nais_logformat.rb
 - lib/fluent/plugin/filter_nais_logtransform.rb
 - lib/fluent/plugin/filter_nais_prefix_fields.rb

data/lib/fluent/plugin/filter_nais_exceptions.rb

@@ -1,20 +0,0 @@
-require "fluent/plugin/nais/version"
-require 'fluent/plugin/filter'
-require 'nais/log/parser'
-
-module Fluent::Plugin
-  class NaisExceptionsFilter < Filter
-    Fluent::Plugin.register_filter('nais_exceptions', self)
-
-    def configure(conf)
-      super
-    end
-      
-    def filter(tag, time, record)
-      ex = ::Nais::Log::Parser.get_exceptions(record['message'].to_s+' '+record['stack_trace'].to_s)
-      record['exception'] = ex unless ex.nil?
-      record
-    end
-    
-  end
-end