fluent-plugin-cloudwatch-transform 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2049729cdc16d2272af9e4a8624c75664783fa5
-  data.tar.gz: 522eb8adeb406890ecb9ddf01b4990ed61420c5b
+  metadata.gz: d617c260e7c26f81912db6b173ce73bffb4fbc29
+  data.tar.gz: b5b9d11c388678d5ba3bbabaf426810622913edf
 SHA512:
-  metadata.gz: e3bf5bef0729c12ec15cf16992ffc41dbb7be10a2a53414c4d10f80d07bc45747ce0d05dfa6c1e881a02f5a240c2db8cca4e3f634bbad52e65ef2c5dc2ecb1e9
-  data.tar.gz: b9f316ec8905c247521dde1dd725f9b81386e053954db40171bf82b451304f4fc372dda49e332744d8c1fc90da5fb613a4400325259528dcf5eddd93432946e7
+  metadata.gz: 76088e67c7ac772999a7b07d653295f5ded2cc1544b8da1a073da10d1d4c614fefac3a8676d0f7fc4ffdfb8e63a60805f2a0ea6d79191781c533bfeac0283498
+  data.tar.gz: 8dff90e28003fdaba5c0d65e0a79583af6c176e799b6f8812909acdaa2442a693e28a186868c1d24068ef1d3a1f159cdddd2bf4d9333c922b7fd3efe0a1e88f0

data/fluent-plugin-cloudwatch-transform.gemspec

@@ -3,8 +3,8 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-cloudwatch-transform"
-  gem.version       = "0.0.6"
-  gem.date          = '2015-04-21'
+  gem.version       = "0.0.7"
+  gem.date          = '2015-04-23'
   gem.authors       = ["Ling Zhang"]
   gem.email         = ["zhangling.ice@gmail.com"]
   gem.summary       = %q{Fluentd output plugin for transform cloudwatch alerts }

data/lib/fluent/plugin/out_cloudwatch_transform.rb

@@ -8,10 +8,23 @@ module Fluent
     config_param  :state_type,    :string,  :default => nil
     config_param  :state_file,    :string,  :default => nil
     config_param  :state_tag,     :string,  :default => nil
+    config_param  :name_for_origin_key,     :string,  :default => nil
+    config_param  :name_for_origin_value,     :string,  :default => nil
+
+    #also need add config for info_name and postion_in_tag (start from 0) within <tag_infos> </tag_infos> block
 
     # This method is called before starting.
     def configure(conf)
       super
+      # Read configuration for tag_infos and create a hash
+      @tag_infos = Hash.new
+      conf.elements.select { |element| element.name == 'tag_infos' }.each { |element|
+        element.each_pair { |info_name, position_in_tag|
+          @tag_infos[info_name] = position_in_tag.to_i
+          $log.info "Added tag_infos: #{info_name}=>#{@tag_infos[info_name]}"
+        }
+      }
+
     end
 
     def initialize
@@ -39,30 +52,31 @@ module Fluent
     #
     # NOTE! This method is called by Fluentd's main thread so you should not write slow routine here. It causes Fluentd's performance degression.
     def emit(tag, es, chain)
-      #tag_parts = tag.split('.')
       tag_parts = tag.scan( /([^".]+)|"([^"]+)"/ ).flatten.compact
-      # the prefix of tag should be like alert.cloudwatch.raw.***
-      # so start from tag_parts[3]
-      regionAZ = tag_parts[3]
-      application_name = tag_parts[4]
-      runbook_url = tag_parts[5]
+      # split the tags with .
+      # ingnore the . within ""
+
       chain.next
       es.each {|time,record|
 
     		newhash = Hash.new
     		# though there is just one key-value pair in cloudwatch alert record, we use a loop to add context for it.
     		record.each_pair do |singlekey, singlevalue|
-    				newhash["event_name"] = singlekey
-            newhash["value"] = singlevalue.to_s
+    				newhash[@name_for_origin_key] = singlekey
+            newhash[@name_for_origin_value] = singlevalue.to_s
             newhash["raw"] ={singlekey => singlevalue}
         end
         # add more information for the cloudwatch alert
+        # fixed info
         timestamp = Engine.now # Should be receive_time_input
         newhash["receive_time_input"]=timestamp.to_s
-        newhash["application_name"] = application_name
-        newhash["intermediary_source"] = regionAZ
-        newhash["runbook"] =  runbook_url
-        newhash["event_type"] = "alert.cloudwatch"
+        newhash["event_type"] = @out_tag
+
+        @tag_infos.each do |info_name, position_in_tag|
+          newhash[info_name] = tag_parts[position_in_tag]
+        end
+
+          
 
         if @highwatermark.last_records(@state_tag)
           last_hwm = @highwatermark.last_records(@state_tag)

data/test/plugin/test_out_cloudwatch_transform.rb

@@ -1,12 +1,23 @@
 require 'helper'
 
-class SnmpTrapInputTest < Test::Unit::TestCase
+class CloudWatchTransOutputTest < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
   end
 
   CONFIG = %[
-    tag alert.cloudwatch.raw.FPS
+    tag alert.cloudwatch.raw.region1-AZ1.Form & Printing Services (FPS)."http://testurl.com"
+    out_tag  alert.processed.cloudwatch
+    state_type file
+    state_file cloudwatch.yaml
+    state_tag cloudwatch
+    name_for_origin_key event_name
+    name_for_origin_value value
+    <tag_infos>
+      region_and_AZ 3
+      application_name 4
+      runbook_url 5
+    </tag_infos>
   ]
 
   def create_driver(conf=CONFIG)
@@ -15,6 +26,6 @@ class SnmpTrapInputTest < Test::Unit::TestCase
 
   def test_configure
     d = create_driver
-    assert_equal 'alert.cloudwatch.out', d.instance.tag
+    assert_equal 'alert.processed.cloudwatch', d.instance.out_tag
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-transform
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ling Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd