fluent-plugin-cloudwatch-put 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d384c9797d32c4f7342de78a6354b35112c7cce6
-  data.tar.gz: f37a80601492563df64e5e77c2428ca22e72bd83
+  metadata.gz: fe04a863ed1a5b6c693fbc94a04d6b0f6f3d8fec
+  data.tar.gz: 78061618a796fbec0514aad7e9cb81e655abad51
 SHA512:
-  metadata.gz: c9d30d0c594b9317f56c728f29745f78a8763bb36273556da7c57b9040e95c1081759779ff0102a9a55844e7810011dc921be452f412834836a8c3b9606cd797
-  data.tar.gz: be243f0ef19d60b0eaffea326f9450b7a86fe878e00233408dbecb7cfa44246b056da77efe6df5c1f1330edfcc6aca697ac22477d95e3a9e9ab72f1276ff4d2f
+  metadata.gz: 67430ddd315340edf6d02888536074183b90e0a1cfa1eb0a00f294af1603cf750785259f00f4cbf49d44066436f9445de281d12ce7c434274d976cf6936be0ee
+  data.tar.gz: 40a9fa68966a9c7bd4c60507cf65863efcda4ac37ba5d23991a73b13ed7f12f8e697734b5f24242549faaa44a5657beb7aa95d7e8ee2624e8e004caff050c827

data/README.md

@@ -72,11 +72,17 @@ CloudWatch metric namespace (support placeholder)
 
 CloudWatch metric name (support placeholder)
 
+### key_as_metric_name (bool) (optional)
+
+Use record key as metric name
+
+Default value: `false`
+
 ### unit (string) (required)
 
 CloudWatch metric unit (support placeholder)
 
-### value_key (string) (required)
+### value_key (array\<string\>) (required)
 
 Use this key as metric value
 

data/fluent-plugin-cloudwatch-put.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-cloudwatch-put"
-  spec.version = "0.1.0"
+  spec.version = "0.2.0"
   spec.authors = ["joker1007"]
   spec.email   = ["kakyoin.hierophant@gmail.com"]
 

data/lib/fluent/plugin/out_cloudwatch_put.rb

@@ -61,7 +61,9 @@ module Fluent
       desc "CloudWatch metric namespace (support placeholder)"
       config_param :namespace, :string
       desc "CloudWatch metric name (support placeholder)"
-      config_param :metric_name, :string
+      config_param :metric_name, :string, default: nil
+      desc "Use keyname as metric name"
+      config_param :key_as_metric_name, :bool, default: false
       desc "CloudWatch metric unit (support placeholder)"
       config_param :unit, :string
 
@@ -76,7 +78,7 @@ module Fluent
       end
 
       desc "Use this key as metric value"
-      config_param :value_key, :string
+      config_param :value_key, :array, value_type: :string
 
       desc "Cloudwatch storage resolution"
       config_param :storage_resolution, :integer, default: 60
@@ -94,6 +96,10 @@ module Fluent
       def configure(conf)
         super
 
+        unless !!@metric_name ^ @key_as_metric_name
+          raise Fluent::ConfigError, "'Either 'metric_name'' or 'key_as_metric_name' must be set"
+        end
+
         @dimensions.each do |d|
           unless d.key.nil? ^ d.value.nil?
             raise Fluent::ConfigError, "'Either dimensions[key]' or 'dimensions[value]' must be set"
@@ -102,6 +108,15 @@ module Fluent
           if @use_statistic_sets && d.key
             raise Fluent::ConfigError, "If 'use_statistic_sets' is true, dimensions[key] is not supportted"
           end
+
+          if @use_statistic_sets && @key_as_metric_name
+            raise Fluent::ConfigError, "If 'use_statistic_sets' is true, 'key_as_metric_name' is not supportted"
+          end
+        end
+
+        @send_all_key = false
+        if @value_key.size == 1 && @value_key[0] == "*"
+          @send_all_key = true
         end
 
         placeholder_params = "namespace=#{@namespace}/metric_name=#{@metric_name}/unit=#{@unit}/dimensions[name]=#{@dimensions.map(&:name).join(",")}/dimensions[value]=#{@dimensions.map(&:value).join(",")}"
@@ -144,7 +159,6 @@ module Fluent
 
       def base_metric_data(meta)
         {
-          metric_name: extract_placeholders(@metric_name, meta),
           unit: extract_placeholders(@unit, meta),
           storage_resolution: @storage_resolution,
         }
@@ -154,16 +168,23 @@ module Fluent
         meta = chunk.metadata
         metric_data = []
         chunk.msgpack_each do |(timestamp, record)|
-          metric_data << base_metric_data(meta).merge({
-            dimensions: @dimensions.map { |d|
-              {
-                name: extract_placeholders(d.name, meta),
-                value: d.key ? record[d.key] : extract_placeholders(d.value, meta),
-              }
-            },
-            value: record[@value_key].to_f,
-            timestamp: Time.at(timestamp)
-          })
+          record.each do |k, v|
+            next unless @value_key.include?(k) || @send_all_key
+
+            metric_data << {
+              metric_name: @key_as_metric_name ? k : extract_placeholders(@metric_name, meta),
+              unit: extract_placeholders(@unit, meta),
+              storage_resolution: @storage_resolution,
+              dimensions: @dimensions.map { |d|
+                {
+                  name: extract_placeholders(d.name, meta),
+                  value: d.key ? record[d.key] : extract_placeholders(d.value, meta),
+                }
+              },
+              value: v.to_f,
+              timestamp: Time.at(timestamp)
+            }
+          end
         end
         metric_data
       end
@@ -173,12 +194,16 @@ module Fluent
         values = []
         timestamps = []
         chunk.msgpack_each do |(timestamp, record)|
-          values << record[@value_key].to_f
+          record.each do |k, v|
+            next unless @value_key.include?(k) || @send_all_key
+            values << v.to_f
+          end
           timestamps << timestamp
         end
 
         [
           base_metric_data(meta).merge({
+            metric_name: extract_placeholders(@metric_name, meta),
             dimensions: @dimensions.map { |d|
               {
                 name: extract_placeholders(d.name, meta),

data/test/plugin/test_out_cloudwatch_put.rb

@@ -106,6 +106,95 @@ class CloudWatchPutOutputTest < Test::Unit::TestCase
     end
   end
 
+  test "write (multi value_key)" do
+    conf = %q{
+      region ap-northeast-1
+      namespace Test
+      key_as_metric_name true
+      unit Count
+
+      <dimensions>
+        name dim1
+        value dim_value1
+      </dimensions>
+
+      <dimensions>
+        name dim2
+        value dim_value2
+      </dimensions>
+
+      value_key key1, key2, key3
+
+      aws_key_id dummy
+      aws_sec_key dummy
+    }
+    d = create_driver(conf)
+    now = Time.now.to_i
+
+    d.instance.start
+
+    mock(d.instance.cloudwatch).put_metric_data({
+      namespace: "Test",
+      metric_data: [
+        {
+          metric_name: "key1",
+          dimensions: [
+            {
+              name: "dim1",
+              value: "dim_value1",
+            },
+            {
+              name: "dim2",
+              value: "dim_value2",
+            },
+          ],
+          timestamp: Time.at(now),
+          value: 1.0,
+          unit: "Count",
+          storage_resolution: 60,
+        },
+        {
+          metric_name: "key2",
+          dimensions: [
+            {
+              name: "dim1",
+              value: "dim_value1",
+            },
+            {
+              name: "dim2",
+              value: "dim_value2",
+            },
+          ],
+          timestamp: Time.at(now),
+          value: 2.0,
+          unit: "Count",
+          storage_resolution: 60,
+        },
+        {
+          metric_name: "key3",
+          dimensions: [
+            {
+              name: "dim1",
+              value: "dim_value1",
+            },
+            {
+              name: "dim2",
+              value: "dim_value2",
+            },
+          ],
+          timestamp: Time.at(now),
+          value: 3.0,
+          unit: "Count",
+          storage_resolution: 60,
+        },
+      ]
+    })
+
+    d.run do
+      d.feed('tag', now, {"key1" => 1, "key2" => 2, "key3" => 3})
+    end
+  end
+
   test "write (use_statistic_sets)" do
     conf = %q{
       region ap-northeast-1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-put
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler