fluent-plugin-cloudwatch 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 623454cb13e5f86266ed713a9a3887d0b641a123
-  data.tar.gz: ba8b5303fdd6766782f9ab0714fe6fc7ef76d22f
+  metadata.gz: ae296984e54b2597b9e0f0679ad7fcad0f7beddb
+  data.tar.gz: 8eb7c5bf6b1295862bf29a49d4453004460dd483
 SHA512:
-  metadata.gz: 7dfef965c1ceab2f8cbe2ff2d9be4cc83b9a724d94115a4f65cb9428bf2ccfab7f09a4fb4a699fb112e9b3ebe24c86a60a9da38df9e7b25aef8a14b20d17f1ef
-  data.tar.gz: 1adefd4cdc57162c3a1f919cfaa88e83b568705792489a058aed0bda393572e8e62ee8f04645e011fa37e214851bf56d8892460d3cacc0b1ea7926d8f98aa078
+  metadata.gz: 516c936782937df0ec098c65648bab91714589443feb65de1610087bafbdf1a87277118d04351d6e3628d10315512b7bedd694e6ddb8ae44ef22900f4e2369e9
+  data.tar.gz: 1578db536832213d87a3a85af0eced90966fcd0e0090380b18efe02000faf55a94dd7fcae1c43ca6a9975bee4bfdbdcf4698007c5410e025a14d6d6b87dc64f1

data/.travis.yml

@@ -1,10 +1,13 @@
 language: ruby
 
+before_install:
+  - gem update bundler
+
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 
 gemfile:
   - Gemfile
@@ -12,5 +15,7 @@ gemfile:
 
 matrix:
   exclude:
-    - rvm: 2.2
+    - rvm: 2.2.4
+      gemfile: Gemfile.fluentd.0.10
+    - rvm: 2.3.0
       gemfile: Gemfile.fluentd.0.10

data/README.md

@@ -207,6 +207,18 @@ Note: Billing requires the us-east-1 endpoint
 2014-01-20 20:12:00 +0900 cloudwatch: {"CachePercentUsed":95.15519175634687}
 ```
 
+## config: Complex metric_name
+
+`metric_name` format is allowed as below.
+- `MetricName`
+- `MetricName:Statstics`
+
+For example, this configuration fetches "Sum of RequestCount" and "Average of Latancy".
+
+```
+  metric_name RequestCount,Latency:Average
+  statistics Sum
+```
 
 ## config: delayed_start
 

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.12"
+  gem.version       = "1.2.13"
   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.}

data/lib/fluent/plugin/in_cloudwatch.rb

@@ -131,29 +131,27 @@ class Fluent::CloudwatchInput < Fluent::Input
 
   def output
     @metric_name.split(",").each {|m|
+      name, s = m.split(":")
+      s ||= @statistics
       now = Time.now - @offset
       statistics = @cw.get_metric_statistics({
         :namespace   => @namespace,
-        :metric_name => m,
-        :statistics  => [@statistics],
+        :metric_name => name,
+        :statistics  => [s],
         :dimensions  => @dimensions,
         :start_time  => (now - @period*10).iso8601,
         :end_time    => now.iso8601,
         :period      => @period,
       })
       unless statistics[:datapoints].empty?
-        stat = @statistics.downcase.to_sym
-        datapoint = statistics[:datapoints].sort_by{|h| h[:timestamp]}.last
-        data = datapoint[stat]
+        datapoint = statistics[:datapoints].sort_by{|h| h[:timestamp]}.first
+        data = datapoint[s.downcase.to_sym]
 
         # unix time
         catch_time = datapoint[:timestamp].to_i
-
-        # no output_data.to_json
-        output_data = {m => data}
-        router.emit(tag, catch_time, output_data)
+        router.emit(tag, catch_time, { name => data })
       else
-        log.warn "cloudwatch: #{@namespace} #{@dimensions_name} #{@dimensions_value} #{m} datapoints is empty"
+        log.warn "cloudwatch: #{@namespace} #{@dimensions_name} #{@dimensions_value} #{name} #{s} datapoints is empty"
       end
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors:
 - Yusuke Nomura
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd