server_metrics 0.0.8.3 → 0.0.8.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.8.4
+
+* normalize load (last minute, etc) by number of CPUs. This keeps the metrics in sync with Scout's server load plugin.
+
 ## 0.0.8.3
 
 * fall back to assumption of 100 jiffies/sec if /proc/timer_list isn't available

data/lib/server_metrics/collectors/cpu.rb

@@ -1,4 +1,5 @@
 require "time"
+require 'server_metrics/system_info'
 
 class ServerMetrics::Cpu < ServerMetrics::Collector
 
@@ -25,9 +26,11 @@ class ServerMetrics::Cpu < ServerMetrics::Collector
     uptime_output = `uptime`
     matches = uptime_output.match(/load averages?: ([\d.]+),? ([\d.]+),? ([\d.]+)\Z/)
 
-    report(:last_minute => matches[1].to_f,
-           :last_five_minutes => matches[2].to_f,
-           :last_fifteen_minutes => matches[3].to_f)
+    number_of_processors = ServerMetrics::SystemInfo.num_processors
+
+    report(:last_minute => matches[1].to_f / number_of_processors,
+           :last_five_minutes => matches[2].to_f / number_of_processors,
+           :last_fifteen_minutes => matches[3].to_f / number_of_processors)
   end
 
   # Helper class

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = "0.0.8.3"
+  VERSION = "0.0.8.4"
 end

data/test/test_with_fixtures.rb

@@ -32,7 +32,6 @@ class TestWithFixtures < Test::Unit::TestCase
     assert c.data[:idle]
   end
 
-
   # First run we get size info
   def test_disk
     ServerMetrics::Disk.any_instance.stubs("linux?").returns(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.8.3
+  version: 0.0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3865381402127672943
+      hash: 3571060902029865156
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3865381402127672943
+      hash: 3571060902029865156
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25