logstash-output-prometheus 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667c219d828f53a1a0a6e3949297b5a7ff9f2561db62332f7d286c4abde345fd
-  data.tar.gz: 6043bc410be20a1dcc2722134d2cccb15d4d2715488e881098e52741bae63057
+  metadata.gz: 130b0b24895276dd2b0d14e77d3b7004e5eaeff456db0f03ad0f45d47e53e4ab
+  data.tar.gz: 0a1439290b627946dd5c97d01d8f34c5da5f8fd04a8d9d1c9897d8bc81c4236e
 SHA512:
-  metadata.gz: a842d58037e05203313574bd5c9180c4a4255918a9f4321c0618728b8d38c34154d16d093db7c9bbf2475fd45cc49b2b44881a5df0adb4c38eaeb78aaa1bc4d3
-  data.tar.gz: ad7f9ddc0b44a250223994af94cc285ce5d8ec191707c9f29b08b908fc3b7d4da57a84ab422fcdc92053a24a1b03dd60ff4ef58e6b6a9178e72faaf35bae715a
+  metadata.gz: 13f01ed0e935e21ee717c82eada2b3e530c7b50b9758b9edb8d988c42869ed71b012f86e75cf1bd20dec2dd0ed644392f7ea543d2ca12addd849cb2542488d86
+  data.tar.gz: 93d3d9ff2fd1ce56e33230513561beacb81b7b731964cea352c84178f6348e6f7340382f82a702f712cacec3a00641f8722f2f5c8167ad77c3f066c7995b12cb

data/CHANGELOG.md

@@ -1,2 +1,4 @@
+## 0.1.1
+  - Fixed bug with unique labels under the same metric name for timers
 ## 0.1.0
   - Plugin created with the logstash plugin generator

data/CONTRIBUTORS

@@ -2,7 +2,7 @@ The following is a list of people who have contributed ideas, code, bug
 reports, or in general have helped logstash along its way.
 
 Contributors:
-* Spencer Malone - smalone@rsglab.com
+* Spencer Malone
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/lib/logstash/outputs/prometheus.rb

@@ -77,13 +77,15 @@ class LogStash::Outputs::Prometheus < LogStash::Outputs::Base
     @timer.each do |metric_name, val|
       val = setup_registry_labels(val)
 
-      if val['type'] == "histogram"
-        metric = prom_server.histogram(metric_name.to_sym, docstring: val['description'], labels: val['labels'].keys, buckets: val['buckets'])
-      else
-        metric = prom_server.summary(metric_name.to_sym, labels: val['labels'].keys, docstring: val['description'])
-      end
+      if $metrics[port.to_s + metric_name].nil?
+        if val['type'] == "histogram"
+          metric = prom_server.histogram(metric_name.to_sym, docstring: val['description'], labels: val['labels'].keys, buckets: val['buckets'])
+        else
+          metric = prom_server.summary(metric_name.to_sym, labels: val['labels'].keys, docstring: val['description'])
+        end
 
-      $metrics[port.to_s + metric_name] = metric
+        $metrics[port.to_s + metric_name] = metric
+      end
     end
   end # def register
 

data/logstash-output-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-prometheus'
-  s.version       = '0.1.0'
+  s.version       = '0.1.1'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Output logstash data to a prometheus exporter'
 #  s.homepage      = 'Nada'

data/spec/outputs/prometheus_spec.rb

@@ -8,13 +8,21 @@ require 'net/http'
 describe LogStash::Outputs::Prometheus do
   let(:port) { rand(2000..10000) }
   let(:output) { LogStash::Outputs::Prometheus.new(properties) }
+  let(:secondary_output) { 
+    if secondary_properties.nil?
+      LogStash::Outputs::Prometheus.new(properties)
+    else
+      LogStash::Outputs::Prometheus.new(secondary_properties)
+    end
+  }
 
   before do
     output.register
+    secondary_output.register
   end
 
-  after do
-    output.kill_thread
+  let(:secondary_properties) do
+    nil
   end
 
   let(:event) do
@@ -23,6 +31,16 @@ describe LogStash::Outputs::Prometheus do
     )
   end
 
+  let(:secondary_event) do
+    if secondary_properties.nil?
+      LogStash::Event.new(
+        secondary_properties
+      )
+    else
+      event
+    end
+  end
+
   shared_examples "it should expose data" do |*values|
     it "should expose data" do
       output.receive(event)
@@ -50,6 +68,35 @@ describe LogStash::Outputs::Prometheus do
     end
   end
 
+  shared_examples "it should expose data from multiple outputs" do |*values|
+    it "should be able to handle unique labels under the same name" do
+      secondary_output.receive(secondary_event)
+
+      output.receive(event)
+
+      url = URI.parse("http://localhost:#{port}/metrics")
+      req = Net::HTTP::Get.new(url.to_s)
+
+      attempts = 0
+
+      begin
+        res = Net::HTTP.start(url.host, url.port) {|http|
+            http.request(req)
+        }
+      rescue
+        attempts++
+        sleep(0.1)
+        if attempts < 10
+          retry
+        end
+      end
+
+      values.each do |value|
+        expect(res.body).to include(value)
+      end
+    end
+  end
+
   describe "counter behavior" do
     let(:properties) {
       { 
@@ -65,7 +112,23 @@ describe LogStash::Outputs::Prometheus do
       }
     }
 
+    let(:secondary_properties) {
+      { 
+        "port" => port,
+        "increment" => { 
+          "basic_counter" => { 
+            "description" => "Test",
+            "labels" => {
+              "mylabel" => "boo" 
+            }
+          }
+        }
+      }
+    }
+
     include_examples "it should expose data", 'basic_counter{mylabel="hi"} 1', "# TYPE basic_counter counter", "# HELP basic_counter Test"
+    include_examples "it should expose data from multiple outputs", 'basic_counter{mylabel="hi"} 1', 'basic_counter{mylabel="boo"} 1'
+
   end
 
   describe "gauge behavior" do
@@ -76,12 +139,32 @@ describe LogStash::Outputs::Prometheus do
           "increment" => { 
             "basic_gauge" => { 
               "description" => "Test1",
+              "labels" => {
+                "mylabel" => "hi" 
+              },
               "type" => "gauge"
             }
           }
         }
       }
-      include_examples "it should expose data", "basic_gauge 1.0", "# TYPE basic_gauge gauge", "# HELP basic_gauge Test1"
+
+      let(:secondary_properties) {
+        { 
+          "port" => port,
+          "increment" => { 
+            "basic_gauge" => { 
+              "description" => "Test1",
+              "type" => "gauge",
+              "labels" => {
+                "mylabel" => "boo" 
+              }
+            }
+          }
+        }
+      }
+
+      include_examples "it should expose data", 'basic_gauge{mylabel="hi"} 1.0', "# TYPE basic_gauge gauge", "# HELP basic_gauge Test1"
+      include_examples "it should expose data from multiple outputs", 'basic_gauge{mylabel="hi"} 1', 'basic_gauge{mylabel="boo"} 1'
     end
 
     describe "decrement" do
@@ -124,12 +207,32 @@ describe LogStash::Outputs::Prometheus do
           "huh" => { 
             "description" => "noway",
             "type" => "summary",
-            "value" => "11"
+            "value" => "11",
+            "labels" => {
+              "mylabel" => "hi" 
+            }
           }
         }
       }
     }
-    include_examples "it should expose data", "huh_sum 11.0", "huh_count 1.0", "# TYPE huh summary", "# HELP huh noway"
+
+    let(:secondary_properties) {
+      { 
+        "port" => port,
+        "timer" => { 
+          "huh" => { 
+            "description" => "noway",
+            "type" => "summary",
+            "value" => "10",
+            "labels" => {
+              "mylabel" => "boo" 
+            }
+          }
+        }
+      }
+    }
+    include_examples "it should expose data", 'huh_sum{mylabel="hi"} 11.0', 'huh_count{mylabel="hi"} 1.0', "# TYPE huh summary", "# HELP huh noway"
+    include_examples "it should expose data from multiple outputs", 'huh_sum{mylabel="hi"} 11.0', 'huh_sum{mylabel="boo"} 10.0'
   end
 
   describe "histogram behavior" do
@@ -142,12 +245,32 @@ describe LogStash::Outputs::Prometheus do
               "description" => "abe",
               "type" => "histogram",
               "buckets" => [1, 5, 10],
-              "value" => "0"
+              "value" => "0",
+              "labels" => {
+                "mylabel" => "hi" 
+              }
+            }
+          }
+        }
+      }
+      let(:secondary_properties) {
+        { 
+          "port" => port,
+          "timer" => { 
+            "history" => { 
+              "description" => "abe",
+              "type" => "histogram",
+              "buckets" => [1, 5, 10],
+              "value" => "0",
+              "labels" => {
+                "mylabel" => "boo" 
+              }
             }
           }
         }
       }
       include_examples "it should expose data", "# TYPE history histogram", "# HELP history abe"
+      include_examples "it should expose data from multiple outputs", 'history_sum{mylabel="hi"} 0.0', 'history_sum{mylabel="boo"} 0.0'
     end
 
     describe "sum and count" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Spencer Malone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement