instrumental_tools 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.5.2 [April 19th, 2012]
+* Check for existence of system commands prior to usage in instrument_server.
+
 ### 0.5.1 [February 9th, 2012]
 * Removing symbol to proc use for compatibility with older version of Ruby
 

data/README.md

@@ -75,3 +75,7 @@ Collect commit counts from git repositories:
 cd project_directory
 gitstrumental <API_KEY>
 ```
+
+## Troubleshooting & Help
+
+We are here to help. Email us at [support@instrumentalapp.com](mailto:support@instrumentalapp.com), or visit the [Instrumental Support](https://fastestforward.campfirenow.com/6b934) Campfire room.

data/bin/instrument_server

@@ -35,6 +35,14 @@ class SystemInspector
       end
   end
 
+  def self.command_missing(command, section)
+    puts "Command #{command} not found. Metrics for #{section} will not be collected."
+  end
+
+  def self.command_present?(command, section)
+    `which #{command}`.length > 0 || command_missing(command, section)
+  end
+
   def load_all
     self.class.memory.cycle
 
@@ -50,7 +58,11 @@ class SystemInspector
 
   module OSX
     def self.load_cpu
-      { :gauges => top }
+      output = { :gauges => {} }
+      if SystemInspector.command_present?('top', 'CPU')
+        output[:gauges].merge!(top)
+      end
+      output
     end
 
     def self.top
@@ -84,7 +96,11 @@ class SystemInspector
 
     def self.load_memory
       # TODO: swap
-      { :gauges => vm_stat }
+      output = { :gauges => {} }
+      if SystemInspector.command_present?('vm_stat', 'memory')
+        output[:gauges].merge!(vm_stat)
+      end
+      output
     end
 
     def self.vm_stat
@@ -108,7 +124,11 @@ class SystemInspector
     end
 
     def self.load_disks
-      { :gauges => df }
+      output = { :gauges => {} }
+      if SystemInspector.command_present?('df', 'disk')
+        output[:gauges].merge!(df)
+      end
+      output
     end
 
     def self.df
@@ -183,8 +203,12 @@ class SystemInspector
 
     def self.load_memory
       output = { :gauges => {} }
-      output[:gauges].merge!(memory)
-      output[:gauges].merge!(swap)
+      if SystemInspector.command_present?('free', 'memory')
+        output[:gauges].merge!(memory)
+      end
+      if SystemInspector.command_present?('free', 'swap')
+        output[:gauges].merge!(swap)
+      end
       output
     end
 
@@ -209,7 +233,14 @@ class SystemInspector
     end
 
     def self.load_disks
-      { :gauges => disk_storage.merge(disk_io) }
+      output = { :gauges => {} }
+      if SystemInspector.command_present?('df', 'disk storage')
+        output[:gauges].merge!(disk_storage)
+      end
+      if SystemInspector.command_present?('mount', 'disk IO')
+        output[:gauges].merge!(disk_io)
+      end
+      output
     end
 
     def self.disk_storage
@@ -252,7 +283,11 @@ class SystemInspector
     end
 
     def self.load_filesystem
-      { :gauges => filesystem }
+      output = { :gauges => {} }
+      if SystemInspector.command_present?('sysctl', 'filesystem')
+        output[:gauges].merge!(filesystem)
+      end
+      output
     end
 
     def self.filesystem

data/lib/instrumental_tools/version.rb

@@ -1,5 +1,5 @@
 module Instrumental
   module Tools
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
   end
 end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: instrumental_tools
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 1
-  version: 0.5.1
+version: !ruby/object:Gem::Version
+  version: 0.5.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Elijah Miller
 - Christopher Zelenak
 - Kristopher Chambers
@@ -17,81 +12,82 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-09 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: instrumental_agent
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.3
-  prerelease: false
-  requirement: *id002
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+- !ruby/object:Gem::Dependency
   name: pidly
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.3
-  prerelease: false
-  requirement: *id003
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description: A collection of scripts useful for monitoring servers and services with Instrumental (instrumentalapp.com)
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A collection of scripts useful for monitoring servers and services with
+  Instrumental (instrumentalapp.com)
+email:
 - support@instrumentalapp.com
-executables: 
+executables:
 - gitstrumental
 - instrument_server
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -102,39 +98,28 @@ files:
 - instrumental_tools.gemspec
 - lib/instrumental_tools/capistrano.rb
 - lib/instrumental_tools/version.rb
-has_rdoc: true
 homepage: http://github.com/fastestforward/instrumental_tools
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Command line tools for Instrumental
 test_files: []
-