heartbeat-client 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/bin/hbc

@@ -22,13 +22,22 @@ unless @config['endpoint']
   exit
 end
 
+version = "0.0"
+begin
+  file = File.open(File.dirname(__FILE__) + "/../VERSION", "rb")
+  version = file.read
+  puts "heartbeat-client #{version}"
+rescue => e
+  puts e.message
+end
+
 if ARGV and ARGV.size == 1
   Daemons.run_proc('heartbeat-client.rb', :dir => File.join('/tmp'), :monitor => true,
     :backtrace => true, :monitor => true) do
     Heartbeat.log = Logger.new('/tmp/heartbeat.log')
     loop do
       begin
-        Heartbeat.create(@config)
+        Heartbeat.create(@config, version)
       rescue => e
         puts e.message
       end

data/heartbeat-client.yml.sample

@@ -2,3 +2,5 @@ endpoint: "http://heartbeat-monitoring.com"
 apikey: "<YOUR KEY>"
 name: "<SERVER NAME ALIAS>"
 apache_status: "http://127.0.0.1/server-status/?auto"
+mongostat_arguments: "-h 127.0.0.1 -n 1"
+#mongostat_arguments: "-h 127.0.0.1 -n 1 -u YOUR_USER -p PASS"

data/lib/heartbeat-client.rb

@@ -3,6 +3,8 @@ gem 'httparty'
 require 'httparty'
 require 'logger'
 require 'macaddr'
+require 'net/http'
+require 'json'
 
 class Heartbeat
   include HTTParty
@@ -23,13 +25,14 @@ class Heartbeat
     @@log
   end
 
-  def self.create(config)
+  def self.create(config, version = '0.0')
     log.info("#create - Collecting data...")
     
     apikey = config['apikey']
     endpoint = config['endpoint']
     name = config['name']
     apache_status = config['apache_status']
+    mongostat_arguments = config['mongostat_arguments']
 
     procs = {'total' => 0, 'running' => 0, 'stuck' => 0, 'sleeping' => 0, 'threads' => 0, 'stopped' => 0, 'zombie' => 0}
     load_avg = []
@@ -39,6 +42,7 @@ class Heartbeat
     disks = {}
     swap = {'free' => 0, 'used' => 0}
     apache = {}
+    mongodb = {}
   
     log.debug("Dumping top output...")
     if is_linux?
@@ -51,9 +55,15 @@ class Heartbeat
     `df -m > /tmp/dfm.out`
 
     if apache_status
+      log.debug("Dumping apache status output...")
       `curl #{apache_status} > /tmp/apache.out`  
     end
 
+    if mongostat_arguments
+      log.debug("Dumping mongostat output...")
+      `mongostat #{mongostat_arguments} > /tmp/mongodb.out`
+    end
+
     if File.exists?('/tmp/top.out')
       counter = 0; proc_count = 0
       File.open("/tmp/top.out", "r") do |infile|
@@ -97,9 +107,20 @@ class Heartbeat
         end
       end
 
+      if File.exists?('/tmp/mongodb.out')
+        File.open("/tmp/mongodb.out", "r") do |infile|
+          counter = 0
+          while (line = infile.gets)
+            mongodb_status(mongodb, line) if counter == 2
+            counter += 1
+          end
+        end
+      end
+
       options = {
         :body => {
           :heartbeat => {
+            :client_version => version,
             :apikey => apikey,
             :host => `hostname`.chomp,
             :macaddr => Mac.addr,
@@ -113,7 +134,8 @@ class Heartbeat
               :memory => memory,
               :disks => disks,
               :swap => swap,
-              :apache_status => apache
+              :apache_status => apache,
+              :mongodb_status => mongodb
             }
           }
         }
@@ -199,6 +221,26 @@ class Heartbeat
     end
   end
 
+  def self.mongodb_status(mongodb, str)
+    if (mo = str.split(' '))
+      mo.each_with_index do |moa, index|
+        mongodb['insert'] = moa.strip.to_i if index == 0
+        mongodb['query'] = moa.strip.to_i if index == 1
+        mongodb['update'] = moa.strip.to_i if index == 2
+        mongodb['delete'] = moa.strip.to_i if index == 3
+        mongodb['getmore'] = moa.strip.to_i if index == 4
+        mongodb['command'] = moa.strip.to_i if index == 5
+        mongodb['flushes'] = moa.strip.to_i if index == 6
+        mongodb['mapped'] = moa.strip if index == 7
+        mongodb['vsize'] = moa.strip if index == 8
+        mongodb['res'] = moa.strip if index == 9
+        mongodb['netIn'] = moa.strip if index == 14
+        mongodb['netOut'] = moa.strip if index == 15
+        mongodb['conn'] = moa.strip if index == 16
+      end
+    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: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Oliver Kiessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 Z
+date: 2012-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement