astro-collectd 0.0.9 → 0.0.10

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 9
+:patch: 10
 :major: 0

data/lib/collectd/em_support.rb

@@ -7,10 +7,10 @@ module Collectd
     def track_deferrable(name, deferrable)
       attach_time = Time.now
       deferrable.callback do |*a|
-        push_deferrable_values("#{name} success", attach_time)
+        push_deferrable_values("#{name}_success", attach_time)
       end
       deferrable.errback do |*a|
-        push_deferrable_values("#{name} error", attach_time)
+        push_deferrable_values("#{name}_error", attach_time)
       end
     end
     def push_deferrable_values(name, attach_time)

data/lib/collectd/interface.rb

@@ -151,7 +151,7 @@ module Collectd
       # Use count & sums for average
       if @gauges.has_key?(plugin_type)
         old_values = @gauges[plugin_type]
-        count = old_values.shift
+        count = old_values.shift || 0
         values.map! { |value| value + (old_values.shift || value) }
         @gauges[plugin_type] = [count + 1] + values
       else
@@ -174,10 +174,10 @@ module Collectd
         plugin_type_values[plugin] ||= {}
         plugin_type_values[plugin][plugin_instance] ||= {}
         plugin_type_values[plugin][plugin_instance][type] ||= {}
-        count = values.shift
+        count = values.shift || next
         values.map! { |value| value.to_f / count }
         plugin_type_values[plugin][plugin_instance][type][type_instance] =
-        Packet::Values.new(values.map { |value| Packet::Values::Gauge.new(value) })
+          Packet::Values.new(values.map { |value| Packet::Values::Gauge.new(value) })
       end
       pkt = [Packet::Host.new(Collectd.hostname),
              Packet::Time.new(Time.now.to_i),

data/lib/collectd/pkt.rb

@@ -8,8 +8,12 @@ module Collectd
 
       ##
       # Makes subclasses more declarative
-      def self.type(number)
-        define_method(:type) { number }
+      def self.type(number=nil)
+        number ? @type = number : @type
+      end
+
+      def type
+        self.class.type
       end
     end
 

data/lib/collectd/server.rb

@@ -6,7 +6,7 @@ module Collectd
 
     def initialize(interval, host, port)
       super(interval)
-      @sock = UDPSocket.new(Socket::AF_INET6)
+      @sock = UDPSocket.new(host.index(':') ? Socket::AF_INET6 : Socket::AF_INET)
       @sock.connect(host, port)
 
       Thread.new do

data/spec/interface_spec.rb

@@ -118,12 +118,12 @@ describe Collectd::EmPlugin do
     end
     it 'should report latency' do
       @df.succeed
-      g = @server.gauges[[:plugin1, :plugin_instance1, :latency, 'df success']]
+      g = @server.gauges[[:plugin1, :plugin_instance1, :latency, 'df_success']]
       g[0].should be_kind_of(Numeric)
     end
     it 'should increase a counter' do
       @df.succeed
-      c = @server.counters[[:plugin1, :plugin_instance1, :counter, 'df success']]
+      c = @server.counters[[:plugin1, :plugin_instance1, :counter, 'df_success']]
       c[0].should be_kind_of(Numeric)
     end
   end
@@ -133,12 +133,12 @@ describe Collectd::EmPlugin do
     end
     it 'should report latency' do
       @df.fail
-      g = @server.gauges[[:plugin1, :plugin_instance1, :latency, 'df error']]
+      g = @server.gauges[[:plugin1, :plugin_instance1, :latency, 'df_error']]
       g[0].should be_kind_of(Numeric)
     end
     it 'should increase a counter' do
       @df.fail
-      c = @server.counters[[:plugin1, :plugin_instance1, :counter, 'df error']]
+      c = @server.counters[[:plugin1, :plugin_instance1, :counter, 'df_error']]
       c[0].should be_kind_of(Numeric)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-collectd
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Stephan Maka
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-29 00:00:00 -07:00
+date: 2009-09-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -19,10 +19,9 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rst
+extra_rdoc_files: []
+
 files: 
-- README.rst
 - Rakefile
 - VERSION.yml
 - examples/em_sender.rb
@@ -37,6 +36,7 @@ files:
 - spec/interface_spec.rb
 has_rdoc: false
 homepage: http://github.com/astro/ruby-collectd
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -57,11 +57,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Send collectd statistics from Ruby
 test_files: 
 - spec/interface_spec.rb
-- examples/sender.rb
 - examples/em_sender.rb
+- examples/sender.rb

data/README.rst

@@ -1,83 +0,0 @@
-collectd Data Model
--------------------
-
-Collectd groups data by **six categories:**
-
-* *hostname* is grabbed from `hostname -f`
-* *plugin* is the application's name
-* *plugin-instance* is passed from the programs' side with the
-  programs instance identifier, useful if you're running the same
-  script twice (PIDs are quite too random)
-* *type* is the kind of data you are measuring and must be defined in
-  types.db_ for collectd to understand
-* *type-instance* provides further distinction and have no relation to
-  other type-instances. Multiple type-instances are only rendered into
-  one graph by collection3 if defined with module GenericStacked.
-* *values* are one or more field names and types belonging
-  together. The exact amount of fields and their corresponding names
-  (useful to collection3) are specified in collectd's types.db_.
-
-A value can be either of **two types:**
-
-* *COUNTER* is for increasing counters where you want to plot the
-  delta. Network interface traffic counters are a good example.
-* *GAUGE* is values that go up and down to be plotted as-is, like a
-  temperature graph.
-
-
-Usage
------
-
-::
-
-    gem 'astro-collectd'
-    require 'collectd'
-
-First of all, specify a server to send data to:
-
-::
-
-    Collectd.add_server(interval, addr='ff18::efc0:4a42', port=25826)
-
-Each server definition you add will receive all the data you push to
-later. An interval of 10 is quite reasonable. Because of UDP and some
-buffering in collectd, an interval of 1 seconds shouldn't hurt either.
-
-All the identifiers from above can be given free form with some
-method_missing stuff. Like this:
-
-::
-
-    # Set gauge absolutely
-    Collectd.plugin(:plugin_instance).type(:type_instance).gauge = 23
-    
-    # Increase counter relatively (collectd caches counters)
-    Collectd.plugin(:plugin_instance).type(:type_instance).count! 5
-    
-    # Set counter absolutely
-    Collectd.plugin(:plugin_instance).type(:type_instance).counter = 42
-
-For convenience, define yourself a global *shortcut*, like:
-
-::
-
-    Stats = Collectd.my_zombie(RAILS_ENV)
-
-To automatically collect *memory and CPU statistics* of your Ruby
-process, do:
-
-::
-
-    Stats.with_full_proc_stats
-
-You can also have the library *poll* for your data, if you feel
-comfortable with that, eg:
-
-::
-
-    Stats.counter(:seconds_elapsed).polled_counter do
-      Time.now.to_i
-    end
-
-
-.. _types.db: http://collectd.org/documentation/manpages/types.db.5.shtml