fluent-plugin-ec2-metadata 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ee9946a828877a04eb144f77d133e8e323d66b6
-  data.tar.gz: 88dfce584d35db6c01607ad33be8b5d6c3535c5a
+  metadata.gz: df4eabe2c68517c236c36639c5ffd605ff54d808
+  data.tar.gz: 9f15d7dfe46065e66b6a980e9df2b4c0cae90997
 SHA512:
-  metadata.gz: 10d687358f19ce66463c52d1519a6785aa579d038e904dfbb2fd23191aab594dbf8fa2c06ad14e6b50361e205ed298977b59c6c85127dea37f078d1c62a6e25f
-  data.tar.gz: 28b29b5c2e79ea3904ad09dd4c6b63e499bcc179a5aa46cc4e05fbc8fdf3b2e759814aa3e68a2ca1bfa8d6576f56f9c1bc4ff8f0e82586ae73ac0e96e51f992c
+  metadata.gz: 6595ef778482ec613e89d99461d8d34c7a583e57f0090f3ec168c71e994fe70ad6869b0b99e26757e0f3a5e6a2d9c3ab194482bc2702bc65fa3b519135cc6614
+  data.tar.gz: dbb124817cd7d47fb635f9339b6e66a464894ec5136dc2649f6d6d2eaa1e591344104695b97033e55cd04143702517a32ef963be3a6f60b588012acc6376ea77

data/fluent-plugin-ec2-metadata.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-ec2-metadata"
-  spec.version       = "0.0.13"
+  spec.version       = "0.0.14"
   spec.authors       = ["SAKAMOTO Takumi"]
   spec.email         = ["takumi.saka@gmail.com"]
   spec.description   = %q{Fluentd output plugin to add ec2 metadata fields to a event record}

data/lib/fluent/plugin/ec2_metadata.rb

@@ -19,7 +19,7 @@ module Fluent
         }
       }
 
-      @placeholder_expander = PlaceholderExpander.new
+      @placeholder_expander = PlaceholderExpander.new(log)
 
       # get metadata first and then setup a refresh thread
       @ec2_metadata = Hash.new
@@ -53,13 +53,13 @@ module Fluent
         ec2_metadata['vpc_id'] = get_metadata("network/interfaces/macs/#{ec2_metadata['mac']}/vpc-id")
       rescue
         ec2_metadata['vpc_id'] = nil
-        $log.info "ec2-metadata: 'vpc_id' is undefined #{ec2_metadata['instance_id']} is not in VPC}"
+        log.info "ec2-metadata: 'vpc_id' is undefined #{ec2_metadata['instance_id']} is not in VPC}"
       end
       begin
         ec2_metadata['subnet_id'] = get_metadata("network/interfaces/macs/#{ec2_metadata['mac']}/subnet-id")
       rescue
         ec2_metadata['subnet_id'] = nil
-        $log.info "ec2-metadata: 'subnet_id' is undefined because #{ec2_metadata['instance_id']} is not in VPC}"
+        log.info "ec2-metadata: 'subnet_id' is undefined because #{ec2_metadata['instance_id']} is not in VPC}"
       end
       @ec2_metadata.merge!(ec2_metadata)
     end
@@ -120,6 +120,10 @@ module Fluent
     end
 
     class PlaceholderExpander
+      def initialize(log)
+        @log = log
+      end
+
       # referenced https://github.com/fluent/fluent-plugin-rewrite-tag-filter
       # referenced https://github.com/sonots/fluent-plugin-record-reformer
       attr_reader :placeholders
@@ -144,7 +148,7 @@ module Fluent
 
       def expand(str)
         str.gsub(/(\${[a-z_:\-]+(\[-?[0-9]+\])?}|__[A-Z_]+__)/) {
-          $log.warn "ec2-metadata: unknown placeholder `#{$1}` found in a tag `#{@placeholders['${tag}']}`" unless @placeholders.include?($1)
+          @log.warn "ec2-metadata: unknown placeholder `#{$1}` found in a tag `#{@placeholders['${tag}']}`" unless @placeholders.include?($1)
           @placeholders[$1]
         }
       end

data/lib/fluent/plugin/filter_ec2_metadata.rb

@@ -21,7 +21,7 @@ module Fluent
       tag_parts = tag.split('.')
       modify_record(record, tag, tag_parts)
     rescue => e
-      $log.warn "ec2-metadata: #{e.class} #{e.message} #{e.backtrace.join(', ')}"
+      log.warn "ec2-metadata: #{e.class} #{e.message} #{e.backtrace.join(', ')}"
     end
   end
 end

data/lib/fluent/plugin/out_ec2_metadata.rb

@@ -11,6 +11,10 @@ module Fluent
       define_method("router") { Fluent::Engine }
     end
 
+    unless method_defined?(:log)
+      define_method(:log) { $log }
+    end
+
     config_param :output_tag, :string
     config_param :aws_key_id, :string, :default => ENV['AWS_ACCESS_KEY_ID'], :secret => true
     config_param :aws_sec_key, :string, :default => ENV['AWS_SECRET_ACCESS_KEY'], :secret => true
@@ -26,7 +30,7 @@ module Fluent
       }
       chain.next
     rescue => e
-      $log.warn "ec2-metadata: #{e.class} #{e.message} #{e.backtrace.join(', ')}"
+      log.warn "ec2-metadata: #{e.class} #{e.message} #{e.backtrace.join(', ')}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ec2-metadata
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - SAKAMOTO Takumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd