prometheus_exporter 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c574a415d9c6c164b9e0671c6649928bbee2cb5645e52a43ef37b899d13bc3
-  data.tar.gz: 822b077292371a669291e69944c85d220dfda7c592711e5bc73e252e41b3ee84
+  metadata.gz: ab23e225a84eae5cc41b7c74e5590781cdcfddf15390848df761750c15b38f35
+  data.tar.gz: 193032ba1f46d910ed9d18c3d60c721513d24a952fe1912cc972fe030dcd9676
 SHA512:
-  metadata.gz: 14eb93a948c46817e889f95c0f9899c0046c667408710eac60a9f96b2693da35d8a0724b9d426e5b5f0882b31f498acfefe5944dce9895629c04dc32af0a3466
-  data.tar.gz: 4ed4f50b3ee95e527d0820cfbbf24f90a44bb51f0ecd652d7159a9a53d7731e1490f8bbd46e0090ca39d723cadbded57f0c2567afc93e7f9700839274e3ce6cd
+  metadata.gz: 5b11c5f1c4f989ab529f4d99beec7d60066d656ea59ce7e474939d68de8723e20e7e5ff17ae63d8bb3ba1e74f51703f2f733b2e57fe4b0484badd692f8af8632
+  data.tar.gz: 3086862d65a45a60b71d6e0c4ebd358eac472f8a5d463701f26fad879cd1da0def826ee6867c0153a5adbb7d4c8cf4a3f60ad7a2038b252d8e3d01677d8bc7ef

data/CHANGELOG

@@ -1,6 +1,11 @@
-Unreleased
+0.3.1
 
-- Follow Prometheus metric [naming conventions](https://prometheus.io/docs/practices/naming/#metric-names)
+- Allow runner to accept a --timeout var
+- Allow runner to accept a blank prefix
+
+0.3.0
+
+- Breaking change: Follow Prometheus metric [naming conventions](https://prometheus.io/docs/practices/naming/#metric-names)
 
 0.1.15 - 2018-02-19
 

data/README.md

@@ -324,14 +324,16 @@ thing2 12
 
 ### Metrics default prefix / labels
 
+_This only works in single process mode_
+
 You can specify default prefix or labels for metrics, for example:
 
 ```ruby
 # Specify prefix for metric names
-PrometheusExporter::Metric.base.default_prefix = "ruby"
+PrometheusExporter::Metric::Base.default_prefix = "ruby"
 
 # Specify default labels for metrics
-PrometheusExporter::Metric.base.default_labels = { "hostname" => "app-server-01" }
+PrometheusExporter::Metric::Base.default_labels = { "hostname" => "app-server-01" }
 
 counter = PrometheusExporter::Metric::Counter.new("web_requests", "number of web requests")
 

data/bin/prometheus_exporter

@@ -18,7 +18,13 @@ def run
            "Port exporter should listen on (default: #{PrometheusExporter::DEFAULT_PORT})") do |o|
       options[:port] = o.to_i
     end
-    opt.on('--prefix METRIC_PREFIX', String, "Prefix to apply to all metrics (default: #{PrometheusExporter::DEFAULT_PREFIX})") do |o|
+    opt.on('-t',
+           '--timeout INTEGER',
+           Integer,
+           "Timeout in seconds for metrics endpoint (default: #{PrometheusExporter::DEFAULT_TIMEOUT})") do |o|
+      options[:timeout] = o.to_i
+    end
+    opt.on('--prefix METRIC_PREFIX', "Prefix to apply to all metrics (default: #{PrometheusExporter::DEFAULT_PREFIX})") do |o|
       options[:prefix] = o.to_s
     end
     opt.on('-c', '--collector FILE', String, "(optional) Custom collector to run") do |o|

data/lib/prometheus_exporter/server/runner.rb

@@ -20,7 +20,7 @@ module PrometheusExporter::Server
         raise WrongInheritance, 'Collector class must be inherited from PrometheusExporter::Server::CollectorBase'
       end
 
-      server = server_class.new port: port, collector: collector, verbose: verbose
+      server = server_class.new port: port, collector: collector, timeout: timeout, verbose: verbose
       server.start
     end
 
@@ -56,6 +56,14 @@ module PrometheusExporter::Server
       @type_collectors || []
     end
 
+    def timeout=(timeout)
+      @timeout = timeout
+    end
+
+    def timeout
+      @timeout || PrometheusExporter::DEFAULT_TIMEOUT
+    end
+
     def verbose=(verbose)
       @verbose = verbose
     end

data/lib/prometheus_exporter/server/web_server.rb

@@ -9,7 +9,7 @@ module PrometheusExporter::Server
   class WebServer
     attr_reader :collector
 
-    def initialize(port: , collector: nil, verbose: false)
+    def initialize(port: , collector: nil, timeout: PrometheusExporter::DEFAULT_TIMEOUT, verbose: false)
 
       @verbose = verbose
 
@@ -44,6 +44,7 @@ module PrometheusExporter::Server
 
       @collector = collector || Collector.new
       @port = port
+      @timeout = timeout
 
       @server.mount_proc '/' do |req, res|
         res['ContentType'] = 'text/plain; charset=utf-8'
@@ -113,7 +114,7 @@ module PrometheusExporter::Server
     def metrics
       metric_text = nil
       begin
-        Timeout::timeout(2) do
+        Timeout::timeout(@timeout) do
           metric_text = @collector.prometheus_metrics_text
         end
       rescue Timeout::Error

data/lib/prometheus_exporter/version.rb

@@ -1,3 +1,3 @@
 module PrometheusExporter
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/prometheus_exporter.rb

@@ -6,6 +6,7 @@ module PrometheusExporter
   # per: https://github.com/prometheus/prometheus/wiki/Default-port-allocations
   DEFAULT_PORT = 9394
   DEFAULT_PREFIX = 'ruby_'
+  DEFAULT_TIMEOUT = 2
 
   class OjCompat
     def self.parse(obj)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler