astro-collectd 0.0.4 → 0.0.5

data/lib/collectd.rb

@@ -1,3 +1,4 @@
+require 'collectd/proc_stats'
 require 'collectd/interface'
 require 'collectd/server'
 begin

data/lib/collectd/em_server.rb

@@ -9,6 +9,7 @@ module Collectd
       @sock.connect(host, port)
 
       EM.add_periodic_timer(interval) do
+        Collectd.run_pollables_for self
         Thread.critical = true
         pkt = make_pkt
         Thread.critical = false

data/lib/collectd/interface.rb

@@ -22,6 +22,17 @@ module Collectd
       @@servers.each(&block)
     end
 
+    def add_pollable(&block)
+      @@pollables ||= []
+      @@pollables << block
+    end
+    def run_pollables_for(server)
+      @@pollables ||= []
+      @@pollables.each do |block|
+        block.call(server)
+      end
+    end
+
     def method_missing(plugin, plugin_instance)
       Plugin.new(plugin, plugin_instance)
     end
@@ -31,6 +42,7 @@ module Collectd
   ##
   # Interface helper
   class Plugin
+    include ProcStats
     def initialize(plugin, plugin_instance)
       @plugin, @plugin_instance = plugin, plugin_instance
     end
@@ -46,12 +58,16 @@ module Collectd
       @plugin, @plugin_instance = plugin, plugin_instance
       @type, @type_instance = type, type_instance
     end
+    ##
+    # GAUGE
     def gauge=(values)
       values = [values] unless values.kind_of? Array
       Collectd.each_server do |server|
         server.set_gauge(plugin_type, values)
       end
     end
+    ##
+    # COUNTER
     def counter=(values)
       values = [values] unless values.kind_of? Array
       Collectd.each_server do |server|
@@ -63,6 +79,30 @@ module Collectd
         server.inc_counter(plugin_type, values)
       end
     end
+    def polled_gauge(&block)
+      Collectd.add_pollable do |server|
+        values = block.call
+        values = [values] unless values.kind_of? Array
+        server.set_gauge(plugin_type, values) if values
+      end
+    end
+    def polled_count(&block)
+      Collectd.add_pollable do |server|
+        values = block.call
+        values = [values] unless values.kind_of? Array
+        server.inc_counter(plugin_type, values) if values
+      end
+    end
+    def polled_counter(&block)
+      Collectd.add_pollable do |server|
+        values = block.call
+        values = [values] unless values.kind_of? Array
+        server.set_counter(plugin_type, values) if values
+      end
+    end
+    private
+    ##
+    # [plugin, plugin_instance, type, type_instance]
     def plugin_type
       [@plugin, @plugin_instance, @type, @type_instance]
     end

data/lib/collectd/proc_stats.rb

@@ -0,0 +1,49 @@
+module Collectd
+  ##
+  # Included by Interface
+  module ProcStats
+    def with_polled_memory
+      def process_status(field)
+        fields = {}
+        IO.readlines("/proc/#{$$}/status").each { |line|
+          line.strip!
+          if line =~ /^(.+?):\s+(.+)$/
+            fields[$1] = $2
+          end
+        }
+        fields[field]
+      end
+
+      memory('VmRSS').polled_gauge do
+        process_status('VmRSS').to_i * 1024
+      end
+      memory('VmSize').polled_gauge do
+        process_status('VmSize').to_i * 1024
+      end
+
+      self
+    end
+
+    def with_polled_cpu
+      def schedstats
+        if IO.readlines("/proc/#{$$}/schedstat").to_s =~ /^(\d+) (\d+) (\d+)/
+            [$1.to_i, $2.to_i, $3.to_i]
+        else
+          []
+        end
+      end
+
+      cpu('user').polled_counter do
+        schedstats[0]
+      end
+      cpu('wait').polled_counter do
+        schedstats[1]
+      end
+    end
+
+    def with_full_proc_stats
+      with_polled_memory
+      with_polled_cpu
+    end
+  end
+end

data/lib/collectd/server.rb

@@ -13,6 +13,7 @@ module Collectd
         loop do
           sleep interval
 
+          Collectd.run_pollables_for self
           Thread.critical = true
           pkt = make_pkt
           Thread.critical = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-collectd
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Stephan Maka
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -07:00
+date: 2009-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/collectd/interface.rb
+- lib/collectd/proc_stats.rb
 - lib/collectd/pkt.rb
 - lib/collectd/server.rb
 - lib/collectd/em_server.rb