scout 5.6.6 → 5.6.7.pre

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 5.6.7
+
+* changed fqdn override to hostname override. We no longer send fqdn.
+* hostname is now send exclusively in the URL -- it is no longer sent in the HTTP headers
+
 # 5.6.6
 
 * Fix for urlify query string in Ruby 1.8.6.

data/lib/scout/command/install.rb

@@ -19,7 +19,7 @@ module Scout
 
         puts "\nAttempting to contact the server..."
         begin
-          Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles, fqdn) do |scout|
+          Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles, @hostname) do |scout|
             scout.fetch_plan
             scout.run_plugins_by_plan
           end

data/lib/scout/command/run.rb

@@ -7,10 +7,10 @@ module Scout
         key = @args.first
         # TODO: this is an awkward way to force creation of the config directory. Could use a little refactoring.
         configuration_directory = config_dir
-        log.debug("Running Scout [#{Scout::VERSION}] on #{@fqdn}") if log
+        log.debug("Running Scout [#{Scout::VERSION}] on #{@hostname}") if log
         log.debug("Configuration directory is #{configuration_directory} ") if log
         # TODO: too much external logic of command doing things TO server. This should be moved into the server class.
-        @scout = Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles, fqdn)
+        @scout = Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles, @hostname)
         @scout.load_history
         
         unless $stdin.tty?

data/lib/scout/command/troubleshoot.rb

@@ -10,8 +10,7 @@ module Scout
   class Command
     class APITimeoutError < RuntimeError; end
 
-    HTTP_HEADERS = { "Client-Version"  => Scout::VERSION,
-                     "Client-Hostname" => Socket.gethostname}
+    HTTP_HEADERS = { "Client-Version"  => Scout::VERSION }
 
     class Troubleshoot < Command
       
@@ -27,8 +26,7 @@ module Scout
         puts "Gathering troubleshooting information about your Scout install ... "
 
         heading "Scout Info"
-        bullet "Hostname", Socket.gethostname
-        bullet "FQDN", @fqdn
+        bullet "Hostname", @hostname
         bullet "History file", history
         bullet "Version", Scout::VERSION
 

data/lib/scout/command.rb

@@ -87,9 +87,9 @@ module Scout
                  "Optional https proxy for SSL traffic." ) do |https_proxy|
           options[:https_proxy] = https_proxy
         end
-        opts.on("--fqdn FQDN", String,
-                "Optional fully qualified domain name override." ) do |fqdn|
-          options[:fqdn] = fqdn
+        opts.on("--hostname HOSTNAME", String,
+                "Optionally override the hostname." ) do |hostname|
+          options[:hostname] = hostname
         end
 
         opts.separator " "
@@ -177,8 +177,7 @@ module Scout
       @server_name    = options[:server_name]
       @http_proxy     = options[:http_proxy] || ""
       @https_proxy    = options[:https_proxy] || ""
-      @fqdn           = (options[:fqdn] || `hostname -f`).chomp
-
+      @hostname       = options[:hostname] || Socket.gethostname
       @options = options
       @args    = args
 
@@ -190,7 +189,7 @@ module Scout
 
     end
 
-    attr_reader :server, :history, :config_dir, :log_path, :server_name, :fqdn
+    attr_reader :server, :history, :config_dir, :log_path, :server_name, :hostname
 
 
     def verbose?

data/lib/scout/server.rb

@@ -27,7 +27,7 @@ module Scout
     attr_reader :client_key
 
     # Creates a new Scout Server connection.
-    def initialize(server, client_key, history_file, logger = nil, server_name=nil, http_proxy='', https_proxy='', roles='', fqdn = nil)
+    def initialize(server, client_key, history_file, logger = nil, server_name=nil, http_proxy='', https_proxy='', roles='', hostname = nil)
       @server       = server
       @client_key   = client_key
       @history_file = history_file
@@ -37,7 +37,7 @@ module Scout
       @http_proxy   = http_proxy
       @https_proxy  = https_proxy
       @roles        = roles || ''
-      @fqdn         = fqdn
+      @hostname     = hostname
       @plugin_plan  = []
       @plugins_with_signature_errors = []
       @directives   = {} # take_snapshots, interval, sleep_interval
@@ -49,7 +49,6 @@ module Scout
       @history_tmp_file = history_file+'.tmp'
       @plugin_config = load_plugin_configs(@plugin_config_path)
       @data_file = Scout::DataFile.new(@history_file,@logger)
-
       # the block is only passed for install and test, since we split plan retrieval outside the lockfile for run
       if block_given?
         load_history
@@ -61,7 +60,7 @@ module Scout
     def refresh?
       return true if !ping_key or account_public_key_changed? # fetch the plan again if the account key is modified/created
 
-      url=URI.join( @server.sub("https://","http://"), "/clients/#{ping_key}/ping.scout?roles=#{@roles}&fqdn=#{URI.encode(@fqdn)}")
+      url=URI.join( @server.sub("https://","http://"), "/clients/#{ping_key}/ping.scout?roles=#{@roles}&hostname=#{URI.encode(@hostname)}")
 
       headers = {"x-scout-tty" => ($stdin.tty? ? 'true' : 'false')}
       if @history["plan_last_modified"] and @history["old_plugins"]

data/lib/scout/server_base.rb

@@ -16,7 +16,6 @@ module Scout
 
     # Headers passed up with all API requests.
     HTTP_HEADERS = { "Client-Version"  => Scout::VERSION,
-                     "Client-Hostname" => Socket.gethostname,
                      "Accept-Encoding" => "gzip" }
 
 
@@ -29,7 +28,7 @@ module Scout
                "/clients/CLIENT_KEY/#{url_name}.scout".
                    gsub(/\bCLIENT_KEY\b/, @client_key).
                    gsub(/\b[A-Z_]+\b/) { |k| options[k.downcase.to_sym] || k })
-      uri.query = ["roles=#{@roles}","fqdn=#{URI.encode(@fqdn)}","tty=#{$stdin.tty? ? 'y' : 'n'}"].join('&')
+      uri.query = ["roles=#{@roles}","hostname=#{URI.encode(@hostname)}","tty=#{$stdin.tty? ? 'y' : 'n'}"].join('&')
       uri
     end
 

data/lib/scout/streamer.rb

@@ -9,7 +9,7 @@ module Scout
 
     # * history_file is the *path* to the history file
     # * plugin_ids is an array of integers
-    def initialize(history_file, streaming_key, p_app_id, p_key, p_secret, plugin_ids, logger = nil)
+    def initialize(history_file, streaming_key, p_app_id, p_key, p_secret, plugin_ids, hostname, logger = nil)
       @@continue_streaming = true
       @history_file = history_file
       @history      = Hash.new
@@ -27,8 +27,6 @@ module Scout
 
       info("Streamer PID=#{$$} starting")
 
-      fqdn=`hostname -f`
-
       # load plugin history
       load_history
 
@@ -72,7 +70,7 @@ module Scout
                      :class=>plugin_hash['code_class']}
         end
 
-        bundle={:hostname=>fqdn,
+        bundle={:hostname=>hostname,
                  :server_time=>Time.now.strftime("%I:%M:%S %p"),
                  :num_processes=>`ps -e | wc -l`.chomp.to_i,
                  :plugins=>plugins }

data/lib/scout/streamer_daemon.rb

@@ -2,7 +2,7 @@ module Scout
   class StreamerDaemon < DaemonSpawn::Base
 
     # this is the public-facing method for starting the streaming daemon
-    def self.start_daemon(history_file, streamer_command)
+    def self.start_daemon(history_file, streamer_command, hostname)
       streamer_log_file=File.join(File.dirname(history_file),"scout_streamer.log")
       streamer_pid_file=File.join(File.dirname(history_file),"scout_streamer.pid")
 
@@ -21,7 +21,7 @@ module Scout
       plugin_ids = tokens.map(&:to_i)
 
       # we use STDOUT for the logger because daemon_spawn directs STDOUT to a log file
-      streamer_args = [history_file,streaming_key,p_app_id,p_key,p_secret,plugin_ids,Logger.new(STDOUT)]
+      streamer_args = [history_file,streaming_key,p_app_id,p_key,p_secret,plugin_ids,hostname,Logger.new(STDOUT)]
       if File.exists?(streamer_pid_file)
         Scout::StreamerDaemon.restart(daemon_spawn_options, streamer_args)
       else
@@ -45,8 +45,8 @@ module Scout
 
     # this method is called by DaemonSpawn's class start method.
     def start(streamer_args)
-      history,streaming_key,p_app_id,p_key,p_secret,plugin_ids,log = streamer_args
-      @scout = Scout::Streamer.new(history, streaming_key, p_app_id, p_key, p_secret, plugin_ids, log)
+      history,streaming_key,p_app_id,p_key,p_secret,plugin_ids,hostname,log = streamer_args
+      @scout = Scout::Streamer.new(history, streaming_key, p_app_id, p_key, p_secret, plugin_ids, hostname, log)
     end
 
     # this method is called by DaemonSpawn's class start method.

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.6.6"
+  VERSION = "5.6.7.pre"
 end

data/test/scout_test.rb

@@ -60,7 +60,6 @@ class ScoutTest < Test::Unit::TestCase
     @db_role=@roles_account.roles.find_by_name("db")
     @app_role=@roles_account.roles.find_by_name("app")
     @hostname = `hostname`.chomp
-    @fqdn = `hostname -f`.chomp
   end
 
   def test_should_checkin_during_interactive_install
@@ -416,7 +415,7 @@ mybar=100
       scout(@client.key) # to write the initial history file. Sinatra MUST be running
       $continue_streaming = true # so the streamer will run once
       # for debugging, make last arg Logger.new(STDOUT)
-      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[@client.plugins.first.id]+plugins.map(&:id),nil)
+      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[@client.plugins.first.id]+plugins.map(&:id),"blade",nil)
     end
 
     streams = Pusher::Channel.streamer_data  # set by the mock_pusher call
@@ -446,7 +445,7 @@ mybar=100
     mock_pusher do
       $continue_streaming = true # so the streamer will run once
       # for debugging, make last arg Logger.new(STDOUT)
-      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[@client.plugins.first.id],nil)
+      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[@client.plugins.first.id],"blade",nil)
     end
     streams = Pusher::Channel.streamer_data  # set by the mock_pusher call
     assert streams.is_a?(Array)
@@ -468,7 +467,7 @@ mybar=100
     test_should_run_first_time
 
     assert !File.exist?(streamer_pid_file)
-
+puts @client.hostname
     assert @client.update_attribute(:streamer_command, "start,A0000000000123,a,b,c,1,3")
     exec_scout(@client.key)
     assert File.exist?(streamer_pid_file)
@@ -491,7 +490,7 @@ mybar=100
       exec_scout(@client.key)
       #puts YAML.load(File.read(PATH_TO_DATA_FILE))['memory'].to_yaml
       # for debugging, make last arg Logger.new(STDOUT)
-      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[plugin.id],nil)
+      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[plugin.id],"blade",nil)
     end
 
     streams = Pusher::Channel.streamer_data  # set by the mock_pusher call
@@ -506,7 +505,7 @@ mybar=100
       plugin = create_plugin(@client, "caching plugin", PLUGIN_FIXTURES[:caching][:code], PLUGIN_FIXTURES[:caching][:sig])
       exec_scout(@client.key)
       # for debugging, make last arg Logger.new(STDOUT)
-      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[plugin.id],nil)
+      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[plugin.id],"blade",nil)
     end
 
     streams = Pusher::Channel.streamer_data  # set by the mock_pusher call
@@ -569,23 +568,11 @@ mybar=100
 
   end
 
-  def test_fqdn
-    scout(@roles_account.key)
-    client=@roles_account.clients.last
-    assert_equal @fqdn, client.fqdn
-  end
-
-  def test_fqdn_override
-    fqdn_override="app1.production.foobar.com"
-    scout(@roles_account.key, "--fqdn", fqdn_override)
-    client=@roles_account.clients.last
-    assert_equal fqdn_override, client.fqdn
-  end
-
-  def test_fqdn_has_newline
-    scout(@roles_account.key, "--fqdn", "db-1.foobar.com\n")
+  def test_hostname_override
+    hostname_override="app1.production.foobar.com"
+    scout(@roles_account.key, "--hostname", hostname_override)
     client=@roles_account.clients.last
-    assert_equal "db-1.foobar.com", client.fqdn
+    assert_equal hostname_override, client.hostname
   end
 
 
@@ -722,7 +709,7 @@ mybar=100
   def create_plugin(client,name, code, signature)
     p=client.plugins.create(:name=>name)
     PluginMeta.create(:plugin=>p)
-    p.meta.code=code
+    p.reload.meta.code=code
     p.code_md5_signature=Digest::MD5.hexdigest(code)
     p.signature=signature
     p.save

metadata

@@ -1,44 +1,40 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: scout
-version: !ruby/object:Gem::Version
-  version: 5.6.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 5.6.7.pre
 platform: ruby
-authors:
+authors: 
 - Andre Lewis
 - Derek Haynes
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-25 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: elif
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'The scout gem reports metrics to scoutapp.com, an easy-to-use hosted
-  server monitoring service.
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: |
+  The scout gem reports metrics to scoutapp.com, an easy-to-use hosted server monitoring service.
 
-'
 email: support@scoutapp.com
-executables:
+executables: 
 - scout
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG.markdown
 - Gemfile
@@ -223,32 +219,34 @@ files:
 - vendor/signature/spec/signature_spec.rb
 - vendor/signature/spec/spec_helper.rb
 - vendor/util/lib/core_extensions.rb
+has_rdoc: true
 homepage: http://scoutapp.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+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'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 1.3.1
+  version: 
 requirements: []
+
 rubyforge_project: scout
-rubygems_version: 1.8.24
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby
-  gem reports metrics to our service. The agent runs plugins, configured via the Scout
-  web interface, to monitor a server.
-test_files:
+summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby gem reports metrics to our service. The agent runs plugins, configured via the Scout web interface, to monitor a server.
+test_files: 
 - test/plugins/disk_usage.rb
 - test/scout_test.rb