fluent-plugin-cloudwatch 1.2.15 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d3adafa0bd5e4b4d0b9293883ea4fb366b58aba
-  data.tar.gz: f22c8670fc9f3e444c1637518ddfc70056956dab
+  metadata.gz: e56dcbc7fca4a826278f668a470737bef1cf5e82
+  data.tar.gz: 2cec16038b6a867eaeddee772afcb0494f4024f2
 SHA512:
-  metadata.gz: 4d35af6e89189ef74e7fbe72b997ddbc93c54dc881498693813f6dbb72c53304418f6ab3cf5cf0645c39073315b9d0f197e3b1862adf1c058874e09902ed6a92
-  data.tar.gz: 110297ebd921c428da1b06cc1144e34a6cafa5b846afdaf618345bf3c4451b229d2f374248c33345eb2bb83c847b6ac7a970e05202e1eef7e47923a7ea879430
+  metadata.gz: e0d28f73d412da3e7c21a9b8baeef13ca2750de2554176acbc9025e1adc835c4014125f34747a782f5ad5abc78048d9136d049594436f23c96924cc739d9f1bd
+  data.tar.gz: d2e956208f697e388d36dac96a1be67a1fa78ec2493f056453f1ed5b86f63d99759606e34af9219851a26ed993ea77e667bc2cb5425a6560b25253f06151c7bd

data/.travis.yml

@@ -4,18 +4,9 @@ before_install:
   - gem update bundler
 
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
+  - 2.1.*
+  - 2.2.*
   - 2.3.0
-
 gemfile:
   - Gemfile
-  - Gemfile.fluentd.0.10
-
-matrix:
-  exclude:
-    - rvm: 2.2.4
-      gemfile: Gemfile.fluentd.0.10
-    - rvm: 2.3.0
-      gemfile: Gemfile.fluentd.0.10
+  - Gemfile.fluentd.0.12

data/Gemfile.fluentd.0.12

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'fluentd', '~> 0.12.0'
+gemspec

data/README.md

@@ -16,7 +16,7 @@ Get metrics from cloudwatch to fluentd.
 
 ```config
 <source>
-  type cloudwatch
+  @type cloudwatch
   tag cloudwatch
   aws_key_id  YOUR_AWS_KEY_ID
   aws_sec_key YOUR_AWS_SECRET_KEY
@@ -38,7 +38,7 @@ Get metrics from cloudwatch to fluentd.
 
 ```config
 <source>
-  type cloudwatch
+  @type cloudwatch
   tag  cloudwatch
   aws_key_id  YOUR_AWS_KEY_ID
   aws_sec_key YOUR_AWS_SECRET_KEY
@@ -51,9 +51,9 @@ Get metrics from cloudwatch to fluentd.
 </source>
 
 <match cloudwatch>
-  type copy
+  @type copy
  <store>
-  type file
+  @type file
   path /var/log/td-agent/test
  </store>
 </match>
@@ -81,7 +81,7 @@ Get metrics from cloudwatch to fluentd.
 
 ```config
 <source>
-  type cloudwatch
+  @type cloudwatch
   tag  cloudwatch
   aws_key_id  YOUR_AWS_KEY_ID
   aws_sec_key YOUR_AWS_SECRET_KEY
@@ -109,7 +109,7 @@ Get metrics from cloudwatch to fluentd.
 
 ```config
 <source>
-  type cloudwatch
+  @type cloudwatch
   tag  cloudwatch
   aws_key_id  YOUR_AWS_KEY_ID
   aws_sec_key YOUR_AWS_SECRET_KEY
@@ -137,7 +137,7 @@ Get metrics from cloudwatch to fluentd.
 ### GET DynamoDB Metirc
 
 ```config
-  type cloudwatch
+  @type cloudwatch
   tag  cloudwatch
   aws_key_id  YOUR_AWS_KEY_ID
   aws_sec_key YOUR_AWS_SECRET_KEY
@@ -163,7 +163,7 @@ Get metrics from cloudwatch to fluentd.
 
 Note: Billing requires the us-east-1 endpoint
 ```config
