fluent-plugin-datadog_event 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84eedb6ff68ca19b14a61c7d73296fbe24f61952660f4cabd226c0d82574e2a6
-  data.tar.gz: 8a43830de5c19b630576587954614dd4d04416b742ac819c14e17c5211d191d6
+  metadata.gz: f76f717b87b37cb1549d64f4cc0dd8fe9ea8274f2124947234225cf34911fd91
+  data.tar.gz: 4b0833603c7d38958070156e96e2fbdd63b7daf3953b3aae2e79bfbb0d1390d4
 SHA512:
-  metadata.gz: '08510a3d1c94a81b9ae98b87a4b652a662e4b28ce6b237a142630fdfd3aed46f41b0fc01a293357baaac931a741ad51ee6a110f412e6a69a5581884012cc7b2c'
-  data.tar.gz: 12ca661e685b26c9af31a656d730247146bca2dfabae7a1b4b997c53d71fc2c0970bf29eaafd5ca11be1bd6b4577da4ca49fa65f43454a1bd9a6e8b45991dbe2
+  metadata.gz: 1c2c3afda9716f3d6aa4ce5e17fe38cf809ffeb613c0e4a757ba2cff6c61a1b65cb31f1e9c867c41ccb33c32ee438b6b7d8809eb5d19a8a327ae745b6068be15
+  data.tar.gz: 5aa3b7647d5d40d15a4db80b01125217343a8f872ed9fd0d487080d0cef935f3548fca38bfdb48bbf3ad95139e67eca9a039b27e9f57927a8ae71906e5403c29

data/.gitignore

@@ -17,3 +17,5 @@ tmtags
 \#*
 .\#*
 *.swp
+.envrc
+/vendor/

data/README.md

@@ -2,23 +2,11 @@
 
 Generates Datadog events from matching fluent records.
 
-## Installation
+## Installation (from original source)
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'fluent-plugin-datadog_event'
 ```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install fluent-plugin-datadog_event
-
-(latter path depending upon acceptance)
+$ gem install fluent-plugin-datadog_event
+```
 
 ## Configuration
 
@@ -27,19 +15,29 @@ Or install it yourself as:
 ```
 <match ddevents.info>
   type datadog_event
+
   # DD api key - mandatory
   api_key MyApIKey110123kjla7
-  # all other config parameters are optional
-  # datadog specific tags associated with event
+
+  # All other config parameters are optional
+
+  # Datadog specific tags associated with event
   tags fluentevent
+
   # alert type: info, warning, error, or success
   alert_type info
-  # aggregation key - anything with this unique value will be considered an additional instance of the same event
+
+  # aggregation key - anything with this unique value # will be considered an additional instance of the # same event
   aggregation_key "my_aggregation_key"
-  # Message title 
+
+  # Message title
   msg_title "My app event"
+
   # Source name - for filtering by event source
   source_type_name "my_app_named"
+
+  # Optional (or add it to record["host"])
+  host myhost
 </match>
 ```
 
@@ -59,5 +57,13 @@ Tag values can be used for configuration, leading to a config style such as:
 </match>
 ```
 
-With the above config, an event tagged as 'ddevents.myapp.info' would be handled at the level of info, with "myapp" as part of the messahe, source_type, and aggregation key - Use of rewrite-tag-names can make this very flexible.
+With the above config, an event tagged as 'ddevents.myapp.info' would be handled at the level of info, with "myapp" as part of the message, source_type, and aggregation key - Use of rewrite-tag-names can make this very flexible.
+
+
+## Contributing
 
+1. Fork it ( https://github.com/inokappa/fluent-plugin-datadog_event )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/fluent-plugin-datadog_event.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "dogapi"
-  spec.add_runtime_dependency "fluentd"
+  spec.add_runtime_dependency "fluentd", [">= 0.14.0", "< 2"]
   spec.add_runtime_dependency "fluent-mixin-rewrite-tag-name"
+  spec.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/datadog_event/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module DatadogEvent
-      VERSION = "0.1.4"
+      VERSION = "0.1.5"
     end
   end
 end

data/lib/fluent/plugin/out_datadog_event.rb

@@ -1,11 +1,16 @@
-module Fluent
-  class OutDatadogEvent < Fluent::Output
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
+  class OutDatadogEvent < Output
     Fluent::Plugin.register_output('datadog_event', self)
 
     unless method_defined?(:log)
-      define_method("log") { $log }
+        define_method("log") { $log }
     end
 
+    helpers :compat_parameters
+
+    config_param :host, :string, :default => nil
     config_param :api_key, :string
     config_param :app_key, :string, :default => nil
     config_param :msg_title, :string, :default => 'fluentd Datadog Event'
@@ -15,45 +20,55 @@ module Fluent
     config_param :aggregation_key, :string, :default => nil
     config_param :source_type_name, :string, :default => 'fluentd'
 
-    def initialize
-      super
-      #
-      require "dogapi"
-      require "date"
+    config_section :buffer do
+        config_set_default :@type, "memory"
+        config_set_default :flush_mode, :immediate
+        config_set_default :chunk_keys, ["tag"]
     end
 
-    def start
-      @dog = Dogapi::Client.new(@api_key, @app_key)
-      @finished = false
+    def configure(conf)
+        super
+
+        compat_parameters_convert(conf, :buffer)
+        raise Fluent::ConfigError, "'tag' in chunk_keys is required." if not @chunk_key_tag
     end
 
-    def shutdown
-      @finished = true
-      @thread.join
+    def initialize
+        super
+
+        require "dogapi"
+        require "date"
     end
 
-    def emit(tag, es, chain)
-      chain.next
-      es.each do |time,record|
-        post_event(time, "record", record)
-      end
+    def start
+        super
+
+        @dog = Dogapi::Client.new(@api_key, @app_key)
     end
 
-    def post_event(time, event_key, event_msg)
-      res = @dog.emit_event(Dogapi::Event.new(
-        "#{event_msg}", 
-        :msg_title => @msg_title, 
-        :date_happend => time,
-        :priority => @priority,
-        # :host => @host,
-        :tags => @tags,
-        :alert_type => @alert_type,
-        :aggregation_key => @aggregation_key,
-        :source_type_name => @source_type_name
-      ))
-      # for debug
-      #puts "debug_out: #{res}\n"
+    def write(chunk)
+        chunk.each do |time, record|
+            post_event(time, "record", record)
+        end
     end
 
-  end
+    def post_event(time, event_key, record)
+        host = @host
+        if !host
+            host = record["host"]
+        end
+
+        res = @dog.emit_event(Dogapi::Event.new(
+            "#{record}",
+            :msg_title => @msg_title,
+            :date_happend => time,
+            :priority => @priority,
+            :host => host,
+            :tags => @tags,
+            :alert_type => @alert_type,
+            :aggregation_key => @aggregation_key,
+            :source_type_name => @source_type_name
+        ))
+        end
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datadog_event
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Yohei Kawahara(inokappa)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: fluent-mixin-rewrite-tag-name
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: fluentd plugin for datadog event
 email:
 - ''