warcorrespondent 0.0.2 → 0.0.3

data/README.rdoc

@@ -1,6 +1,54 @@
 = warcorrespondent
 
-warcorrespondent reports to the warroom.
+<em>warcorrespondent reports to the warroom.</em>
+
+warcorrespondent is a tool that reports measured data in json format to a web application.
+At the moment the functionality is only available in a standalone binary.
+
+== Data Format
+The data is subitted to the web app via POST, setting <em>secret</em> and <em>data</em>.
+<em>secret</em> is set to the string specified in the configuration file and is meant as a simple authentication method.
+<em>data</em> is a json structure and looks like this: 
+	[
+		{
+			identifier:"hosts:example:users",
+			timestamp: 1271146141,
+			type:"integer",
+			value:12
+		},
+		{
+			identifier: "apps:example:dontations",
+			timestamp: 1271146141,
+			type:"money",
+			unit:"EUR",
+			value:100
+		}
+	]
+
+
+== Configuration
+
+The main configuration lies in /etc/warcorrespondent/warcorrespondent.yml by default.
+Example:
+	url: http://localhost:3000/graphs
+	secret: adsfdsafdsfa
+
+The reporters are by default defined in /etc/warcorrespondent/reporters/*.rb
+	WarCorrespondent::Reporter.new(:timeout => 300, :identifier => 'hosts:example:users') do 
+	        count = 0
+	        IO.popen('who') do |p|
+	          count = p.readlines.size
+	        end
+	        {:value => count, :type => "integer"}
+	end
+The block may either return one  hash or an array of hashes.
+
+
+
+To start/stop the daemon use:
+	warcorrespondent start
+or
+	warcorrespondent stop
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/warcorrespondent

@@ -7,5 +7,10 @@ rescue LoadError
   require 'warcorrespondent'
 end
 
-WarCorrespondent::setup
-WarCorrespondent::run
+require 'daemons'
+
+Daemons.run_proc('warcorrespondent.rb') do
+  WarCorrespondent::setup
+  WarCorrespondent::run
+end
+

data/lib/warcorrespondent/reporter.rb

@@ -3,7 +3,7 @@ module WarCorrespondent
     attr_accessor :timeout
     attr_accessor :identifier
     def initialize(args, &block)
-      @timeout = 5
+      @timeout = 300
       [:timeout, :identifier].each do |key|
         if args[key] && self.respond_to?("#{key}=")
            self.send("#{key}=",args[key])
@@ -17,10 +17,12 @@ module WarCorrespondent
       data = @block.call
       data = [data] if data.class == Hash
       data.map! do |e|
-        e[:identifier] = "#{identifier}#{e[:identifier] ? (':' + e[:identifier]) : ''}".gsub(/:+/, ':')
+        e = {:timestamp => Time.now.to_i}.merge(e)
+        e[:identifier] = identifier + (e[:identifier]  ? (':' + e[:identifier]) : '')
+        e[:identifier].gsub!(/:+/, ':')
         e
       end
-      WarCorrespondent::update({:payload => data, :timestamp => Time.now.to_i})
+      WarCorrespondent::update(data)
     end
 
     def run
@@ -36,7 +38,7 @@ module WarCorrespondent
 
   
 end
-puts Dir.pwd
+
 Dir.glob(File.dirname(__FILE__) + "/reporters/*.rb") do |i| 
   require i 
 end

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

@@ -0,0 +1,42 @@
+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

@@ -0,0 +1,26 @@
+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:running", :type => "integer", :value => processes_total}
+              ]
+            end
+          end
+          super(args)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,46 @@
+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

data/lib/warcorrespondent/uplink.rb

@@ -1,5 +1,4 @@
 require 'net/http'
-require 'pp'
 module WarCorrespondent
   class Uplink
     
@@ -16,11 +15,16 @@ module WarCorrespondent
 
     def sync
       return if @@messages.size == 0
-      begin
-        message = @@messages.shift
-        post(encode(message))
-      rescue
-        add(message)
+      buffer = []
+      10.times do
+        buffer << @@messages.shift if @@messages.size > 0
+      end
+      buffer.each do |message| 
+        begin
+          post(encode(message))
+        rescue
+          add(message)
+        end
       end
     end
     
@@ -38,9 +42,7 @@ module WarCorrespondent
     end
     
     def post(message)
-      pp({'secret' => secret, 'data' => message})
-      res = Net::HTTP.post_form(URI.parse(url),
-                                {'secret'=>secret, 'data'=>message})
+      res = Net::HTTP.post_form(URI.parse(url), {'secret'=>secret, 'data'=>message})
       raise if res.code == 200
     end
     

data/lib/warcorrespondent.rb

@@ -1,7 +1,6 @@
 require 'warcorrespondent/reporter.rb'
 require 'warcorrespondent/uplink.rb'
 require 'json'
-require 'pp'
 
 module WarCorrespondent
   CONFIG_FILE = '/etc/warcorrespondent/warcorrespondent.yml'
@@ -14,7 +13,7 @@ module WarCorrespondent
       @@uplink.url = @@config['url']
       @@uplink.secret = @@config['secret']
     rescue
-      puts "Could not load config file #{CONFIG_FILE}"
+      raise "Could not load config file #{CONFIG_FILE}"
       exit
     end
     Dir.glob("#{REPORTERS_DIRECTORIES}/*.rb").each do |i| 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Stefan Maier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +02:00
+date: 2010-04-17 00:00:00 +02:00
 default_executable: warcorrespondent
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,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/users.rb
 - lib/warcorrespondent/uplink.rb
 - test/helper.rb