instrumental_tools 0.3.1 → 0.3.2

data/README.md

@@ -10,8 +10,6 @@ Use to collect various monitoring statistics of a server. Execute with:
 instrument_server -k <INSTRUMENTAL_API_KEY>
 ```
 
-Linux note: Install iostat (part of the sysstat package) in order to collect disk I/O metrics.
-
 Mac OS note: Due to a bug in Ruby, instrument_server can occasionally deadlock ([bug report](http://bugs.ruby-lang.org/issues/5811)).
 
 ## instrumental

data/bin/instrument_server

@@ -208,7 +208,7 @@ class SystemInspector
     end
 
     def self.load_disks
-      { :gauges => disks.merge(iostat) }
+      { :gauges => disks.merge(diskstats) }
     end
 
     def self.disks
@@ -227,16 +227,26 @@ class SystemInspector
       output
     end
 
-    def self.iostat
+    def self.diskstats
+      entries = `cat /proc/diskstats`.chomp.split("\n").map do |line|
+        values = line.split
+        entry = {}
+        entry[:time]   = Time.now
+        entry[:device] = values[2]
+        entry[:read]   = values[6].to_f
+        entry[:write]  = values[10].to_f
+        entry[:io]     = entry[:read] + entry[:write]
+        SystemInspector.memory.store("disk_stats_#{entry[:device]}".to_sym, entry)
+      end
+
       output = {}
-      if system('iostat > /dev/null 2>&1')
-        lines      = `iostat -dx`.split("\n")
-        header     = lines.grep(/^Device/i).first
-        dev_lines  = lines[(lines.index(header) + 1)..-1]
-        util_index = header.split.index('%util')
-        dev_lines.each do |dev_line|
-          values = dev_line.split
-          output["disk.#{values[0]}.percent_utilization"] = values[util_index].to_f
+      entries.each do |entry|
+        if previous_entry = SystemInspector.memory.retrieve("disk_stats_#{entry[:device]}".to_sym)
+          time_delta = (entry[:time] - previous_entry[:time]) * 1000
+          [:read, :write, :io].each do |type|
+            utilization_delta = entry[type] - previous_entry[type]
+            output["disk.#{entry[:device]}.#{type}_utilization"] = utilization_delta / time_delta * 100
+          end
         end
       end
       output
@@ -327,12 +337,6 @@ class ServerController < Pidly::Control
   alias_method :clean, :clean!
 end
 
-def terminal_messages
-  if `which iostat`.chomp.empty?
-    puts 'Install iostat (sysstat package) to collect disk I/O metrics.'
-  end
-end
-
 def require_api_key(options, parser)
   unless options[:api_key] # present?
     print parser.help
@@ -365,7 +369,6 @@ option_parser = OptionParser.new do |opts|
   end
   opts.on('-h', '--help', 'Display this screen') do
     puts opts
-    terminal_messages
     exit
   end
 end

data/lib/instrumental_tools/version.rb

@@ -1,5 +1,5 @@
 module Instrumental
   module Tools
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: instrumental_tools
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Elijah Miller
@@ -21,7 +21,8 @@ cert_chain: []
 date: 2012-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: json
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +32,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json
+  type: :runtime
   version_requirements: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: instrumental_agent
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +47,11 @@ dependencies:
         - 0
         - 5
         version: "0.5"
-  name: instrumental_agent
+  type: :runtime
   version_requirements: *id002
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: pidly
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +63,11 @@ dependencies:
         - 1
         - 3
         version: 0.1.3
-  name: pidly
+  type: :runtime
   version_requirements: *id003
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rake
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,9 +77,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
+  type: :development
   version_requirements: *id004
-  prerelease: false
 description: Tools for displaying information from and reporting to Instrumental (instrumentalapp.com)
 email: 
 - support@instrumentalapp.com