logstash-output-dogstatsd 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cb8720939c32309a703107f259983b53df4207c
-  data.tar.gz: 754cac540de40f10618bbadbfa4f0494bc014721
+  metadata.gz: b5ddb05f4531bbcabcd244a0dba19614a95a003a
+  data.tar.gz: b8a1da9467d14137a19f35320b9c40f35fbc81d5
 SHA512:
-  metadata.gz: 892f9d95c67a7ecfb8e4ce7529559efa1d622be0f87d3beb3f931a9ec10408c7eedbe419b587b99485027ace7600d371e0dbd43909b3d06a3c55028891551fdc
-  data.tar.gz: d2f85fb11a8d0dc3d0639d72e3a89fe3b89c9b66d533c02f8a3a53949612e3165ebf8f30a03dcefdf130680becb22ec25944ba6811d0d438b9ceca225e58dcfa
+  metadata.gz: 7b63850c1cf2c3e37e80297d04ee405f05f96eed298676353158387ba477c6f709b6cfda1bdc5f75c33f976281de56c66c07443687c0eab7ad12124afee8b969
+  data.tar.gz: e1e90e25ed3fb81c8864bd3f0dafafc24dcb7e7d0f3836e5fcef700c0386ff82cf7d19dce4bc301005aa87a4c09762b4f87f3264cf2ad9601c4529a07f2ce2ca

data/lib/logstash/outputs/dogstatsd.rb

@@ -29,9 +29,7 @@ end
 # [source,ruby]
 # output {
 #  dogstatsd {
-#   metric_tags => {
-#     "host" => "%{host}"
-#   }
+#   metric_tags => ["host:%{host}","role:foo"]
 #   count => {
 #    "http.bytes" => "%{bytes}"
 #   }
@@ -71,7 +69,7 @@ class LogStash::Outputs::Dogstatsd < LogStash::Outputs::Base
   config :sample_rate, :validate => :number, :default => 1
 
   # The tags to apply to each metric.
-  config :metric_tags, :validate => :hash, :default => {}
+  config :metric_tags, :validate => :array, :default => []
 
   public
   def register
@@ -83,8 +81,10 @@ class LogStash::Outputs::Dogstatsd < LogStash::Outputs::Base
     return unless output?(event)
     @logger.debug? and @logger.debug("Event: #{event}")
 
-    tags = process_tags(event, @metric_tags)
-    metric_opts = { :sample_rate => @sample_rate, :tags => tags }
+    metric_opts = {
+      :sample_rate => @sample_rate,
+      :tags => @metric_tags.map { |t| event.sprintf(t) }
+    }
 
     @increment.each do |metric|
       @client.increment(event.sprintf(metric), metric_opts)
@@ -110,10 +110,4 @@ class LogStash::Outputs::Dogstatsd < LogStash::Outputs::Base
       @client.gauge(event.sprintf(metric), event.sprintf(val), metric_opts)
     end
   end # def receive
-
-  private
-  # Returns an array of tags like ["tag1:value1", "tag2:value2"]
-  def process_tags(event, tags)
-    tags.map { |k, v| event.sprintf(k) + ':' + event.sprintf(v) }
-  end
 end # class LogStash::Outputs::Statsd

data/logstash-output-dogstatsd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-dogstatsd'
-  s.version         = '1.2.0'
+  s.version         = '1.3.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Send metrics to StatsD"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

data/spec/outputs/dogstatsd_spec.rb

@@ -39,7 +39,7 @@ describe LogStash::Outputs::Dogstatsd do
       end
 
       context 'with tags' do
-        let(:metric_config) { super().merge('metric_tags' => { 'foo' => '%{value}' }) }
+        let(:metric_config) { super().merge('metric_tags' => ['foo:%{value}']) }
         let(:event) { { 'value' => 'helloworld' } }
 
         it 'sprintf tags' do
@@ -55,7 +55,7 @@ describe LogStash::Outputs::Dogstatsd do
       let(:metric_config) { { 'histogram' => { '%{metric_name}' => '%{track_value}' } } }
       let(:event) { super().merge('metric_name' => metric_to_track, 'track_value' => 123) }
 
-      context 'with tags in the metric name and value' do
+      context 'with event fields in the metric name and value' do
         it 'tracks' do
           expect_any_instance_of(Datadog::Statsd).to receive(:send_to_socket)
             .with("#{metric_to_track}:123|h")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-dogstatsd
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tom Dooner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core