instrumental_agent 0.4.0 → 0.5.0

data/.rspec

@@ -0,0 +1 @@
+--colour --format Fuubar

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2 do
+guard 'rspec', :version => 2, :cli => '--format Fuubar' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{spec/(spec_helper|test_server).rb})  { "spec/" }

data/bin/instrument_server

@@ -1,225 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'instrumental_agent'
-
-
-class SystemInspector
-  TYPES = [:gauges, :incrementors]
-  attr_accessor *TYPES
-
-  def initialize
-    @gauges = {}
-    @incrementors = {}
-    @platform =
-      case RUBY_PLATFORM
-      when /linux/
-        Linux
-      when /darwin/
-        OSX
-      else
-        raise "unsupported OS"
-      end
-  end
-
-  def load_all
-    load @platform.load_cpu
-    load @platform.load_memory
-    load @platform.load_disks
-  end
-
-  def load(stats)
-    @gauges.merge!(stats[:gauges] || {})
-  end
-
-  module OSX
-    def self.load_cpu
-      { :gauges => top }
-    end
-
-    def self.top
-      lines = []
-      processes = date = load = cpu = nil
-      IO.popen('top -l 1 -n 0') do |top|
-        processes = top.gets.split(': ')[1]
-        date = top.gets
-        load = top.gets.split(': ')[1]
-        cpu = top.gets.split(': ')[1]
-      end
-
-      user, system, idle = cpu.split(", ").map { |v| v.to_f }
-      load1, load5, load15 = load.split(", ").map { |v| v.to_f }
-      total, running, stuck, sleeping, threads = processes.split(", ").map { |v| v.to_i }
-
-      {
-        'cpu.user' => user,
-        'cpu.system' => system,
-        'cpu.idle' => idle,
-        'load.1min' => load1,
-        'load.5min' => load5,
-        'load.15min' => load15,
-        'processes.total' => total,
-        'processes.running' => running,
-        'processes.stuck' => stuck,
-        'processes.sleeping' => sleeping,
-        'threads' => threads,
-      }
-    end
-
-    def self.load_memory
-      # TODO: swap
-      { :gauges => vm_stat }
-    end
-
-    def self.vm_stat
-      header, *rows = `vm_stat`.split("\n")
-      page_size = header.match(/page size of (\d+) bytes/)[1].to_i
-      sections = ["free", "active", "inactive", "wired", "speculative", "wired down"]
-      output = {}
-      total = 0.0
-      rows.each do |row|
-        if match = row.match(/Pages (.*):\s+(\d+)\./)
-          section, value = match[1, 2]
-          if sections.include?(section)
-            value = value.to_f * page_size / 1024 / 1024
-            output["memory.#{section.gsub(' ', '_')}_mb"] = value
-            total += value
-          end
-        end
-      end
-      output["memory.free_percent"] = output["memory.free_mb"] / total * 100 # TODO: verify
-      output
-    end
-
-    def self.load_disks
-      { :gauges => df }
-    end
-
-    def self.df
-      output = {}
-      `df -k`.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
-
-    def self.netstat(interface = 'en1')
-      # mostly functional network io stats
-      headers, *lines = `netstat -ibI #{interface}`.split("\n").map { |l| l.split(/\s+/) } # FIXME: vulnerability?
-      headers = headers.map { |h| h.downcase }
-      lines.each do |line|
-        if !line[3].include?(':')
-          return Hash[headers.zip(line)]
-        end
-      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: utilization
-
-token, collector = *ARGV
-unless token
-  puts "Usage: #{$0} <token> [collector]"
-  exit 1
-end
-I = Instrumental::Agent.new(token, :collector => collector)
-
-host = `hostname`.chomp
-
-puts "Collecting stats under the hostname: #{host}"
-
-loop do
-  inspector = SystemInspector.new
-  inspector.load_all
-  inspector.gauges.each do |stat, value|
-    I.gauge("#{host}.#{stat}", value)
-  end
-  # I.increment("#{host}.#{stat}", delta)
-  sleep 10
-end
+puts '***********************************'
+puts '*** Moved to instrumental_tools ***'
+puts '***********************************'
+puts "\ngem install instrumental_tools\n"
+exit 1

data/instrumental_agent.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<guard-rspec>, [">= 0"])
   s.add_development_dependency(%q<growl_notify>, [">= 0"])
   s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
+  s.add_development_dependency(%q<fuubar>, [">= 0"])
 end

data/lib/instrumental/agent.rb

@@ -101,24 +101,35 @@ module Instrumental
       @socket && !@socket.closed?
     end
 
+    def logger=(logger)
+      @logger = logger
+    end
+
     def logger
-      self.class.logger
+      @logger ||= self.class.logger
     end
 
     private
 
     def valid?(metric, value, time)
-      if metric !~ /^([\d\w\-_]+\.)*[\d\w\-_]+$/i
-        increment 'agent.invalid_metric'
-        logger.warn "Invalid metric #{metric}"
-        return false
-      end
-      if value.to_s !~ /^\d+(\.\d+)?$/
-        increment 'agent.invalid_value'
-        logger.warn "Invalid value #{value.inspect} for #{metric}"
-        return false
-      end
-      true
+      valid_metric = metric =~ /^([\d\w\-_]+\.)*[\d\w\-_]+$/i
+      valid_value  = value.to_s =~ /^-?\d+(\.\d+)?$/
+
+      return true if valid_metric && valid_value
+
+      report_invalid_metric(metric) unless valid_metric
+      report_invalid_value(metric, value) unless valid_value
+      false
+    end
+
+    def report_invalid_metric(metric)
+      increment "agent.invalid_metric"
+      logger.warn "Invalid metric #{metric}"
+    end
+
+    def report_invalid_value(metric, value)
+      increment "agent.invalid_value"
+      logger.warn "Invalid value #{value.inspect} for #{metric}"
     end
 
     def report_exception(e)

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/agent_spec.rb

@@ -180,4 +180,39 @@ describe Instrumental::Agent, "enabled" do
     end
     @agent.increment("test").should be_nil
   end
+
+  it "should track invalid metrics" do
+    @agent.logger.should_receive(:warn).with(/%%/)
+    @agent.increment(' %% .!#@$%^&*', 1, 1)
+    wait
+    @server.commands.join("\n").should include("increment agent.invalid_metric")
+  end
+
+  it "should allow reasonable metric names" do
+    @agent.increment('a')
+    @agent.increment('a.b')
+    @agent.increment('hello.world')
+    @agent.increment('ThisIsATest.Of.The.Emergency.Broadcast.System.12345')
+    wait
+    @server.commands.join("\n").should_not include("increment agent.invalid_metric")
+  end
+
+  it "should track invalid values" do
+    @agent.logger.should_receive(:warn).with(/hello.*testington/)
+    @agent.increment('testington', 'hello')
+    wait
+    @server.commands.join("\n").should include("increment agent.invalid_value")
+  end
+
+  it "should allow reasonable values" do
+    @agent.increment('a', -333.333)
+    @agent.increment('a', -2.2)
+    @agent.increment('a', -1)
+    @agent.increment('a',  0)
+    @agent.increment('a',  1)
+    @agent.increment('a',  2.2)
+    @agent.increment('a',  333.333)
+    wait
+    @server.commands.join("\n").should_not include("increment agent.invalid_value")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: instrumental_agent
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  segments_generated: true
+  version: 0.5.0
 platform: ruby
 authors: 
 - Elijah Miller
@@ -17,94 +17,101 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 -05:00
+date: 2011-12-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
+  requirement: *id001
+  name: rake
+  prerelease: false
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 0
+        segments_generated: true
         version: "2.0"
+  requirement: *id002
+  name: rspec
+  prerelease: false
   type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: guard
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
+  requirement: *id003
+  name: guard
+  prerelease: false
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
+  requirement: *id004
+  name: guard-rspec
+  prerelease: false
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: growl_notify
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
+  requirement: *id005
+  name: growl_notify
+  prerelease: false
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        segments_generated: true
+        version: "0"
+  requirement: *id006
   name: rb-fsevent
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
+  requirement: *id007
+  name: fuubar
+  prerelease: false
   type: :development
-  version_requirements: *id006
 description: Keep track of anything.
 email: 
 - support@instrumentalapp.com
@@ -116,6 +123,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - Guardfile
 - README.rdoc
@@ -142,27 +150,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Agent for reporting data to instrumentalapp.com