warcorrespondent 0.1.2 → 0.2.0

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Stefan Maier"]
     gem.add_dependency("json")
     gem.add_dependency("daemons")
+    gem.add_dependency("systeminformation")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/warcorrespondent.rb

@@ -1,6 +1,7 @@
 require 'warcorrespondent/reporter.rb'
 require 'warcorrespondent/uplink.rb'
 require 'json'
+require 'systeminformation'
 require 'yaml'
 
 module WarCorrespondent
@@ -45,4 +46,4 @@ module WarCorrespondent
   def self.update(message)
     @@uplink.add(message)
   end
-end
+end

data/lib/warcorrespondent/reporter.rb

@@ -39,6 +39,6 @@ module WarCorrespondent
   
 end
 
-Dir.glob(File.dirname(__FILE__) + "/reporters/**/*.rb") do |i| 
+Dir.glob(File.dirname(__FILE__) + "/reporters/*.rb") do |i| 
   require i 
 end

data/lib/warcorrespondent/reporters/cpu.rb

@@ -0,0 +1,18 @@
+module WarCorrespondent
+  module Reporters
+    module Linux
+      class CPU < WarCorrespondent::Reporter
+        def initialize(args)
+          @block = Proc.new do
+            SystemInformation::cpu.map{ |cpu_id,data|
+              data.map{ |type, value|
+                {:identifier => "cpu:#{cpu_id.to_s}:#{type.to_s}", :value => value }
+              }
+            }.inject([]){|a,b| a+b}
+          end
+          super(args)
+        end
+      end
+    end
+  end
+end

data/lib/warcorrespondent/reporters/loadavg.rb

@@ -0,0 +1,22 @@
+module WarCorrespondent
+  module Reporters
+    module Linux
+      class LoadAvg < WarCorrespondent::Reporter
+        def initialize(args)
+        
+          @block = Proc.new do
+            load = SystemInformation::load
+            [
+              {:identifier => "load:1", :type => "float", :value => load[:load_1]},
+              {:identifier => "load:5", :type => "float", :value => load[:load_5]},
+              {:identifier => "load:15", :type => "float", :value => load[:load_15]},
+              {:identifier => "processes:running", :type => "integer", :value => load[:procs_running]},
+              {:identifier => "processes:total", :type => "integer", :value => load[:procs_total]}
+            ]
+          end
+          super(args)
+        end
+      end
+    end
+  end
+end

data/lib/warcorrespondent/reporters/memory.rb

@@ -0,0 +1,19 @@
+module WarCorrespondent
+  module Reporters
+    module Linux
+      class Memory < WarCorrespondent::Reporter
+        def initialize(args)
+          @block = Proc.new do
+            mem_items = {:free => :free, :cached => :cached, :buffers => :buffers, :total => :total, :used => :used}
+            swap_items = {:swaptotal => :total, :swapfree => :free, :swapused => :used}
+            memory = SystemInformation::memory
+            mem_items = mem_items.map{|k,v| {:identifier => "mem:#{v.to_s}", :value => memory[k]}}
+            swap_items = swap_items.map{|k,v| {:identifier => "swap:#{v.to_s}", :value => memory[k]}}
+            mem_items + swap_items
+          end
+          super(args)
+        end
+      end
+    end
+  end
+end

data/lib/warcorrespondent/reporters/net.rb

@@ -0,0 +1,18 @@
+module WarCorrespondent
+  module Reporters
+    module Linux
+      class Net < WarCorrespondent::Reporter
+        def initialize(args)
+          @block = Proc.new do
+            SystemInformation::net.map{ |net_id,data|
+              data.map{ |type, value|
+                {:identifier => "net:#{net_id.to_s}:#{type.to_s}", :value => value }
+              }
+            }.inject([]){|a,b|a+b}
+          end
+          super(args)
+        end
+      end
+    end
+  end
+end

data/lib/warcorrespondent/reporters/users.rb

@@ -4,11 +4,7 @@ module WarCorrespondent
       def initialize(args)
         
         @block = Proc.new do
-          count = 0
-          IO.popen('who') do |p|
-            count = p.readlines.size
-          end
-          {:identifier => "users", :value => count, :type => "integer" }
+          {:identifier => "users", :value => SystemInformation::users }
         end
         
         super(args)

data/lib/warcorrespondent/uplink.rb

@@ -46,4 +46,4 @@ module WarCorrespondent
     end
     
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warcorrespondent
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Stefan Maier
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 +02:00
+date: 2010-06-09 00:00:00 +02:00
 default_executable: warcorrespondent
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,14 +36,30 @@ dependencies:
   name: daemons
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: systeminformation
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: warcorrespondent collects data and reports it back to warroom.
 email: stefanmaier@gmail.com
 executables: 
@@ -60,10 +79,10 @@ files:
 - bin/warcorrespondent
 - lib/warcorrespondent.rb
 - lib/warcorrespondent/reporter.rb
-- lib/warcorrespondent/reporters/linux/cpu.rb
-- lib/warcorrespondent/reporters/linux/loadavg.rb
-- lib/warcorrespondent/reporters/linux/memory.rb
-- lib/warcorrespondent/reporters/linux/net.rb
+- lib/warcorrespondent/reporters/cpu.rb
+- lib/warcorrespondent/reporters/loadavg.rb
+- lib/warcorrespondent/reporters/memory.rb
+- lib/warcorrespondent/reporters/net.rb
 - lib/warcorrespondent/reporters/users.rb
 - lib/warcorrespondent/uplink.rb
 has_rdoc: true
@@ -76,23 +95,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: warcorrespondent reports to the warroom.

data/lib/warcorrespondent/reporters/linux/cpu.rb

@@ -1,42 +0,0 @@
-module WarCorrespondent
-  module Reporters
-    module Linux
-      class CPU < WarCorrespondent::Reporter
-        def initialize(args)
-          @block = Proc.new do
-            get_data = Proc.new do
-              data = nil
-              File.open('/proc/stat','r') do |f|
-                f.readlines.select{|l| l =~ /^cpu /}.each do |l|
-                  data = l.split
-                  data.shift
-                end
-              end
-              data
-            end
-            if !@prev_data 
-              @prev_data = get_data.call
-              sleep 5
-            end
-            @new_data = get_data.call
-            difference = @prev_data.zip(@new_data).map{|i| i[1].to_f - i[0].to_f}
-            sum = difference.inject{|a,b| a+b}
-            difference.map!{|i| i/sum}
-            @prev_data = @new_data
-            [
-              {:identifier => "cpu:user", :type => "float", :value => difference[0]},
-              {:identifier => "cpu:nice", :type => "float", :value => difference[1]},
-              {:identifier => "cpu:system", :type => "float", :value => difference[2]},
-              {:identifier => "cpu:idle", :type => "float", :value => difference[3]},
-              {:identifier => "cpu:running", :type => "float", :value => difference[4]},
-              {:identifier => "cpu:iowait", :type => "float", :value => difference[5]},
-              {:identifier => "cpu:irq", :type => "float", :value => difference[6]},
-              {:identifier => "cpu:softirq", :type => "float", :value => difference[7]}
-            ]
-          end
-          super(args)
-        end
-      end
-    end
-  end
-end

data/lib/warcorrespondent/reporters/linux/loadavg.rb

@@ -1,26 +0,0 @@
-module WarCorrespondent
-  module Reporters
-    module Linux
-      class LoadAvg < WarCorrespondent::Reporter
-        def initialize(args)
-        
-          @block = Proc.new do
-            File.open('/proc/loadavg','r') do |f|
-              line = f.readline
-              load_one_min, load_five_min, load_fivteen_min, processes = line.split
-              processes_running, processes_total = processes.split('/')
-              [
-                {:identifier => "load:1", :type => "float", :value => load_one_min},
-                {:identifier => "load:5", :type => "float", :value => load_five_min},
-                {:identifier => "load:15", :type => "float", :value => load_fivteen_min},
-                {:identifier => "processes:running", :type => "integer", :value => processes_running},
-                {:identifier => "processes:total", :type => "integer", :value => processes_total}
-              ]
-            end
-          end
-          super(args)
-        end
-      end
-    end
-  end
-end

data/lib/warcorrespondent/reporters/linux/memory.rb

@@ -1,36 +0,0 @@
-module WarCorrespondent
-  module Reporters
-    module Linux
-      class Memory < WarCorrespondent::Reporter
-        def initialize(args)
-          @block = Proc.new do
-            items = {
-              'mem:free' => 'MemFree',
-              'mem:cached' => 'Cached',
-              'mem:buffers' => 'Buffers',
-              'mem:total' => 'MemTotal',
-              'swap:total' => 'SwapTotal',
-              'swap:free' => 'SwapFree'
-              
-            }
-            File.open('/proc/meminfo','r') do |f|
-              f.readlines.each do |l|
-                items.each_pair do |i, k|
-                  if matches = Regexp.new("#{k}: +([0-9]+)").match(l)
-                    items[i] = matches[1].to_i
-                  end
-                end
-              end
-              items['mem:used'] = items['mem:total'] - items['mem:free'] - items['mem:cached'] - items['mem:buffers']
-              items['swap:used'] = items['mem:total'] - items['mem:free']
-            end
-            items.map{|k,v|
-              {:identifier => k, :value => v, :type => "integer", :unit => "kB"}
-            }
-          end
-          super(args)
-        end
-      end
-    end
-  end
-end

data/lib/warcorrespondent/reporters/linux/net.rb

@@ -1,46 +0,0 @@
-module WarCorrespondent
-  module Reporters
-    module Linux
-      class Net < WarCorrespondent::Reporter
-        def initialize(args)
-          @block = Proc.new do
-            get_data = Proc.new do
-              delta = nil
-              data = {}
-              File.open('/proc/net/dev','r') do |f|
-                f.readlines.select{|l| l =~ /:/}.each do |l|
-                  l.gsub!(/ +/,' ').strip!
-                  id, body = l.split(':')
-                  body = body.strip.split
-                  data[id] = [body[0],body[1],body[8],body[9]]
-                end
-              end
-              data
-            end
-            if !@prev_data
-              @prev_data = get_data.call
-              delta = 5
-              sleep 5
-            end
-            delta ||= timeout
-            @new_data = get_data.call
-            difference ={}
-            @prev_data.keys.each{|k|
-              difference[k] = @prev_data[k].zip(@new_data[k]).map{|i| (i[1].to_f - i[0].to_f)/delta}
-            }
-            @prev_data = @new_data
-            result=[]
-            difference.each{|k,body|
-              result << {:identifier => "net:#{k}:rbytes", :value => body[0], :type => "integer"}
-              result << {:identifier => "net:#{k}:rpackets", :value => body[1], :type => "integer"}
-              result << {:identifier => "net:#{k}:sbytes", :value => body[2], :type => "integer"}
-              result << {:identifier => "net:#{k}:spackets", :value => body[3], :type => "integer"}
-            }
-            result
-          end
-          super(args)
-        end
-      end
-    end
-  end
-end