fluent-plugin-cloudwatch 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98b0e87a73f102d68f0987b91514ad3ef5f5d34e
-  data.tar.gz: b259121bdf5da5113b223d4f5d87ce909d130913
+  metadata.gz: 57e317fa3685f8cbe444fa5483dd89ed1dd85e1c
+  data.tar.gz: 34db441dddcf273cafa6e5da45500a02386065a1
 SHA512:
-  metadata.gz: ed1f124bf94ae7d737498a1395958f978ea6814a77223b23463631e34c2a4a95da5a8163947af08ec8bf4c54c42ce695bb03e26eab3b30f8a5c7d8bb59620dc9
-  data.tar.gz: f795231cf8657546aa68a77c990d7a21231bbdd4fc6440cdebe121cf1046b078193069cfc2984e0906783cd789a6708bc6d132155bcac3db3bfa4dd110e9a056
+  metadata.gz: 5f73145f2f180bc8da10be7a3c92b2997a304803886d412d4478bb5f38a89a108c6f3bb7fbae6b9d07cd81b7d59e682b559bb2eb6456e21dc32cd6c83c9a9766
+  data.tar.gz: 7abc322f510684c3ee571844b91e41561c627e84bb213f47800d0f3740f63ba4f3d97a2b30acab0b794f2bf7441ec1b874746cb7ec964bd394c89cc239cc625c

data/README.md

@@ -239,6 +239,36 @@ If `offset` is specified, fluent-plugin-cloudwatch gets metrics between `offset`
 
 If `emit_zero` is true and cloudwatch datapoint is empty, fluent-plugin-cloudwatch emits 0 instead of warn log "datapoint is empty".
 
+## config: record_attr
+
+`record_attr` is an optional value injected into each records.
+
+```
+<source>
+  @type cloudwatch
+  tag  cloudwatch.rds
+  aws_key_id  YOUR_AWS_KEY_ID
+  aws_sec_key YOUR_AWS_SECRET_KEY
+  cw_endpoint monitoring.ap-northeast-1.amazonaws.com
+
+  namespace AWS/RDS
+  metric_name CPUUtilization,FreeStorageSpace
+  dimensions_name DBInstanceIdentifier
+  dimensions_value rds01
+  record_attr DBInstanceIdentifier:rds01
+  # JSON format
+  # record_attr {"DBInstanceIdentifier":"rds01"}
+</source>
+```
+
+Example output.
+
+```
+2017-11-04T13:40:00+09:00       cloudwatch.rds      {"CPUUtilization":2.0,"DBInstanceIdentifier":"rds01"}
+2013-11-04T13:40:00+09:00       cloudwatch.rds      {"FreeStorageSpace":104080723968.0,"DBInstanceIdentifier":"rds01"}
+```
+
+
 ## 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       = "2.0.1"
+  gem.version       = "2.1.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.}

data/lib/fluent/plugin/in_cloudwatch.rb

@@ -33,6 +33,7 @@ class Fluent::CloudwatchInput < Fluent::Input
   config_param :delayed_start,     :bool,    :default => false
   config_param :offset,            :integer, :default => 0
   config_param :emit_zero,         :bool,    :default => false
+  config_param :record_attr,       :hash,    :default => {}
 
   attr_accessor :dimensions
 
@@ -164,9 +165,9 @@ class Fluent::CloudwatchInput < Fluent::Input
 
         # unix time
         catch_time = datapoint[:timestamp].to_i
-        router.emit(tag, catch_time, { name => data })
+        router.emit(tag, catch_time, { name => data }.merge(@record_attr))
       elsif @emit_zero
-        router.emit(tag, now.to_i, { name => 0 })
+        router.emit(tag, now.to_i, { name => 0 }.merge(@record_attr))
       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: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Yusuke Nomura
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Input plugin for AWS CloudWatch.