Merge pull request #6 from Automattic/usielriedl/handle-multiple-local-proxies

Add label for proxy

Author: xavierholt

lib/twemproxy_exporter/twemproxy.rb

@@ -16,15 +16,16 @@ def initialize(exporter, host = 'localhost', port = 22222)
     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
       @exporter.uptime.count            stats['uptime'],            labels
 
       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 @@ def count
 
         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

spec/twemproxy_exporter/exporter_spec.rb

@@ -1,7 +1,7 @@
 describe TwemproxyExporter::Exporter do
   let(:stats_file) { File.open("spec/fixtures/files/stats.json") }
   let(:config) { { "proxies" => ["localhost"] } }
-  let(:twemproxy_labels) { { twemproxy: "app-production-redis-twemproxy" } }
+  let(:twemproxy_labels) { { twemproxy: "app-production-redis-twemproxy", proxy: "localhost:22222" } }
   let(:cluster_labels) { twemproxy_labels.merge({ cluster: "app_persistent" }) }
 
   before do