server_metrics 0.0.8.7.pre → 0.0.8.8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.8.8
+
+* fix for LVM-mapped disk IO stats
+
 ## 0.0.8.5
 
 * Mac per-process memory and per-process CPU reports 0s instead of throwing an exception (Mac only)

data/examples/example_usage.rb

@@ -1,6 +1,5 @@
 require "rubygems"
-require File.dirname(__FILE__)+ "/lib/server_metrics"
-require "pry"
+require "server_metrics"
 
 class Harness
   attr_accessor :num_runs, :latest_run
@@ -30,7 +29,7 @@ harness = Harness.new
 harness.run
 sleep 1
 harness.run
-pp harness.latest_run
+puts harness.latest_run.inspect
 
 #puts "starting"
 #while(true) do

data/lib/server_metrics/collectors/disk.rb

@@ -9,6 +9,7 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
     ENV['LANG'] = 'C' # forcing English for parsing
     @df_output = `df -Pkh`.split("\n")
     @devices = `mount`.split("\n").grep(/^\/dev/).map{|l|l.split.first} # any device that starts with /dev
+    @disk_stats = `cat /proc/diskstats`.split("\n")
 
     @devices.each do |device|
       get_sizes(device) # does its own reporting
@@ -77,28 +78,22 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
   # * If there isn't an exact match but there are /proc/diskstats lines that are included in +dev+,
   #   returns the first matching line. This is needed as the mount output used to find the default device doesn't always
   #   match /proc/diskstats output.
-  # * If there are no matches but an LVM is used, returns the line matching "dm-0".
   def iostat(dev)
-    # if a LVM is used, `mount` output doesn't map to `/diskstats`. In this case, use dm-0 as the default device.
-    lvm = nil
-    retried = false
-    possible_devices = []
-    begin
-      %x(cat /proc/diskstats).split(/\n/).each do |line|
-        entry = Hash[*COLUMNS.zip(line.strip.split(/\s+/).collect { |v| Integer(v) rescue v }).flatten]
-        possible_devices << entry if dev.include?(entry['name'])
-        lvm = entry if (@default_device_used and 'dm-0'.include?(entry['name']))
-      end
-    rescue Errno::EPIPE
-      if retried
-        raise
-      else
-        retried = true
-        retry
-      end
+
+    # if this is a mapped device, translate it into the mapped name for lookup in @disk_stats
+    if dev =~ %r(^/dev/mapper/)
+      name_to_find = File.readlink(dev).split("/").last rescue dev
+    else
+      name_to_find = dev
     end
-    found_device = possible_devices.find { |entry| dev == entry['name'] } || possible_devices.first
-    return found_device || lvm
+
+    # narrow our @disk_stats down to a list of possible devices
+    possible_devices = @disk_stats.map { |line|
+      Hash[*COLUMNS.zip(line.strip.split(/\s+/).collect { |v| Integer(v) rescue v }).flatten]
+    }.select{|entry| name_to_find.include?(entry['name']) }
+
+    # return an exact match (preferred) or a partial match. If neither exist, nil will be returned
+    return possible_devices.find { |entry| name_to_find == entry['name'] } || possible_devices.first
   end
 
   def normalize_key(key)

data/lib/server_metrics/collectors/processes.rb

@@ -157,7 +157,7 @@ class ServerMetrics::Processes
       # best thread I've seen on cutime vs utime & cstime vs stime: https://www.ruby-forum.com/topic/93176
       # * cutime and cstime include CPUusage of child processes
       # * utime and stime don't include CPU usage of child processes
-      (cutime || 0) + (cstime || 0)  # utime and stime aren't available on mac. Result is %cpu is 0 on mac.
+      (utime || 0) + (stime || 0)  # utime and stime aren't available on mac. Result is %cpu is 0 on mac.
     end
     # delegate everything else to ProcTable::Struct
     def method_missing(sym, *args, &block)

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = "0.0.8.7.pre"
+  VERSION = "0.0.8.8"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.8.7.pre
-  prerelease: 8
+  version: 0.0.8.8
+  prerelease: 
 platform: ruby
 authors:
 - Andre Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -172,13 +172,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2782727168826211888
+      hash: 1750487156162138654
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1750487156162138654
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23