-  type cloudwatch
+  @type cloudwatch
   tag  cloudwatch
   aws_key_id  YOUR_AWS_KEY_ID
   aws_sec_key YOUR_AWS_SECRET_KEY
@@ -188,7 +188,7 @@ Note: Billing requires the us-east-1 endpoint
 ### GET StorageGateway Metirc
 
 ```config
-  type cloudwatch
+  @type cloudwatch
   tag  cloudwatch
   aws_key_id  YOUR_AWS_KEY_ID
   aws_sec_key YOUR_AWS_SECRET_KEY

data/fluent-plugin-cloudwatch.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-cloudwatch"
-  gem.version       = "1.2.15"
+  gem.version       = "2.0.0"
   gem.authors       = ["Yusuke Nomura", "kenjiskywalker", "FUJIWARA Shunichiro"]
   gem.email         = ["yunomu@gmail.com", "git@kenjiskywalker.org", "fujiwara.shunichiro@gmail.com"]
   gem.description   = %q{Input plugin for AWS CloudWatch.}
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency "fluentd", ">= 0.10.30"
-  gem.add_dependency "aws-sdk-v1", "~> 1.59.1"
+  gem.add_dependency "aws-sdk", "~> 2"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "test-unit", ">= 3.1.0"
   gem.license = 'MIT'

data/lib/fluent/plugin/in_cloudwatch.rb

@@ -1,3 +1,7 @@
+require 'fluent/input'
+require 'aws-sdk'
+require 'uri'
+
 class Fluent::CloudwatchInput < Fluent::Input
   Fluent::Plugin.register_input("cloudwatch", self)
 
@@ -33,7 +37,6 @@ class Fluent::CloudwatchInput < Fluent::Input
 
   def initialize
     super
-    require 'aws-sdk-v1'
   end
 
   def configure(conf)
@@ -56,10 +59,12 @@ class Fluent::CloudwatchInput < Fluent::Input
       })
     end
 
-    AWS.config(
-      :http_open_timeout => @open_timeout,
-      :http_read_timeout => @read_timeout,
-    )
+    endpoint = URI(@cw_endpoint)
+    if endpoint.scheme != "http" && endpoint.scheme != "https"
+      @cw_endpoint_uri = "https://#{@cw_endpoint}"
+    else
+      @cw_endpoint_uri = endpoint.to_s
+    end
   end
 
   def start
@@ -102,18 +107,20 @@ class Fluent::CloudwatchInput < Fluent::Input
   end
 
   def watch
+    log.debug "cloudwatch: watch thread starting"
     if @delayed_start
       delay = rand() * @interval
       log.debug "cloudwatch: delay at start #{delay} sec"
       sleep delay
     end
 
-    @cw = AWS::CloudWatch.new(
-      :access_key_id        => @aws_key_id,
-      :secret_access_key    => @aws_sec_key,
-      :cloud_watch_endpoint => @cw_endpoint,
-    ).client
-
+    @cw = Aws::CloudWatch::Client.new(
+      :access_key_id     => @aws_key_id,
+      :secret_access_key => @aws_sec_key,
+      :endpoint          => @cw_endpoint_uri,
+      :http_open_timeout => @open_timeout,
+      :http_read_timeout => @read_timeout,
+    )
     output
 
     started = Time.now
@@ -135,6 +142,7 @@ class Fluent::CloudwatchInput < Fluent::Input
       name, s = m.split(":")
       s ||= @statistics
       now = Time.now - @offset
+      log.debug("now #{now}")
       statistics = @cw.get_metric_statistics({
         :namespace   => @namespace,
         :metric_name => name,

data/test/helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler'
+require 'fluent/input'
 
 begin
   Bundler.setup(:default, :development)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 1.2.15
+  version: 2.0.0
 platform: ruby
 authors:
 - Yusuke Nomura
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -27,19 +27,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.30
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.59.1
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.59.1
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.fluentd.0.10
+- Gemfile.fluentd.0.12
 - LICENSE
 - README.md
 - Rakefile
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Input plugin for AWS CloudWatch.

data/Gemfile.fluentd.0.10

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in fluent-plugin-cloudwatch.gemspec
-gem 'fluentd', '= 0.10.30'
-gemspec