kanshi 0.0.2 → 0.1.0

data/README.md

@@ -26,9 +26,10 @@ Kanshi will work as a gem or as a standalone app.
 
 ### Create as separate Heroku app
 
-1. Push the code as-is to a new Heroku app.
-2. Set environment variables with database URLs.
-3. `heroku scale kanshi=1`
+1. Create a new app.
+2. Follow steps 1-3 from above.
+3. Add environment variables for each database URL you want to monitor.
+4. `heroku scale kanshi=1`
 
 ### Custom install
 
@@ -37,6 +38,9 @@ of your choosing, e.g. monitor specific databases or provide your own
 reporter for output. An easy way to do this would be to create a Rake
 task to run Kanshi.
 
+For more information, see the Configuration section below and [the
+source code for bin/kanshi](/heroku/kanshi/blob/master/bin/kanshi).
+
 ## Configuration
 
 If using the `kanshi` binary, configuration is optional but is done

data/bin/kanshi

@@ -8,11 +8,11 @@ databases = ENV.select { |k, v| v =~ %r{^postgres://} }.invert.invert
 prefix = ENV['KANSHI_PREFIX'] || 'kanshi'
 unless prefix.empty?
   databases.keys.each do |db|
-    databases["#{prefix}.#{db}"] = databases.delete(db)
+    databases["#{prefix}.#{db.downcase}"] = databases.delete(db)
   end
 end
 
 Kanshi.run(
   :databases => databases,
-  :delay => (ENV['KANSHI_SAMPLE_DELAY'] || 300).to_i
+  :delay => (ENV['KANSHI_SAMPLE_DELAY'] || 60).to_i
 )

data/lib/kanshi.rb

@@ -12,7 +12,7 @@ class Kanshi
   def initialize(options = {})
     @options = {
       :databases => {},
-      :delay => 300,
+      :delay => 60,
       :reporter => ScrollsReporter
     }
     @options.merge!(options)

data/lib/kanshi/queries.rb

@@ -1,11 +1,12 @@
 Kanshi::Queries = <<EOF.split(/\s*;\s*/)
 SELECT
-  pg_database_size(d.datname) as size,
+  pg_database_size(d.datname) AS size,
   numbackends,
   xact_commit,
   xact_rollback,
   blks_read,
   blks_hit,
+  blks_read + blks_hit AS blks_total,
   tup_fetched,
   tup_returned,
   tup_inserted,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kanshi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: