fluent-plugin-ec2-metadata 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925b152c581833ade6515063ca0bb368ea020957
-  data.tar.gz: e1debc52e316b0f0dcfdbdbf61a65319ba84ded4
+  metadata.gz: e72a76bfeb7db2cffcc55ef8125cbf727e39452c
+  data.tar.gz: 262dfff134c0f1c6e2c70f75f3952e44dfc0c07e
 SHA512:
-  metadata.gz: 0d4e83b16d0836ed17b23aa66103dd333e960bab0e689db0383d81f9ff368ce33b66cf80cab357ee450b434acffd5f00a957a685d442bd9885b058d73d1009b7
-  data.tar.gz: 8b9b4acf8189439c7c528d1aeb66d6ff0c8cccd387154059b6d1c1bd0ff59e0bb4f04562a6281f79271f3bea1642ca77eb52a2fa15b686f692e6e7cdbf7270ce
+  metadata.gz: 7707d4060fe19458ffda77ea95af0d65a9c7e01166f781d5c93cacb5e30641221c536da2edb0b60664090bdf24470d6f29d2374459250100dd6bab4e70935e0c
+  data.tar.gz: 52734d6d7fad767437c2b40ecad7664cb187997b4954d6e56bd5d010952ac7f89886fe8a26b8bab091c7a9d21e25b2878a262b6a43c82f520a922393cce7c372

data/README.md

@@ -1,6 +1,6 @@
-# fluent-plugin-ec2-metadata, a plugin for [Fluentd](http://fluentd.org)
+# fluent-plugin-ec2-metadata
 
-Fluentd plugin to add ec2 metadata fields to a event record
+[Fluentd](http://fluentd.org) plugin to add ec2 metadata fields to a event record
 
 ## Installation
 Use RubyGems:
@@ -56,11 +56,12 @@ The following placeholders are always available:
 * ${instance_type} instance type
 * ${availability_zone} availability zone
 * ${region} region
+* ${mac} MAC address
+* ${vpc_id} vpc id
+* ${subnet_id} subnet id
 
 The followings are available when you define `aws_key_id` and `aws_sec_key`(or define IAM Policy):
 
-* ${vpc_id} vpc id
-* ${subnet_id} subnet id
 * ${tagset_xxx} EC2 tag (e.g. tagset_name is replaced by the value of Key = Name)
 
 The following is an example for a minimal IAM policy needed to ReadOnlyAccess to EC2.
@@ -97,8 +98,8 @@ The following is an example for a minimal IAM policy needed to ReadOnlyAccess to
 }
 ```
 
-Refer to the {AWS documentation}[http://docs.aws.amazon.com/IAM/latest/UserGuide/ExampleIAMPolicies.html] for example policies.
-Using {IAM roles}[http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html] with a properly configured IAM policy are preferred over embedding access keys on EC2 instances.
+Refer to the [AWS documentation](http://docs.aws.amazon.com/IAM/latest/UserGuide/ExampleIAMPolicies.html) for example policies.
+Using [IAM roles](http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html) with a properly configured IAM policy are preferred over embedding access keys on EC2 instances.
 
 ## Contributing
 

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.5"
+  spec.version       = "0.0.6"
   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/out_ec2_metadata.rb

@@ -5,7 +5,6 @@ module Fluent
     def initialize
       super
       require 'net/http'
-      require 'aws-sdk-v1'
     end
 
     config_param :output_tag,  :string
@@ -33,23 +32,28 @@ module Fluent
       @ec2_metadata['instance_type']     = get_metadata('instance-type')
       @ec2_metadata['availability_zone'] = get_metadata('placement/availability-zone')
       @ec2_metadata['region']            = @ec2_metadata['availability_zone'].chop
+      @ec2_metadata['mac']               = get_metadata('mac')
+      @ec2_metadata['vpc_id']            = get_metadata("network/interfaces/macs/#{@ec2_metadata['mac']}/vpc-id")
+      @ec2_metadata['subnet_id']         = get_metadata("network/interfaces/macs/#{@ec2_metadata['mac']}/subnet-id")
+
+      # get tags
+      if @map.values.any? { |v| v.match(/^\${tagset_/) }
+        require 'aws-sdk-v1'
+
+        if @aws_key_id and @aws_sec_key then
+          AWS.config(access_key_id: @aws_key_id, secret_access_key: @aws_sec_key, region: @ec2_metadata['region'])
+        else
+          AWS.config(region: @ec2_metadata['region'])
+        end
 
-      if @aws_key_id and @aws_sec_key then
-        #require 'aws-sdk'
-        AWS.config(access_key_id: @aws_key_id, secret_access_key: @aws_sec_key, region: @ec2_metadata['region'])
-      else
-        AWS.config(region: @ec2_metadata['region'])
-      end
         response = AWS.ec2.client.describe_instances( { :instance_ids => [ @ec2_metadata['instance_id'] ] })
         instance = response[:reservation_set].first[:instances_set].first
         raise Fluent::ConfigError, "ec2-metadata: failed to get instance data #{response.pretty_inspect}" if instance.nil?
 
-        @ec2_metadata['vpc_id']    = instance[:vpc_id]
-        @ec2_metadata['subnet_id'] = instance[:subnet_id]
-
         instance[:tag_set].each { |tag|
             @ec2_metadata["tagset_#{tag[:key].downcase}"] = tag[:value]
         }
+      end
     end
 
     def emit(tag, es, chain)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ec2-metadata
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - SAKAMOTO Takumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake