ganymed 0.1.0 → 0.1.1

data/bin/ganymed

@@ -3,10 +3,18 @@
 require 'rubygems'
 $:.unshift(File.join(File.expand_path("../..", __FILE__), 'lib'))
 
+$0 = "ganymed"
+
+require 'madvertise/ext/logging'
+require 'madvertise/ext/environment'
+Env.key = 'GANYMED_ENV'
+
 require 'ganymed/master'
 cli = Ganymed::Master::CLI.parse_options
 server = Ganymed::Master.new(cli.config)
 
+log.level = :debug if cli.config[:debug]
+
 if cli.config[:daemonize] or cli.config[:kill]
   daemon = Servolux::Daemon.new(:server => server)
 

data/contrib/cpuhog.c

@@ -0,0 +1,21 @@
+
+/* do some CPU hogging */
+
+
+int main(int argc, char *argv[])
+{
+  	int i;
+	unsigned long long v1,v2,v3;
+
+	while (1) {
+		v1 = 42;
+		v2 = v3 = -1;
+		for (i=0; i<1000; i++) {
+			v1 += i;
+			v2 = v1*i + v3;
+			v3 = v1 ^ v2;
+		}
+	}
+	return 0;
+}
+

data/lib/ganymed.rb

@@ -1,5 +1,3 @@
-require 'madvertise/ext/logging'
-
 module Ganymed
   GEM_ROOT = File.expand_path("../..", __FILE__).freeze
   LIB_DIR = File.join(GEM_ROOT, "lib").freeze

data/lib/ganymed/client.rb

@@ -78,7 +78,7 @@ module Ganymed
       # Emit a new {Event}.
       #
       # @param [String] ns  {Event} namespace.
-      # @param [Fixnum, Float] value  {Event} value.
+      # @param [Object] value  {Event} value.
       # @param [Hash] opts  Options
       # @option opts [String] cf  Consolidation function used in this event.
       # @option opts [Time] now  {Event} timestamp.

data/lib/ganymed/collector.rb

@@ -24,12 +24,29 @@ module Ganymed
       @client = Client.new(:processor => @config.collector.processor,
                            :sampler => @config.collector.sampler)
 
+      load_collectors
       @config.collectors.each do |collector|
         log.info("initializing collector #{collector.klass.demodulize}")
         collector.klass.constantize.new(collector, self).run
       end
     end
 
+    def load_collectors
+      # collectors shipped with ganymed
+      Dir[File.join(Ganymed::LIB_DIR, 'ganymed/collector/*.rb')].each do |f|
+        log.debug("Loading collector from #{f}")
+        require f
+      end
+
+      # custom collectors
+      if @config.collector.path.tap{}
+        Dir[File.join(@config.collector.path, '*.rb')].each do |f|
+          log.debug("Loading collector from #{f}")
+          require f
+        end
+      end
+    end
+
     ##
     # A base class for collectors.
     #
@@ -83,7 +100,3 @@ module Ganymed
     end
   end
 end
-
-Dir[File.join(Ganymed::LIB_DIR, 'ganymed/collector/*.rb')].each do |f|
-  require f
-end

data/lib/ganymed/collector/cpu.rb

@@ -4,8 +4,10 @@ module Ganymed
   class Collector
     class CPU < Base
       def collect!
-        File.open('/proc/stat') do |f|
-          cpu = f.readline.chomp.split[1,7].map do |x|
+        return if not File.readable?('/proc/stat')
+        File.open('/proc/stat').each do |line|
+          next if not line =~ /^cpu /
+          cpu = line.chomp.split[1,7].map do |x|
             x.to_i / hz
           end
           @sampler.emit(:derive, "os.cpu.user", cpu[0])

data/lib/ganymed/collector/disk.rb

@@ -9,6 +9,7 @@ module Ganymed
           next if st.blocks == 0 or st.files == 0
 
           name = name(mount.mount_point)
+          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)

data/lib/ganymed/collector/iostat.rb

@@ -8,12 +8,13 @@ module Ganymed
   class Collector
     class IOStat < Base
       def collect!
-        File.open('/proc/diskstats') do |f|
-          f.each do |line|
-            ios = Struct::IOStat.new(*line.strip.split(/\s+/))
-            @sampler.emit(:derive, "os.iostat.#{ios.dev}.rsect", ios.rsect)
-            @sampler.emit(:derive, "os.iostat.#{ios.dev}.wsect", ios.wsect)
-          end
+        return 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+$/
+          next if @config.exclude.map {|e| Regexp.new(e).match(ios.dev)}.any?
+          @sampler.emit(:derive, "os.iostat.#{ios.dev}.rsect", ios.rsect)
+          @sampler.emit(:derive, "os.iostat.#{ios.dev}.wsect", ios.wsect)
         end
       end
 

data/lib/ganymed/collector/load.rb

@@ -4,6 +4,7 @@ module Ganymed
   class Collector
     class Load < Base
       def collect!
+        return 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/collector/metadata.rb

@@ -20,6 +20,9 @@ module Ganymed
             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
 

data/lib/ganymed/collector/network.rb

@@ -7,11 +7,17 @@ module Ganymed
   class Collector
     class Network < Base
       def collect!
+        return if not File.readable?('/proc/net/dev')
+
         File.open('/proc/net/dev') do |f|
           f.each do |line|
             next unless line =~ /:/
+
             ns = Struct::NetworkStat.new(*line.strip.split(/\s+/))
             ns.dev.sub!(/:$/, '')
+
+            next if @config.exclude.map {|e| Regexp.new(e).match(ns.dev)}.any?
+
             @sampler.emit(:derive, "os.net.#{ns.dev}.rbytes", ns.rbytes)
             @sampler.emit(:derive, "os.net.#{ns.dev}.wbytes", ns.wbytes)
             @sampler.emit(:derive, "os.net.#{ns.dev}.rpackets", ns.rpackets)

data/lib/ganymed/collector/procs.rb

@@ -0,0 +1,22 @@
+module Ganymed
+  class Collector
+    class Procs < Base
+      def collect!
+        return if not File.readable?('/proc/stat')
+        File.open('/proc/stat').each do |line|
+          next if not line =~ /^procs_/
+          key, value = line.chomp.split
+          if key == "procs_running"
+            @sampler.emit(:gauge, "os.procs.running", value.to_i)
+          elsif key == "procs_blocked"
+            @sampler.emit(:gauge, "os.procs.blocked", value.to_i)
+          end
+        end
+      end
+
+      def interval
+        @config.interval.tap{} or 0.2
+      end
+    end
+  end
+end

data/lib/ganymed/collector/uptime.rb

@@ -4,9 +4,10 @@ module Ganymed
   class Collector
     class Uptime < Base
       def collect!
-        File.open('/proc/uptime') do |f|
-          uptime = f.read.chomp.split.first.to_f
-          boottime = Time.now - uptime
+        return 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)
           @processor.event("os.reboot", 1, :now => boottime)
         end
       end

data/lib/ganymed/config.yml

@@ -1,8 +1,9 @@
 generic:
-  pid_file: /tmp/ganymed.pid
-
   resolution: 300
 
+  eventmachine:
+    threadpool_size: 2
+
   profiling:
     perftools: false
     gcprofiler: false
@@ -44,6 +45,18 @@ generic:
     - klass: Ganymed::Collector::Uptime
     - klass: Ganymed::Collector::Load
     - klass: Ganymed::Collector::CPU
+    - klass: Ganymed::Collector::Procs
     - klass: Ganymed::Collector::Network
+      exclude:
+        - ^lo$
+        - ^sit
     - klass: Ganymed::Collector::Disk
+      exclude:
+        - ^dev$
+        - ^dev-shm$
+        - rc-init-d$
+        - ^run$
+        - ^sys-fs-cgroup$
     - klass: Ganymed::Collector::IOStat
+      skip_numbered: true
+      exclude: []

data/lib/ganymed/event.rb

@@ -34,7 +34,7 @@ module Ganymed
     attr_accessor :timestamp
 
     # The actual value of this sample.
-    # @return [Fixnum, Float]
+    # @return [Object]
     attr_accessor :value
 
     # Create a new {Event} instance from +obj+.
@@ -93,10 +93,6 @@ module Ganymed
       if @timestamp < 0
         raise "invalid timestamp: #{@timestamp.inspect}"
       end
-
-      unless @value.is_a?(Fixnum) or @value.is_a?(Float)
-        raise "invalid value in #{@ns}: #{@value.inspect} (#{@value.class.name})"
-      end
     end
   end
 end

data/lib/ganymed/master.rb

@@ -1,6 +1,5 @@
 require 'eventmachine'
 require 'madvertise/ext/config'
-require 'madvertise/ext/environment'
 require 'mixlib/cli'
 require 'servolux'
 require 'socket'
@@ -17,22 +16,26 @@ module Ganymed
     include Configuration::Helpers
 
     def initialize(cli)
-      $0 = "ganymed"
-
-      log.level = :debug if cli[:debug]
-
+      # load config file
       @default_config_file = File.join(LIB_DIR, 'ganymed/config.yml')
       @config_file = cli[:config_file]
 
-      @pid_file = config.pid_file.tap{}
-
-      super('ganymed', :interval => 1, :logger => log, :pid_file => @pid_file)
+      # initialize servolux
+      super('ganymed',
+            :interval => 1,
+            :logger => log,
+            :pid_file => cli[:pidfile])
     end
 
     def run
       unless EventMachine.reactor_running?
         @reactor.join if @reactor.is_a?(Thread)
         log.info("starting Ganymed reactor in #{Env.mode} mode")
+
+        # configure eventmachine
+        log.debug("EventMachine threadpool_size=#{config.eventmachine.threadpool_size}")
+        EventMachine.threadpool_size = config.eventmachine.threadpool_size
+
         @reactor = Thread.new do
           begin
             EventMachine.run { setup_reactor }
@@ -105,6 +108,12 @@ module Ganymed
         :long => '--config CONFIG',
         :description => "The configuration file to use"
 
+      option :pidfile,
+        :short => '-p PIDFILE',
+        :long => '--pidfile PIDFILE',
+        :description => "The daemon pidfile",
+        :default => "ganymed.pid"
+
       option :debug,
         :short => '-D',
         :long => '--debug',
@@ -128,7 +137,7 @@ module Ganymed
         :long => '--environment ENVIRONMENT',
         :description => "Set the daemon environment",
         :default => "development",
-        :proc => Proc.new { |value| ENV[Env.key] = value }
+        :proc => ->(value) { ENV[Env.key] = value }
 
       option :help,
         :short => '-h',
@@ -140,7 +149,6 @@ module Ganymed
         :exit => 0
 
       def self.parse_options
-        Env.key = 'GANYMED_ENV'
         new.tap do |cli|
           cli.parse_options
         end

data/lib/ganymed/sampler.rb

@@ -53,8 +53,10 @@ module Ganymed
     def flush(tick)
       modifiers = tick == 1 ? ['realtime'] : []
       datasources.each do |_, datasource|
-        datasource.flush(tick) do |ns, origin, values|
-          emit(ns, modifiers, origin, values)
+        EM.defer do
+          datasource.flush(tick) do |ns, origin, values|
+            emit(ns, modifiers, origin, values)
+          end
         end
       end
     end

data/lib/ganymed/sampler/datasource.rb

@@ -37,7 +37,7 @@ module Ganymed
       #
       # @param [String] ns  The namespace for this value.
       # @param [String] origin The origin of this value.
-      # @param [Fixnum,Float] ts  The timestamp of this value.
+      # @param [Time] ts  The timestamp of this value.
       # @param [Fixnum,Float] value  The actual value.
       # @return [void]
       def feed(ns, origin, ts, value)

data/lib/ganymed/version.rb

@@ -1,3 +1,3 @@
 module Ganymed
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ganymed
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &10633280 !ruby/object:Gem::Requirement
+  requirement: &11641160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *10633280
+  version_requirements: *11641160
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &10629700 !ruby/object:Gem::Requirement
+  requirement: &11637760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *10629700
+  version_requirements: *11637760
 - !ruby/object:Gem::Dependency
   name: madvertise-ext
-  requirement: &10628060 !ruby/object:Gem::Requirement
+  requirement: &11636500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *10628060
+  version_requirements: *11636500
 - !ruby/object:Gem::Dependency
   name: madvertise-logging
-  requirement: &10626000 !ruby/object:Gem::Requirement
+  requirement: &11634080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *10626000
+  version_requirements: *11634080
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &10642620 !ruby/object:Gem::Requirement
+  requirement: &11650400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10642620
+  version_requirements: *11650400
 - !ruby/object:Gem::Dependency
   name: servolux
-  requirement: &10640980 !ruby/object:Gem::Requirement
+  requirement: &11648860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10640980
+  version_requirements: *11648860
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &10640020 !ruby/object:Gem::Requirement
+  requirement: &11647780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10640020
+  version_requirements: *11647780
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &10639220 !ruby/object:Gem::Requirement
+  requirement: &11647060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *10639220
+  version_requirements: *11647060
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &10638060 !ruby/object:Gem::Requirement
+  requirement: &11645980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10638060
+  version_requirements: *11645980
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &10635980 !ruby/object:Gem::Requirement
+  requirement: &11644260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10635980
+  version_requirements: *11644260
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
-  requirement: &10652440 !ruby/object:Gem::Requirement
+  requirement: &11660200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10652440
+  version_requirements: *11660200
 - !ruby/object:Gem::Dependency
   name: ohai
-  requirement: &10650420 !ruby/object:Gem::Requirement
+  requirement: &11658260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: 0.6.12
   type: :runtime
   prerelease: false
-  version_requirements: *10650420
+  version_requirements: *11658260
 description: Ganymed is an event collection daemon
 email:
 - bb@xnull.de
@@ -160,6 +160,8 @@ files:
 - README.md
 - Rakefile
 - bin/ganymed
+- contrib/cpuhog
+- contrib/cpuhog.c
 - ganymed.gemspec
 - lib/ganymed.rb
 - lib/ganymed/client.rb
@@ -170,6 +172,7 @@ files:
 - lib/ganymed/collector/load.rb
 - lib/ganymed/collector/metadata.rb
 - lib/ganymed/collector/network.rb
+- lib/ganymed/collector/procs.rb
 - lib/ganymed/collector/uptime.rb
 - lib/ganymed/config.yml
 - lib/ganymed/event.rb
@@ -214,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3690408133288017606
+      hash: 3485584446673225312
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3690408133288017606
+      hash: 3485584446673225312
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17