fluent-plugin-cloudwatch 1.2.5 → 1.2.6

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+
+gemfile:
+  - Gemfile

data/README.md

@@ -1,4 +1,4 @@
-# fluent-plugin-cloudwatch
+# fluent-plugin-cloudwatch [![Build Status](https://travis-ci.org/yunomu/fluent-plugin-cloudwatch.png)](https://travis-ci.org/yunomu/fluent-plugin-cloudwatch/)
 
 
 ## Overview
@@ -189,6 +189,29 @@ Note: Billing requires the us-east-1 endpoint
 
 ```
 
+### GET StorageGateway Metirc
+
+```config
+  type cloudwatch
+  tag  cloudwatch
+  aws_key_id  YOUR_AWS_KEY_ID
+  aws_sec_key YOUR_AWS_SECRET/KE
+  cw_endpoint monitoring.us-east-1.amazonaws.com
+
+  namespace AWS/StorageGateway
+  metric_name CacheHitPercent,CachePercentUsed
+  dimensions_name GatewayId,GatewayName
+  dimensions_value sgw-XXXXXXXX,mygateway
+  statistics Average
+```
+
+#### output data format
+
+```
+2014-01-20 20:12:00 +0900 cloudwatch: {"CacheHitPercent":0.0}
+2014-01-20 20:12:00 +0900 cloudwatch: {"CachePercentUsed":95.15519175634687}
+```
+
 ## Contributing
 
 1. Fork it

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.5"
+  gem.version       = "1.2.6"
   gem.authors       = ["Yusuke Nomura", "kenjiskywalker"]
   gem.email         = ["yunomu@gmail.com", "git@kenjiskywalker.org"]
   gem.description   = %q{Input plugin for AWS CloudWatch.}
@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.add_dependency "fluentd", "~> 0.10.30"
   gem.add_dependency "aws-sdk", "= 1.8.3"
+  gem.add_development_dependency "rake", ">= 0.9.2"
   gem.license = 'MIT'
 end

data/lib/fluent/plugin/in_cloudwatch.rb

@@ -1,6 +1,11 @@
 class Fluent::CloudwatchInput < Fluent::Input
   Fluent::Plugin.register_input("cloudwatch", self)
 
+  # To support log_level option implemented by Fluentd v0.10.43
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   config_param :tag,               :string
   config_param :aws_key_id,        :string, :default => nil
   config_param :aws_sec_key,       :string, :default => nil
@@ -16,8 +21,9 @@ class Fluent::CloudwatchInput < Fluent::Input
   config_param :open_timeout,      :integer, :default => 10
   config_param :read_timeout,      :integer, :default => 30
 
+  attr_accessor :dimensions
 
-   def initialize
+  def initialize
     super
     require 'aws-sdk'
   end
@@ -25,6 +31,23 @@ class Fluent::CloudwatchInput < Fluent::Input
   def configure(conf)
     super
 
+    @dimensions = []
+    if @dimensions_name && @dimensions_value
+      names = @dimensions_name.split(",").each
+      values = @dimensions_value.split(",").each
+      loop do
+        @dimensions.push({
+          :name => names.next,
+          :value => values.next,
+        })
+      end
+    else
+      @dimensions.push({
+        :name => @dimensions_name,
+        :value => @dimensions_value,
+      })
+    end
+
     AWS.config(
       :http_open_timeout => @open_timeout,
       :http_read_timeout => @read_timeout,
@@ -62,10 +85,7 @@ class Fluent::CloudwatchInput < Fluent::Input
         :namespace   => @namespace,
         :metric_name => m,
         :statistics  => [@statistics],
-        :dimensions  => [{
-          :name  => @dimensions_name,
-          :value => @dimensions_value,
-        }],
+        :dimensions  => @dimensions,
         :start_time  => (Time.now - @period*2).iso8601,
         :end_time    => Time.now.iso8601,
         :period      => @period,
@@ -81,6 +101,8 @@ class Fluent::CloudwatchInput < Fluent::Input
         # no output_data.to_json
         output_data = {m => data}
         Fluent::Engine.emit(tag, catch_time, output_data)
+      else
+        log.warn "cloudwatch: statistics[:datapoints] is empty"
       end
     }
     sleep 1

data/test/plugin/test_in_cloudwatch.rb

@@ -31,6 +31,7 @@ class CloudwatchInputTest < Test::Unit::TestCase
     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
   end
 
 
@@ -60,6 +61,36 @@ class CloudwatchInputTest < Test::Unit::TestCase
     assert_equal 'CPUUtilization,FreeStorageSpace,DiskQueueDepth,FreeableMemory,SwapUsage,ReadIOPS,ReadLatency,ReadThroughput,WriteIOPS,WriteLatency,WriteThroughput', d.instance.metric_name
     assert_equal 'InstanceId', d.instance.dimensions_name
     assert_equal 'ec2-01', d.instance.dimensions_value
+    assert_equal [{ :name => 'InstanceId', :value => 'ec2-01' }], d.instance.dimensions
+  end
+
+  ### for StorageGateway
+  CONFIG_SG = %[
+    tag cloudwatch
+    aws_key_id test_key_id
+    aws_sec_key test_sec_key
+    cw_endpoint test_cloud_watch_endpoint
+    namespace AWS/StorageGateway
+    metric_name CacheHitPercent,CachePercentUsed
+    dimensions_name GatewayId,GatewayName
+    dimensions_value sgw-XXXXXXXX,mygateway
+  ]
+
+  def create_driver_sg(conf = CONFIG_SG)
+    Fluent::Test::InputTestDriver.new(Fluent::CloudwatchInput).configure(conf)
+  end
+
+  def test_configure_sg
+    d = create_driver_sg
+    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/StorageGateway', d.instance.namespace
+    assert_equal 'CacheHitPercent,CachePercentUsed', d.instance.metric_name
+    assert_equal 'GatewayId,GatewayName', d.instance.dimensions_name
+    assert_equal 'sgw-XXXXXXXX,mygateway', d.instance.dimensions_value
+    assert_equal [{ :name => "GatewayId", :value => "sgw-XXXXXXXX" }, { :name => "GatewayName", :value => "mygateway" }], d.instance.dimensions
   end
 
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
+  prerelease: 
 platform: ruby
 authors:
 - Yusuke Nomura
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -35,10 +39,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Input plugin for AWS CloudWatch.
 email:
 - yunomu@gmail.com
@@ -48,6 +69,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -59,26 +81,27 @@ files:
 homepage: https://github.com/yunomu/fluent-plugin-cloudwatch
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Input plugin for AWS CloudWatch.
 test_files:
 - test/helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1d74deec9a580641e39759288103927bc8d192c7
-  data.tar.gz: 6eacd7162f2c882460b903a9ca54694baab6703c
-SHA512:
-  metadata.gz: 5b05469fd665b61b9d76eacc4e2860cfe4e2750a87cc690c4e9e59f681f09951f232b2d4bd0d25456caa484d50866ae881896dcf7400cd83314f5b3d60e683b6
-  data.tar.gz: 9b794b419cafc4630788248071b18db8d1097b0cee9429e472aa32a6d1272114f83da990d7cd10f262624a6c180912d547a38f630aa75c54099793a32c839931