ganymed 0.3.1 → 0.3.2

data/lib/ganymed/collectors/disk.rb

@@ -16,10 +16,10 @@ collect do
       next if config.exclude.map {|e| Regexp.new(e).match(name)}.any?
 
       block_pc = 1.0 - (st.blocks_free.to_f / st.blocks.to_f)
-      processor.event("os.disk.#{name}.blocks", block_pc)
+      sampler.emit(:gauge, "os.disk.#{name}.blocks", block_pc)
 
       files_pc = 1.0 - (st.files_free.to_f / st.files.to_f)
-      processor.event("os.disk.#{name}.files", files_pc)
+      sampler.emit(:gauge, "os.disk.#{name}.files", files_pc)
     end
   end
 end

data/lib/ganymed/collectors/uptime.rb

@@ -1,4 +1,4 @@
-collect do
+collect(900) do
   next if not File.readable?('/proc/stat')
   File.open('/proc/stat') do |file|
     file.each do |line|

data/lib/ganymed/event.rb

@@ -44,22 +44,22 @@ module Ganymed
     #
     # @return [Event] The parsed event instance.
     def self.parse(obj)
-      new.tap do |event|
-        event.ns = obj['n']
-        event.cf = obj['c']
-        event.origin = obj['o']
-        event.timestamp = obj['t'].to_i
-        event.resolution = obj['r'].to_i
+      event = new
+      event.ns = obj['n']
+      event.cf = obj['c']
+      event.origin = obj['o']
+      event.timestamp = obj['t'].to_i
+      event.resolution = obj['r'].to_i
 
-        value = obj['v']
-        if value.is_a?(Float) and (value.nan? or value.infinite?)
-          event.value = nil
-        else
-          event.value = value
-        end
-
-        event.validate
+      value = obj['v']
+      if value.is_a?(Float) and (value.nan? or value.infinite?)
+        event.value = nil
+      else
+        event.value = value
       end
+
+      event.validate
+      event
     end
 
     # Convert this event into a hash with long keys. This hash cannot be parsed
@@ -81,7 +81,7 @@ module Ganymed
     #
     # @return [void]
     def validate
-      unless @ns =~ /^[a-z][a-z0-9_\.-]+[a-z0-9]$/
+      unless @ns =~ /^[a-z][a-z0-9_\.-]+[a-z0-9]$/i
         raise "invalid namespace: #{@ns.inspect}"
       end
 

data/lib/ganymed/mongodb.rb

@@ -12,8 +12,7 @@ module Ganymed
     end
 
     def connection
-      @connection ||= ::Mongo::Connection.new(config.host,
-                                              config.port,
+      @connection ||= ::Mongo::Connection.new(config.host, config.port,
                                               :pool_size => config.pool_size,
                                               :pool_timeout => config.pool_timeout)
     end
@@ -23,18 +22,19 @@ module Ganymed
     end
 
     def collection(ns)
-      @collections[ns] ||= db[ns].tap do |col|
-        col.ensure_index([['c', ::Mongo::ASCENDING]])
-        col.ensure_index([['o', ::Mongo::ASCENDING]])
-        col.ensure_index([['t', ::Mongo::ASCENDING]])
-        col.ensure_index([['c', ::Mongo::ASCENDING], ['o', ::Mongo::ASCENDING]])
-        col.ensure_index([['o', ::Mongo::ASCENDING], ['t', ::Mongo::ASCENDING]])
-        col.ensure_index([['c', ::Mongo::ASCENDING], ['o', ::Mongo::ASCENDING], ['t', ::Mongo::ASCENDING]], :unique => true)
-      end
+      return @collections[ns] if @collections.has_key?(ns)
+      col = @collections[ns] = db.collection(ns)
+      col.ensure_index([['c', ::Mongo::ASCENDING]])
+      col.ensure_index([['o', ::Mongo::ASCENDING]])
+      col.ensure_index([['t', ::Mongo::ASCENDING]])
+      col.ensure_index([['c', ::Mongo::ASCENDING], ['o', ::Mongo::ASCENDING]])
+      col.ensure_index([['o', ::Mongo::ASCENDING], ['t', ::Mongo::ASCENDING]])
+      col.ensure_index([['c', ::Mongo::ASCENDING], ['o', ::Mongo::ASCENDING], ['t', ::Mongo::ASCENDING]], :unique => true)
+      col
     end
 
-    def method_missing(method, *args, &block)
-      db.__send__(method, *args, &block)
+    def [](*args)
+      db.collection(*args)
     end
   end
 end

data/lib/ganymed/version.rb

@@ -1,4 +1,4 @@
 module Ganymed
   # @private
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ganymed
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &7558920 !ruby/object:Gem::Requirement
+  requirement: &10346400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *7558920
+  version_requirements: *10346400
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &7557220 !ruby/object:Gem::Requirement
+  requirement: &10345340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *7557220
+  version_requirements: *10345340
 - !ruby/object:Gem::Dependency
   name: ganymed-client
-  requirement: &7555900 !ruby/object:Gem::Requirement
+  requirement: &10344700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *7555900
+  version_requirements: *10344700
 - !ruby/object:Gem::Dependency
   name: madvertise-ext
-  requirement: &7554720 !ruby/object:Gem::Requirement
+  requirement: &10343960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *7554720
+  version_requirements: *10343960
 - !ruby/object:Gem::Dependency
   name: madvertise-logging
-  requirement: &7553740 !ruby/object:Gem::Requirement
+  requirement: &10362800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *7553740
+  version_requirements: *10362800
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &7553220 !ruby/object:Gem::Requirement
+  requirement: &10362360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7553220
+  version_requirements: *10362360
 - !ruby/object:Gem::Dependency
   name: RubyInline
-  requirement: &7567900 !ruby/object:Gem::Requirement
+  requirement: &10361580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7567900
+  version_requirements: *10361580
 - !ruby/object:Gem::Dependency
   name: servolux
-  requirement: &7566640 !ruby/object:Gem::Requirement
+  requirement: &10361080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7566640
+  version_requirements: *10361080
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &7564920 !ruby/object:Gem::Requirement
+  requirement: &10383460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7564920
+  version_requirements: *10383460
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &7562960 !ruby/object:Gem::Requirement
+  requirement: &10381520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *7562960
+  version_requirements: *10381520
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &7561620 !ruby/object:Gem::Requirement
+  requirement: &10380040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7561620
+  version_requirements: *10380040
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &7592340 !ruby/object:Gem::Requirement
+  requirement: &10377140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7592340
+  version_requirements: *10377140
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
-  requirement: &7591700 !ruby/object:Gem::Requirement
+  requirement: &10398540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7591700
+  version_requirements: *10398540
 - !ruby/object:Gem::Dependency
   name: ohai
-  requirement: &7590960 !ruby/object:Gem::Requirement
+  requirement: &10394740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: 0.6.12
   type: :runtime
   prerelease: false
-  version_requirements: *7590960
+  version_requirements: *10394740
 description: Ganymed is an event collection daemon
 email:
 - bb@xnull.de
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4196854861267997123
+      hash: -2621061982868671869
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4196854861267997123
+      hash: -2621061982868671869
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17