fluent-plugin-append-kubernetes-annotations-to-tag 0.1.0.pre.3 → 0.1.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06907fe3eeaac25e07fe4e88d9e8aa6140bb4492
-  data.tar.gz: f016326af8b036cde7621f1e2aa8fae236042244
+  metadata.gz: 9ee16cb16d06bc93c08653552077219cfe3b3018
+  data.tar.gz: 406c6aff9af91b5aef551a3abac05b59f829073b
 SHA512:
-  metadata.gz: bc6a9bd01c530fc040458cf2be74b4b5b6cf5df5a721a6aed7e15cec9e9f2a7624130a8bfb26b1fdfc86bd025e4bf2bb833ba43990186b019ab0966d20fee3b4
-  data.tar.gz: 6c9c6ea11f987e5ca70263a7125aca871e7d6029531cbc7d80ebbad48cf34865cb4b8ffd0b600f2779e209e0200eb33365c6e5b8f224a704bb7a645ac0b8552d
+  metadata.gz: a3af3c8683eb30bbde584452d6c835f2184c0edf9d55d3c6c38ae29bda9e24d7df81fa9b3e5be44e68d0cac544c3149a818ea91fd29283f620855785daadb34a
+  data.tar.gz: fb35f4737419d0717121b1e71abff6361f58f2df816d98b099547feff0a55bf9ec883a6593951daeccc2b9c7abe43acd6f72bcd77870ac7a80789ed3fc6c3043

data/fluent-plugin-append-kubernetes-annotations-to-tag.gemspec

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-append-kubernetes-annotations-to-tag"
-  gem.version       = "0.1.0-3"
+  gem.version       = "0.1.0-4"
   gem.authors       = ["Redbubble Delivery Engineering Team"]
   gem.email         = ["delivery-engineers@redbubble.com"]
-  gem.description   = %q{Filter plugin to append certain Kubernetes annotations to the Fluentd tag}
+  gem.description   = %q{Plugin to append Kubernetes annotations to Fluentd tags}
   gem.summary       = %q{Filter plugin to append certain Kubernetes annotations to the Fluentd tag}
   gem.homepage      = "https://github.com/redbubble/fluent-plugin-append_kubernetes_annotations_to_tag"
-  gem.license       = "Copyright (c) Redbubble 2017. All rights reserved."
+  gem.license       = "LGPL-2.0"
 
   gem.files = Dir['lib/**/*'] + %w(Gemfile README.md fluent-plugin-append-kubernetes-annotations-to-tag.gemspec)
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_runtime_dependency "fluentd", ">= 0.12.0"
+  gem.add_runtime_dependency "fluentd", '~> 0.12', '>= 0.12.0'
 
   gem.add_development_dependency "bundler", "~> 1.3"
   gem.add_development_dependency "rspec", "~> 3.0"

data/lib/fluent/plugin/out_append_kubernetes_annotations_to_tag.rb

@@ -13,14 +13,12 @@ module Fluent
     end
 
     def emit(tag, es, chain)
+      chain.next
       es.each do |time, record|
-        events(tag, time, record).each do |(tag, time, record)|
-          router.emit(tag, time, record)
-        end
+        new_tag = process_tag(tag, record)
+        router.emit(new_tag, time, record)
       end
 
-      chain.next
-
     rescue
       log.error "Failed to re-format docker record #{tag}"
       # this seems to be a way to safely swallow records we don't know how to format
@@ -29,26 +27,14 @@ module Fluent
 
     private
 
-    def events(tag, time, record)
-      [
-        event(tag, time, record)
-      ]
-    end
-
-    def event(tag, time, record)
-      new_tag = if record.has_key?('kubernetes') && record['kubernetes'].has_key?('annotations')
-                  kubernetes_annotations_tag_appender.append(tag,
-                                                             record['kubernetes']['annotations'],
-                                                             record['kubernetes']['container_name'])
+    def process_tag(tag, record)
+      if record.has_key?('kubernetes') && record['kubernetes'].has_key?('annotations')
+        kubernetes_annotations_tag_appender.append(tag,
+                                                   record['kubernetes']['annotations'],
+                                                   record['kubernetes']['container_name'])
       else
         tag
       end
-
-      [
-        new_tag,
-        time,
-        record
-      ]
     end
 
     def kubernetes_annotations_tag_appender

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-append-kubernetes-annotations-to-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.3
+  version: 0.1.0.pre.4
 platform: ruby
 authors:
 - Redbubble Delivery Engineering Team
@@ -14,6 +14,9 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
@@ -52,8 +58,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Filter plugin to append certain Kubernetes annotations to the Fluentd
-  tag
+description: Plugin to append Kubernetes annotations to Fluentd tags
 email:
 - delivery-engineers@redbubble.com
 executables: []
@@ -67,7 +72,7 @@ files:
 - lib/kubernetes_annotations_tag_appender.rb
 homepage: https://github.com/redbubble/fluent-plugin-append_kubernetes_annotations_to_tag
 licenses:
-- Copyright (c) Redbubble 2017. All rights reserved.
+- LGPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []