garru-ruby_scribe_client 0.0.6 → 0.0.6.1

data/CHANGELOG

@@ -1,4 +1,4 @@
-v0.0.6 fb303: added host option.  moved client to module namespace 
+v0.0.6.1 fb303: added host option.  moved client to module namespace 
 v0.0.5 wrote fb303 client for scribe mgmt
 v0.0.4 removing flush because framed transport doesn't need it
 v0.0.3 flush instead of open/close each time

data/Manifest

@@ -15,6 +15,7 @@ LICENSE
 Manifest
 Rakefile
 README
+ruby_scribe_client.gemspec
 vendor/thrift/client.rb
 vendor/thrift/deprecation.rb
 vendor/thrift/exceptions.rb

data/etc/scribe_munin.rb

@@ -10,7 +10,7 @@ class ScribeStats
   CATEGORY = 'scribe'
 
   def initialize(host, port)
-    @scribe = FB303.new(host, port)
+    @scribe = FB303::Client.new(host, port)
     @category = 'scribe'
   end
 

data/etc/scribe_net

@@ -1 +1,85 @@
-scribe_munin.rb
+#! /usr/bin/env ruby
+# Munin plugin for starling.
+HOST = ENV['HOST'] || '127.0.0.1';
+PORT = ENV['PORT'] || 1463;
+require 'rubygems'
+require 'ruby_scribe_client'
+
+#Monkey patched so the namespaced queues are included in stats
+class ScribeStats
+  CATEGORY = 'scribe'
+
+  def initialize(host, port)
+    @scribe = FB303::Client.new(host, port)
+    @category = 'scribe'
+  end
+
+
+  def net_stats
+    stats = {
+        :label => 'read',
+        :type => 'COUNTER',
+        :graph => 'no',
+        :cdef => '8,*'
+    }
+    return stats
+  end
+
+  def net_munin_config
+    graph_config = <<-END.gsub(/  +/, '')
+      graph_title Scribe Traffic
+      graph_args --base 1000
+      graph_vlabel bits read(-) / written(+) per second
+      graph_category #{CATEGORY}
+      graph_order bytes_read bytes_written
+    END
+
+    stat_config = ''
+    counters.keys do |stat|
+      stat.gsub!(/\s/){'_'}
+      stats.each do |var,value|
+        value = "#{stat}," + value if var == :cdef
+        stat_config << "#{stat}.#{var} #{value}\n"
+      end
+    end
+
+    return graph_config + stat_config
+  end
+
+  def net_munin
+    ret = ""
+    @scribe.getCounters.each do |k, v|
+      ret << "#{k.gsub(/\s/){'_'}}.value #{v}\n"
+    end
+  end
+    
+private  
+
+  def munin_name(str)
+    str.tr(":", '_')
+  end
+  
+  
+  
+  def counters
+    @scribe.getCounters
+  end
+  
+end
+
+# We pick the chart based on the command we were called as.
+if $0 =~ /scribe_(\w+)/ then
+  chart_name = $1
+else
+  $stderr.puts "can't find chart name"
+end
+
+starling = ScribeStats.new(HOST, PORT)
+
+command = "#{chart_name}_munin"
+
+if ARGV[0] == 'config' then
+  command << '_config'
+end
+
+print starling.send(command)

data/lib/ruby_scribe_client/scribe.rb

@@ -7,7 +7,7 @@
 require File.join([File.dirname(__FILE__), '..', '..', 'vendor','thrift'])
 require File.join([File.dirname(__FILE__) ,'FacebookService'])
 require File.join([File.dirname(__FILE__), 'scribe_types'])
-require File.join([File.dirname(__FILE__), 'ruby_scribe_client', 'fb303_client'])
+require File.join([File.dirname(__FILE__), 'fb303_client'])
 
 module Scribe
   class Client < FacebookService::Client 

data/ruby_scribe_client.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_scribe_client}
-  s.version = "0.0.6"
+  s.version = "0.0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gary Tsang"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Ruby Scribe Client. Package and Wrapper for generated ruby interfaces}
   s.email = %q{}
   s.extra_rdoc_files = ["CHANGELOG", "lib/ruby_scribe_client/FacebookService.rb", "lib/ruby_scribe_client/fb303_client.rb", "lib/ruby_scribe_client/fb303_types.rb", "lib/ruby_scribe_client/reflection_limited_types.rb", "lib/ruby_scribe_client/scribe.rb", "lib/ruby_scribe_client/scribe_mgmt.rb", "lib/ruby_scribe_client/scribe_types.rb", "lib/ruby_scribe_client.rb", "LICENSE", "README"]
-  s.files = ["CHANGELOG", "etc/scribe_cat.rb", "etc/scribe_munin.rb", "etc/scribe_net", "etc/test.rb", "lib/ruby_scribe_client/FacebookService.rb", "lib/ruby_scribe_client/fb303_client.rb", "lib/ruby_scribe_client/fb303_types.rb", "lib/ruby_scribe_client/reflection_limited_types.rb", "lib/ruby_scribe_client/scribe.rb", "lib/ruby_scribe_client/scribe_mgmt.rb", "lib/ruby_scribe_client/scribe_types.rb", "lib/ruby_scribe_client.rb", "LICENSE", "Manifest", "Rakefile", "README", "vendor/thrift/client.rb", "vendor/thrift/deprecation.rb", "vendor/thrift/exceptions.rb", "vendor/thrift/processor.rb", "vendor/thrift/protocol/binaryprotocol.rb", "vendor/thrift/protocol/binaryprotocolaccelerated.rb", "vendor/thrift/protocol/tbinaryprotocol.rb", "vendor/thrift/protocol/tprotocol.rb", "vendor/thrift/protocol.rb", "vendor/thrift/serializer.rb", "vendor/thrift/server/httpserver.rb", "vendor/thrift/server/nonblockingserver.rb", "vendor/thrift/server/thttpserver.rb", "vendor/thrift/server/tserver.rb", "vendor/thrift/server.rb", "vendor/thrift/struct.rb", "vendor/thrift/thrift.rb", "vendor/thrift/transport/httpclient.rb", "vendor/thrift/transport/socket.rb", "vendor/thrift/transport/thttpclient.rb", "vendor/thrift/transport/tsocket.rb", "vendor/thrift/transport/ttransport.rb", "vendor/thrift/transport/unixsocket.rb", "vendor/thrift/transport.rb", "vendor/thrift/types.rb", "vendor/thrift.rb", "ruby_scribe_client.gemspec"]
+  s.files = ["CHANGELOG", "etc/scribe_cat.rb", "etc/scribe_munin.rb", "etc/scribe_net", "etc/test.rb", "lib/ruby_scribe_client/FacebookService.rb", "lib/ruby_scribe_client/fb303_client.rb", "lib/ruby_scribe_client/fb303_types.rb", "lib/ruby_scribe_client/reflection_limited_types.rb", "lib/ruby_scribe_client/scribe.rb", "lib/ruby_scribe_client/scribe_mgmt.rb", "lib/ruby_scribe_client/scribe_types.rb", "lib/ruby_scribe_client.rb", "LICENSE", "Manifest", "Rakefile", "README", "ruby_scribe_client.gemspec", "vendor/thrift/client.rb", "vendor/thrift/deprecation.rb", "vendor/thrift/exceptions.rb", "vendor/thrift/processor.rb", "vendor/thrift/protocol/binaryprotocol.rb", "vendor/thrift/protocol/binaryprotocolaccelerated.rb", "vendor/thrift/protocol/tbinaryprotocol.rb", "vendor/thrift/protocol/tprotocol.rb", "vendor/thrift/protocol.rb", "vendor/thrift/serializer.rb", "vendor/thrift/server/httpserver.rb", "vendor/thrift/server/nonblockingserver.rb", "vendor/thrift/server/thttpserver.rb", "vendor/thrift/server/tserver.rb", "vendor/thrift/server.rb", "vendor/thrift/struct.rb", "vendor/thrift/thrift.rb", "vendor/thrift/transport/httpclient.rb", "vendor/thrift/transport/socket.rb", "vendor/thrift/transport/thttpclient.rb", "vendor/thrift/transport/tsocket.rb", "vendor/thrift/transport/ttransport.rb", "vendor/thrift/transport/unixsocket.rb", "vendor/thrift/transport.rb", "vendor/thrift/types.rb", "vendor/thrift.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/garru/ruby_scribe_client}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ruby_scribe_client", "--main", "README"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: garru-ruby_scribe_client
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.6.1
 platform: ruby
 authors: 
 - Gary Tsang
@@ -49,6 +49,7 @@ files:
 - Manifest
 - Rakefile
 - README
+- ruby_scribe_client.gemspec
 - vendor/thrift/client.rb
 - vendor/thrift/deprecation.rb
 - vendor/thrift/exceptions.rb
@@ -75,7 +76,6 @@ files:
 - vendor/thrift/transport.rb
 - vendor/thrift/types.rb
 - vendor/thrift.rb
-- ruby_scribe_client.gemspec
 has_rdoc: true
 homepage: http://github.com/garru/ruby_scribe_client
 post_install_message: