logstash-codec-prometheus 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b78c11762b5d2d8402571191124e55b4a34efcfbbe7d835eac871ef7163bad9
-  data.tar.gz: f290451b60e77b02591ea3295dbb80fbd88a8375102657a9546c148d589fc485
+  metadata.gz: 70f42545c6c2f2afb23084ba07f144c67ae4501cb29e0fbdfb18755039e0e151
+  data.tar.gz: abbfce71f80d73b0584694c3fb136515cf141e1dbd270f3bdbe44b34e29792da
 SHA512:
-  metadata.gz: 38c3a2575b1478f98981278c60d8ab959bf3f8736f0d1cd25ac0aeae8bf2f5a1f3ce7b3822786755e438a0a179084ce60e8fbe3cf5e72a2e554019ffa596a62e
-  data.tar.gz: dfdf449288985f78a1f278605398af1ddb0fd73db95fa38a016d2af0095020278cbdcccf2c8816f33ea3ec5c5d4bc245f5bf0450bdd61a3c69c60f2e44e40304
+  metadata.gz: d85fa26f4a9854912d557834a9fcbbf26da58427ecf522b012e3815783602c67c589c112b40e69ea82fea638165cbdbb78dacb42060b0708fd844d7a98624367
+  data.tar.gz: b2835b957093bc69bf1177232d214d99511ca4789ca197b599fbf309e06943d7bebc09f7c10e60837851741a80f3584e0f4beae47b17b3fee4fb54770b1f6cbe

data/lib/logstash/codecs/prometheus.rb

@@ -6,6 +6,9 @@ require 'json'
 class LogStash::Codecs::Prometheus < LogStash::Codecs::Base
   config_name "prometheus"
 
+  # 
+  config :multi_event, :validate => :boolean, :default => false
+
   public
   def register
     @lines = LogStash::Codecs::Line.new
@@ -13,33 +16,44 @@ class LogStash::Codecs::Prometheus < LogStash::Codecs::Base
 
   public
   def decode(data)
+    events = []
     @lines.decode(data) do |event|
       unless event.get("message").start_with?("#")
         metric_name, metric_value = event.get("message").split(" ")
         unless metric_name.match(/^.+{.+}$/)
-          yield LogStash::Event.new(metric_name => metric_value.to_f)
+          events << {metric_name => metric_value.to_f}
         else
           outside, inside = metric_name.match(/^(.+){(.+)}$/).captures
           vars = inside.split(",")
+          labels = {}
           vars.each do |var|
             key, value = var.split("=")
-            custom_metric_name = [outside,key,value.gsub!(/^\"|\"?$/, "")].join('_')
-            yield LogStash::Event.new(custom_metric_name => metric_value.to_f)
+            labels[key.downcase] = value.gsub!(/^\"|\"?$/, "")
+          end
+          events << {outside.downcase => {"value" => metric_value.to_f, "labels" => labels}}
+        end
+      end
+    end
+    unless events.empty?
+      if @multi_event
+        events.each do |event|
+          yield LogStash::Event.new(event)
+        end
+      else
+        hash = {}
+        events.each do |event|
+          event.to_h.each do |metric_name, metric_value|
+            hash[metric_name] = metric_value
           end
         end
+        yield LogStash::Event.new(hash)
       end
     end
   end
 
   public
   def encode(event)
-    h = {}
-    event.to_hash.each do |metric_name,metric_value|
-      h[metric_name] = metric_value
-    end
-    unless h.empty?
-      @on_event.call(event, h.to_json)
-    end
+    @on_event.call(event, event.to_json)
   end
 
 end

data/logstash-codec-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-codec-prometheus'
-  s.version       = '0.1.0'
+  s.version       = '0.2.0'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Reads `prometheus` formatted lines'
   s.description   = 'This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program'

data/spec/codecs/prometheus_spec.rb

@@ -8,7 +8,9 @@ require "insist"
 
 describe LogStash::Codecs::Prometheus do
 
-	let(:codec) { LogStash::Codecs::Prometheus.new }
+	let(:cfg) {{"multi_event" => false}}
+
+	let(:codec) {LogStash::Codecs::Prometheus.new(cfg)}
 
 	before do
 		codec.register
@@ -21,38 +23,42 @@ describe LogStash::Codecs::Prometheus do
 			codec.decode("#test 1\n") do |event|
 				event_returned = true
 			end
-			insist { !event_returned }
+			insist {!event_returned}
 		end
 
 		it "should return an event from single full prometheus line" do
 			codec.decode("test 1\n") do |event|
-				insist { event.is_a?(LogStash::Event) }
-				insist { event.get("test") } == 1.to_f
+				insist {event.is_a?(LogStash::Event)}
+				insist {event.get("test")} == 1.to_f
 			end
 		end
 
-		it "should return an multiple events given multiple prometheus lines" do
+		it "should return single event given multiple prometheus lines" do
 			counter = 0
-			codec.decode("test 1\ntest 2\n") do |event|
-				insist { event.is_a?(LogStash::Event) }
+			codec.decode("test1 1\ntest2 2\n") do |event|
+				insist {event.is_a?(LogStash::Event)}
+				insist {event.get("test1")} == 1.to_f
+				insist {event.get("test2")} == 2.to_f
 				counter += 1
 			end
-			insist { counter } == 2
+			insist {counter} == 1
 		end
 
-		it "should return multiple events given a labeled metric" do
+		it "should return single event given a labeled metric" do
+
 			counter = 0
 			codec.decode("test{a=\"b\",x=\"y\"} 1\n") do |event|
-				insist { event.is_a?(LogStash::Event) }
+				insist {event.is_a?(LogStash::Event)}
+				insist {event.get("test")} == { "value" => 1.0, "labels" => { "a" => "b", "x" => "y" }}
 				counter += 1
 			end
-			insist { counter } == 2
+			insist {counter} == 1
 		end
 
-		it "should have correct metric name for labeled metric" do
+		it "should return event with labels for labeled metric" do
 			codec.decode("test{a=\"b\"} 1\n") do |event|
-				insist { event.is_a?(LogStash::Event) }
-				insist { event.get("test_a_b") } == 1.to_f
+				insist {event.is_a?(LogStash::Event)}
+				insist {event.get("test")} == { "value" => 1.0, "labels" => { "a" => "b" }}
 			end
 		end
 
@@ -61,17 +67,17 @@ describe LogStash::Codecs::Prometheus do
 	context "#encode" do
 
 		it "should return json data" do
-			data = {"foo" => 1.0, "bar" => 2.0}
+			data = {"foo" => 1.0, "bar" => { "value" => 2.0, "labels" => { "a" => "b" }}}
 			event = LogStash::Event.new(data)
 			got_event = false
 			codec.on_event do |event, message|
-				insist { message.chomp } == event.to_json
-				insist { LogStash::Json.load(message)["foo"] } == data["foo"]
-				insist { LogStash::Json.load(message)["bar"] } == data["bar"]
+				insist {message.chomp} == event.to_json
+				insist {LogStash::Json.load(message)["foo"]} == data["foo"]
+				insist {LogStash::Json.load(message)["bar"]} == data["bar"]
 				got_event = true
 			end
 			codec.encode(event)
-			insist { got_event }
+			insist {got_event}
 		end
 
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Bartsch