ivelum-fluent-plugin-oomkiller 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5659b3d52a3baa5edfe09b94d4d642c9f6b2056
-  data.tar.gz: d4bef41644df6e41be12d268e30a3cc443d371a1
+  metadata.gz: 02d5210629dacf910ddadd3a28a829d41b9ce0e1
+  data.tar.gz: a71a3a3b4796b689f669cd7fd0e4ec1473c8d87e
 SHA512:
-  metadata.gz: dbbad9640f87f1f38cbad45329f4dbaa593708845b126f1a79fa94038f92fc650751fc41400e8b56e3e08f573cd21e3f42b55d33b286454b9997197795b449e0
-  data.tar.gz: 7564ce195283af1f996e5d2e4c2de924c663405392a02dec911dad38077c561d52769b32b6d6c981041f4bfaa57b21ce433f7e318f09526d1bf05ca95e6056fc
+  metadata.gz: abcd15cca9e36cbb35cbe255e88e7cdde2b5fb4580bbf24d201e5f455ee2e6d31e2f2aa7fa782a22c40243ec8eec209e4faa0798a9df7f9de8262d8c2a2462bc
+  data.tar.gz: 0625b28d7e4a01241276969857fee39a88375b453fd2b5739e9182ec68be0cedc89c8ede3d117f2b175eddee24600afd34088ac60b4fb8f677c7ef36ae2a7af3

data/.gitignore

@@ -11,3 +11,4 @@ tmtags
 *.swp
 .project
 .buildpath
+.DS_Store

data/fluent-plugin-oomkiller.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "ivelum-fluent-plugin-oomkiller"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["Megumi Nakamura", "Ilnur Ibragimov"]
   spec.email         = ["ilnur.ibragimov@ivelum.com"]
 
@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "test-unit", "~> 1.2"
 
-  spec.add_development_dependency "fluentd", "~> 0.12"
-  spec.add_runtime_dependency "fluentd", "~> 0.12"
+  spec.add_development_dependency "fluentd", "~> 0.14"
+  spec.add_runtime_dependency "fluentd", "~> 0.14"
 end

data/lib/fluent/plugin/out_oomkiller.rb

@@ -48,31 +48,17 @@ class Fluent::OomKillerOutput < Fluent::Output
   end
 
   REGEX1 = /^(\S+\s+\d+\s\d+:\d+:\d+)\s.+/
-  REGEX2 = /Killed process (\d+)\s+\((\S+)\)\s+total-vm:(\d+)kB,\s+anon-rss:(\d+)kB,\s+file-rss:(\d+)kB/
+  REGEX2 = /Killed process (\d+)[\W\w\s]+\((\S+)\)\s+total-vm:(\d+)kB,\s+anon-rss:(\d+)kB,\s+file-rss:(\d+)kB/
 
   def parse_record_block(syslog_record, tag, time)
-    record = {}
-
-    if syslog_record.has_key?('time') and syslog_record['time'] then
-      time = syslog_record['time']
-    else
-      @logs[:"#{tag}"][0] =~ REGEX1
-      if $1 then
-        datetime = Time.parse($1)
-        time = datetime.to_i if datetime
-      end
-    end
+    record = syslog_record.clone
 
     @logs[:"#{tag}"][-1] =~ REGEX2
-    record['time'] = time
-    record['host'] = syslog_record['host']
-    record['ident'] = syslog_record['ident']
     record['pid'] = $1.to_i
     record['name'] = $2
     record['total_vm_kb'] = $3.to_i
     record['anon_rss_kb'] = $4.to_i
     record['file_rss_kb'] = $5.to_i
-
     record['raw'] = @logs[:"#{tag}"].map {|m| m.strip}.join("\n")
 
     flush_emit(tag, time, record)
@@ -83,7 +69,6 @@ class Fluent::OomKillerOutput < Fluent::Output
 
     if !@remove_tag_prefix && !@remove_tag_suffix && !@add_tag_prefix && !@add_tag_suffix
       router.emit(tag, time, record)
-
     else
       _tag = tag.clone
       filter_record(_tag, time, record)

