postfix-exporter 1.0.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b675b89c0c32beb4f209de131c64d992ae7afe2
-  data.tar.gz: fdb7ff7596e381785878fc29165acc9aa58765b1
+  metadata.gz: ac8829a4fac2d42ea4eaecbc3b7f028f4e6bf290
+  data.tar.gz: 488d26327ab992f7e50bffd0b1214542e323abe1
 SHA512:
-  metadata.gz: a4957e02af98f8b89b46a83939ee6250e53c4813b3976f413f56abb5b94b338f929c2bd5c5bfd05ac2d7169e1d045047f0a1669fc99a595812711022d69427fc
-  data.tar.gz: 0c3351d074a4ff7d4f7691d21fce5995703d2ab3ece107845a9397f6182f5405bcf2df612f38d67e100c471017d921edadbd8a112260a2b8296f73b6f8e2c1c2
+  metadata.gz: 109c656a3ce8271e78430ba5a6d1b7fce8a194b5a916bc2c330118c0484dec1d966008ac50eaf3a08c85b15fa2e8df5c0a68e5fb5bc76f4a0ceaf2bf907a75a5
+  data.tar.gz: 53987a004535aebe9291f4c2d86ac270af7378c5a79b6be80afc8bba5ed56a4156009756af8d5b12c6cfde1c743aa2ecd07c446ca4672c6d32bf7172bbf5ba55

data/bin/postfix-exporter

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'prometheus/client/rack/exporter'
-require 'socket'
 require 'rack'
+require 'prometheus/middleware/exporter'
+require 'socket'
 require 'rack/handler/webrick'
 require 'logger'
 
@@ -34,7 +34,6 @@ end
 
 if ENV["SYSLOG_SOCKET"]
 	delays   = prometheus.summary(:postfix_delivery_delays, "Distribution of time taken to deliver (or bounce) messages")
-	statuses = prometheus.counter(:postfix_deliveries, "How many messages have been delivered (or bounced)")
 
 	Thread.new do
 		begin
@@ -48,14 +47,13 @@ if ENV["SYSLOG_SOCKET"]
 		loop do
 			begin
 				msg = s.recvmsg.first
-				if msg =~ %r{postfix/smtp.* delay=(\d+(\.\d+)?), .* dsn=(\d+\.\d+\.\d+), status=(\w+)}
+				if msg =~ %r{postfix/.* delay=(\d+(\.\d+)?), .* dsn=(\d+\.\d+\.\d+), status=(\w+)}
 					delay  = $1.to_f
 					dsn    = $3
 					status = $4
 
 					if status == "bounced" or status == "sent"
-						statuses.increment(dsn: dsn, status: status)
-						delays.add({dsn: dsn, status: status}, delay)
+						delays.observe({dsn: dsn, status: status}, delay)
 					end
 				end
 			rescue StandardError => ex
@@ -68,6 +66,7 @@ if ENV["SYSLOG_SOCKET"]
 end
 
 app = Rack::Builder.new
+app.use Rack::Deflater, if: ->(_, _, _, body) { body.any? && body[0].length > 512 }
 app.use Prometheus::Client::Rack::Exporter
 app.run ->(env) { [404, {'Content-Type' => 'text/plain'}, ['NOPE NOPE NOPE NOPE']] }
 

data/postfix-exporter.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
 	s.required_ruby_version = ">= 2.1.0"
 
-	s.add_runtime_dependency 'prometheus-client'
+	s.add_runtime_dependency 'prometheus-client', '~> 0.7'
 	s.add_runtime_dependency 'rack'
 
 	s.add_development_dependency 'bundler'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: postfix-exporter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Export Prometheus statistics for a Postfix server