fluent-plugin-ec2-metadata 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df4eabe2c68517c236c36639c5ffd605ff54d808
-  data.tar.gz: 9f15d7dfe46065e66b6a980e9df2b4c0cae90997
+  metadata.gz: f6d2c8b687f111b107457e4d141196b4a04c16bc
+  data.tar.gz: 8b6b74fcecb1a2bc1b845f54049ca65e907ad2d8
 SHA512:
-  metadata.gz: 6595ef778482ec613e89d99461d8d34c7a583e57f0090f3ec168c71e994fe70ad6869b0b99e26757e0f3a5e6a2d9c3ab194482bc2702bc65fa3b519135cc6614
-  data.tar.gz: dbb124817cd7d47fb635f9339b6e66a464894ec5136dc2649f6d6d2eaa1e591344104695b97033e55cd04143702517a32ef963be3a6f60b588012acc6376ea77
+  metadata.gz: 4f2a19de0877c4ffd1c6e45532d09645f1af6f2a64eb37c5996713355bf595af0a4d105416e9e4c7ae6fa0e5d2bcfb3b34932ddd20c02af05075d221d8e3523e
+  data.tar.gz: bf2d28ec7d231966e8ebe24571f2875c1f0476d522d614f4ae8098d3d3f95275c07fe5703a009fd418e5625e38d4467327470a559fd229d8f04485ffcc5ec68d

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.14"
+  spec.version       = "0.0.15"
   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

@@ -22,23 +22,25 @@ module Fluent
       @placeholder_expander = PlaceholderExpander.new(log)
 
       # get metadata first and then setup a refresh thread
-      @ec2_metadata = Hash.new
-      set_metadata
-      set_tag
+      @ec2_metadata = get_metadata_and_tags
       @refresh_thread = Thread.new {
         while true
           sleep @metadata_refresh_seconds
-          set_metadata
-          set_tag
+          @ec2_metadata = get_metadata_and_tags
         end
       }
     end
 
     private
 
-    def set_metadata()
-      ec2_metadata = {}
+    def get_metadata_and_tags
+      metadata = {}
+      set_metadata(metadata)
+      set_tag(metadata)
+      metadata
+    end
 
+    def set_metadata(ec2_metadata)
       instance_identity = Oj.load(get_dynamic_data("instance-identity/document"))
       ec2_metadata['account_id'] = instance_identity["accountId"]
       ec2_metadata['image_id'] = instance_identity["imageId"]
@@ -61,7 +63,7 @@ module Fluent
         ec2_metadata['subnet_id'] = nil
         log.info "ec2-metadata: 'subnet_id' is undefined because #{ec2_metadata['instance_id']} is not in VPC}"
       end
-      @ec2_metadata.merge!(ec2_metadata)
+      ec2_metadata
     end
 
     def get_dynamic_data(f)
@@ -76,27 +78,27 @@ module Fluent
       res.body
     end
 
-    def set_tag()
+    def set_tag(ec2_metadata)
       if @map.values.any? { |v| v.match(/^\${tagset_/) } || @output_tag =~ /\${tagset_/
 
         if @aws_key_id and @aws_sec_key
           ec2 = Aws::EC2::Client.new(
-            region: @ec2_metadata['region'],
+            region: ec2_metadata['region'],
             access_key_id: @aws_key_id,
             secret_access_key: @aws_sec_key,
           )
         else
           ec2 = Aws::EC2::Client.new(
-            region: @ec2_metadata['region'],
+            region: ec2_metadata['region'],
           )
         end
 
-        response = ec2.describe_instances({ :instance_ids => [@ec2_metadata['instance_id']] })
+        response = ec2.describe_instances({ :instance_ids => [ec2_metadata['instance_id']] })
         instance = response.reservations[0].instances[0]
         raise Fluent::ConfigError, "ec2-metadata: failed to get instance data #{response.pretty_inspect}" if instance.nil?
 
         instance.tags.each { |tag|
-          @ec2_metadata["tagset_#{tag.key.downcase}"] = tag.value
+          ec2_metadata["tagset_#{tag.key.downcase}"] = tag.value
         }
       end
     end

metadata

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