twemproxy_exporter 0.1.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ec46c7f81bdf569bf0667d041d7009f91258e655
-  data.tar.gz: 17da3e1a4c0200255e122c77e9a95bc21a8fe174
+SHA256:
+  metadata.gz: 6c526524a297bbd8e6ec6756d36277d134c2099071ba8ff3134c37af63e61954
+  data.tar.gz: 971989dceffd599097d2ff3d07a87b8c2cc878d590f174716bf719eb2f2d076a
 SHA512:
-  metadata.gz: f9f6c58fcb55fc66f709961cabc2139c150b9ed7449de9946260ecc4942dc40f95f32ac980a7a765208cb25c6d003ab36c76438f4494f43d1cd3820c457d49fb
-  data.tar.gz: 52f603b48f9b68145672336e4ee06cd1a556faf72df546af390d0636da9ffc1212aa09bdfc1575e3f6425469016efed70a9965f784485cb04c333a9a7fc36ab3
+  metadata.gz: 44c1cf6c4e423d569b4b7b046cfcb08b354da23431861852f4aac774f6e3b7f2d6aa56a31238f530f40cedcd5cf0b4c71f14edab9786eaca2d6ab9142d2fce08
+  data.tar.gz: a08c9480dcb77c88616b247bb409eb8096b4298a5cc50e5a4156d401761f0e7770144a1d8741fbb9f1a54cbd461a7f6575e9221f26db368d2eedd33b494c2d16

data/.gitignore

@@ -29,8 +29,8 @@ build/
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
 Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/.travis.yml

@@ -3,5 +3,6 @@ language: ruby
 rvm:
   - 2.2.2 # Oldest compatible Ruby
   - 2.3.1
-  - 2.4.0 # Most recent Ruby release
-before_install: gem install bundler -v 1.13.7
+  - 2.4.0
+  - 3.4.7 # Most recent Ruby release
+before_install: gem install bundler -v 2.7.2

data/README.md

@@ -1,5 +1,6 @@
 # twemproxy_exporter
 [![Build Status](https://travis-ci.org/xavierholt/twemproxy_exporter.svg?branch=master)](https://travis-ci.org/xavierholt/twemproxy_exporter)
+[![Gem Version](https://badge.fury.io/rb/twemproxy_exporter.svg)](https://rubygems.org/gems/twemproxy_exporter)
 
 This is a simple Prometheus exporter for Twemproxy (a.k.a. Nutcracker), written
 in Ruby.  It currently takes a list of Twemproxy URLs to monitor and exposes
@@ -11,8 +12,9 @@ Run it from the command line like this:
 twemproxy_exporter my.proxy.host my.other.proxy.host:33333
 ```
 
-Run it with the `--help` flag to see the full list of options.  It can also read
-these options from a JSON or YAML file:
+Run it with the `--help` flag to see the full list of options, or check out [the
+source](https://github.com/xavierholt/twemproxy_exporter/blob/master/bin/twemproxy_exporter).
+It can also read these options from a JSON or YAML file:
 
 ```yml
 bind: 127.0.0.1
@@ -20,8 +22,8 @@ port: 9876
 interval: 10
 timeout: 2
 proxies:
-  - my.proxy.host
-  - my.other.proxy.host:33333
+- my.twemproxy.host
+- my.other.twemproxy.host:33333
 ```
 
 ```sh

data/lib/twemproxy_exporter/counter.rb

@@ -3,17 +3,17 @@ module TwemproxyExporter
     def initialize(registry, name, desc)
       @counter = Prometheus::Client::Counter.new(name, desc)
       registry.register(@counter)
-      @last = 0
+      @last_values = {}
     end
 
     def count(value, labels = {})
-      if value >= @last
-        @counter.increment(labels, value - @last)
+      last = @last_values[labels] || 0
+      if value >= last
+        @counter.increment(labels, value - last)
       else
         @counter.increment(labels, value)
       end
-
-      @last = value
+      @last_values[labels] = value
     end
 
     def value(labels = {})

data/lib/twemproxy_exporter/twemproxy.rb

@@ -16,7 +16,8 @@ module TwemproxyExporter
     def count
       stats  = self.stats
       name   = stats['source']
-      labels = {twemproxy: name}
+      proxy  = "#{@host}:#{@port}"
+      labels = {twemproxy: name, proxy: proxy}
 
       @exporter.total_connections.count stats['total_connections'], labels
       @exporter.curr_connections.count  stats['curr_connections'],  labels
@@ -24,7 +25,7 @@ module TwemproxyExporter
 
       stats.each do |cluster, cinfo|
         next unless cinfo.is_a? Hash
-        labels = {twemproxy: name, cluster: cluster}
+        labels = {twemproxy: name, proxy: proxy, cluster: cluster}
 
         @exporter.fragments.count          cinfo['fragments'],          labels
         @exporter.forward_error.count      cinfo['forward_error'],      labels
@@ -35,7 +36,7 @@ module TwemproxyExporter
 
         cinfo.each do |server, sinfo|
           next unless sinfo.is_a? Hash
-          labels = {twemproxy: name, cluster: cluster, server: server}
+          labels = {twemproxy: name, proxy: proxy, cluster: cluster, server: server}
 
           @exporter.in_queue.count           sinfo['in_queue'],           labels
           @exporter.in_queue_bytes.count     sinfo['in_queue_bytes'],     labels
@@ -58,8 +59,14 @@ module TwemproxyExporter
 
     def stats
       socket = TCPSocket.new(@host, @port)
-      return YAML.load(socket.read) if select([socket], nil, nil, @exporter.timeout)
-      raise "Connection to #{@host}:#{@port} timed out after #{@exporter.timeout} seconds."
+      if not select([socket], nil, nil, @exporter.timeout)
+        raise "Connection to #{@host}:#{@port} timed out after #{@exporter.timeout} seconds."
+      end
+      data = socket.read
+      # Double-quoted server aliases are not escaped by twemproxy
+      # https://github.com/twitter/twemproxy/issues/532
+      data.gsub!(/"("[^"]+")"/, '\1')
+      return YAML.load(data)
     ensure
       socket.close if socket
     end

data/lib/twemproxy_exporter/version.rb

@@ -1,3 +1,3 @@
 module TwemproxyExporter
-  VERSION = "0.1.1"
+  VERSION = "0.3.1"
 end

data/twemproxy_exporter.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_runtime_dependency "prometheus-client", "~> 0.6.0"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twemproxy_exporter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Kevin Burk
 - Andrew Tongen
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 
 email:
 - xavierholt@gmail.com
 executables:
@@ -109,7 +107,6 @@ homepage: https://github.com/xavierholt/twemproxy_exporter
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Prometheus exporter for Twemproxy / Nutcracker.
 test_files: []