fluent-plugin-cloudwatch 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36e2969f74749ad54025253cb94f0528c5bc7ccf
-  data.tar.gz: 5f02e13c932e3b458790b0a589f64ccd04c23f64
+  metadata.gz: 676e50628ee8eaed446c8ce90ee2415b4590c58e
+  data.tar.gz: b5d61bd882a2d9391552f56840c3d723efc76c7a
 SHA512:
-  metadata.gz: 4535f7688efc8f45afc0f4215c256e701f06be7bffc092c64a0fbfbfe8455ee88e96d591639ace1cf194fa33438c0775cd51aced2f7f129f7b9f4b4ec3a23cc1
-  data.tar.gz: 042774d37dbf1f3c7410e924b91a876fc5e65fec5108c500dfec669105d9b1a706622a9d09e36656760a44f36020d0bb906e971589d448123c67479c096b7efb
+  metadata.gz: 49aee0b5ad1da7a0f30b440d0faf37f4a861305469efd89757b20cc26bdbab1485716376cc4228d443817fe14d5d0e37653ed13e7944a65e4aae66c198abca55
+  data.tar.gz: 393eb9f72736d129b3edd8967a4dce328b95df8c9d31fd8e0feea57dc199c06f66b899295ecb84a7f845d49a745672f876c9499fda524fa0083ff6fce9d9dcde

data/README.md

@@ -2,13 +2,15 @@
 
 
 ## Overview
-***AWS CloudWatch*** input plugin.  
 
-this plugin is simple.  
-get metrics from cloudwatch.
+***AWS CloudWatch*** input plugin.
 
-1. get every 300 seconds from AWS CloudWatch API(sleep 1sec)
-2. 300 seconds of data
+This plugin is simple.
+Get metrics from cloudwatch to fluentd.
+
+* Get metrics from AWS CloudWatch API.
+  * Interval is 300(default. config=interval) seconds
+  * Fetch datapoints in recent (interval * 10) seconds, and emit the latest datapoint to Fluentd data stream.
 
 ## Configuration
 
@@ -27,8 +29,8 @@ get metrics from cloudwatch.
   dimensions_value [dimensions value]
   period           [period] (default: 300)
   interval         [interval] (default: 300)
+  delayed_start    [bool] (default: false)
 </source>
-
 ```
 
 ### GET RDS Metric
@@ -94,13 +96,11 @@ get metrics from cloudwatch.
 #### output data format
 
 ```
-
 2013-03-21T14:08:00+09:00       cloudwatch      {"HealthyHostCount":2.0}
 2013-03-21T14:08:00+09:00       cloudwatch      {"HTTPCode_Backend_2XX":1.0}
 2013-03-21T14:08:00+09:00       cloudwatch      {"Latency":0.004025}
 2013-03-21T14:08:00+09:00       cloudwatch      {"RequestCount":1.0}
 2013-03-21T14:09:00+09:00       cloudwatch      {"UnHealthyHostCount":0.0}
-
 ```
 
 
@@ -124,7 +124,6 @@ get metrics from cloudwatch.
 #### output data format
 
 ```
-
 2013-02-25T00:44:00+09:00       cloudwatch      {"CPUUtilization":1.58}
 2013-02-25T00:44:00+09:00       cloudwatch      {"DiskReadBytes":0.0}
 2013-02-25T00:44:00+09:00       cloudwatch      {"DiskReadBytes":0.0}
@@ -132,7 +131,6 @@ get metrics from cloudwatch.
 2013-02-25T00:44:00+09:00       cloudwatch      {"DiskWriteOps":0.0}
 2013-02-25T00:44:00+09:00       cloudwatch      {"NetworkIn":95183.0}
 2013-02-25T00:44:00+09:00       cloudwatch      {"NetworkOut":95645.0}
-
 ```
 
 ### GET DynamoDB Metirc
@@ -156,10 +154,8 @@ get metrics from cloudwatch.
 #### output data format
 
 ```
-
 2013-04-11 15:13:00 +0900       cloudwatch      {"ConsumedReadCapacityUnits":8271.5}
 2013-04-11 15:13:00 +0900       cloudwatch      {"ConsumedWriteCapacityUnits":2765.5}
-
 ```
 
 ### GET Billing Metirc
@@ -183,10 +179,8 @@ Note: Billing requires the us-east-1 endpoint
 #### output data format
 
 ```
-
 2013-06-10 02:03:00 +0900       cloudwatch      {"EstimatedCharges_in_USD":"543.175"}
 2013-06-10 04:03:00 +0900       cloudwatch      {"EstimatedCharges_in_USD":"550.39"}
-
 ```
 
 ### GET StorageGateway Metirc
@@ -212,6 +206,11 @@ Note: Billing requires the us-east-1 endpoint
 2014-01-20 20:12:00 +0900 cloudwatch: {"CachePercentUsed":95.15519175634687}
 ```
 
+
+## config: delayed_start
+
+When config `delayed_start` is set true, plugin startup will be delayed in random seconds(0 ~ interval).
+
 ## Contributing
 
 1. Fork it

data/fluent-plugin-cloudwatch.gemspec

@@ -4,9 +4,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-cloudwatch"
-  gem.version       = "1.2.7"
-  gem.authors       = ["Yusuke Nomura", "kenjiskywalker"]
-  gem.email         = ["yunomu@gmail.com", "git@kenjiskywalker.org"]
+  gem.version       = "1.2.8"
+  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.}
   gem.homepage      = "https://github.com/yunomu/fluent-plugin-cloudwatch"
   gem.summary       = gem.description

data/lib/fluent/plugin/in_cloudwatch.rb

@@ -20,6 +20,7 @@ class Fluent::CloudwatchInput < Fluent::Input
   config_param :interval,          :integer, :default => 300
   config_param :open_timeout,      :integer, :default => 10
   config_param :read_timeout,      :integer, :default => 30
+  config_param :delayed_start,     :bool,    :default => false
 
   attr_accessor :dimensions
 
@@ -52,30 +53,45 @@ class Fluent::CloudwatchInput < Fluent::Input
       :http_open_timeout => @open_timeout,
       :http_read_timeout => @read_timeout,
     )
-
-    @cw = AWS::CloudWatch.new(
-      :access_key_id        => @aws_key_id,
-      :secret_access_key    => @aws_sec_key,
-      :cloud_watch_endpoint => @cw_endpoint,
-    ).client
   end
 
   def start
     super
+    @running = true
     @watcher = Thread.new(&method(:watch))
   end
 
   def shutdown
     super
+    @running = false
     @watcher.terminate
     @watcher.join
   end
 
   private
   def watch
-    while true
-      sleep @interval
-      output
+    if @delayed_start
+      delay = rand() * @interval
+      log.debug("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
+
+    output
+
+    started = Time.now
+    while @running
+      now = Time.now
+      sleep 1
+      if now - started >= @interval
+        output
+        started = now
+      end
     end
   end
 
@@ -86,7 +102,7 @@ class Fluent::CloudwatchInput < Fluent::Input
         :metric_name => m,
         :statistics  => [@statistics],
         :dimensions  => @dimensions,
-        :start_time  => (Time.now - @period*5).iso8601,
+        :start_time  => (Time.now - @period*10).iso8601,
         :end_time    => Time.now.iso8601,
         :period      => @period,
       })
@@ -102,9 +118,8 @@ class Fluent::CloudwatchInput < Fluent::Input
         output_data = {m => data}
         Fluent::Engine.emit(tag, catch_time, output_data)
       else
-        log.warn "cloudwatch: statistics[:datapoints] is empty"
+        log.warn "cloudwatch: #{@namespace} #{@dimensions_name} #{@dimensions_value} #{m} datapoints is empty"
       end
     }
-    sleep 1
   end
 end

data/test/plugin/test_in_cloudwatch.rb

@@ -93,4 +93,27 @@ class CloudwatchInputTest < Test::Unit::TestCase
     assert_equal [{ :name => "GatewayId", :value => "sgw-XXXXXXXX" }, { :name => "GatewayName", :value => "mygateway" }], d.instance.dimensions
   end
 
+  ### delayed_start
+  CONFIG_DELAYED_START = CONFIG_RDS + %[
+    delayed_start true
+  ]
+
+  def create_driver_delayed_start(conf = CONFIG_DELAYED_START)
+    Fluent::Test::InputTestDriver.new(Fluent::CloudwatchInput).configure(conf)
+  end
+
+  def test_configure_delayed_start
+    d = create_driver_delayed_start
+    assert_equal 'cloudwatch', d.instance.tag
+    assert_equal 'test_key_id', d.instance.aws_key_id
+    assert_equal 'test_sec_key', d.instance.aws_sec_key
+    assert_equal 'test_cloud_watch_endpoint', d.instance.cw_endpoint
+    assert_equal 'AWS/RDS', d.instance.namespace
+    assert_equal 'CPUUtilization,FreeStorageSpace,DiskQueueDepth,FreeableMemory,SwapUsage,ReadIOPS,ReadLatency,ReadThroughput,WriteIOPS,WriteLatency,WriteThroughput', d.instance.metric_name
+    assert_equal 'DBInstanceIdentifier', d.instance.dimensions_name
+    assert_equal 'rds01', d.instance.dimensions_value
+    assert_equal [{ :name => 'DBInstanceIdentifier', :value => 'rds01' }], d.instance.dimensions
+    assert_equal true, d.instance.delayed_start
+  end
+
 end

metadata

@@ -1,28 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Yusuke Nomura
 - kenjiskywalker
+- FUJIWARA Shunichiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.30
 - !ruby/object:Gem::Dependency
@@ -43,26 +44,27 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Input plugin for AWS CloudWatch.
 email:
 - yunomu@gmail.com
 - git@kenjiskywalker.org
+- fujiwara.shunichiro@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -81,17 +83,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Input plugin for AWS CloudWatch.