vmpooler 0.13.3 → 0.14.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: prometheus-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-ldap
   requirement: !ruby/object:Gem::Requirement
@@ -205,13 +219,18 @@ files:
 - lib/vmpooler/api.rb
 - lib/vmpooler/api/dashboard.rb
 - lib/vmpooler/api/helpers.rb
+- lib/vmpooler/api/request_logger.rb
 - lib/vmpooler/api/reroute.rb
 - lib/vmpooler/api/v1.rb
 - lib/vmpooler/dashboard.rb
-- lib/vmpooler/dummy_statsd.rb
 - lib/vmpooler/generic_connection_pool.rb
-- lib/vmpooler/graphite.rb
 - lib/vmpooler/logger.rb
+- lib/vmpooler/metrics.rb
+- lib/vmpooler/metrics/dummy_statsd.rb
+- lib/vmpooler/metrics/graphite.rb
+- lib/vmpooler/metrics/promstats.rb
+- lib/vmpooler/metrics/promstats/collector_middleware.rb
+- lib/vmpooler/metrics/statsd.rb
 - lib/vmpooler/pool_manager.rb
 - lib/vmpooler/providers.rb
 - lib/vmpooler/providers/base.rb
@@ -228,7 +247,6 @@ files:
 - lib/vmpooler/public/lib/dashboard.js
 - lib/vmpooler/public/lib/jquery.min.js
 - lib/vmpooler/public/vmpooler.css
-- lib/vmpooler/statsd.rb
 - lib/vmpooler/util/parsing.rb
 - lib/vmpooler/version.rb
 - lib/vmpooler/views/dashboard.erb

data/lib/vmpooler/dummy_statsd.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Vmpooler
-  class DummyStatsd
-    attr_reader :server, :port, :prefix
-
-    def initialize(*)
-    end
-
-    def increment(*)
-      true
-    end
-
-    def gauge(*)
-      true
-    end
-
-    def timing(*)
-      true
-    end
-  end
-end

data/lib/vmpooler/graphite.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems' unless defined?(Gem)
-
-module Vmpooler
-  class Graphite
-    attr_reader :server, :port, :prefix
-
-    def initialize(params = {})
-      raise ArgumentError, "Graphite server is required. Config: #{params.inspect}" if params['server'].nil? || params['server'].empty?
-
-      @server = params['server']
-      @port   = params['port'] || 2003
-      @prefix = params['prefix'] || 'vmpooler'
-    end
-
-    def increment(label)
-      log label, 1
-    end
-
-    def gauge(label, value)
-      log label, value
-    end
-
-    def timing(label, duration)
-      log label, duration
-    end
-
-    def log(path, value)
-      Thread.new do
-        socket = TCPSocket.new(server, port)
-        begin
-          socket.puts "#{prefix}.#{path} #{value} #{Time.now.to_i}"
-        ensure
-          socket.close
-        end
-      end
-    rescue Errno::EADDRNOTAVAIL => e
-      warn "Could not assign address to graphite server #{server}: #{e}"
-    rescue StandardError => e
-      warn "Failure logging #{path} to graphite server [#{server}:#{port}]: #{e}"
-    end
-  end
-end

data/lib/vmpooler/statsd.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems' unless defined?(Gem)
-require 'statsd'
-
-module Vmpooler
-  class Statsd
-    attr_reader :server, :port, :prefix
-
-    def initialize(params = {})
-      raise ArgumentError, "Statsd server is required. Config: #{params.inspect}" if params['server'].nil? || params['server'].empty?
-
-      host    = params['server']
-      @port   = params['port'] || 8125
-      @prefix = params['prefix'] || 'vmpooler'
-      @server = ::Statsd.new(host, @port)
-    end
-
-    def increment(label)
-      server.increment(prefix + '.' + label)
-    rescue StandardError => e
-      warn "Failure incrementing #{prefix}.#{label} on statsd server [#{server}:#{port}]: #{e}"
-    end
-
-    def gauge(label, value)
-      server.gauge(prefix + '.' + label, value)
-    rescue StandardError => e
-      warn "Failure updating gauge #{prefix}.#{label} on statsd server [#{server}:#{port}]: #{e}"
-    end
-
-    def timing(label, duration)
-      server.timing(prefix + '.' + label, duration)
-    rescue StandardError => e
-      warn "Failure updating timing #{prefix}.#{label} on statsd server [#{server}:#{port}]: #{e}"
-    end
-  end
-end