yabeda-prometheus 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36a4a73e4e698126e81bf8cb5069de6521ac396742a59dc13a906b2e6470f12
-  data.tar.gz: 67b7b8d5d56cff197c47bbac7b27d9a3eefe3cbbc1f63a01d8d35d2d4cd97305
+  metadata.gz: 03ed652a9c06383f38442a04db2ed423b0bf5c2bad99a0e34da5d965ed988ced
+  data.tar.gz: ec9f84a17b4f8b773a57985fe61cc4f6a0a4a67e4216f36683a0b8d5e6f95671
 SHA512:
-  metadata.gz: 25eae376eda44fd094891a717efaf877bd629b7ae9fcb0867ecf146fd0ea70e1afc7df3d24f8e615c4be11081004719de67bbfd89cacdeb011e51d74a331f1b4
-  data.tar.gz: 7184e70ea9a35daaf7b29e4fc8e2f9fd18e6b89679d1a4ebcb97722e359853e5723ace3a17cc3fb4a132947f758f2a4e88ccd6a8fe30bd7b48ff5d0872d46de4
+  metadata.gz: 45f454d796db3b1202bc238aadb4bb744686ddffe4efbf328ac172d3eeea6c21614a643d21ae49b971ca43eee0ad29b5ebb636773ebce0cd643620b3f99646f6
+  data.tar.gz: 1300508ed83ecefa768fb7ae6a8de08534eae83b2834fa9bf3577e77897ef7efb1a8ad5dfab88af92a1ba6c96caec9412dd14d48a1aa8938749bdfdaa17a5853

data/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 0.8.0 - 2021-12-30
+
+### Added
+
+- Ability to specify a logger instance for exporter web server. [@palkan], [#19](https://github.com/yabeda-rb/yabeda-prometheus/pull/19)
+- Ability to specify Prometheus instance value for push gateway. [@ollym], [#20](https://github.com/yabeda-rb/yabeda-prometheus/pull/20)
+
+### Changed
+
+- Logging is disabled by default for exporter web server. [@palkan], [#19](https://github.com/yabeda-rb/yabeda-prometheus/pull/19)
+
 ## 0.7.0 - 2021-07-21
 
 ### Added
@@ -128,3 +139,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [@alexander37137]: https://github.com/alexander37137 "Alexander Andreev"
 [@baarkerlounger]: https://github.com/baarkerlounger "Daniel Baark"
 [@dsalahutdinov]: https://github.com/dsalahutdinov "Dmitry Salahutdinov"
+[@palkan]: https://github.com/palkan "Vladimir Dementyev"
+[@ollym]: https://github.com/ollym "Oliver Morgan"

data/README.md

@@ -94,6 +94,13 @@ end
 
 These are only enabled in debug mode. See [Yabeda debugging metrics](https://github.com/yabeda-rb/yabeda#debugging-metrics) on how to enable it  (e.g. by specifying `YABEDA_DEBUG=true` in your environment variables).
 
+## Exporter logs
+
+By default, exporter web server logs are disabled. For example, you can plug in a Rails logger:
+
+```ruby
+Yabeda::Prometheus::Exporter.start_metrics_server! logger: Rails.application.logger
+```
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/yabeda/prometheus/exporter.rb

@@ -18,11 +18,11 @@ module Yabeda
           @app.call(env)
         end
 
-        def start_metrics_server!
+        def start_metrics_server!(**rack_app_options)
           Thread.new do
             default_port = ENV.fetch("PORT", 9394)
             ::Rack::Handler::WEBrick.run(
-              rack_app,
+              rack_app(**rack_app_options),
               Host: ENV["PROMETHEUS_EXPORTER_BIND"] || "0.0.0.0",
               Port: ENV.fetch("PROMETHEUS_EXPORTER_PORT", default_port),
               AccessLog: [],
@@ -30,9 +30,9 @@ module Yabeda
           end
         end
 
-        def rack_app(exporter = self, path: "/metrics")
+        def rack_app(exporter = self, path: "/metrics", logger: Logger.new(IO::NULL))
           ::Rack::Builder.new do
-            use ::Rack::CommonLogger
+            use ::Rack::CommonLogger, logger
             use ::Rack::ShowExceptions
             use exporter, path: path
             run NOT_FOUND_HANDLER

data/lib/yabeda/prometheus/version.rb

@@ -2,6 +2,6 @@
 
 module Yabeda
   module Prometheus
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/lib/yabeda/prometheus.rb

@@ -18,7 +18,7 @@ module Yabeda
         @push_gateway ||= begin
           ::Prometheus::Client::Push.new(
             ENV.fetch("PROMETHEUS_JOB_NAME", "yabeda"),
-            nil,
+            ENV["PROMETHEUS_INSTANCE"],
             ENV.fetch("PROMETHEUS_PUSH_GATEWAY", "http://localhost:9091"),
           ).tap do |gateway|
             http = gateway.instance_variable_get(:@http)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client