logstash-filter-kubernetes 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ab0ab830f44fb83005390d2b34179b28a9036d8
-  data.tar.gz: 265bfdc97fb8431ac3dd8e16283470578bd8027f
+  metadata.gz: dcf4e960b8b44eea9fcc4cf065eca53ebd26274f
+  data.tar.gz: 7d13be190e624ae1ae0144a2dd922fe5226a73f4
 SHA512:
-  metadata.gz: fce9d4cc5fda859824b3fdec1467d1bd7d78596e125009623ec3aa87cb8b44dffc84cd20a4f410f9a2fdb3ef75d5eb04e126e037d3e087764ad6856d096e4573
-  data.tar.gz: edad6000d3acdc6405b0ed9439325dbb731f6361c3756e900275cabb3187a76bb51056678963357c376e66d0524e3e0cfb897cc5e14d0591aab1f901c4072672
+  metadata.gz: c1ff6b3dac5309eb0211cbf0ba176709e595e45d3c724bd9ca806e16282966df9ee74d8d65d5326c0084f708980ad7ebe97ca260757fbbc464467d283848b4cb
+  data.tar.gz: 4726ff04aa35dabc4acb9a1c10fbec5c7db8b465f993ed5d0df05731ad96c963c6e46bc3c7e9e6e7860282336e5ede53079057f752e881e7124ad4f70c152827

data/lib/logstash/filters/kubernetes.rb

@@ -36,17 +36,11 @@ class LogStash::Filters::Kubernetes < LogStash::Filters::Base
   # The target field name to write event kubernetes metadata.
   config :target, :validate => :string, :default => "kubernetes"
 
+  def register; end
 
-  public
-  def register
-    # Nothing to do
-  end # def register
-
-  public
   def filter(event)
-
-    if @source and event[@source]
-      parts = event[@source].split(File::SEPARATOR).last.gsub(/.log$/, '').split('_')
+    if @source and event.get(@source)
+      parts = event.get(@source).split(File::SEPARATOR).last.gsub(/.log$/, '').split('_')
 
       # We do not care about empty POD log files
       if parts.length != 3 || parts[2].start_with?('POD-')
@@ -59,11 +53,10 @@ class LogStash::Filters::Kubernetes < LogStash::Filters::Base
         kubernetes['container_name'] = parts[2].gsub(/-[0-9a-z]*$/, '')
         kubernetes['container_id'] = parts[2].split('-').last
 
-        event[@target] = kubernetes
+        event.set(@target, kubernetes)
       end
     end
 
-    # filter_matched should go in the last line of our successful code
     filter_matched(event)
-  end # def filter
-end # class LogStash::Filters::Kubernetes
+  end
+end

data/logstash-filter-kubernetes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-kubernetes'
-  s.version         = '0.2.1'
+  s.version = '0.3.1'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This filter extracts useful kubernetes information from kubelet logfile symlinks."
   s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0", "< 3.0.0"
-  s.add_development_dependency 'logstash-devutils', '~> 0'
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_development_dependency 'logstash-devutils'
 end

data/spec/filters/kubernetes_spec.rb

@@ -1,8 +1,18 @@
 require 'spec_helper'
-require "logstash/filters/kubernetes"
+require 'logstash/filters/kubernetes'
 
 describe LogStash::Filters::Kubernetes do
-  describe "Split path into kubernetes key-value pairs." do
+  let(:expected_map) do 
+    {
+      'replication_controller' => 'kube-dns-v9', 
+      'pod' => 'kube-dns-v9-6mnxk',
+      'namespace' => 'default',
+      'container_name' => 'skydns',
+      'container_id' => '47d3a3bfb112dbd2fd6e255e1e3d9eb91a10b62342e620e4917e2f5e24398507'
+    }
+  end
+
+  describe 'Split path into kubernetes key-value pairs' do
     let(:config) do <<-CONFIG
       filter {
         kubernetes {
@@ -12,14 +22,12 @@ describe LogStash::Filters::Kubernetes do
     CONFIG
     end
 
-    sample("path" => "/var/log/containers/kube-dns-v9-6mnxk_default_skydns-47d3a3bfb112dbd2fd6e255e1e3d9eb91a10b62342e620e4917e2f5e24398507.log") do
-      insist { subject["kubernetes"] } == {"replication_controller"=>"kube-dns-v9", "pod"=>"kube-dns-v9-6mnxk", "namespace"=>"default", "container_name"=>"skydns", "container_id"=>"47d3a3bfb112dbd2fd6e255e1e3d9eb91a10b62342e620e4917e2f5e24398507"}
+    sample('path' => '/var/log/containers/kube-dns-v9-6mnxk_default_skydns-47d3a3bfb112dbd2fd6e255e1e3d9eb91a10b62342e620e4917e2f5e24398507.log') do
+      insist { subject.get('kubernetes') } == expected_map
     end
   end
-end
 
-describe LogStash::Filters::Kubernetes do
-  describe "Set target field name." do
+  describe 'Set target field name' do
     let(:config) do <<-CONFIG
       filter {
         kubernetes {
@@ -30,14 +38,12 @@ describe LogStash::Filters::Kubernetes do
     CONFIG
     end
 
-    sample("path" => "/var/log/containers/kube-dns-v9-6mnxk_default_skydns-47d3a3bfb112dbd2fd6e255e1e3d9eb91a10b62342e620e4917e2f5e24398507.log") do
-      insist { subject["foobar"] } == {"replication_controller"=>"kube-dns-v9", "pod"=>"kube-dns-v9-6mnxk", "namespace"=>"default", "container_name"=>"skydns", "container_id"=>"47d3a3bfb112dbd2fd6e255e1e3d9eb91a10b62342e620e4917e2f5e24398507"}
+    sample('path' => '/var/log/containers/kube-dns-v9-6mnxk_default_skydns-47d3a3bfb112dbd2fd6e255e1e3d9eb91a10b62342e620e4917e2f5e24398507.log') do
+      insist { subject.get('foobar') } == expected_map
     end
   end
-end
 
-describe LogStash::Filters::Kubernetes do
-  describe "Skip parsing empty POD event." do
+  describe 'Skip parsing empty POD event' do
     let(:config) do <<-CONFIG
       filter {
         kubernetes {
@@ -47,8 +53,8 @@ describe LogStash::Filters::Kubernetes do
     CONFIG
     end
 
-    sample("path" => "/var/log/containers/kube-dns-v9-6mnxk_default_POD-eaca2cf56e761c25dc4878d48fbe056402ba01f3f6448650d93f988ec121b8cd.log") do
-      insist { subject["kubernetes"] } == nil
+    sample('path' => '/var/log/containers/kube-dns-v9-6mnxk_default_POD-eaca2cf56e761c25dc4878d48fbe056402ba01f3f6448650d93f988ec121b8cd.log') do
+      insist { subject.get("kubernetes") } == nil
     end
   end
 end

metadata

@@ -1,47 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-kubernetes
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Vaidas Jablonskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is a logstash plugin required to be installed on top of the
@@ -81,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: This filter extracts useful kubernetes information from kubelet logfile symlinks.