ganymed 0.2.1 → 0.2.2

data/lib/ganymed/collectors/cpu.rb

@@ -1,5 +1,5 @@
 collect(0.3) do
-  return if not File.readable?('/proc/stat')
+  break if not File.readable?('/proc/stat')
 
   File.open('/proc/stat').each do |line|
     next if not line =~ /^cpu /

data/lib/ganymed/collectors/iostat.rb

@@ -5,7 +5,7 @@ Struct.new("IOStat",
            :running, :use, :aveq)
 
 collect(0.3) do
-  return if not File.readable?('/proc/diskstats')
+  next if not File.readable?('/proc/diskstats')
   File.open('/proc/diskstats').each do |line|
     ios = Struct::IOStat.new(*line.strip.split(/\s+/))
     next if config.skip_numbered.tap{} and ios.dev =~ /\d+$/

data/lib/ganymed/collectors/load.rb

@@ -1,5 +1,5 @@
 collect(5) do
-  return if not File.readable?('/proc/loadavg')
+  next if not File.readable?('/proc/loadavg')
   File.open('/proc/loadavg') do |f|
     loadavg = f.read.chomp.split[0,3].map(&:to_f)
     sampler.emit(:gauge, "os.loadavg", loadavg[0])

data/lib/ganymed/collectors/memory.rb

@@ -1,5 +1,5 @@
 collect(5) do
-  return if not File.readable?('/proc/meminfo')
+  next if not File.readable?('/proc/meminfo')
 
   # calculate app memory from total
   apps = 0

data/lib/ganymed/collectors/network.rb

@@ -4,7 +4,7 @@ Struct.new("NetworkStat", :dev,
            :wbytes, :wpackets, :werrs, :wdrop, :wfifo, :wcolls, :wcarrier, :wcompressed)
 
 collect(0.3) do
-  return if not File.readable?('/proc/net/dev')
+  break if not File.readable?('/proc/net/dev')
 
   File.open('/proc/net/dev') do |f|
     f.each do |line|

data/lib/ganymed/collectors/process.rb

@@ -1,5 +1,5 @@
 collect(0.3) do
-  return if not File.readable?('/proc/stat')
+  break if not File.readable?('/proc/stat')
   File.open('/proc/stat').each do |line|
     key, value = line.chomp.split
     case key

data/lib/ganymed/collectors/uptime.rb

@@ -1,5 +1,5 @@
 collect do
-  return if not File.readable?('/proc/stat')
+  break if not File.readable?('/proc/stat')
   File.open('/proc/stat').each do |line|
     next if not line =~ /^btime /
     boottime = Time.at(line.chomp.split[1].to_i)

data/lib/ganymed/event.rb

@@ -72,6 +72,7 @@ module Ganymed
         :cf => cf,
         :origin => origin,
         :timestamp => timestamp,
+        :resolution => resolution,
         :value => value
       }
     end

data/lib/ganymed/processor.rb

@@ -75,7 +75,11 @@ module Ganymed
         connection.publish(event)
       end
 
-      # skip events that are produced below the mongodb storage threshold
+      # normalize timestamp for events with a resolution
+      if event.resolution > 1
+        event.timestamp -= event.timestamp % event.resolution
+
+      # skip events that are produced below the resolution threshold
       return if (1...@config.resolution).include?(event.resolution)
 
       # insert event into ns collection

data/lib/ganymed/version.rb

@@ -1,4 +1,4 @@
 module Ganymed
   # @private
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/ganymed/websocket/filter.rb

@@ -11,10 +11,10 @@ module Ganymed
         @spec.map do |skey, svalue|
           evalue = event.send(skey.to_sym)
           case svalue
-          when String
-            svalue == evalue
           when Array
             svalue.include?(evalue)
+          else
+            svalue == evalue
           end
         end.all?
       end

data/lib/ganymed/websocket/subscribe.rb

@@ -15,23 +15,23 @@ module Ganymed
 
       def subscribe(data)
         return if not authenticated?
-        data.each do |prefix, filter|
-          log.debug("client #{peer} subscribed to #{prefix} with filter=#{filter.inspect}")
-          filters[prefix] = Filter.new(filter)
+        data.each do |ns, filter|
+          log.debug("client #{peer} subscribed to #{ns} with filter=#{filter.inspect}")
+          filters[ns] = Filter.new(filter)
         end
       end
 
       def unsubscribe(data)
         return if not authenticated?
-        data.each do |prefix, filter|
-          log.debug("client #{peer} unsubscribed prefix #{prefix}")
-          filters.delete(prefix)
+        data.each do |ns, filter|
+          log.debug("client #{peer} unsubscribed namespace #{ns}")
+          filters.delete(ns)
         end
       end
 
       def subscribed?(event)
-        filters.map do |prefix, filter|
-          filter if prefix == "all" or event.ns =~ /^#{prefix}/
+        filters.map do |ns, filter|
+          filter if ns == "all" or event.ns == ns
         end.compact.map do |filter|
           filter.match?(event)
         end.any?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ganymed
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &11533840 !ruby/object:Gem::Requirement
+  requirement: &11336480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *11533840
+  version_requirements: *11336480
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &11547700 !ruby/object:Gem::Requirement
+  requirement: &11333940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *11547700
+  version_requirements: *11333940
 - !ruby/object:Gem::Dependency
   name: ganymed-client
-  requirement: &11545880 !ruby/object:Gem::Requirement
+  requirement: &11331240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11545880
+  version_requirements: *11331240
 - !ruby/object:Gem::Dependency
   name: madvertise-ext
-  requirement: &11543540 !ruby/object:Gem::Requirement
+  requirement: &11329740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *11543540
+  version_requirements: *11329740
 - !ruby/object:Gem::Dependency
   name: madvertise-logging
-  requirement: &11568260 !ruby/object:Gem::Requirement
+  requirement: &11357980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *11568260
+  version_requirements: *11357980
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &11567280 !ruby/object:Gem::Requirement
+  requirement: &11356980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11567280
+  version_requirements: *11356980
 - !ruby/object:Gem::Dependency
   name: RubyInline
-  requirement: &11565860 !ruby/object:Gem::Requirement
+  requirement: &11354780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11565860
+  version_requirements: *11354780
 - !ruby/object:Gem::Dependency
   name: servolux
-  requirement: &11564440 !ruby/object:Gem::Requirement
+  requirement: &11352760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11564440
+  version_requirements: *11352760
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &11562600 !ruby/object:Gem::Requirement
+  requirement: &11351720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11562600
+  version_requirements: *11351720
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &11576160 !ruby/object:Gem::Requirement
+  requirement: &11372540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *11576160
+  version_requirements: *11372540
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &11573300 !ruby/object:Gem::Requirement
+  requirement: &11368680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11573300
+  version_requirements: *11368680
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &11572500 !ruby/object:Gem::Requirement
+  requirement: &11367160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11572500
+  version_requirements: *11367160
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
-  requirement: &11570040 !ruby/object:Gem::Requirement
+  requirement: &11365860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11570040
+  version_requirements: *11365860
 - !ruby/object:Gem::Dependency
   name: ohai
-  requirement: &11598400 !ruby/object:Gem::Requirement
+  requirement: &11387480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: 0.6.12
   type: :runtime
   prerelease: false
-  version_requirements: *11598400
+  version_requirements: *11387480
 description: Ganymed is an event collection daemon
 email:
 - bb@xnull.de
@@ -192,7 +192,6 @@ files:
 - lib/ganymed/collectors/iostat.rb
 - lib/ganymed/collectors/load.rb
 - lib/ganymed/collectors/memory.rb
-- lib/ganymed/collectors/metadata.rb
 - lib/ganymed/collectors/network.rb
 - lib/ganymed/collectors/process.rb
 - lib/ganymed/collectors/uptime.rb
@@ -239,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2510946604903301186
+      hash: 2492483449465881370
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2510946604903301186
+      hash: 2492483449465881370
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17

data/lib/ganymed/collectors/metadata.rb

@@ -1,22 +0,0 @@
-require 'ohai'
-
-collect do
-  Ohai::System.new.tap do |ohai|
-    %w(
-      os
-      kernel
-      hostname
-      keys
-      network
-      platform
-      uptime
-      virtualization
-    ).each do |plugin|
-      ohai.require_plugin(plugin)
-    end
-    processor.metadata(ohai.data)
-
-    # ohai doesn't cleanup after itself
-    true while Process.wait(-1, Process::WNOHANG) rescue nil
-  end
-end