logstash-output-graphite 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaa1548ced5cd4e3cc3f3724c078a13e9c507fe5
-  data.tar.gz: 9c2309ed86b7c371bd35ad4d21ed7bb96536b48d
+  metadata.gz: 7b6b47436f05d8903ef227740690ad1d785a93d7
+  data.tar.gz: 672997abc19ab7bc65e4650d7798125d2713a8ad
 SHA512:
-  metadata.gz: 26aedf2dae122c104225a6297484edd858457e553b340113d2458c2c4ec963a80133e8505f52cc0e348135db0ab5eb6ee654e8b15419906a1ba7a3f2f62dc7f4
-  data.tar.gz: dd176d82e9c199bb713dc8c8e3ecdda2b30117692994b9beef372d6531c125a6ff1056ae13d6bec070fc62d33f80b4637f8b567dd9404fef663d843a2f9a7571
+  metadata.gz: 43f7a13e246f7b82402fdeb8cbfd8ed3a87ed7d61e97b6f62cfd2e0e14dc137445b8284b58c083cc647787b830d1f97d4a92e4140ca29f7ab41dcf0e6e62812f
+  data.tar.gz: b0824e226d9b6bd324ea2988846d7416bf0248599b7edabae43f23bfc754a268b6a267ef4f8ee3af7df1c2f590435bbc17d7dce7a8de03f0bdd2cec5e57b169f

data/CHANGELOG.md

@@ -1,2 +1,4 @@
+- 1.0.2
+  * Added support for sprintf in field formatting
 - 1.0.1
   * Added support for nested hashes as values

data/lib/logstash/outputs/graphite.rb

@@ -104,9 +104,10 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
     end
   end # def connect
 
-  def construct_metric_name(metric)
+  def construct_metric_name(event, metric)
     if @metrics_format
-      return @metrics_format.gsub(METRIC_PLACEHOLDER, metric)
+      sprinted = event.sprintf(@metrics_format)
+      return sprinted.gsub(METRIC_PLACEHOLDER, metric)
     end
 
     metric
@@ -175,15 +176,15 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
   def metrics_lines_for_event(event, metric, value, timestamp)
     if event[metric].is_a?(Hash)
       dotify(event[metric], metric).map do |k,v|
-        metrics_line(k, v, timestamp)
+        metrics_line(event, k, v, timestamp)
       end
     else
-      metrics_line(event.sprintf(metric), event.sprintf(value).to_f, timestamp)
+      metrics_line(event, event.sprintf(metric), event.sprintf(value).to_f, timestamp)
     end
   end
 
-  def metrics_line(name, value, timestamp)
-    "#{construct_metric_name(name)} #{value} #{timestamp}"
+  def metrics_line(event, name, value, timestamp)
+    "#{construct_metric_name(event, name)} #{value} #{timestamp}"
   end
 
   # Take a nested ruby hash of the form {:a => {:b => 2}, c: => 3} and

data/logstash-output-graphite.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-graphite'
-  s.version         = '1.0.1'
+  s.version         = '1.0.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output allows you to pull metrics from your logs and ship them to Graphite"
   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/graphite_spec.rb

@@ -31,9 +31,10 @@ describe LogStash::Outputs::Graphite do
                                                       "port" => port,
                                                       "fields_are_metrics" => true,
                                                       "include_metrics" => ["foo"],
-                                                      "metrics_format" => "foo.bar.sys.data.*") }
+                                                      "metrics_format" => "foo.%{@host}.sys.data.*") }
 
-      let(:event) { LogStash::Event.new("foo" => "123") }
+      let(:event) { LogStash::Event.new("foo" => "123", "@host" => "testhost") }
+      let(:expected_metric_prefix) { "foo.#{event['@host']}.sys.data" }
 
       context "match one key" do
         it "should generate one element" do
@@ -42,17 +43,17 @@ describe LogStash::Outputs::Graphite do
 
         it "should match the generated key" do
           line = server.pop
-          expect(line).to match(/^foo.bar.sys.data.foo 123.0 \d{10,}\n$/)
+          expect(line).to match(/^#{expected_metric_prefix}.foo 123.0 \d{10,}\n$/)
         end
       end
 
       context "when matching a nested hash" do
-        let(:event) { LogStash::Event.new("foo" => {"a" => 3, "c" => {"d" => 2}}) }
+        let(:event) { LogStash::Event.new("foo" => {"a" => 3, "c" => {"d" => 2}}, "@host" => "myhost") }
 
         it "should create the proper formatted lines" do
           lines = [server.pop, server.pop].sort # Put key 'a' first
-          expect(lines[0]).to match(/^foo.bar.sys.data.foo.a 3 \d{10,}\n$/)
-          expect(lines[1]).to match(/^foo.bar.sys.data.foo.c.d 2 \d{10,}\n$/)
+          expect(lines[0]).to match(/^#{expected_metric_prefix}.foo.a 3 \d{10,}\n$/)
+          expect(lines[1]).to match(/^#{expected_metric_prefix}.foo.c.d 2 \d{10,}\n$/)
         end
       end
     end
@@ -192,6 +193,5 @@ describe LogStash::Outputs::Graphite do
         expect(dotified).to eql("a" => 2, "5" => 4)
       end
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-graphite
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Elastic