fluent-plugin-cloudwatch 1.2.13 → 1.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae296984e54b2597b9e0f0679ad7fcad0f7beddb
-  data.tar.gz: 8eb7c5bf6b1295862bf29a49d4453004460dd483
+  metadata.gz: 45d8c2420320473c4dfaebb1034d97ab165b1b4d
+  data.tar.gz: f4169b49d842cb281e55e853d1079be73b147f35
 SHA512:
-  metadata.gz: 516c936782937df0ec098c65648bab91714589443feb65de1610087bafbdf1a87277118d04351d6e3628d10315512b7bedd694e6ddb8ae44ef22900f4e2369e9
-  data.tar.gz: 1578db536832213d87a3a85af0eced90966fcd0e0090380b18efe02000faf55a94dd7fcae1c43ca6a9975bee4bfdbdcf4698007c5410e025a14d6d6b87dc64f1
+  metadata.gz: 8fdb5b88eccb856a694ffa9f410cc5069c396ef80d1a7126c49e7acf9bc04da1a709ee24b5c47203dc4062ce46f87e80e2d0ed3bd61780d40de192bf68e516af
+  data.tar.gz: 8bfc84fb6ac5cb787c7ffaf99ccad5b247cf1ed83c0621ba15265e2f6cede3ed38d43609ec50ed2a491f49b6d5dd91e35ad591a80e809db48297b0334f85761d

data/README.md

@@ -30,6 +30,7 @@ Get metrics from cloudwatch to fluentd.
   period           [period] (default: 300)
   interval         [interval] (default: 300)
   delayed_start    [bool] (default: false)
+  emit_zero        [bool] (default: false)
 </source>
 ```
 
@@ -234,6 +235,10 @@ But the latest metric is insufficient for `statistics Sum`.
 
 If `offset` is specified, fluent-plugin-cloudwatch gets metrics between `offset` sec ago and older.
 
+## config: emit_zero
+
+If `emit_zero` is true and cloudwatch datapoint is empty, fluent-plugin-cloudwatch emits 0 instead of warn log "datapoint is empty".
+
 ## 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.13"
+  gem.version       = "1.2.14"
   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

@@ -27,6 +27,7 @@ class Fluent::CloudwatchInput < Fluent::Input
   config_param :read_timeout,      :integer, :default => 30
   config_param :delayed_start,     :bool,    :default => false
   config_param :offset,            :integer, :default => 0
+  config_param :emit_zero,         :bool,    :default => false
 
   attr_accessor :dimensions
 
@@ -143,13 +144,15 @@ class Fluent::CloudwatchInput < Fluent::Input
         :end_time    => now.iso8601,
         :period      => @period,
       })
-      unless statistics[:datapoints].empty?
-        datapoint = statistics[:datapoints].sort_by{|h| h[:timestamp]}.first
+      if not statistics[:datapoints].empty?
+        datapoint = statistics[:datapoints].sort_by{|h| h[:timestamp]}.last
         data = datapoint[s.downcase.to_sym]
 
         # unix time
         catch_time = datapoint[:timestamp].to_i
         router.emit(tag, catch_time, { name => data })
+      elsif @emit_zero
+        router.emit(tag, now.to_i, { name => 0 })
       else
         log.warn "cloudwatch: #{@namespace} #{@dimensions_name} #{@dimensions_value} #{name} #{s} datapoints is empty"
       end

metadata

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