server_metrics 1.2.8 → 1.2.9.1

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.2.9.1
+
+* Ruby 1.8.7 fix
+
+## 1.2.9
+
+* Add support for dockerized metric gathering
+
+## 1.2.8
+
+* compatibility with Ruby 1.8.5 and 1.8.6
+
 ## 1.2.7
 
 * Revert vz changes from 1.2.6
@@ -89,4 +101,4 @@ Performance related:
 
 ## 0.0.8.3
 
-* Fall back to assumption of 100 jiffies/sec if /proc/timer_list isn't available
+* Fall back to assumption of 100 jiffies/sec if /proc/timer_list isn't available

data/lib/server_metrics/collectors/cpu.rb

@@ -46,7 +46,7 @@ class ServerMetrics::Cpu < ServerMetrics::Collector
     def self.fetch
       output = nil
       begin
-        output = File.read("/proc/stat")
+        output = File.read("#{ServerMetrics::SystemInfo.proc_dir}/stat")
       rescue Errno::ENOENT
         # No such file or directory - /proc/stat
         # /proc/stat doesn't exist on this system.

data/lib/server_metrics/collectors/disk.rb

@@ -1,3 +1,5 @@
+require "server_metrics/system_info"
+
 # Collects Disk metrics on eligible filesystems. Reports a hash of hashes, with the first hash keyed by device name.
 #
 # TODO: Currently, this reports on devices that begins with /dev as listed by `mount`. Revisit this.
@@ -12,7 +14,7 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
     
     devices.each do |device|
       get_sizes(device) # does its own reporting
-      get_io_stats(device) if linux? # does its own reporting
+      get_io_stats(device[:name]) if linux? # does its own reporting
     end
   end
   
@@ -30,10 +32,20 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
   def devices
     if @devices.nil? or @last_devices_output < (Time.now-@options[:ttl].to_i*60)
       @last_devices_output = Time.now
-      @devices = `mount`.split("\n").grep(/^\/dev/).map{|l|l.split.first} # any device that starts with /dev   
-    else
-      @devices
+      # if running inside a docker container, we want the devices mounted on the host
+      mount_output = dockerized_agent? ? `cat /host/etc/mtab` : `mount`
+      @devices = mount_output.split("\n").grep(/^\/dev/).map{|l| {:name => l.split.first, :aliases => []}} # any device that starts with /dev   
+      if dockerized_agent?
+        `blkid`.split("\n").grep(/ UUID=/).each do |device|
+          name = device.match(/\A[^\:]*/)[0]
+          uuid = device.match(/\ UUID="(.+?)"/)[1]
+          if host_device = @devices.find { |dn| dn[:name] == name }
+            host_device[:aliases] << "/dev/disk/by-uuid/#{uuid}"
+          end
+        end
+      end
     end
+    @devices
   end
 
   # called from build_report for each device
@@ -48,7 +60,11 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
     end
 
     # select the right line
-    hash = parsed_lines.select{|l| l["Filesystem"] == device}.first
+    hash = parsed_lines.find {|l| l["Filesystem"] == device[:name]}
+    # device wasn't found. check device aliases
+    if hash.nil?
+      hash = parsed_lines.find {|l| device[:aliases].include?(l["Filesystem"])}
+    end
     # device wasn't found. could be a mapped device. skip over. 
     return if hash.nil?
     result = {}
@@ -58,35 +74,35 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
       result[key]=value
     end
 
-    report(device, result)
+    report(device[:name], result)
   end
 
   # called from build_report for each device
-  def get_io_stats(device)
-    stats = iostat(device)
+  def get_io_stats(device_name)
+    stats = iostat(device_name)
 
     if stats
-      counter(device, :rps,   stats['rio'],        :per => :second)
-      counter(device, :wps,   stats['wio'],        :per => :second)
-      counter(device, :rps_kb, stats['rsect'] / 2,  :per => :second)
-      counter(device, :wps_kb, stats['wsect'] / 2,  :per => :second)
-      counter(device, :utilization,  stats['use'] / 10.0, :per => :second)
+      counter(device_name, :rps,   stats['rio'],        :per => :second)
+      counter(device_name, :wps,   stats['wio'],        :per => :second)
+      counter(device_name, :rps_kb, stats['rsect'] / 2,  :per => :second)
+      counter(device_name, :wps_kb, stats['wsect'] / 2,  :per => :second)
+      counter(device_name, :utilization,  stats['use'] / 10.0, :per => :second)
       # Not 100% sure that average queue length is present on all distros.
       if stats['aveq']
-        counter(device, :average_queue_length,  stats['aveq'], :per => :second)
+        counter(device_name, :average_queue_length,  stats['aveq'], :per => :second)
       end
 
-      if old = memory(device, "stats")
+      if old = memory(device_name, "stats")
         ios = (stats['rio'] - old['rio']) + (stats['wio']  - old['wio'])
 
         if ios > 0
           await = ((stats['ruse'] - old['ruse']) + (stats['wuse'] - old['wuse'])) / ios.to_f
 
-          report(device, :await => await)
+          report(device_name, :await => await)
         end
       end
 
-      remember(device, "stats" => stats)
+      remember(device_name, "stats" => stats)
     end
   end
 
@@ -119,7 +135,7 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
 
   # Returns /proc/diskstats as array.
   def disk_stats
-    File.readlines("/proc/diskstats")
+    File.readlines("#{ServerMetrics::SystemInfo.proc_dir}/diskstats")
   rescue Errno::ENOENT # Handle missing /proc/diskstats, i.e. on Mac OS X.
     []
   end
@@ -128,4 +144,8 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
     key = "Used Percent" if /capacity|use.*%|%.*use/i === key
     key.downcase.gsub(" ", "_").to_sym
   end
+
+  def dockerized_agent?
+    File.exists?("/host/etc/mtab")
+  end
 end

data/lib/server_metrics/collectors/memory.rb

@@ -1,3 +1,5 @@
+require "server_metrics/system_info"
+
 class ServerMetrics::Memory < ServerMetrics::Collector
   # reports darwin units as MB
   DARWIN_UNITS = { "b" => 1/(1024*1024),
@@ -17,7 +19,7 @@ class ServerMetrics::Memory < ServerMetrics::Collector
 
   def linux_memory
     mem_info = {}
-    File.read("/proc/meminfo").each_line do |line|
+    File.read("#{ServerMetrics::SystemInfo.proc_dir}/meminfo").each_line do |line|
       _, key, value = *line.match(/^(\w+):\s+(\d+)\s/)
       mem_info[key] = value.to_i
     end

data/lib/server_metrics/collectors/network.rb

@@ -4,7 +4,7 @@ class ServerMetrics::Network < ServerMetrics::MultiCollector
 
   def build_report
     if linux?
-      lines = File.read("/proc/net/dev").lines.to_a[2..-1]
+      lines = File.read("#{ServerMetrics::SystemInfo.proc_dir}/net/dev").lines.to_a[2..-1]
       interfaces = []
       lines.each do |line|
         iface, rest = line.split(':', 2).collect { |e| e.strip }

data/lib/server_metrics/lib/proctable_lite.rb

@@ -80,15 +80,17 @@ module SysLite
       array  = block_given? ? nil : []
       struct = nil
       raise TypeError unless pid.is_a?(Fixnum) if pid
+
+      proc_dir = ServerMetrics::SystemInfo.proc_dir
       
-      Dir.chdir("/proc")
+      Dir.chdir(proc_dir)
       Dir.glob("[0-9]*").each do |file|
         next unless file.to_i == pid if pid
 
         struct = ProcTableStruct.new
 
         # Get /proc/<pid>/stat information
-        stat = IO.read("/proc/#{file}/stat") rescue next
+        stat = IO.read("#{proc_dir}/#{file}/stat") rescue next
 
         # Deal with spaces in comm name. Courtesy of Ara Howard.
         re = %r/\([^\)]+\)/

data/lib/server_metrics/system_info.rb

@@ -42,6 +42,11 @@ module ServerMetrics
     def self.to_h
       {:architecture => architecture, :os=>os, :os_version=>os_version, :num_processors=>num_processors, :hostname=>hostname, :timezone=>timezone, :timezone_offset=>timezone_offset }
     end
+
+    # When run inside a docker container, we want to read from the host proc dir. 
+    def self.proc_dir
+      @@proc_dir ||= (File.directory?("/host/proc") ? "/host/proc" : "/proc")
+    end
   end
 end
 

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = '1.2.8'
+  VERSION = '1.2.9.1'
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9.1
+  prerelease: 
 platform: ruby
 authors:
 - Andre Lewis
@@ -10,104 +11,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
 description: Collect information about disks, memory, CPU, networks, and processes
@@ -117,7 +132,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -153,26 +168,27 @@ files:
 homepage: http://scoutapp.com
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Used by the Scout agent, but also available as a stand-lone gem
 test_files:
 - spec/server_metrics/collector_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a4040b1194f4904d529f0b9325e5770d33ca7364
-  data.tar.gz: 2cd897acaa0dbde2e0a44e4a3d83fa3263b8720c
-SHA512:
-  metadata.gz: 18a1aaf212424d1d3801b7d1519980aacad35b9b84cbda28774638c70cb93fbf6db786e0222ef0c7366a4556cabd413067a166a92ac4feeada4f181a20b60ab0
-  data.tar.gz: b55d1b3a853393b13c86a817a38e33d2587f659733613f5b31abd4fd518f08c5977b3a1406a7e00aa5d672bf99d857cd04c9a0f9878f44936505499055387d03