pghero 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42d5f779562b89764cd14697f3929b48407b2902
-  data.tar.gz: e89c108a39b3eeb72d8e8c36bcfa83b3243a9410
+  metadata.gz: dc8ca524f848315726b63a987ca3a39ca7768d13
+  data.tar.gz: 230b213962882f7a62615f90fc9bc6b45cc97da5
 SHA512:
-  metadata.gz: 9b04c5e26d00034f12600df994dc6b6c86195cf777dbcfd4e552dd10d41020de4747d8f50fea104d595aaa5d8579b9a868124f84c968b6288f107939bf7464b8
-  data.tar.gz: 8ab45421d0d4a71e38d26916cef3747f360e581fdf5fd7ef4507ffdbbcc8ad9d374cfc0df772a976a29e36fd01d29365bfe6a8e06071977e929ab9b428b613d3
+  metadata.gz: 74956a91d498cf2b68d7f3dd261d7b727b7695d84a89851514ab8d31ce617f0c6005e18901a792aeb92c12e718ea4847518553ca74c6304f31f4b9aab7af2483
+  data.tar.gz: 0f63ae5e71393fab956c8d2df185acb4abbe3ce1aaba3b0fed637fc7404011f538b7070c8a0598824968fc7243bdce9845f8cf837b255a64cee3cc7ee5c2eae6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.1.5
+
+- Added system stats for Amazon RDS
+- Added code to remove unused indexes
+- Require unused indexes to be at least 1 MB
+- Use `pg_terminate_backend` to ensure queries are killed
+
 ## 0.1.4
 
 - Reduced long running queries threshold to 1 minute

data/README.md

