heroku_mongo_watcher 0.1.1.beta → 0.2.1.beta

data/README.md

@@ -34,6 +34,7 @@ The output looks like the following ...
     <tr><td>max</td><td>max request time</td></tr>
     <tr><td>r_err</td><td>number of router errors, i.e. timeouts</td></tr>
     <tr><td>w_err</td><td>number of web errros (see below)</td></tr>
+    <tr><td>%err</td><td>total errors divided by total requests</td></tr>
     <tr><td>wait</td><td>average router wait</td></tr>
     <tr><td>queue</td><td>average router queue</td></tr>
     <tr><td>slowest</td><td>path of the url that corresponds to the max request time</td></tr>
@@ -51,7 +52,7 @@ At least for me, one of the key features is aggregating signals from my web log
 and other errors).  You can can configure the `error_messages` array in your .watcher file to define which String we
 should report on.
 
-In concert with that is the `display_errors` configuration.  If set to true it will aggregate and display the errors
+In concert with that is the `print_errors` configuration.  If set to true it will aggregate and display the errors
 found (see output above), set to false it will just put the total in the summary row
 
 
@@ -66,3 +67,10 @@ found (see output above), set to false it will just put the total in the summary
 2. create a .watcher file (see the examples) in your user directory ~/.watcher
 3. then run `bundle exec watcher`
 4. Ctrl-C out to quit
+
+## Options
+
+*  `--print-errors` to print a summary of errors during each sample
+*  `--print-requests` to print a summary of requests during each sample
+
+note: you can set these defaults in your .watcher file

data/example/.watcher

@@ -26,4 +26,7 @@ heroku_appname: 'my-heroku-app-name'
 heroku_account: 'my-heroku-account'
 
 # If you want to display the list of errors in the logs
-display_errors: true
+print_errors: true
+
+# If you want to display the list of requests in the logs
+print_requests: false

data/lib/heroku_mongo_watcher/cli.rb

@@ -72,7 +72,8 @@ class HerokuMongoWatcher::CLI
 
     HerokuMongoWatcher::DataRow.print_header
 
-    IO.popen("mongostat --rowcount 0 #{config[:interval]} --host #{config[:mongo_host]} --username #{config[:mongo_username]} --password #{config[:mongo_password]} --noheaders") do |f|
+    #IO.popen("mongostat --rowcount 0 #{config[:interval]} --host #{config[:mongo_host]} --username #{config[:mongo_username]} --password #{config[:mongo_password]} --noheaders") do |f|
+    IO.popen("mongostat --rowcount 0 10 --host #{config[:mongo_host]} --username #{config[:mongo_username]} --password #{config[:mongo_password]} --noheaders") do |f|
       while line = f.gets
         next unless line =~ /^/ && !(line =~ /^connected/)
         @mutex.synchronize do
@@ -163,7 +164,7 @@ class HerokuMongoWatcher::CLI
         "Faults: #{@last_row.faults}",
         "NetI/O: #{@last_row.net_in}/#{@last_row.net_out}",
     ]
-    content = content + @last_row.error_content_for_email
+    content = content + @last_row.error_content_for_email + @last_row.request_content_for_email
 
     content = content.join("\r\n")
     Net::SMTP.enable_tls(OpenSSL::SSL::VERIFY_NONE)

data/lib/heroku_mongo_watcher/configuration.rb

@@ -15,7 +15,8 @@ class HerokuMongoWatcher::Configuration
       mongo_password: '',
       heroku_appname: '',
       heroku_account: '',
-      print_errors: true
+      print_errors: false,
+      print_requests: false
   }
 
   @@valid_config_keys = @@config.keys
@@ -25,7 +26,8 @@ class HerokuMongoWatcher::Configuration
     configure_with(f)
 
     opts = Trollop::options do
-      opt :print_errors, "show aggregate error summaries", default: true
+      opt :print_errors, "show aggregate error summaries", default: false
+      opt :print_requests, "show aggregate requests summaries", default: false
     end
 
     @@config.merge!(opts)

data/lib/heroku_mongo_watcher/data_row.rb

@@ -5,7 +5,7 @@ class HerokuMongoWatcher::DataRow
   # Heroku Attributes
   @@attributes = [:total_requests, :total_service, :total_wait,
                   :total_queue, :total_router_errors, :total_web_errors,
-                  :max_service, :slowest_request, :errors, :dynos]
+                  :max_service, :slowest_request, :errors, :requests,:dynos]
 
   # Mongo Attributes
   @@attributes.concat [:inserts, :queries, :ops, :updates, :deletes,
@@ -17,6 +17,7 @@ class HerokuMongoWatcher::DataRow
     @@attributes.each { |attr| send "#{attr}=", 0 }
     self.slowest_request = nil
     self.errors = {}
+    self.requests = {}
   end
 
   def config
@@ -58,6 +59,8 @@ class HerokuMongoWatcher::DataRow
       status = items[8].split('=').last if items[8]
       bytes = items[9].split('=').last if items[9]
 
+      path = URI('http://' + url).path
+
       if is_number?(service) && is_number?(wait) && is_number?(queue)
         self.total_requests +=1
         self.total_service += Integer(service) if service
@@ -65,10 +68,17 @@ class HerokuMongoWatcher::DataRow
         self.total_queue += Integer(queue) if queue
         if Integer(service) > self.max_service
           self.max_service = Integer(service)
-          self.slowest_request = URI('http://' + url).path
+          self.slowest_request = path
         end
       end
 
+      if self.requests.has_key? path
+        self.requests[path] = self.requests[path] + 1
+      else
+        self.requests[path] = 1
+      end
+
+
     end
   end
 
@@ -126,7 +136,8 @@ class HerokuMongoWatcher::DataRow
   end
 
   def print_row
-    print_errors
+    print_hash(@errors) if config[:print_errors]
+    print_hash(@requests) if config[:print_requests]
 
     color_print @dynos, length: 4
     color_print @total_requests, warning: 30_000, critical: 50_000
@@ -150,10 +161,10 @@ class HerokuMongoWatcher::DataRow
     printf "\n"
   end
 
-  def print_errors
-    if config[:print_errors] && @errors && @errors.keys && @errors.keys.length > 0
-      @errors.each do |error,count|
-        puts "\t\t[#{count}] #{error}"
+  def print_hash(hash)
+    if hash && hash.keys && hash.keys.length > 0
+      hash.sort_by{|key,count| -count}.each do |row|
+        printf "\t%10s %s\n", "[#{row.last}]", row.first
       end
     end
   end
@@ -161,6 +172,7 @@ class HerokuMongoWatcher::DataRow
   def error_content_for_email
      content = []
      if @errors && @errors.keys && @errors.keys.length > 0
+       content << ""
        content << "Errors"
        @errors.each do |error,count|
          content <<  "\t\t[#{count}] #{error}"
@@ -169,6 +181,18 @@ class HerokuMongoWatcher::DataRow
      content
   end
 
+  def request_content_for_email
+     content = []
+     if @requests && @requests.keys && @requests.keys.length > 0
+       content << ""
+       content << "Requests"
+       @requests.sort_by{|req,count| -count}.each do |row|
+         content << "\t\t[#{row.last}] #{row.first}"
+       end
+     end
+     content
+  end
+
   private
 
   def is_number?(string)
@@ -183,9 +207,9 @@ class HerokuMongoWatcher::DataRow
 
   def color_print(field, options ={})
     options[:length] = 7 unless options[:length]
-    print Term::ANSIColor.bold if options[:bold] == true
+    print Term::ANSIColor.bold if options[:bold]
     if options[:critical] && is_number?(field) && Float(field) > options[:critical]
-      print "\a" #beep
+      beep
       print Term::ANSIColor.red
       print Term::ANSIColor.bold
     elsif options[:warning] && is_number?(field) && Float(field) > options[:warning]
@@ -200,5 +224,9 @@ class HerokuMongoWatcher::DataRow
     print Term::ANSIColor.clear
   end
 
+  def beep
+    print "\a"
+  end
+
 
 end

data/lib/heroku_mongo_watcher/version.rb

@@ -1,3 +1,3 @@
 module HerokuMongoWatcher
-  VERSION = "0.1.1.beta"
+  VERSION = "0.2.1.beta"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_mongo_watcher
 version: !ruby/object:Gem::Version
-  version: 0.1.1.beta
+  version: 0.2.1.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000Z
+date: 2012-07-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2158231140 !ruby/object:Gem::Requirement
+  requirement: &2156725900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158231140
+  version_requirements: *2156725900
 - !ruby/object:Gem::Dependency
   name: tlsmail
-  requirement: &2158230500 !ruby/object:Gem::Requirement
+  requirement: &2156724780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158230500
+  version_requirements: *2156724780
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2158229820 !ruby/object:Gem::Requirement
+  requirement: &2156723920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158229820
+  version_requirements: *2156723920
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2158229060 !ruby/object:Gem::Requirement
+  requirement: &2156722860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158229060
+  version_requirements: *2156722860
 description: Also notifies you when certain thresholds are hit.  I have found this
   much more accurate than New Relic
 email: