fluent-plugin-ec2-metadata 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51d18cb9bf76683868d83333fb3392de5558841f
-  data.tar.gz: a2afe995beea65ed8d1e1e7916a33b00fb852a6a
+SHA256:
+  metadata.gz: 8edbffe5e89033b3a4afd3987dca6ba91397c13196b35aed4c8f9f86c0a7790e
+  data.tar.gz: 8c48870da4ca4898ee8b0962e01d00107cb4a23c668bc175a40945e71b105d92
 SHA512:
-  metadata.gz: dec9971874bc1ddd376fe053554f498dd814904166c2d0e9c9f6ab88fc46bad6f488ab4b0785d5bb1c2ed488b281fea082252b6887f3bdd036e2a63c74c9620d
-  data.tar.gz: a0abf8a74a99c74b5ed93ad8cd8d81fbda353ff00f4160d98fcb0d29488b7cbad3e2a125dbb15eeb52f71b6e8d079a3ae669d2b326667274f4c59c0a750dd5ec
+  metadata.gz: f281b7634cccf2c9f93b1b85ac266d35df5e6ea634b2ca2abb98f72f83213f987fbaef0b929a843dead5647f78b935ad6546e2be58f515a9f57c2d8e4f90adbd
+  data.tar.gz: 429e24060b389ce45be6d2b8eb12f03d08c8b1cc3cbe6b63f61cdece3160aff8b348fabf430063c2cdb05d5896bbbc1e48dd93f34890940264683c6f618cb169

data/.gitlab-ci.yml

