fluent-plugin-metricsense 0.2.7 → 0.2.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTBlNzEzYzFlZjFlYjVjOGYyZmFjYjY5NDgzYzcwZDU2YzMzNTY5ZQ==
-  data.tar.gz: !binary |-
-    NDgxZDc4NjViMGZkZjZmZTVkZTRmNzc0YTYwOGIzZGU3ZTUxMzVjYQ==
+SHA1:
+  metadata.gz: 6c643fbeba22178c8a8885ec35a75cf440d32030
+  data.tar.gz: 7785e0dc9b06c13df3fa970cf706d1f1cb5c42b8
 SHA512:
-  metadata.gz: !binary |-
-    N2UxOWM1MmYzMmM4NDM4YjI4NTQzNTIyZDFmZjVmNjY0OWU5NmFkODk5NDRk
-    MTYwMTA2NzM0ZGE3Y2FkMDIxNjZhZmQ5YWY0MTQ2ZGNhM2E2MjFlNjQzNGI0
-    NWYyY2M5Y2M5ZjAxZDQzY2VmMDNhNWY5OGVhMjllOTQxMzU0ZTk=
-  data.tar.gz: !binary |-
-    Y2NjNTU4MTVjNTliYmIwYTNmM2RmMzAxZDhlOTY4ZDIxYzRlMWY5ZDNhYzVj
-    YTBjMWE1NWEzZGQ3NmJlYzRmYTkxMDMxZmNhMzM4OTdjNmM4NTA2NWFjZDBl
-    MzBkM2I3MmI3Mjk0MzU1Y2M1NThmN2UzNjE3YjUxMzMyZDZmNWU=
+  metadata.gz: b626f5ea31a320dd2ea666e78f30c12d4bebf3d37851c961623edaccd4937767d5b396e7247e514678068923491c1f2f71add3326c3b8a19f9eb85d5677642e8
+  data.tar.gz: f55ca38fc8cb7c0b9cd0d79ce80b9b2627432c128a58cb99991529021a49cc29f7f1b7d1949c09fed41eabf856c91dde3d986e54ed7126f8dab59de31a8132bd

data/LICENSE

@@ -0,0 +1,14 @@
+Copyright (C) 2012 FURUHASHI Sadayuki
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/fluent-plugin-metricsense.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.version     = File.read("VERSION").strip
   s.authors     = ["Sadayuki Furuhashi"]
   s.email       = "sf@treasure-data.com"
+  s.license     = "Apache-2.0"
   s.has_rdoc    = false
   s.require_paths = ['lib']
   #s.platform    = Gem::Platform::RUBY
@@ -16,6 +17,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   s.add_dependency "fluentd", "~> 0.10.6"
+  s.add_dependency "dogapi"
   s.add_development_dependency "rake", ">= 0.8.7"
   s.add_development_dependency 'bundler', ['>= 1.0.0']
   s.add_development_dependency "simplecov", ">= 0.5.4"

data/lib/fluent/plugin/backends/datadog_backend.rb

@@ -0,0 +1,85 @@
+#
+# fluent-plugin-metricsense
+#
+# Copyright (C) 2012 Sadayuki Furuhashi
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module Fluent::MetricSenseOutput::Backends
+
+  class DatadogBackend < Fluent::MetricSenseOutput::Backend
+    Fluent::MetricSenseOutput.register_backend('datadog', self)
+
+    config_param :dd_api_key, :string
+    config_param :dd_app_key, :string, :default => nil
+    config_param :host, :string, :default => nil
+    config_param :tags, :array, :default => []
+    config_param :batch_size, :integer, :default => 200
+
+    def initialize()
+      super
+      require "dogapi"
+    end
+
+    def configure(conf)
+      super
+
+      if @dd_api_key.nil?
+        raise Fluent::ConfigError, "missing Datadog API key"
+      end
+
+      client_args = [@dd_api_key]
+      client_args << @dd_app_key if @dd_app_key
+      @dog = Dogapi::Client.new(*client_args)
+    end
+
+    def write(data)
+      data.each_slice(@batch_size) do |slice|
+        metric_points = {}
+        slice.each do |tag, time, value, seg_key, seg_val|
+          if seg_key and seg_val
+            # segmented values
+            segment = "#{seg_key}:#{seg_val}"
+          else
+            # simple values
+            segment = "simple"
+          end
+          metric = tag # use fluentd's tag as metric name on datadog
+          metric_points[metric] ||= {}
+          metric_points[metric][segment] ||= []
+          metric_points[metric][segment].push([Time.at(time), value])
+        end
+
+        metric_points.each do |metric, segment_points|
+          segment_points.each do |segment, points|
+            seg_key, seg_val = segment.split(":", 2)
+
+            tags = @tags.dup
+            tags.push(segment)
+            if seg_key and seg_val
+              # add seg_key as a tag to allow calculating metrics over the segment name
+              tags.push(seg_key)
+            end
+
+            options = {}
+            options["tags"] = tags
+            options["host"] = @host if @host
+            options["type"] = "gauge"
+
+            @dog.emit_points(metric, points, options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fluent/plugin/backends/librato_backend.rb

@@ -111,6 +111,14 @@ module Fluent::MetricSenseOutput::Backends
         }
       }.to_json
 
+    METRIC_INITIALIZE_REQUEST_PER_MODE[UpdateMode::COUNT] = {
+        "type" => "gauge",
+        "attributes" => {
+          "aggregate" => false,
+          "source_aggregate" => false,
+        }
+      }.to_json
+
     def ensure_metric_initialized(http, name, mode)
       return if @initialized_metrics[name]
 

data/lib/fluent/plugin/out_metricsense.rb

@@ -31,6 +31,7 @@ module Fluent
       ADD = 0
       MAX = 1
       AVERAGE = 2
+      COUNT = 3
     end
 
     class Backend
@@ -47,6 +48,7 @@ module Fluent
 
     module Backends
       backend_dir = "#{File.dirname(__FILE__)}/backends"
+      require "#{backend_dir}/datadog_backend"
       require "#{backend_dir}/librato_backend"
       require "#{backend_dir}/rdb_tsdb_backend"
       require "#{backend_dir}/stdout_backend"
@@ -149,6 +151,8 @@ module Fluent
           update_mode = UpdateMode::MAX
         when "average"
           update_mode = UpdateMode::AVERAGE
+        when "count"
+          update_mode = UpdateMode::COUNT
         else
           # default is add
           update_mode = UpdateMode::ADD
@@ -200,6 +204,25 @@ module Fluent
       end
     end
 
+    class CountUpdater
+      def initialize
+        @value = 0
+      end
+      attr_reader :value
+ 
+      def normalized_value(n)
+        @value
+      end
+ 
+      def add(value)
+        @value += 1
+      end
+ 
+      def mode
+        UpdateMode::ADD
+      end
+    end
+
     class MaxUpdater
       def initialize
         @value = 0
@@ -254,6 +277,8 @@ module Fluent
           updater = MaxUpdater
         when UpdateMode::AVERAGE # AVERAGE uses MaxUpdater and calculate average on server-side aggregation
           updater = AverageUpdater
+        when UpdateMode::COUNT
+          updater = CountUpdater
         else  # default is AddUpdater
           updater = AddUpdater
         end

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-metricsense
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.6
+- !ruby/object:Gem::Dependency
+  name: dogapi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
 description: MetricSense - application metrics aggregation plugin for Fluentd
@@ -72,18 +86,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
+- LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - fluent-plugin-metricsense.gemspec
+- lib/fluent/plugin/backends/datadog_backend.rb
 - lib/fluent/plugin/backends/librato_backend.rb
 - lib/fluent/plugin/backends/rdb_tsdb_backend.rb
 - lib/fluent/plugin/backends/stdout_backend.rb
 - lib/fluent/plugin/out_metricsense.rb
 homepage: https://github.com/treasure-data/fluent-plugin-metricsense
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -91,19 +108,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: MetricSense - application metrics aggregation plugin for Fluentd
 test_files: []
-has_rdoc: false