heartbeat-client 0.3.2 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/bin/hbc

@@ -28,7 +28,7 @@ if ARGV and ARGV.size == 1
     Heartbeat.log = Logger.new('/tmp/heartbeat.log')
     loop do
       begin
-        Heartbeat.create(@config['apikey'], @config['endpoint'], @config['name'])
+        Heartbeat.create(@config)
       rescue => e
         puts e.message
       end

data/heartbeat-client.yml.sample

@@ -0,0 +1,4 @@
+endpoint: "http://heartbeat-monitoring.com"
+apikey: "<YOUR KEY>"
+name: "<SERVER NAME ALIAS>"
+apache_status: "http://127.0.0.1/server-status/?auto"

data/lib/heartbeat-client.rb

@@ -23,9 +23,14 @@ class Heartbeat
     @@log
   end
 
-  def self.create(apikey, endpoint, name = nil)
+  def self.create(config)
     log.info("#create - Collecting data...")
     
+    apikey = config['apikey']
+    endpoint = config['endpoint']
+    name = config['name']
+    apache_status = config['apache_status']
+
     procs = {'total' => 0, 'running' => 0, 'stuck' => 0, 'sleeping' => 0, 'threads' => 0, 'stopped' => 0, 'zombie' => 0}
     load_avg = []
     cpu_usage = {'user' => 0, 'sys' => 0, 'idle' => 0}
@@ -33,6 +38,7 @@ class Heartbeat
     memory = {'free' => 0, 'used' => 0}
     disks = {}
     swap = {'free' => 0, 'used' => 0}
+    apache = {}
   
     log.debug("Dumping top output...")
     if is_linux?
@@ -44,6 +50,10 @@ class Heartbeat
     log.debug("Dumping df output...")
     `df -m > /tmp/dfm.out`
 
+    if apache_status
+      `curl #{apache_status} > /tmp/apache.out`  
+    end
+
     if File.exists?('/tmp/top.out')
       counter = 0; proc_count = 0
       File.open("/tmp/top.out", "r") do |infile|
@@ -76,6 +86,16 @@ class Heartbeat
           end
         end
       end
+      
+      if File.exists?('/tmp/apache.out')
+        File.open("/tmp/apache.out", "r") do |infile|
+          counter = 0; lines = []
+          while (line = infile.gets)
+            apache_status(apache, line)
+            counter += 1
+          end
+        end
+      end
 
       options = {
         :body => {
@@ -92,12 +112,13 @@ class Heartbeat
               :processes => processes,
               :memory => memory,
               :disks => disks,
-              :swap => swap
+              :swap => swap,
+              :apache_status => apache
             }
           }
         }
       }
-      
+
       log.info("#create - Sending data to endpoint...")
       res = Heartbeat.post(endpoint + '/heartbeat', options)
       log.debug("Response: #{res.response.inspect}") if res
@@ -168,7 +189,16 @@ class Heartbeat
       end
     end
   end
-  
+
+  def self.apache_status(apache, str)
+    ap = str.split(':')
+    if ap and ap[0]
+      apache['requests'] = ap[1].strip.to_f if ap[0].include?('ReqPerSec')
+      apache['busy_workers'] = ap[1].strip.to_i if ap[0].include?('BusyWorkers')
+      apache['idle_workers'] = ap[1].strip.to_i if ap[0].include?('IdleWorkers')
+    end
+  end
+
   def self.disk_usage(disks, str)
     ds = str.split(' ')
     disks[ds[0].strip] = {'used' => ds[2].strip, 'available' => ds[3].strip}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heartbeat-client
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Oliver Kiessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-01-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -222,6 +222,7 @@ files:
 - Rakefile
 - VERSION
 - bin/hbc
+- heartbeat-client.yml.sample
 - lib/heartbeat-client.rb
 - test/helper.rb
 - test/test_heartbeat-client.rb