heartbeat-client 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/bin/hbc

@@ -35,9 +35,12 @@ 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')
+    count = 0
     loop do
       begin
-        Heartbeat.create(@config, version)
+        Heartbeat.create(@config, version, (count == 2))
+        count += 1
+        count = 0 if count == 2
       rescue => e
         puts e.message
       end

data/lib/heartbeat-client.rb

@@ -25,7 +25,7 @@ class Heartbeat
     @@log
   end
 
-  def self.create(config, version = '0.0')
+  def self.create(config, version = '0.0', gather_metrics = false)
     log.info("#create - Collecting data...")
     
     apikey = config['apikey']
@@ -34,89 +34,121 @@ class Heartbeat
     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 = []
-    cpu_usage = {'user' => 0, 'sys' => 0, 'idle' => 0}
-    processes = []
-    memory = {'free' => 0, 'used' => 0}
-    disks = {}
-    swap = {'free' => 0, 'used' => 0}
-    apache = {}
-    mongodb = {}
-  
-    log.debug("Dumping top output...")
-    if is_linux?
-      `top -b -n1 > /tmp/top.out`
-    else
-      `top -l 1 > /tmp/top.out`
-    end
-    
-    log.debug("Dumping df output...")
-    `df -m > /tmp/dfm.out`
+    if gather_metrics
+      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}
+      processes = []
+      memory = {'free' => 0, 'used' => 0}
+      disks = {}
+      swap = {'free' => 0, 'used' => 0}
+      apache = {}
+      mongodb = {}
 
-    if apache_status
-      log.debug("Dumping apache status output...")
-      `curl #{apache_status} > /tmp/apache.out`  
-    end
+      log.debug("Dumping top output...")
+      if is_linux?
+        `top -b -n1 > /tmp/top.out`
+      else
+        `top -l 1 > /tmp/top.out`
+      end
 
-    if mongostat_arguments
-      log.debug("Dumping mongostat output...")
-      `mongostat #{mongostat_arguments} > /tmp/mongodb.out`
-    end
+      log.debug("Dumping df output...")
+      `df -m > /tmp/dfm.out`
 
-    if File.exists?('/tmp/top.out')
-      counter = 0; proc_count = 0
-      File.open("/tmp/top.out", "r") do |infile|
-        while (line = infile.gets)
-          if is_linux?
-            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
+      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/dfm.out')
-        File.open("/tmp/dfm.out", "r") do |infile|
-          counter = 0
+
+      if File.exists?('/tmp/top.out')
+        counter = 0; proc_count = 0
+        File.open("/tmp/top.out", "r") do |infile|
           while (line = infile.gets)
-            disk_usage(disks, line) if counter > 0
+            if is_linux?
+              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
-      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
+
+        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
-      end
 
-      if File.exists?('/tmp/mongodb.out')
-        File.open("/tmp/mongodb.out", "r") do |infile|
-          counter = 0; lines = []
-          while (line = infile.gets)
-            lines << line
+        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
-          mongodb_status(mongodb, lines)
         end
-      end
 
+        if File.exists?('/tmp/mongodb.out')
+          File.open("/tmp/mongodb.out", "r") do |infile|
+            counter = 0; lines = []
+            while (line = infile.gets)
+              lines << line
+            end
+            mongodb_status(mongodb, lines)
+          end
+        end
+
+        options = {
+          :body => {
+            :heartbeat => {
+              :client_version => version,
+              :apikey => apikey,
+              :host => `hostname`.chomp,
+              :macaddr => Mac.addr,
+              :name => name,
+              :timestamp => Time.now.to_i,
+              :values => {
+                :process_stats => procs,
+                :load_avg => load_avg,
+                :cpu_usage => cpu_usage,
+                :processes => processes,
+                :memory => memory,
+                :disks => disks,
+                :swap => swap,
+                :apache_status => apache,
+                :mongodb_status => mongodb
+              }
+            }
+          }
+        }
+
+        log.info("#create - Sending data to endpoint (with metrics)...")
+        res = Heartbeat.post(endpoint + '/heartbeat', options)
+        log.debug("Response: #{res.response.inspect}") if res
+      else
+        log.error "No top output found."
+      end
+    else
       options = {
         :body => {
           :heartbeat => {
@@ -125,29 +157,16 @@ class Heartbeat
             :host => `hostname`.chomp,
             :macaddr => Mac.addr,
             :name => name,
-            :timestamp => Time.now.to_i,
-            :values => {
-              :process_stats => procs,
-              :load_avg => load_avg,
-              :cpu_usage => cpu_usage,
-              :processes => processes,
-              :memory => memory,
-              :disks => disks,
-              :swap => swap,
-              :apache_status => apache,
-              :mongodb_status => mongodb
-            }
+            :timestamp => Time.now.to_i
           }
         }
       }
 
-      log.info("#create - Sending data to endpoint...")
+      log.info("#create - Sending data to endpoint (no metrics)...")
       res = Heartbeat.post(endpoint + '/heartbeat', options)
       log.debug("Response: #{res.response.inspect}") if res
-      log.info("Finished iteration.")
-    else
-      log.error "No top output found."
     end
+    log.info("Finished iteration.")
   end
 
   def self.processes(procs, str)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heartbeat-client
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Oliver Kiessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 Z
+date: 2012-03-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Heartbeat