server_metrics 1.2.14 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0866cb360c322dd639f687db9331f027d287155
-  data.tar.gz: 72ef85ce24454c67f178237ae5b4a1631183f429
+  metadata.gz: 79ef80a2159b7e4572c1d95ccfe02ea9e356eb08
+  data.tar.gz: 88e3b4bbe5c1a2bbb5b3824f4b85de04e3382ade
 SHA512:
-  metadata.gz: 036fb66268f2f4475e02c16ae4ad29c62e12e0714c1b0692e712b661622bea293b645478e0c4b88afd617c9ab5a3b5194e1068b09ba4e81159b83ec38837919c
-  data.tar.gz: fbaa6810e494021f4fdfaf7cca0e058518aa896cbdfb72139a04d3f7821c50ba68d6ab17e06cfe413558cff896efd93e5774d1e166d6623c96a80cf03f6cef64
+  metadata.gz: 7b128f526ac97d986c8d8f13236ca19ede9a9585a9dd17d7916050cb05eb52623a7edd710e02081d0ff6ae1bd080f33d323ac574662a10cb29a0454a1dab0ea8
+  data.tar.gz: 4a6f352c28598a98c01b59e860a3623fcfc2fffa39f05f90feaf752ca293c467582531db9d4d4d4228e4fa701042d9a4df1f6883388d9db5333a187cec0c66cb

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.2.17
+
+* Fixed collector sort block older Rubies compatibility
+
+# 1.2.16
+
+* ignoring disc devices via regexp
+
+# 1.2.15
+
+* Update gemspec
+
 # 1.2.14
 
 * Disk symlink alias uses full path
@@ -64,7 +76,7 @@
 Performance related:
 
 * Using `Dir#glob` vs. `Dir#foreach`
-* Using `File#read` vs. `cat FILE`. 
+* Using `File#read` vs. `cat FILE`.
 * Removing commented out and unused elements from `SysLite::ProcTable`
 * Removed method_missing logic in `Processes::Process` to access the `ProcTableStruct`
 * `Disk` added caching logic via a `@option[:ttl]` to execute slow system calls at a lower interval (ex: ev 60 seconds)
@@ -100,7 +112,7 @@ Performance related:
 
 ## 0.0.9.0
 
-* Reporting process memory in MB, not in page size. 
+* Reporting process memory in MB, not in page size.
 * When determining process cpu usage, caching number of processors.
 
 ## 0.0.8.9

data/lib/server_metrics/collector.rb

@@ -20,7 +20,7 @@ module ServerMetrics
       @options = options
       @data={}
       @memory={}
-      @collector_id = self.class.name+'-'+@options.to_a.sort_by { |a| a.first }.flatten.join('-')
+      @collector_id = self.class.name+'-'+@options.to_a.sort_by { |a| a.first.to_s }.flatten.join('-')
       @error=nil
     end
 

data/lib/server_metrics/collectors/disk.rb

@@ -11,14 +11,14 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
     # forcing English for parsing
     ENV['LC_ALL'] = 'C'
     ENV['LANG'] = 'C'
-    
+
     devices.each do |device|
       get_sizes(device) # does its own reporting
       get_io_stats(device[:name]) if linux? # does its own reporting
     end
   end
-  
-  # System calls are slow. Read once every minute and not on every innvocation. 
+
+  # System calls are slow. Read once every minute and not on every innvocation.
   def df_output
     if @last_df_output.nil? or @last_df_output < (Time.now-@options[:ttl].to_i*60)
       @last_df_output = Time.now
@@ -27,14 +27,19 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
       @df_output
     end
   end
-  
-  # System calls are slow. Read once every minute and not on every innvocation. 
+
+  # System calls are slow. Read once every minute and not on every innvocation.
   def devices
     if @devices.nil? or @last_devices_output < (Time.now-@options[:ttl].to_i*60)
       @last_devices_output = Time.now
       # 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   
+      # @devices = mount_output.split("\n").grep(/^\/dev/).map{|l| {:name => l.split.first, :aliases => []}} # any device that starts with /dev
+      @unfiltered_devices = mount_output.split("\n").grep(/^\/dev/).reject do |e|
+        regex = Regexp.new(@options[:ignored_devices]) rescue next
+        !!e.match(regex)
+      end # any device that starts with /dev
+      @devices = @unfiltered_devices.map{|l| {:name => l.split.first, :aliases => [], :mounted_on => l.split[2]}}
       if dockerized_agent?
         `blkid`.split("\n").grep(/ UUID=/).each do |device|
           name = device.match(/\A[^\:]*/)[0]
@@ -58,21 +63,23 @@ class ServerMetrics::Disk < ServerMetrics::MultiCollector
   # called from build_report for each device
   def get_sizes(device)
     header_line=df_output.first
-    headers = header_line.split(/\s+/,6) # limit to 6 columns - last column is "mounted on"
-    parsed_lines=[] # Each line will look like {"%iused" => "38%","Avail" => "289Gi", "Capacity=> "38%", "Filesystem"=> "/dev/disk0s2","Mounted => "/", "Size" => "465Gi", "Used" => "176Gi", "ifree" => "75812051", "iused"  => "46116178"}
+    headers = header_line.split(/\s+/,6).map(&:chomp) # limit to 6 columns - last column is "mounted on"
+    parsed_lines=[] # Each line will look like {"%iused" => "38%","Avail" => "289Gi", "Capacity=> "38%", "Filesystem"=> "/dev/disk0s2","Mounted on"=> "/", "Size" => "465Gi", "Used" => "176Gi", "ifree" => "75812051", "iused"  => "46116178"}
 
     df_output[1..df_output.size-1].each do |line|
-      values=line.split(/\s+/,6)
-      parsed_lines<<Hash[*headers.zip(values).flatten]
+      values=line.split(/\s+/,6).map(&:chomp)
+      parsed_lines << Hash[*headers.zip(values).flatten]
     end
 
     # select the right line
     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"])}
+      hash = parsed_lines.find do |l|
+        device[:aliases].include?(l["Filesystem"]) || device[:mounted_on] == l["Mounted on"]
+      end
     end
-    # device wasn't found. could be a mapped device. skip over. 
+    # device wasn't found. could be a mapped device. skip over.
     return if hash.nil?
     result = {}
     hash.each_pair do |key,value|

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = '1.2.14'
+  VERSION = '1.2.18'
 end

data/server_metrics.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |spec|
   spec.name          = "server_metrics"
   spec.version       = ServerMetrics::VERSION
   spec.authors       = ["Andre Lewis", "Derek Haynes", "Matt Rose"]
-  spec.email         = ["support@scoutapp.com"]
+  spec.email         = ["support.server@pingdom.com"]
   spec.description   = %q{Collect information about disks, memory, CPU, networks, and processes}
   spec.summary       = %q{Used by the Scout agent, but also available as a stand-lone gem}
-  spec.homepage      = "http://scoutapp.com"
+  spec.homepage      = "http://server.pingdom.com"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.14
+  version: 1.2.18
 platform: ruby
 authors:
 - Andre Lewis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,7 +112,7 @@ dependencies:
         version: '2.14'
 description: Collect information about disks, memory, CPU, networks, and processes
 email:
-- support@scoutapp.com
+- support.server@pingdom.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -150,7 +150,7 @@ files:
 - test/test_basics.rb
 - test/test_helper.rb
 - test/test_with_fixtures.rb
-homepage: http://scoutapp.com
+homepage: http://server.pingdom.com
 licenses:
 - MIT
 metadata: {}