scout 5.6.3.pre → 5.6.4

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 5.6.4
+
+* send FQDN in addition to hostname, and provide an override
+
 # 5.6.3
 
 * Removing $VERBOSE = true

data/lib/scout/command.rb

@@ -87,6 +87,10 @@ 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
+        end
 
         opts.separator " "
         opts.separator "Common Options:"
@@ -173,6 +177,7 @@ module Scout
       @server_name    = options[:server_name]
       @http_proxy     = options[:http_proxy] || ""
       @https_proxy    = options[:https_proxy] || ""
+      @fqdn           = options[:fqdn] || `hostname -f`
 
       @options = options
       @args    = args
@@ -185,7 +190,7 @@ module Scout
 
     end
 
-    attr_reader :server, :history, :config_dir, :log_path, :server_name
+    attr_reader :server, :history, :config_dir, :log_path, :server_name, :fqdn
 
 
     def verbose?

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) do |scout|
+          Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles, fqdn) 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 #{Socket.gethostname}") if log
+        log.debug("Running Scout [#{Scout::VERSION}] on #{@fqdn}") 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)
+        @scout = Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles, fqdn)
         @scout.load_history
         
         unless $stdin.tty?

data/lib/scout/command/test.rb

@@ -45,7 +45,7 @@ module Scout
           puts "== You haven't provided any options for running this plugin."
         end
 
-        Scout::Server.new(nil, nil, history, log, server_name, @http_proxy, @https_proxy, nil) do |scout|
+        Scout::Server.new(nil, nil, history, log, server_name, @http_proxy, @https_proxy, nil, nil) do |scout|
           scout.prepare_checkin
           scout.process_plugin( 'interval'  => 0,
                                 'plugin_id' => 1,

data/lib/scout/command/troubleshoot.rb

@@ -28,6 +28,7 @@ module Scout
 
         heading "Scout Info"
         bullet "Hostname", Socket.gethostname
+        bullet "FQDN", @fqdn
         bullet "History file", history
         bullet "Version", Scout::VERSION
 

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='')
+    def initialize(server, client_key, history_file, logger = nil, server_name=nil, http_proxy='', https_proxy='', roles='', fqdn = nil)
       @server       = server
       @client_key   = client_key
       @history_file = history_file
@@ -37,6 +37,7 @@ module Scout
       @http_proxy   = http_proxy
       @https_proxy  = https_proxy
       @roles        = roles || ''
+      @fqdn         = fqdn
       @plugin_plan  = []
       @plugins_with_signature_errors = []
       @directives   = {} # take_snapshots, interval, sleep_interval
@@ -60,7 +61,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}&hostname=#{Socket.gethostname}")
+      url=URI.join( @server.sub("https://","http://"), "/clients/#{ping_key}/ping.scout?roles=#{@roles}&fqdn=#{@fqdn}")
 
       headers = {"x-scout-tty" => ($stdin.tty? ? 'true' : 'false')}
       if @history["plan_last_modified"] and @history["old_plugins"]

data/lib/scout/server_base.rb

@@ -29,7 +29,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 },
-               "?roles=#{@roles}&hostname=#{Socket.gethostname}&tty=#{$stdin.tty? ? 'y' : 'n'}")
+               "?roles=#{@roles}&fqdn=#{@fqdn}&tty=#{$stdin.tty? ? 'y' : 'n'}")
     end
 
     def post(url, error, body, headers = Hash.new, &response_handler)

data/lib/scout/streamer.rb

@@ -27,7 +27,7 @@ module Scout
 
       info("Streamer PID=#{$$} starting")
 
-      hostname=Socket.gethostname
+      fqdn=`hostname -f`
 
       # load plugin history
       load_history
@@ -72,7 +72,7 @@ module Scout
                      :class=>plugin_hash['code_class']}
         end
 
-        bundle={:hostname=>hostname,
+        bundle={:hostname=>fqdn,
                  :server_time=>Time.now.strftime("%I:%M:%S %p"),
                  :num_processes=>`ps -e | wc -l`.chomp.to_i,
                  :plugins=>plugins }

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.6.3.pre"
+  VERSION = "5.6.4"
 end

data/test/scout_test.rb

@@ -60,6 +60,7 @@ 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
@@ -547,7 +548,7 @@ mybar=100
     assert_equal 2, client.plugins.count
 
     client.plugins.each do |plugin|
-      assert @app_role.plugin_templates.include?(plugin.plugin_definition), "#{plugin} should be included in the app role"
+      assert @app_role.plugin_templates.include?(plugin.plugin_template), "#{plugin} should be included in the app role"
     end
 
     # second checkin - add a role
@@ -563,11 +564,25 @@ mybar=100
     assert_equal 2, client.plugins.count
 
     client.plugins.each do |plugin|
-      assert @db_role.plugin_templates.include?(plugin.plugin_definition), "#{plugin} should be included in the db role"
+      assert @db_role.plugin_templates.include?(plugin.plugin_template), "#{plugin} should be included in the db role"
     end
 
   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
+
+
   ######################
   ### Helper Methods ###
   ######################
@@ -612,7 +627,7 @@ mybar=100
   # you can use this, but you have to create the plugin file and clean up afterwards.
   # Or, you can use the blog version below
   def scout_test(path_to_test_plugin, opts = String.new)
-    `bin/scout test #{path_to_test_plugin} -d #{PATH_TO_DATA_FILE} #{opts}`
+    `bin/scout test #{path_to_test_plugin} -d #{PATH_TO_DATA_FILE} #{opts} -v -ldebug`
   end
 
   # The preferred way to test the agent in test mode. This creates a plugin file with the code you provide,

metadata

@@ -1,39 +1,40 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: scout
-version: !ruby/object:Gem::Version
-  version: 5.6.3.pre
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  version: 5.6.4
 platform: ruby
-authors:
+authors: 
 - Andre Lewis
 - Derek Haynes
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-11 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: elif
-  requirement: &2156450540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: *2156450540
-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
@@ -218,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: 1.3.1
+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: "0"
+  version: 
 requirements: []
+
 rubyforge_project: scout
-rubygems_version: 1.8.10
+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