scout 5.0.3 → 5.1.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 5.1.0
+
+* Agent now reports data on initial install
+* If history file is empty, Agent will resume normal checkin when it can write history file again (thx @jnewland)
+* inclusion of counter functionality (thx @lindvall)
+
 == 5.0.3
 
 * fixed regression: Error when running `scout AGENT_KEY` without first running scout and manually entering the agent key 

data/lib/scout/command/install.rb

@@ -22,7 +22,10 @@ module Scout
 
         puts "\nAttempting to contact the server..."
         begin
-          Scout::Server.new(server, key, history, log) { |scout| scout.fetch_plan }
+          Scout::Server.new(server, key, history, log) do |scout|
+            scout.fetch_plan
+            scout.run_plugins_by_plan
+          end
 
           puts <<-END_SUCCESS.gsub(/^ {10}/, "")
           Success!

data/lib/scout/command.rb

@@ -218,7 +218,7 @@ module Scout
         if running
           if pid == "unknown"
             log.warn "Could not create or read PID file.  "                +
-                     "You may need to the path to the config directory.  " +
+                     "You may need to specify the path to the config directory.  " +
                      "See:  http://scoutapp.com/help#data_file" if log
           else
             log.warn "Process #{pid} was already running" if log

data/lib/scout/plugin.rb

@@ -155,6 +155,52 @@ module Scout
       (0...other.size).step(2) { |i| memory.merge!(other[i] => other[i + 1]) }
     end
     
+    #
+    # Usage:
+    #
+    #   counter(:rkbps, stats['rsect'] / 2, :per => :second)
+    #   counter(:rpm, request_counter, :per => :minute)
+    #   counter(:swap_ins, vmstat['pswpin'], :per => :second, :round => true)
+    #
+    def counter(name, value, options = {}, &block)
+      current_time = Time.now
+
+      if data = memory("_counter_#{name}")
+        last_time, last_value = data[:time], data[:value]
+        elapsed_seconds       = current_time - last_time
+
+        # We won't log it if the value has wrapped or enough time hasn't
+        # elapsed
+        if value >= last_value && elapsed_seconds >= 1
+          if block
+            result = block.call(last_value, value)
+          else
+            result = value - last_value
+          end
+
+          case options[:per]
+          when :second, 'second'
+            result = result / elapsed_seconds.to_f
+          when :minute, 'minute'
+            result = result / elapsed_seconds.to_f / 60.0
+          else
+            raise "Unknown option for ':per': #{options[:per].inspect}"
+          end
+
+          if options[:round]
+            # Backward compatibility
+            options[:round] = 1 if options[:round] == true
+
+            result = (result * (10 ** options[:round])).round / (10 ** options[:round]).to_f
+          end
+
+          report(name => result)
+        end
+      end
+
+      remember("_counter_#{name}" => { :time => current_time, :value => value })
+    end
+
     #
     # Old plugins will work because they override this method.  New plugins can
     # now leave this method in place, add a build_report() method instead, and

data/lib/scout/server.rb

@@ -67,7 +67,7 @@ module Scout
     def fetch_plan
       url = urlify(:plan)
       info "Pinging server at #{url}..."
-      headers = Hash.new
+      headers = {"x_scout_tty" => ($stdin.tty? ? 'true' : 'false')}
       if @history["plan_last_modified"] and @history["old_plugins"]
         headers["If-Modified-Since"] = @history["plan_last_modified"]
       end
@@ -291,7 +291,7 @@ module Scout
     # it creates one.
     #
     def load_history
-      unless File.exist? @history_file
+      if !File.exist?(@history_file) || File.zero?(@history_file)
         create_blank_history
       end
       debug "Loading history file..."

data/lib/scout.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -wKU
 
 module Scout
-  VERSION = "5.0.3".freeze
+  VERSION = "5.1.0".freeze
 end
 
 require "scout/command"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  version: 5.0.3
+  version: 5.1.0
 platform: ruby
 authors: 
 - Highgroove Studios
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -08:00
+date: 2010-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency