instrumental_agent 0.1.0 → 0.1.2

data/README.rdoc

@@ -6,16 +6,17 @@ Instrument anything.
 
 Add the gem to your Gemfile.
 
-  gem 'instrumental-agent'
+  gem 'instrumental_agent'
 
 Head over to instrumentalapp.com and setup an account, then 
 initialize the agent.
 
-  I = Instrumental::Agent.new('YOUR_API_KEY')
+  I = Instrumental::Agent.new('YOUR_API_KEY', :enabled => Rails.env.production?)
 
-  # or, if you're using eventmachine already
+If you already use EventMachine elsewhere, or are hosted on heroku 
+then you will need to disable the reactor loop startup like so:
 
-  I = Instrumental::Agent.new('YOUR_API_KEY', :start_reactor => false)
+  I = Instrumental::Agent.new('YOUR_API_KEY', :enabled => Rails.env.production?, :start_reactor => false)
 
 Now you can begin to use instrumental to track your application
 

data/bin/watch_server.rb

@@ -123,12 +123,86 @@ class SystemInspector
       end
     end
   end
+
+  module Linux
+    def self.load_cpu
+      output = { :gauges => {} }
+      output[:gauges].merge!(cpu)
+      output[:gauges].merge!(loadavg)
+      output
+    end
+
+    def self.cpu
+      cpu, user, nice, system, idle, iowait = `cat /proc/stat | grep cpu[^0-9]`.chomp.split(/\s+/)
+      total = user.to_i + system.to_i + idle.to_i + iowait.to_i
+      {
+        'cpu.user' => (user.to_f / total) * 100,
+        'cpu.system' => (system.to_f / total) * 100,
+        'cpu.idle' => (idle.to_f / total) * 100,
+        'cpu.iowait' => (iowait.to_f / total) * 100,
+      }
+    end
+
+    def self.loadavg
+      min_1, min_5, min_15 = `cat /proc/loadavg`.split(/\s+/)
+      {
+        'load.1min' => min_1.to_f,
+        'load.5min' => min_5.to_f,
+        'load.15min' => min_15.to_f,
+      }
+    end
+
+    def self.load_memory
+      output = { :gauges => {} }
+      output[:gauges].merge!(memory)
+      output[:gauges].merge!(swap)
+      output
+    end
+
+    def self.memory
+      _, total, used, free, shared, buffers, cached = `free -k -o | grep Mem`.chomp.split(/\s+/)
+      {
+        'memory.used_mb' => used.to_f / 1024,
+        'memory.free_mb' => free.to_f / 1024,
+        'memory.buffers_mb' => buffers.to_f / 1024,
+        'memory.cached_mb' => cached.to_f / 1024,
+        'memory.free_percent' => (free.to_f / total.to_f) * 100,
+      }
+    end
+
+    def self.swap
+      _, total, used, free = `free -k -o | grep Swap`.chomp.split(/\s+/)
+      {
+        'swap.used_mb' => used.to_f / 1024,
+        'swap.free_mb' => free.to_f / 1024,
+        'swap.free_percent' => (free.to_f / total.to_f) * 100,
+      }
+    end
+
+    def self.load_disks
+      { :gauges => disks }
+    end
+
+    def self.disks
+      output = {}
+      `df -Pk`.split("\n").grep(%r{^/dev/}).each do |line|
+        device, total, used, available, capacity, mount = line.split(/\s+/)
+        names = [File.basename(device)]
+        names << 'root' if mount == '/'
+        names.each do |name|
+          output["disk.#{name}.total_mb"] = total.to_f / 1024
+          output["disk.#{name}.used_mb"] = used.to_f / 1024
+          output["disk.#{name}.available_mb"] = available.to_f / 1024
+          output["disk.#{name}.available_percent"] = available.to_f / total.to_f * 100
+        end
+      end
+      output
+    end
+  end
 end
 
-# TODO: swap
 # TODO: utilization
 
-
 token, collector = *ARGV
 unless token
   puts "Usage: #{$0} <token> [collector]"
@@ -147,5 +221,5 @@ loop do
     I.gauge("#{host}.#{stat}", value)
   end
   # I.increment("#{host}.#{stat}", delta)
-  sleep 1
+  sleep 10
 end

data/instrumental_agent.gemspec

@@ -4,8 +4,8 @@ require "instrumental/version"
 Gem::Specification.new do |s|
   s.name        = "instrumental_agent"
   s.version     = Instrumental::VERSION
-  s.authors     = ["Elijah Miller", "Christopher Zelenak"]
-  s.email       = ["elijah.miller@gmail.com", "netshade@gmail.com"]
+  s.authors     = ["Elijah Miller", "Christopher Zelenak", "Kristopher Chambers"]
+  s.email       = ["elijah.miller@gmail.com", "netshade@gmail.com", 'kristopher.chambers@gmail.com']
   s.homepage    = "http://github.com/fastestforward/instrumental_agent"
   s.summary     = %q{Agent for reporting data to instrumentalapp.com}
   s.description = %q{Keep track of anything.}

data/lib/instrumental/agent.rb

@@ -9,7 +9,7 @@ require 'logger'
 module Instrumental
   class Agent
     attr_accessor :host, :port
-    attr_reader :connection
+    attr_reader :connection, :enabled
     
     def self.start_reactor
       unless EM.reactor_running?
@@ -98,7 +98,7 @@ module Instrumental
     #  Instrumental::Agent.new(API_KEY)
     #  Instrumental::Agent.new(API_KEY, :collector => 'hostname:port')
     def initialize(api_key, options = {})
-      default_options = { :start_reactor => true }
+      default_options = { :start_reactor => true, :enabled => true }
       options = default_options.merge(options)
       @api_key = api_key
       if options[:collector]
@@ -109,10 +109,16 @@ module Instrumental
         @port = 8000
       end
 
-      self.class.start_reactor if options[:start_reactor]
+      @enabled = options[:enabled]
 
-      EM.next_tick do
-        @connection = EM.connect host, port, ServerConnection, self, api_key
+      if @enabled
+        if options[:start_reactor]
+          self.class.start_reactor
+        end
+
+        EM.next_tick do
+          @connection = EM.connect host, port, ServerConnection, self, api_key
+        end
       end
     end
 
@@ -133,6 +139,10 @@ module Instrumental
       send_command("increment", metric, value, time.to_i)
     end
 
+    def enabled?
+      @enabled
+    end
+
     def connected?
       connection && connection.connected
     end
@@ -158,10 +168,12 @@ module Instrumental
     end
 
     def send_command(cmd, *args)
-      cmd = "%s %s\n" % [cmd, args.collect(&:to_s).join(" ")]
-      logger.debug "Sending: #{cmd.chomp}"
-      EM.next_tick do
-        connection.send_data(cmd)
+      if enabled?
+        cmd = "%s %s\n" % [cmd, args.collect(&:to_s).join(" ")]
+        logger.debug "Sending: #{cmd.chomp}"
+        EM.next_tick do
+          connection.send_data(cmd)
+        end
       end
     end
 

data/lib/instrumental/version.rb

@@ -1,4 +1,4 @@
 module Instrumental
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end
-  
+  

data/spec/agent_spec.rb

@@ -1,5 +1,28 @@
 require 'spec_helper'
 
+describe Instrumental::Agent, "disabled" do
+  before do
+    random_port = Time.now.to_i % rand(2000)
+    base_port = 4000
+    @port = base_port + random_port
+    TestServer.start(@port)
+  end
+
+  after do
+    TestServer.stop
+  end
+
+  subject { Instrumental::Agent.new('test_token', :collector => "127.0.0.1:#{@port}", :enabled => false) }
+
+  it 'should not connect to the server' do
+    subject.gauge('gauge_test', 123)
+    EM.next do
+      TestServer.last.should be_nil
+    end
+  end
+
+end
+
 describe Instrumental::Agent do
   before do
     random_port = Time.now.to_i % rand(2000)

data/spec/spec_helper.rb

@@ -21,7 +21,6 @@ RSpec.configure do |config|
   end
 
   config.after(:all) do
-    EM.stop
   end
 
 end

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: instrumental_agent
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Elijah Miller
 - Christopher Zelenak
+- Kristopher Chambers
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -04:00
+date: 2011-10-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,6 +109,7 @@ description: Keep track of anything.
 email: 
 - elijah.miller@gmail.com
 - netshade@gmail.com
+- kristopher.chambers@gmail.com
 executables: 
 - watch_server.rb
 extensions: []