instrumental_tools 0.4.1 → 0.4.2

data/bin/instrument_server

@@ -208,10 +208,10 @@ class SystemInspector
     end
 
     def self.load_disks
-      { :gauges => disks.merge(diskstats) }
+      { :gauges => disk_storage.merge(disk_io) }
     end
 
-    def self.disks
+    def self.disk_storage
       output = {}
       `df -Pk`.split("\n").grep(%r{^/dev/}).each do |line|
         device, total, used, available, capacity, mount = line.split(/\s+/)
@@ -227,15 +227,15 @@ class SystemInspector
       output
     end
 
-    def self.diskstats
-      entries = `cat /proc/diskstats`.chomp.split("\n").map do |line|
+    def self.disk_io
+      mounted_devices = `mount`.split("\n").grep(/^\/dev\/(\w+)/) { $1 }
+      diskstats_lines = `cat /proc/diskstats`.split("\n").grep(/#{mounted_devices.join('|')}/)
+      entries = diskstats_lines.map do |line|
         values = line.split
         entry = {}
-        entry[:time]   = Time.now
+        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]
+        entry[:utilization] = values[12].to_f
         SystemInspector.memory.store("disk_stats_#{entry[:device]}".to_sym, entry)
       end
 
@@ -243,10 +243,8 @@ class SystemInspector
       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
+          utilization_delta = entry[:utilization] - previous_entry[:utilization]
+          output["disk.#{entry[:device]}.percent_utilization"] = utilization_delta / time_delta * 100
         end
       end
       output

data/lib/instrumental_tools/version.rb

@@ -1,5 +1,5 @@
 module Instrumental
   module Tools
-    VERSION = "0.4.1"
+    VERSION = '0.4.2'
   end
 end

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: instrumental_tools
-version: !ruby/object:Gem::Version
-  version: 0.4.1
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
-authors:
+authors: 
 - Elijah Miller
 - Christopher Zelenak
 - Kristopher Chambers
@@ -12,62 +17,80 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70127299346760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70127299346760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: instrumental_agent
-  requirement: &70127299344700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.5'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
   type: :runtime
-  prerelease: false
-  version_requirements: *70127299344700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: pidly
-  requirement: &70127299342960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 1
+        - 3
         version: 0.1.3
   type: :runtime
-  prerelease: false
-  version_requirements: *70127299342960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70127299357440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70127299357440
+  version_requirements: *id004
 description: Tools for displaying information from and reporting to Instrumental (instrumentalapp.com)
-email:
+email: 
 - support@instrumentalapp.com
-executables:
+executables: 
 - gitstrumental
 - instrument_server
 - instrumental
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -80,26 +103,36 @@ files:
 - lib/instrumental_tools/version.rb
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Command line tools for Instrumental
 test_files: []
+