data/test/plugin/test_out_oomkiller.rb

@@ -14,18 +14,19 @@ class OomKillerOutputTest < Test::Unit::TestCase
   def create_driver(conf=%[], tag='test')
     Fluent::Test::OutputTestDriver.new(Fluent::OomKillerOutput, tag).configure(conf)
   end
-  
+
   def test_configure_nil
     d = create_driver(CONFIG1, 'myapp.test1')
     assert_equal nil, d.instance.add_tag_prefix
   end
-  
+
   def test_configure_set_config
     d = create_driver(CONFIG2, 'myapp.test2')
     assert_equal 'oomkiller.', d.instance.add_tag_prefix
   end
 
   def test_emit_nil
+    current_year = Time.now.year
     d = create_driver(CONFIG1, 'myapp.test3')
     d.run do
       IO.foreach(File.join(File.dirname(__FILE__), "..", "testdata", "message1")) do |s|
@@ -44,22 +45,22 @@ class OomKillerOutputTest < Test::Unit::TestCase
     assert_equal 2, d.emits.size
 
     assert_equal 'myapp.test3', d.emits[0][0]
-    assert_equal 1423450527, d.emits[0][1]
+    d.emits[0][2].delete("time")
+    d.emits[0][2].delete("message")
     assert_equal({
       "pid" => 13550,
-      "uid" => 500,
       "name" => "java",
       "total_vm_kb" => 12466024,
       "anon_rss_kb" => 7625016,
       "file_rss_kb" => 2608,
       "raw" => File.read(File.join(File.dirname(__FILE__), "..", "testdata", "message2"))
     }, d.emits[0][2])
-    
+
     assert_equal 'myapp.test3', d.emits[1][0]
-    assert_equal 1423672620, d.emits[1][1]
+    d.emits[1][2].delete("time")
+    d.emits[1][2].delete("message")
     assert_equal({
       "pid" => 18938,
-      "uid" => 500,
       "name" => "java",
       "total_vm_kb" => 12482944,
       "anon_rss_kb" => 7678888,
@@ -69,6 +70,7 @@ class OomKillerOutputTest < Test::Unit::TestCase
   end
 
   def test_emit_set_config
+    current_year = Time.now.year
     d = create_driver(CONFIG2, 'myapp.test4')
     d.run do
       IO.foreach(File.join(File.dirname(__FILE__), "..", "testdata", "message1")) do |s|
@@ -85,24 +87,24 @@ class OomKillerOutputTest < Test::Unit::TestCase
       end
     end
     assert_equal 2, d.emits.size
-    
+
     assert_equal 'oomkiller.myapp.test4', d.emits[0][0]
-    assert_equal 1423450527, d.emits[0][1]
+    d.emits[0][2].delete("time")
+    d.emits[0][2].delete("message")
     assert_equal({
       "pid" => 13550,
-      "uid" => 500,
       "name" => "java",
       "total_vm_kb" => 12466024,
       "anon_rss_kb" => 7625016,
       "file_rss_kb" => 2608,
       "raw" => File.read(File.join(File.dirname(__FILE__), "..", "testdata", "message2"))
     }, d.emits[0][2])
-    
+
     assert_equal 'oomkiller.myapp.test4', d.emits[1][0]
-    assert_equal 1423672620, d.emits[1][1]
+    d.emits[1][2].delete("time")
+    d.emits[1][2].delete("message")
     assert_equal({
       "pid" => 18938,
-      "uid" => 500,
       "name" => "java",
       "total_vm_kb" => 12482944,
       "anon_rss_kb" => 7678888,
@@ -110,5 +112,5 @@ class OomKillerOutputTest < Test::Unit::TestCase
       "raw" => File.read(File.join(File.dirname(__FILE__), "..", "testdata", "message4"))
     }, d.emits[1][2])
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ivelum-fluent-plugin-oomkiller
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Megumi Nakamura
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,34 +39,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
 description: Fluentd plugin to get oom killer log from system message.
 email:
 - ilnur.ibragimov@ivelum.com