@@ -0,0 +1,70 @@
+stages:
+  - build
+  - test
+
+bundle:
+  stage: build
+  image: ruby:2.5
+  cache:
+    paths:
+      - vendor/ruby
+  script:
+    - bundle install -j $(nproc) --path vendor
+  artifacts:
+    paths:
+      - Gemfile.lock
+
+dependency_scanning:
+  stage: test
+  image: docker:stable
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export DS_VERSION=${SP_VERSION:-$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')}
+    - |
+      if ! docker info &>/dev/null; then
+        if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
+          export DOCKER_HOST='tcp://localhost:2375'
+        fi
+      fi
+    - | # this is required to avoid undesirable reset of Docker image ENV variables being set on build stage
+      function propagate_env_vars() {
+        CURRENT_ENV=$(printenv)
+
+        for VAR_NAME; do
+          echo $CURRENT_ENV | grep "${VAR_NAME}=" > /dev/null && echo "--env $VAR_NAME "
+        done
+      }
+    - |
+      docker run \
+        $(propagate_env_vars \
+          DS_ANALYZER_IMAGES \
+          DS_ANALYZER_IMAGE_PREFIX \
+          DS_ANALYZER_IMAGE_TAG \
+          DS_DEFAULT_ANALYZERS \
+          DS_EXCLUDED_PATHS \
+          DEP_SCAN_DISABLE_REMOTE_CHECKS \
+          DS_DOCKER_CLIENT_NEGOTIATION_TIMEOUT \
+          DS_PULL_ANALYZER_IMAGE_TIMEOUT \
+          DS_RUN_ANALYZER_TIMEOUT \
+        ) \
+        --volume "$PWD:/code" \
+        --volume /var/run/docker.sock:/var/run/docker.sock \
+        "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$DS_VERSION" /code
+  artifacts:
+    reports:
+      dependency_scanning: gl-dependency-scanning-report.json
+  dependencies:
+    - bundle
+  only:
+    refs:
+      - branches
+    variables:
+      - $GITLAB_FEATURES =~ /\bdependency_scanning\b/
+  except:
+    variables:
+      - $DEPENDENCY_SCANNING_DISABLED
+

data/.travis.yml

@@ -1,7 +1,9 @@
 rvm:
   - 2.1.*
   - 2.2.*
-  - 2.3.0
+  - 2.3.*
+  - 2.4.*
+  - 2.5.*
 gemfile:
   - Gemfile
 before_install: gem update bundler

data/README.md

@@ -2,12 +2,11 @@
 
 [![Gem Version](https://badge.fury.io/rb/fluent-plugin-ec2-metadata.svg)](http://badge.fury.io/rb/fluent-plugin-ec2-metadata)
 [![Build Status](https://travis-ci.org/takus/fluent-plugin-ec2-metadata.svg?branch=master)](https://travis-ci.org/takus/fluent-plugin-ec2-metadata)
-[![Dependency Status](https://gemnasium.com/takus/fluent-plugin-ec2-metadata.svg)](https://gemnasium.com/takus/fluent-plugin-ec2-metadata)
 [![Test Coverage](https://codeclimate.com/github/takus/fluent-plugin-ec2-metadata/badges/coverage.svg)](https://codeclimate.com/github/takus/fluent-plugin-ec2-metadata/coverage)
 [![Code Climate](https://codeclimate.com/github/takus/fluent-plugin-ec2-metadata/badges/gpa.svg)](https://codeclimate.com/github/takus/fluent-plugin-ec2-metadata)
 [![Codacy Badge](https://api.codacy.com/project/badge/grade/16f6786edb554f1ea7462353808011d6)](https://www.codacy.com/app/takus/fluent-plugin-ec2-metadata)
 
-[Fluentd](http://fluentd.org) plugin to add ec2 metadata fields to a event record
+[Fluentd](http://fluentd.org) plugin to add Amazon EC2 metadata fields to a event record
 
 ## Requirements
 
@@ -26,12 +25,13 @@ Use RubyGems:
 Example:
 
     <match foo.**>
-      type ec2_metadata
+      @type ec2_metadata
 
       aws_key_id  YOUR_AWS_KEY_ID
       aws_sec_key YOUR_AWS_SECRET/KEY
 
       metadata_refresh_seconds 300 # Optional, default 300 seconds
+      imdsv2 true                  # Optional, default false
 
       output_tag ${instance_id}.${tag}
       <record>
@@ -71,12 +71,13 @@ i-28b5ee77.foo.bar {
 Or you can use filter version:
 
     <filter foo.**>
-      type ec2_metadata
+      @type ec2_metadata
 
       aws_key_id  YOUR_AWS_KEY_ID      
       aws_sec_key YOUR_AWS_SECRET/KEY
 
       metadata_refresh_seconds 300 # Optional, default 300 seconds
+      imdsv2 true                  # Optional, default false
 
       <record>
         hostname      ${tagset_name}

data/fluent-plugin-ec2-metadata.gemspec

@@ -4,11 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-ec2-metadata"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.3"
   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}
-  spec.summary       = %q{Fluentd output plugin to add ec2 metadata fields to a event record}
+  spec.description   = %q{Fluentd output plugin to add Amazon EC2 metadata fields to a event record}
+  spec.summary       = %q{Fluentd output plugin to add Amazon EC2 metadata fields to a event record}
   spec.homepage      = "https://github.com/takus/fluent-plugin-ec2-metadata"
   spec.license       = "APLv2"
 

data/lib/fluent/plugin/ec2_metadata.rb

@@ -68,15 +68,31 @@ module Fluent
     end
 
     def get_dynamic_data(f)
-      res = Net::HTTP.get_response("169.254.169.254", "/latest/dynamic/#{f}")
-      raise Fluent::ConfigError, "ec2-dynamic-data: failed to get #{f}" unless res.is_a?(Net::HTTPSuccess)
-      res.body
+      Net::HTTP.start('169.254.169.254') do |http|
+        res = http.get("/latest/dynamic/#{f}", get_header())
+        raise Fluent::ConfigError, "ec2-dynamic-data: failed to get #{f}" unless res.is_a?(Net::HTTPSuccess)
+        res.body
+      end
     end
 
     def get_metadata(f)
-      res = Net::HTTP.get_response("169.254.169.254", "/latest/meta-data/#{f}")
-      raise Fluent::ConfigError, "ec2-metadata: failed to get #{f}" unless res.is_a?(Net::HTTPSuccess)
-      res.body
+      Net::HTTP.start('169.254.169.254') do |http|
+        res = http.get("/latest/meta-data/#{f}", get_header())
+        raise Fluent::ConfigError, "ec2-metadata: failed to get #{f}" unless res.is_a?(Net::HTTPSuccess)
+        res.body
+      end
+    end
+
+    def get_header()
+      if @imdsv2
+        Net::HTTP.start('169.254.169.254') do |http|
+          res = http.put("/latest/api/token", '', { 'X-aws-ec2-metadata-token-ttl-seconds' => '300' })
+          raise Fluent::ConfigError, "ec2-metadata: failed to get token" unless res.is_a?(Net::HTTPSuccess)
+          { 'X-aws-ec2-metadata-token' => res.body }
+        end
+      else
+        {}
+      end
     end
 
     def set_tag(ec2_metadata)

data/lib/fluent/plugin/filter_ec2_metadata.rb

@@ -10,6 +10,7 @@ module Fluent::Plugin
     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
     config_param :metadata_refresh_seconds, :integer, default: 300
+    config_param :imdsv2, :bool, default: false
 
     attr_reader :ec2_metadata
 

data/lib/fluent/plugin/out_ec2_metadata.rb

@@ -13,6 +13,7 @@ module Fluent::Plugin
     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
     config_param :metadata_refresh_seconds, :integer, default: 300
+    config_param :imdsv2, :bool, default: false
 
     attr_reader :ec2_metadata
 

data/test/cassettes/ec2-vpc-with-imdsv2.yml

@@ -0,0 +1,545 @@
+---
+http_interactions:
+- request:
+    method: put
+    uri: http://169.254.169.254/latest/api/token
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      X-Aws-Ec2-Metadata-Token-Ttl-Seconds:
+      - '300'
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Length:
+      - '56'
+      Content-Type:
+      - text/plain
+      Date:
+      - Thu, 12 Dec 2019 11:38:19 GMT
+      X-Aws-Ec2-Metadata-Token-Ttl-Seconds:
+      - '300'
+      Connection:
+      - close
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+    http_version:
+  recorded_at: Thu, 12 Dec 2019 11:38:19 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/instance-id
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1971254081"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '10'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: i-0c0c0000
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/instance-type
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"765393446"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '8'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: m3.large
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/placement/availability-zone
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1870317889"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '15'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: ap-northeast-1b
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/local-ipv4
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1870317889"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '15'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: 10.21.34.200
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/mac
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1996419393"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '17'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: 00:A0:00:0A:AA:00
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/network/interfaces/macs/00:A0:00:0A:AA:00/vpc-id
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1822409025"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '12'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: vpc-00000000
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/network/interfaces/macs/00:A0:00:0A:AA:00/subnet-id
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"1870330753"'
+      Last-Modified:
+      - Thu, 02 Jul 2015 12:49:17 GMT
+      Content-Length:
+      - '15'
+      Connection:
+      - close
+      Date:
+      - Sun, 13 Dec 2015 06:37:00 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: subnet-00000000
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 06:37:00 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/network/interfaces/macs/00:00:0A:AA:0A:0A/vpc-id
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '345'
+      Connection:
+      - close
+      Date:
+      - Wed, 16 Dec 2015 17:11:22 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0" encoding="iso-8859-1"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+                 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+         <head>
+          <title>404 - Not Found</title>
+         </head>
+         <body>
+          <h1>404 - Not Found</h1>
+         </body>
+        </html>
+    http_version:
+  recorded_at: Wed, 16 Dec 2015 17:11:22 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/meta-data/network/interfaces/macs/00:00:0A:AA:0A:0A/subnet-id
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '345'
+      Connection:
+      - close
+      Date:
+      - Wed, 16 Dec 2015 17:11:22 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0" encoding="iso-8859-1"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+                 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+         <head>
+          <title>404 - Not Found</title>
+         </head>
+         <body>
+          <h1>404 - Not Found</h1>
+         </body>
+        </html>
+    http_version:
+  recorded_at: Wed, 16 Dec 2015 17:11:22 GMT
+- request:
+    method: post
+    uri: https://ec2.ap-northeast-1.amazonaws.com/
+    body:
+      encoding: UTF-8
+      string: Action=DescribeInstances&InstanceId.1=i-0c0c0000&Version=2015-10-01
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded; charset=utf-8
+      Accept-Encoding:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby2/2.2.5 ruby/2.1.4 x86_64-linux
+      X-Amz-Date:
+      - 20151213T100607Z
+      Host:
+      - ec2.ap-northeast-1.amazonaws.com
+      Content-Length:
+      - '67'
+      Accept:
+      - '*/*'
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/xml;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Vary:
+      - Accept-Encoding
+      Date:
+      - Sun, 13 Dec 2015 10:06:07 GMT
+      Server:
+      - AmazonEC2
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2015-10-01/">
+            <requestId>00f71347-3b87-4f5b-a60f-8c46d76ea808</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-44d8965d</reservationId>
+                    <ownerId>000000000000</ownerId>
+                    <groupSet/>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-0c0c0000</instanceId>
+                            <tagSet>
+                                <item>
+                                    <key>Name</key>
+                                    <value>instance-name</value>
+                                </item>
+                                <item>
+                                    <key>aws:cloudformation:stack-name</key>
+                                    <value>mystack</value>
+                                </item>
+                            </tagSet>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version:
+  recorded_at: Sun, 13 Dec 2015 10:06:07 GMT
+- request:
+    method: get
+    uri: http://169.254.169.254/latest/dynamic/instance-identity/document
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      X-aws-ec2-metadata-token:
+      - AAAAAAAAAAAAA__AAAAAAAAAAAAAAA_AAAAAAAAAAAAAAAAAAAAAAA==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - '"2871764318"'
+      Last-Modified:
+      - Wed, 11 May 2016 20:52:55 GMT
+      Content-Length:
+      - '422'
+      Connection:
+      - close
+      Date:
+      - Wed, 11 May 2016 21:05:40 GMT
+      Server:
+      - EC2ws
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "privateIp" : "172.31.1.232",
+          "devpayProductCodes" : null,
+          "availabilityZone" : "us-west-1c",
+          "version" : "2010-08-31",
+          "instanceId" : "i-123456",
+          "billingProducts" : null,
+          "instanceType" : "t2.micro",
+          "accountId" : "123456789",
+          "imageId" : "ami-123456",
+          "pendingTime" : "2016-05-11T20:52:25Z",
+          "architecture" : "x86_64",
+          "kernelId" : null,
+          "ramdiskId" : null,
+          "region" : "us-west-1"
+        }
+    http_version:
+  recorded_at: Wed, 11 May 2016 21:05:40 GMT
+recorded_with: VCR 3.0.1

data/test/plugin/test_filter_ec2_metadata.rb

@@ -55,6 +55,36 @@ class EC2MetadataFilterTest < Test::Unit::TestCase
     end
   end
 
+  test 'configure-vpc-with-imdsv2' do
+    VCR.use_cassette('ec2-vpc-with-imdsv2', :allow_playback_repeats => true) do
+      c = %[
+        aws_key_id aws_key
+        aws_sec_key aws_sec
+        imdsv2 true
+        <record>
+          name ${tagset_name}
+        </record>
+      ]
+      d = create_driver(conf=c)
+
+      assert_equal("aws_key", d.instance.aws_key_id)
+      assert_equal("aws_sec", d.instance.aws_sec_key)
+
+      assert_equal("ami-123456", d.instance.ec2_metadata['image_id'])
+      assert_equal("123456789", d.instance.ec2_metadata['account_id'])
+
+      assert_equal("i-0c0c0000", d.instance.ec2_metadata['instance_id'])
+      assert_equal("m3.large", d.instance.ec2_metadata['instance_type'])
+      assert_equal("ap-northeast-1", d.instance.ec2_metadata['region'])
+      assert_equal("ap-northeast-1b", d.instance.ec2_metadata['availability_zone'])
+      assert_equal("00:A0:00:0A:AA:00", d.instance.ec2_metadata['mac'])
+      assert_equal("vpc-00000000", d.instance.ec2_metadata['vpc_id'])
+      assert_equal("subnet-00000000", d.instance.ec2_metadata['subnet_id'])
+
+      assert_equal("instance-name", d.instance.ec2_metadata['tagset_name'])
+    end
+  end
+
   test 'configure-classic' do
     VCR.use_cassette('ec2-classic') do
       c = %[

data/test/plugin/test_out_ec2_metadata.rb

@@ -62,6 +62,41 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
     end
   end
 
+  test 'configure-vpc-with-imdsv2' do
+    VCR.use_cassette('ec2-vpc-with-imdsv2', :allow_playback_repeats => true) do
+      c = %[
+        output_tag ${instance_id}.${tag}
+        aws_key_id aws_key
+        aws_sec_key aws_sec
+        imdsv2 true
+        <record>
+          name  ${tagset_name}
+          stack ${tagset_aws:cloudformation:stack-name}
+        </record>
+      ]
+      d = create_driver(conf=c)
+
+      assert_equal("${instance_id}.${tag}", d.instance.output_tag)
+      assert_equal("aws_key", d.instance.aws_key_id)
+      assert_equal("aws_sec", d.instance.aws_sec_key)
+
+      assert_equal("ami-123456", d.instance.ec2_metadata['image_id'])
+      assert_equal("123456789", d.instance.ec2_metadata['account_id'])
+      assert_equal("10.21.34.200", d.instance.ec2_metadata['private_ip'])
+
+      assert_equal("i-0c0c0000", d.instance.ec2_metadata['instance_id'])
+      assert_equal("m3.large", d.instance.ec2_metadata['instance_type'])
+      assert_equal("ap-northeast-1", d.instance.ec2_metadata['region'])
+      assert_equal("ap-northeast-1b", d.instance.ec2_metadata['availability_zone'])
+      assert_equal("00:A0:00:0A:AA:00", d.instance.ec2_metadata['mac'])
+      assert_equal("vpc-00000000", d.instance.ec2_metadata['vpc_id'])
+      assert_equal("subnet-00000000", d.instance.ec2_metadata['subnet_id'])
+
+      assert_equal("instance-name", d.instance.ec2_metadata['tagset_name'])
+      assert_equal("mystack", d.instance.ec2_metadata['tagset_aws:cloudformation:stack-name'])
+    end
+  end
+
   test 'configure-classic' do
     VCR.use_cassette('ec2-classic') do
       c = %[

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ec2-metadata
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - SAKAMOTO Takumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-description: Fluentd output plugin to add ec2 metadata fields to a event record
+description: Fluentd output plugin to add Amazon EC2 metadata fields to a event record
 email:
 - takumi.saka@gmail.com
 executables: []
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -126,6 +127,7 @@ files:
 - lib/fluent/plugin/filter_ec2_metadata.rb
 - lib/fluent/plugin/out_ec2_metadata.rb
 - test/cassettes/ec2-classic.yml
+- test/cassettes/ec2-vpc-with-imdsv2.yml
 - test/cassettes/ec2-vpc.yml
 - test/helper.rb
 - test/plugin/test_filter_ec2_metadata.rb
@@ -149,13 +151,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Fluentd output plugin to add ec2 metadata fields to a event record
+summary: Fluentd output plugin to add Amazon EC2 metadata fields to a event record
 test_files:
 - test/cassettes/ec2-classic.yml
+- test/cassettes/ec2-vpc-with-imdsv2.yml
 - test/cassettes/ec2-vpc.yml
 - test/helper.rb
 - test/plugin/test_filter_ec2_metadata.rb