@@ -121,6 +121,23 @@ and reset stats with:
 SELECT pg_stat_statements_reset();
 ```
 
+## System Stats
+
+System stats are available for Amazon RDS.  Add these lines to your application’s Gemfile:
+
+```ruby
+gem 'aws-sdk'
+gem 'chartkick'
+```
+
+And add these variables to your environment:
+
+```sh
+PGHERO_ACCESS_KEY_ID=accesskey123
+PGHERO_SECRET_ACCESS_KEY=secret123
+PGHERO_DB_INSTANCE_IDENTIFIER=datakick-production
+```
+
 ## TODO
 
 - show exactly which indexes to add

data/app/controllers/pg_hero/home_controller.rb

@@ -42,6 +42,11 @@ module PgHero
       @query_stats = PgHero.query_stats
     end
 
+    def system_stats
+      @title = "System Stats"
+      @cpu_usage = PgHero.cpu_usage
+    end
+
     def explain
       @title = "Explain"
       @query = params[:query]
@@ -91,6 +96,7 @@ module PgHero
 
     def set_query_stats_enabled
       @query_stats_enabled = PgHero.query_stats_enabled?
+      @system_stats_enabled = PgHero.system_stats_enabled?
     end
 
   end

data/app/views/layouts/pg_hero/application.html.erb

@@ -349,6 +349,9 @@
             <% if @query_stats_enabled %>
               <li class="<%= controller.action_name == "query_stats" ? "active" : "" %>"><%= link_to "Queries", query_stats_path %></li>
             <% end %>
+            <% if @system_stats_enabled %>
+              <li class="<%= controller.action_name == "system_stats" ? "active" : "" %>"><%= link_to "System", system_stats_path %></li>
+            <% end %>
             <li class="<%= controller.action_name == "indexes" ? "active" : "" %>"><%= link_to "Indexes", indexes_path %></li>
             <li class="<%= controller.action_name == "space" ? "active" : "" %>"><%= link_to "Space", space_path %></li>
             <li class="<%= controller.action_name == "explain" ? "active" : "" %>"><%= link_to "Explain", explain_path %></li>

data/app/views/pg_hero/home/index.html.erb

@@ -126,7 +126,18 @@ pg_stat_statements.track = all</pre>
   <div class="content">
     <h1>Unused Indexes</h1>
 
-    <p>Unused indexes cause unnecessary overhead. Remove them for faster writes.</p>
+    <p>
+      Unused indexes cause unnecessary overhead. Remove them
+      <a href="javascript: void(0);" onclick="document.getElementById('migration').style.display = 'block';">with a migration</a>
+      for faster writes.
+    </p>
+
+    <div id="migration" style="display: none;">
+      <pre>rails g migration remove_unused_indexes</pre>
+      <p>And paste</p>
+      <pre style="overflow: scroll; white-space: pre; word-break: normal;"><% @unused_indexes.each do |query| %>
+remove_index <%= query["table"].to_sym.inspect %>, name: <%= query["index"].to_s.inspect %><% end %></pre>
+    </div>
 
     <table class="table">
       <thead>

data/app/views/pg_hero/home/system_stats.html.erb

@@ -0,0 +1,6 @@
+<div class="content">
+  <h1>CPU Usage</h1>
+
+  <%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %>
+  <div style="margin-bottom: 20px;"><%= line_chart @cpu_usage %></div>
+</div>

data/config/routes.rb

@@ -4,6 +4,7 @@ PgHero::Engine.routes.draw do
   get "space", to: "home#space"
   get "queries", to: "home#queries"
   get "query_stats", to: "home#query_stats"
+  get "system_stats", to: "home#system_stats"
   get "explain", to: "home#explain"
 
   post "kill", to: "home#kill"

data/lib/pghero.rb

@@ -137,9 +137,9 @@ module PgHero
           pg_index i ON ui.indexrelid = i.indexrelid
         WHERE
           NOT indisunique
-          AND idx_scan < 50 AND pg_relation_size(relid) > 5 * 8192
+          AND idx_scan < 50
+          AND pg_relation_size(i.indexrelid) > 1024 * 1024
         ORDER BY
-          pg_relation_size(i.indexrelid) / nullif(idx_scan, 0) DESC NULLS FIRST,
           pg_relation_size(i.indexrelid) DESC,
           relname ASC
       }
@@ -170,7 +170,7 @@ module PgHero
     end
 
     def kill(pid)
-      execute("SELECT pg_cancel_backend(#{pid.to_i})").first["pg_cancel_backend"] == "t"
+      execute("SELECT pg_terminate_backend(#{pid.to_i})").first["pg_terminate_backend"] == "t"
     end
 
     def kill_all
@@ -270,6 +270,45 @@ module PgHero
       end
     end
 
+    def cpu_usage
+      if system_stats_enabled?
+        cw = AWS::CloudWatch.new(access_key_id: access_key_id, secret_access_key: secret_access_key)
+        now = Time.now
+        resp = cw.client.get_metric_statistics(
+          namespace: "AWS/RDS",
+          metric_name: "CPUUtilization",
+          dimensions: [{name: "DBInstanceIdentifier", value: db_instance_identifier}],
+          start_time: (now - 1 * 3600).iso8601,
+          end_time: now.iso8601,
+          period: 60,
+          statistics: ["Average"]
+        )
+        data = {}
+        resp[:datapoints].sort_by{|d| d[:timestamp] }.each do |d|
+          data[d[:timestamp]] = d[:average]
+        end
+        data
+      else
+        {}
+      end
+    end
+
+    def system_stats_enabled?
+      !!(defined?(AWS) && access_key_id && secret_access_key && db_instance_identifier)
+    end
+
+    def access_key_id
+      ENV["PGHERO_ACCESS_KEY_ID"] || ENV["AWS_ACCESS_KEY_ID"]
+    end
+
+    def secret_access_key
+      ENV["PGHERO_SECRET_ACCESS_KEY"] || ENV["AWS_SECRET_ACCESS_KEY"]
+    end
+
+    def db_instance_identifier
+      ENV["PGHERO_DB_INSTANCE_IDENTIFIER"]
+    end
+
     # TODO better RDS check
     def rds?
       !!(Connection.connection_config[:host].to_s =~ /rds\.amazonaws\.com\z/)

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -103,6 +103,7 @@ files:
 - app/views/pg_hero/home/queries.html.erb
 - app/views/pg_hero/home/query_stats.html.erb
 - app/views/pg_hero/home/space.html.erb
+- app/views/pg_hero/home/system_stats.html.erb
 - config/routes.rb
 - gemfiles/activerecord31.gemfile
 - gemfiles/activerecord32.gemfile