logstash-codec-prometheus 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f42545c6c2f2afb23084ba07f144c67ae4501cb29e0fbdfb18755039e0e151
-  data.tar.gz: abbfce71f80d73b0584694c3fb136515cf141e1dbd270f3bdbe44b34e29792da
+  metadata.gz: 88f16844dd2bbb8ea29bade3d5a76b262bc1532e8ffa28589163db38751dc5a2
+  data.tar.gz: 786588dcdfddc1911cbcdfbe547e5f993d3664b62325e8922563d76fe0e403bf
 SHA512:
-  metadata.gz: d85fa26f4a9854912d557834a9fcbbf26da58427ecf522b012e3815783602c67c589c112b40e69ea82fea638165cbdbb78dacb42060b0708fd844d7a98624367
-  data.tar.gz: b2835b957093bc69bf1177232d214d99511ca4789ca197b599fbf309e06943d7bebc09f7c10e60837851741a80f3584e0f4beae47b17b3fee4fb54770b1f6cbe
+  metadata.gz: f68ad509bbe839bbaef86dcc3cf608a91a56eda9a789a4f29011f4e51e494d044cacde9f43a5734fbdd2b01010bba648d496e1cf66591ea84ffc37ac641e47d7
+  data.tar.gz: 5f0e4fe6f61c66e3a074726aa541d11682413ee8d992a4afa4dfa128ed6ab3f8b77a24b3bc4667cf0986a704ed254054b9188496f46d33f9baa47a3c93893a15

data/lib/logstash/codecs/prometheus.rb

@@ -6,7 +6,7 @@ require 'json'
 class LogStash::Codecs::Prometheus < LogStash::Codecs::Base
   config_name "prometheus"
 
-  # 
+  # create individual events for each metric
   config :multi_event, :validate => :boolean, :default => false
 
   public
@@ -26,11 +26,14 @@ class LogStash::Codecs::Prometheus < LogStash::Codecs::Base
           outside, inside = metric_name.match(/^(.+){(.+)}$/).captures
           vars = inside.split(",")
           labels = {}
+          keys = []
           vars.each do |var|
             key, value = var.split("=")
+            keys << key
             labels[key.downcase] = value.gsub!(/^\"|\"?$/, "")
           end
-          events << {outside.downcase => {"value" => metric_value.to_f, "labels" => labels}}
+          custom_metric_name = keys.unshift(outside.downcase).join('_')
+          events << {custom_metric_name => {outside.downcase => metric_value.to_f, "labels" => labels}}
         end
       end
     end

data/logstash-codec-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-codec-prometheus'
-  s.version       = '0.2.0'
+  s.version       = '0.3.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

@@ -49,7 +49,7 @@ describe LogStash::Codecs::Prometheus do
 			counter = 0
 			codec.decode("test{a=\"b\",x=\"y\"} 1\n") do |event|
 				insist {event.is_a?(LogStash::Event)}
-				insist {event.get("test")} == { "value" => 1.0, "labels" => { "a" => "b", "x" => "y" }}
+				insist {event.get("test_a_x")} == { "test" => 1.0, "labels" => { "a" => "b", "x" => "y" }}
 				counter += 1
 			end
 			insist {counter} == 1
@@ -58,7 +58,7 @@ describe LogStash::Codecs::Prometheus 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")} == { "value" => 1.0, "labels" => { "a" => "b" }}
+				insist {event.get("test_a")} == { "test" => 1.0, "labels" => { "a" => "b" }}
 			end
 		end
 

metadata

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