heartbeat-client 0.2.2 → 0.2.3

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 gem 'httparty'
 gem 'daemons'
+gem 'foreman'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -2,6 +2,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     daemons (1.1.4)
+    foreman (0.30.1)
+      term-ansicolor (~> 1.0.5)
+      thor (>= 0.13.6)
     git (1.2.5)
     httparty (0.8.1)
       multi_json
@@ -15,6 +18,8 @@ GEM
     rake (0.9.2.2)
     rcov (0.9.11)
     shoulda (2.11.3)
+    term-ansicolor (1.0.7)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
@@ -22,6 +27,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   daemons
+  foreman
   httparty
   jeweler (~> 1.5.2)
   rcov

data/Rakefile

@@ -21,6 +21,8 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Oliver Kiessler"]
   gem.add_runtime_dependency 'daemons'
   gem.add_runtime_dependency 'httparty'
+  gem.add_runtime_dependency 'json'
+  gem.add_runtime_dependency 'foreman'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/heartbeat-client.rb

@@ -25,6 +25,9 @@ class Heartbeat
     load_avg = []
     cpu_usage = {'user' => 0, 'sys' => 0, 'idle' => 0}
     processes = []
+    memory = {'free' => 0, 'used' => 0}
+    disks = {}
+    swap = {'free' => 0, 'used' => 0}
 
     if is_linux?
       `top -b -n1 > /tmp/top.out`
@@ -32,6 +35,8 @@ class Heartbeat
       `top -l 1 > /tmp/top.out`
     end
 
+    `df -m > /tmp/dfm.out`
+
     if File.exists?('/tmp/top.out')
       counter = 0; proc_count = 0
       File.open("/tmp/top.out", "r") do |infile|
@@ -40,17 +45,30 @@ class Heartbeat
             processes(procs, line) if line.include?('Task')
             load_averages(load_avg, line) if line.include?('load average')
             cpu_usages(cpu_usage, line) if line.include?('Cpu')
+            memory_usage(memory, line) if line.include?('Mem')
+            swap_usage(swap, line) if line.include?('Swap')
             proc_count = counter + 1 if line.include?('PID') and line.include?('COMMAND')
           else
             processes(procs, line) if line.include?('Processes')
             load_averages(load_avg, line) if line.include?('Load Avg')
             cpu_usages(cpu_usage, line) if line.include?('CPU usage')
+            memory_usage(memory, line) if line.include?('PhysMem')
             proc_count = counter + 1 if line.include?('PID') and line.include?('COMMAND')
           end
           process(processes, line) if proc_count > 0 and counter >= proc_count
           counter += 1
         end
       end
+      
+      if File.exists?('/tmp/dfm.out')
+        File.open("/tmp/dfm.out", "r") do |infile|
+          counter = 0
+          while (line = infile.gets)
+            disk_usage(disks, line) if counter > 0
+            counter += 1
+          end
+        end
+      end
 
       options = {
         :body => {
@@ -62,16 +80,21 @@ class Heartbeat
               :process_stats => procs,
               :load_avg => load_avg,
               :cpu_usage => cpu_usage,
-              :processes => processes
+              :processes => processes,
+              :memory => memory,
+              :disks => disks,
+              :swap => swap
             }
           }
         }
       }
 
-      #puts procs.inspect
-      #puts load_avg.inspect
-      #puts cpu_usage.inspect
-      #puts processes.inspect
+      puts procs.inspect
+      puts load_avg.inspect
+      puts cpu_usage.inspect
+      puts processes.inspect
+      puts memory.inspect
+      puts disks.inspect
 
       Heartbeat.post('/heartbeat', options)
     else
@@ -114,10 +137,35 @@ class Heartbeat
     end
   end
 
-  def self.process(processes, line)
-    procs = line.split(' ')
+  def self.process(processes, str)
+    procs = str.split(' ')
     if procs and procs.size > 0
       processes << (is_linux? ? procs[11].strip : procs[1].strip)
     end
   end
+  
+  def self.memory_usage(memory, str)
+    mem = str.split(':')
+    if mem and mem[0]
+      mem[1].split(',').each do |m|
+        memory['free'] = m.split(' ')[0].strip if m.include?('free')
+        memory['used'] = m.split(' ')[0].strip if m.include?('used')
+      end
+    end
+  end
+
+  def self.swap_usage(swap, str)
+    sw = str.split(':')
+    if sw and sw[0]
+      sw[1].split(',').each do |s|
+        swap['free'] = s.split(' ')[0].strip if s.include?('free')
+        swap['used'] = s.split(' ')[0].strip if s.include?('used')
+      end
+    end
+  end
+  
+  def self.disk_usage(disks, str)
+    ds = str.split(' ')
+    disks[ds[0].strip] = {'used' => ds[2].strip, 'available' => ds[3].strip}
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heartbeat-client
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Oliver Kiessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -55,12 +55,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: shoulda
+  name: foreman
   prerelease: false
-  type: :development
+  type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: shoulda
+  prerelease: false
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,9 +88,9 @@ dependencies:
   name: bundler
   prerelease: false
   type: :development
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,9 +104,9 @@ dependencies:
   name: jeweler
   prerelease: false
   type: :development
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,9 +118,9 @@ dependencies:
   name: rcov
   prerelease: false
   type: :development
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -118,9 +132,9 @@ dependencies:
   name: daemons
   prerelease: false
   type: :runtime
-  requirement: *id007
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -132,7 +146,35 @@ dependencies:
   name: httparty
   prerelease: false
   type: :runtime
-  requirement: *id008
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: json
+  prerelease: false
+  type: :runtime
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: foreman
+  prerelease: false
+  type: :runtime
+  requirement: *id011
 description: Heartbeat Client in Ruby
 email: kiessler@inceedo.com
 executables: