scout 5.7.5 → 5.8.0.pre

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 5.8.0.pre
+
+Support for server metrics
+
 # 5.7.5
 
 * send unix timestamp when streaming data

data/Gemfile

@@ -3,6 +3,8 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in scout.gemspec
 gemspec
 
+gem "server_metrics"
+
 group :test do
   gem "newrelic_rpm"
   gem "activerecord", "2.2.2"

data/lib/scout.rb

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby -wKU
+
+require "rubygems" # only required during development, so server_metrics will load
+require "server_metrics"
+
 require "scout/version"
 
 require "scout/http"
@@ -13,3 +17,4 @@ require "scout/daemon_spawn"
 require "scout/streamer_daemon"
 require "scout/data_file"
 require "scout/environment"
+

data/lib/scout/server.rb

@@ -312,11 +312,37 @@ module Scout
         end
       end
       take_snapshot if @directives['take_snapshots']
+      get_server_metrics
       process_signature_errors
       store_account_public_key
       checkin
     end
-    
+
+    # called from the main "run_plugin_by_plan" method.
+    def get_server_metrics
+      @history[:server_metrics] ||= {}
+
+      res={}
+      collectors = {:disk      => ServerMetrics::Disk,
+                    :cpu       => ServerMetrics::Cpu,
+                    :memory    => ServerMetrics::Memory,
+                    :network   => ServerMetrics::Network,
+                    :processes => ServerMetrics::Processes}
+
+      collectors.each_pair do |key,klass|
+        begin
+          collector_previous_run = @history[:server_metrics][key]
+          collector = collector_previous_run.is_a?(Hash) ? klass.from_hash(collector_previous_run) : klass.new() # continue with last run, or just create new
+          res[key] = collector.run
+          @history[:server_metrics][key] = collector.to_hash # store its state for next time
+        rescue Exception => e
+          raise if e.is_a?(SystemExit)
+          error "Problem running server/#{key} metrics: #{e.message}: \n#{e.backtrace.join("\n")}"
+        end
+      end
+      @checkin[:server_metrics] = res
+    end
+
     # Reports errors if there are any plugins with invalid signatures and sets a flag
     # to force a fresh plan on the next run.
     def process_signature_errors
@@ -502,7 +528,8 @@ module Scout
                    :snapshot         => '',
                    :config_path      => File.expand_path(File.dirname(@history_file)),
                    :server_name      => @server_name,
-                   :options          => Array.new}
+                   :options          => Array.new,
+                   :server_metrics   => Hash.new }
     end
 
     def show_checkin(printer = :p)

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.7.5"
+  VERSION = "5.8.0.pre"
 end

data/scout.gemspec

@@ -24,4 +24,5 @@ END_DESC
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "elif"
+  s.add_runtime_dependency "server_metrics",">= 0.0.3"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.7.5
-  prerelease: 
+  version: 5.8.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Andre Lewis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elif
@@ -29,6 +29,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: server_metrics
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: ! 'The scout gem reports metrics to scoutapp.com, an easy-to-use hosted
   server monitoring service.
 
@@ -316,9 +332,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout
 rubygems_version: 1.8.25