metriks-addons 2.2.6 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd102e75443cab2b7a78f801e4fde90b2f552f0f
-  data.tar.gz: e9b7d5e7b293635bc2e5c76048a9ecfd4cbae071
+  metadata.gz: ea2d1d23539d5721da6b13d7435000a6d183457d
+  data.tar.gz: d4df482e5faaa8c98e979b65cf8919589173d45a
 SHA512:
-  metadata.gz: c367fd4cb118869b008d56ca2692e49fe94f7b1f72975816089830eb568644b7182ebb1ddb1aa680105a28f7710f727f8e9c56add8688fd3187a8147ec0969ba
-  data.tar.gz: d62f4f8cf83172369e1d823f3290a71f9d7b54a11f9fd3026b6c47fac4302e9b2f29ebb5b25ff44ba11e12677bc303e6e2f7fe90ebe23e3ca9e9dcb28f62c57e
+  metadata.gz: dea3f88202c6b82dc2b3657000b8ce22770e82ef401f5c4b8a06a6617c6ba4ead6ce1a69e4f9e81fd7f3e6790618864b9ea068df1753c84d77c0b2471929960b
+  data.tar.gz: f2166eead807181eee4e6c9c5642344581b0f0711bea89cf4871df4486993461c3eeb6fc408fdb9fd0eb5e86d684de6fa6214a68e0bf8b30554159c6df91f369

data/Gemfile

@@ -8,3 +8,4 @@ group :test do
 end
 
 gem "rest-client"
+gem 'aws-sdk', '1.40.3'

data/lib/metriks-addons.rb

@@ -1,6 +1,7 @@
 require 'metriks/opentsdb_reporter'
 require 'metriks/signalfx_reporter'
+require 'metriks/cloudwatch_reporter'
 
 module MetriksAddons
-  VERSION = '2.2.4'
+  VERSION = '2.3.0'
 end

data/lib/metriks/cloudwatch_reporter.rb

@@ -0,0 +1,195 @@
+require 'metriks/time_tracker'
+require 'logger'
+require 'aws'
+require 'time'
+
+module Metriks
+  class CloudWatchReporter
+    attr_accessor :prefix, :source, :cw, :tags, :logger
+
+    def initialize(access_key, secret_key, namespace, tags, options = {})
+      @cw = AWS::CloudWatch.new(:access_key_id => access_key, :secret_access_key => secret_key)
+      @namespace = namespace
+      @dimensions = get_dimensions(tags)
+
+      @prefix = options[:prefix]
+      @source = options[:source]
+
+      @logger       = options[:logger] || nil
+      @batch_size   = options[:batch_size] || 50
+      @registry     = options[:registry] || Metriks::Registry.default
+      @interval     = options[:interval] || 60
+      @time_tracker = Metriks::TimeTracker.new(@interval)
+      @on_error     = options[:on_error] || proc { |ex| }
+
+      if options[:percentiles]
+        @percentiles = options[:percentiles]
+      else
+        @percentiles = [ 0.95, 0.99]
+      end
+
+      @mutex = Mutex.new
+      @running = false
+    end
+
+    def log(level, msg)
+      if !@logger.nil?
+        @logger.send level, msg
+      end
+    end
+
+    def start
+      if @thread && @thread.alive?
+        return
+      end
+
+      @running = true
+      @thread = Thread.new do
+        while @running
+          @time_tracker.sleep
+
+          Thread.new do
+            flush
+          end
+        end
+      end
+    end
+
+    def stop
+      @running = false
+
+      if @thread
+        @thread.join
+        @thread = nil
+      end
+    end
+
+    def restart
+      stop
+      start
+    end
+
+    def flush
+      begin
+        @mutex.synchronize do
+          log "debug", "Flushing metrics"
+          submit get_datapoints
+        end
+      rescue Exception => ex
+        log "error",ex.message
+        @on_error[ex] rescue nil
+      end
+    end
+
+    def submit(datapoints)
+      return if datapoints.empty?
+      datapoints.each do |datapoint|
+        response = @cw.put_metric_data({:namespace => @namespace, :metric_data => [datapoint]})
+      end
+      log "info", "Sent #{datapoints.size} metrics to CloudWatch"
+    end
+
+    def get_datapoints
+      time = Time.at(@time_tracker.now_floored).iso8601
+
+      datapoints = []
+      @registry.each do |name, metric|
+        next if name.nil? || name.empty?
+        name = name.to_s.gsub(/ +/, '_')
+        if @prefix
+          name = "#{@prefix}.#{name}"
+        end
+
+        case metric
+        when Metriks::Meter
+          datapoints |= create_datapoints name, metric, time, [
+            :count, :one_minute_rate, :five_minute_rate,
+            :fifteen_minute_rate, :mean_rate
+          ], [
+            'Count', 'Count/Second', 'Count/Second',
+            'Count/Second', 'Count/Second'
+          ]
+        when Metriks::Counter
+          datapoints |= create_datapoints name, metric, time, [
+            :count
+          ], [
+            'Count'
+          ]
+        when Metriks::Gauge
+          datapoints |= create_datapoints name, metric, time, [
+            :value
+          ], [
+            'Count'
+          ]
+        when Metriks::Timer
+          datapoints |= create_datapoints name, metric, time, [
+            :count, :one_minute_rate, :five_minute_rate,
+            :fifteen_minute_rate, :mean_rate,
+            :min, :max, :mean, :stddev
+          ], [
+            'Count', 'Count/Second', 'Count/Second',
+            'Count/Second', 'Count/Second',
+            'Seconds', 'Seconds', 'Seconds', 'Seconds'
+          ], [
+            :median, :get_95th_percentile
+          ], [
+            'Seconds', 'Seconds'
+          ]
+        when Metriks::Histogram
+          datapoints |= create_datapoints name, metric, time, [
+            :count, :min, :max, :mean, :stddev
+          ], [
+            'Count', 'Count', 'Count', 'Count',
+            'Count'
+          ], [
+            :median, :get_95th_percentile
+          ], [
+            'Count', 'Count'
+          ]
+        end
+      end
+      datapoints
+    end
+
+    def create_datapoints(base_name, metric, time, keys, keys_unit, snapshot_keys = [], snapshot_keys_unit = [])
+      datapoints = []
+
+      keys.flatten.zip(keys_unit.flatten).each do |key, key_unit|
+        name = key.to_s.gsub(/^get_/, '')
+        datapoints << {
+          :metric_name => "#{base_name}.#{name}",
+          :timestamp => time,
+          :value => metric.send(key),
+          :dimensions => @dimensions,
+          :unit => key_unit
+        }
+      end
+
+      unless snapshot_keys.empty?
+        snapshot = metric.snapshot
+        snapshot_keys.flatten.zip(snapshot_keys_unit.flatten).each do |key, key_unit|
+          name = key.to_s.gsub(/^get_/, '')
+          datapoints << {
+            :metric_name => "#{base_name}.#{name}",
+            :timestamp => time,
+            :value => snapshot.send(key),
+            :dimensions => @dimensions,
+            :unit => key_unit
+          }
+        end
+      end
+      datapoints
+    end
+
+    def get_dimensions(tags)
+      dimensions =[]
+      tags.each do |name, value|
+        dimensions << {
+          :name => "#{name}",
+          :value => value
+        }
+      end
+      dimensions
+    end
+  end
+end

data/lib/metriks/signalfx_reporter.rb

@@ -91,15 +91,14 @@ module Metriks
 
     def submit(datapoints)
       return if datapoints.empty?
-			
-			log "info", "Datapoints: #{datapoints}"
+
       jsonstr = datapoints.to_json
-      log "info", "Json for SignalFx: #{jsonstr}"
+      log "debug", "Json for SignalFx: #{jsonstr}"
       response  = RestClient.post "#{@hostname}?orgid=#{@orgid}",
 						        jsonstr,
 						        :content_type => :json, :accept => :json, :'X-SF-TOKEN' => @x_sf_token
       log "info", "Sent #{datapoints.size} metrics to SignalFX"
-      log "info", "Response is: #{response}"
+      log "debug", "Response is: #{response}"
     end
 
     def get_datapoints
@@ -108,7 +107,7 @@ module Metriks
       datapoints = {}
       counter = []
       gauge = []
-      log "info", "Resgistry: #{@registry}"
+      log "debug", "Resgistry: #{@registry}"
       @registry.each do |name, metric|
         next if name.nil? || name.empty?
         name = name.to_s.gsub(/ +/, '_')

data/metriks-addons.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'metriks-addons'
-  s.version           = '2.2.6'
-  s.date              = '2015-09-24'
+  s.version           = '2.3.0'
+  s.date              = '2015-10-04'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -63,9 +63,11 @@ Gem::Specification.new do |s|
     README.md
     Rakefile
     lib/metriks-addons.rb
+    lib/metriks/cloudwatch_reporter.rb
     lib/metriks/opentsdb_reporter.rb
     lib/metriks/signalfx_reporter.rb
     metriks-addons.gemspec
+    spec/cloudwatch_spec.rb
     spec/opentsdb_spec.rb
     spec/signalfx_spec.rb
   ]

data/spec/cloudwatch_spec.rb

@@ -0,0 +1,197 @@
+require 'webmock/rspec'
+require 'metriks'
+require 'metriks/cloudwatch_reporter'
+
+describe "Smoke test" do
+  before(:each) do
+    AWS::CloudWatch.any_instance.stub(:put_metric_data)
+    @registry = Metriks::Registry.new
+    @reporter = Metriks::CloudWatchReporter.new(
+      'DummyDummyDummyDummy', 
+      "DummyDummyDummyDummyDummyDummyDummyDummy",
+      "testingtier",
+      {:env =>"test"},
+      { :registry => @registry, :batch_size => 3})
+  end
+
+  after(:each) do
+    @reporter.stop
+    @registry.stop
+  end
+
+  it "meter" do
+    @registry.meter('meter.testing').mark
+    datapoints = @reporter.get_datapoints
+    expect(datapoints.size).to eql(5)
+    expect(datapoints[0][:metric_name]).to eql("meter.testing.count")
+    expect(datapoints[0][:value]).to eql(1)
+    expect(datapoints[0][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[0][:timestamp]).not_to be_nil
+    expect(datapoints[0][:unit]).to eql('Count')
+
+    expect(datapoints[1][:metric_name]).to eql("meter.testing.one_minute_rate")
+    expect(datapoints[1][:value]).not_to be_nil
+    expect(datapoints[1][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[1][:timestamp]).not_to be_nil
+    expect(datapoints[1][:unit]).to eql('Count/Second')
+
+    expect(datapoints[2][:metric_name]).to eql("meter.testing.five_minute_rate")
+    expect(datapoints[2][:value]).to eql(0.0)
+    expect(datapoints[2][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[2][:timestamp]).not_to be_nil
+    expect(datapoints[2][:unit]).to eql('Count/Second')
+
+    expect(datapoints[3][:metric_name]).to eql("meter.testing.fifteen_minute_rate")
+    expect(datapoints[3][:value]).to eql(0.0)
+    expect(datapoints[3][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[3][:timestamp]).not_to be_nil
+    expect(datapoints[3][:unit]).to eql('Count/Second')
+
+    expect(datapoints[4][:metric_name]).to eql("meter.testing.mean_rate")
+    expect(datapoints[4][:value]).not_to be_nil
+    expect(datapoints[4][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[4][:timestamp]).not_to be_nil
+    expect(datapoints[4][:unit]).to eql('Count/Second')
+  end
+
+  it "counter" do
+    @registry.counter('counter.testing').increment
+    datapoints = @reporter.get_datapoints
+    expect(datapoints.size).to eql(1)
+    expect(datapoints[0][:metric_name]).to eql("counter.testing.count")
+    expect(datapoints[0][:value]).to eql(1)
+    expect(datapoints[0][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[0][:timestamp]).not_to be_nil
+    expect(datapoints[0][:unit]).to eql('Count')
+  end
+
+  it "timer" do
+    @registry.timer('timer.testing').update(1.5)
+    datapoints = @reporter.get_datapoints
+    expect(datapoints.size).to eql(11)
+    expect(datapoints[0][:metric_name]).to eql("timer.testing.count")
+    expect(datapoints[0][:value]).to eql(1)
+    expect(datapoints[0][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[0][:timestamp]).not_to be_nil
+    expect(datapoints[0][:unit]).to eql('Count')
+
+    expect(datapoints[1][:metric_name]).to eql("timer.testing.one_minute_rate")
+    expect(datapoints[1][:value]).not_to be_nil
+    expect(datapoints[1][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[1][:timestamp]).not_to be_nil
+    expect(datapoints[1][:unit]).to eql('Count/Second')
+
+    expect(datapoints[2][:metric_name]).to eql("timer.testing.five_minute_rate")
+    expect(datapoints[2][:value]).to eql(0.0)
+    expect(datapoints[2][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[2][:timestamp]).not_to be_nil
+    expect(datapoints[2][:unit]).to eql('Count/Second')
+
+    expect(datapoints[3][:metric_name]).to eql("timer.testing.fifteen_minute_rate")
+    expect(datapoints[3][:value]).to eql(0.0)
+    expect(datapoints[3][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[3][:timestamp]).not_to be_nil
+    expect(datapoints[3][:unit]).to eql('Count/Second')
+
+    expect(datapoints[4][:metric_name]).to eql("timer.testing.mean_rate")
+    expect(datapoints[4][:value]).not_to be_nil
+    expect(datapoints[4][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[4][:timestamp]).not_to be_nil
+    expect(datapoints[4][:unit]).to eql('Count/Second')
+
+    expect(datapoints[5][:metric_name]).to eql("timer.testing.min")
+    expect(datapoints[5][:value]).not_to be_nil
+    expect(datapoints[5][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[5][:timestamp]).not_to be_nil
+    expect(datapoints[5][:unit]).to eql('Seconds')
+
+    expect(datapoints[6][:metric_name]).to eql("timer.testing.max")
+    expect(datapoints[6][:value]).not_to be_nil
+    expect(datapoints[6][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[6][:timestamp]).not_to be_nil
+    expect(datapoints[6][:unit]).to eql('Seconds')
+
+    expect(datapoints[7][:metric_name]).to eql("timer.testing.mean")
+    expect(datapoints[7][:value]).not_to be_nil
+    expect(datapoints[7][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[7][:timestamp]).not_to be_nil
+    expect(datapoints[7][:unit]).to eql('Seconds')
+
+    expect(datapoints[8][:metric_name]).to eql("timer.testing.stddev")
+    expect(datapoints[8][:value]).not_to be_nil
+    expect(datapoints[8][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[8][:timestamp]).not_to be_nil
+    expect(datapoints[8][:unit]).to eql('Seconds')
+
+    expect(datapoints[9][:metric_name]).to eql("timer.testing.median")
+    expect(datapoints[9][:value]).not_to be_nil
+    expect(datapoints[9][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[9][:timestamp]).not_to be_nil
+    expect(datapoints[9][:unit]).to eql('Seconds')
+
+    expect(datapoints[10][:metric_name]).to eql("timer.testing.95th_percentile")
+    expect(datapoints[10][:value]).not_to be_nil
+    expect(datapoints[10][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[10][:timestamp]).not_to be_nil
+    expect(datapoints[10][:unit]).to eql('Seconds')
+  end
+
+  it "histogram" do
+    @registry.histogram('histogram.testing').update(1.5)
+    datapoints = @reporter.get_datapoints
+    expect(datapoints.size).to eql(7)
+    expect(datapoints[0][:metric_name]).to eql("histogram.testing.count")
+    expect(datapoints[0][:value]).to eql(1)
+    expect(datapoints[0][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[0][:timestamp]).not_to be_nil
+    expect(datapoints[0][:unit]).to eql('Count')
+
+    expect(datapoints[1][:metric_name]).to eql("histogram.testing.min")
+    expect(datapoints[1][:value]).not_to be_nil
+    expect(datapoints[1][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[1][:timestamp]).not_to be_nil
+    expect(datapoints[1][:unit]).to eql('Count')
+
+    expect(datapoints[2][:metric_name]).to eql("histogram.testing.max")
+    expect(datapoints[2][:value]).not_to be_nil
+    expect(datapoints[2][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[2][:timestamp]).not_to be_nil
+    expect(datapoints[2][:unit]).to eql('Count')
+
+    expect(datapoints[3][:metric_name]).to eql("histogram.testing.mean")
+    expect(datapoints[3][:value]).not_to be_nil
+    expect(datapoints[3][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[3][:timestamp]).not_to be_nil
+    expect(datapoints[3][:unit]).to eql('Count')
+
+    expect(datapoints[4][:metric_name]).to eql("histogram.testing.stddev")
+    expect(datapoints[4][:value]).not_to be_nil
+    expect(datapoints[4][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[4][:timestamp]).not_to be_nil
+    expect(datapoints[4][:unit]).to eql('Count')
+
+    expect(datapoints[5][:metric_name]).to eql("histogram.testing.median")
+    expect(datapoints[5][:value]).not_to be_nil
+    expect(datapoints[5][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[5][:timestamp]).not_to be_nil
+    expect(datapoints[5][:unit]).to eql('Count')
+
+    expect(datapoints[6][:metric_name]).to eql("histogram.testing.95th_percentile")
+    expect(datapoints[6][:value]).not_to be_nil
+    expect(datapoints[6][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[6][:timestamp]).not_to be_nil
+    expect(datapoints[6][:unit]).to eql('Count')
+  end
+
+  it "gauge" do
+    @registry.gauge('gauge.testing') { 123 }
+    datapoints = @reporter.get_datapoints
+    expect(datapoints.size).to eql(1)
+    expect(datapoints[0][:metric_name]).to eql("gauge.testing.value")
+    expect(datapoints[0][:value]).to eql(123)
+    expect(datapoints[0][:dimensions]).to include({:name => "env", :value => "test"})
+    expect(datapoints[0][:timestamp]).not_to be_nil
+    expect(datapoints[0][:unit]).to eql('Count')    
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metriks-addons
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.3.0
 platform: ruby
 authors:
 - Rajat Venkatesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks
@@ -71,9 +71,11 @@ files:
 - README.md
 - Rakefile
 - lib/metriks-addons.rb
+- lib/metriks/cloudwatch_reporter.rb
 - lib/metriks/opentsdb_reporter.rb
 - lib/metriks/signalfx_reporter.rb
 - metriks-addons.gemspec
+- spec/cloudwatch_spec.rb
 - spec/opentsdb_spec.rb
 - spec/signalfx_spec.rb
 homepage: https://github.com/vrajat/metriks-addons
@@ -96,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 2
 summary: Reporters for Metriks.