pghero 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a1b8fd1b842ba05d906e6e8881f660666272df2
-  data.tar.gz: baf28af591b300f743afff313dc4065a9dc79016
+  metadata.gz: a1a3cb7c5c2090aa6b4dcc0fb11aca000945a5a4
+  data.tar.gz: 2304979bb7676c7a346bfbd490e697f16379f8bb
 SHA512:
-  metadata.gz: 679f9d8cc6560727236cedb2f5dacb5030efacb418973683345d904fe3d0abcab12376c1d27b187100d9a921391f8651ff9cd26f4505115968fd203883ff97be
-  data.tar.gz: 77c3f3cabd0d818f266ce433a9ce2e450fa3dd8201c969b199ffd33c1d5e445117ce05f816087fb5ae046762d236fe48b7d9d3c0543ad659827f81be381c1537
+  metadata.gz: cb6cc9c80f2ea049225b3f8d4da5eefb7d3ac754a33ba6da644fff7adbb385626f4f5967fb9e91bb3328575d42e52a064c9d7d5cef43273b8d7ac894155c4197
+  data.tar.gz: 964c90c704e2049d3d2a47cad1479146409a0ad49ffa7a1436dc913ac8cbb992dd101cf3021ba288dbfc45736bd2c3b4f687627fbd9b5373fe24bb54cb631a5e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.3
+
+- Added SQL to recreate invalid indexes
+- Added unused index marker to Space page
+- Fixed `capture_query_stats` on Postgres < 9.4
+
 ## 2.0.2
 
 - Fixed error with suggested indexes

data/app/assets/stylesheets/pghero/application.css

@@ -475,6 +475,12 @@ body {
   font-weight: bold;
 }
 
+.primary-key {
+  color: #f0ad4e;
+  font-size: 11px;
+  font-weight: bold;
+}
+
 .origin {
   word-break: break-word;
 }

data/app/controllers/pg_hero/home_controller.rb

@@ -76,7 +76,8 @@ module PgHero
         end
       end
 
-      @unused_indexes = @database.unused_indexes(max_scans: 0)
+      across = params[:across].to_s.split(",")
+      @unused_indexes = @database.unused_indexes(max_scans: 0, across: across)
       @unused_index_names = Set.new(@unused_indexes.map { |r| r[:index] })
       @show_migrations = PgHero.show_migrations
       @system_stats_enabled = @database.system_stats_enabled?

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

@@ -4,6 +4,7 @@
     <title><%= [@databases.size > 1 ? @database.name : "PgHero", @title].compact.join(" / ") %></title>
 
     <meta charset="utf-8" />
+    <%= favicon_link_tag "pghero/favicon.png" %>
     <%= stylesheet_link_tag "pghero/application" %>
     <%= javascript_include_tag "pghero/application" %>
   </head>

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

@@ -50,7 +50,7 @@
                 ·
               <% end %>
             <% end %>
-            <% if @show_details %>
+            <% if @show_details && query[:query_hash] %>
               <%= link_to "details", show_query_path(query[:query_hash]), target: "_blank" %>
             <% end %>
           </span>

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

@@ -247,7 +247,18 @@
       <tbody>
         <% @invalid_indexes.each do |index| %>
           <tr>
-            <td><%= index[:name] %></td>
+            <td>
+              <%= index[:name] %>
+              <% if index[:schema] != "public" %>
+                <span class="text-muted"><%= query[:schema] %></span>
+              <% end %>
+            </td>
+          </tr>
+          <tr>
+            <td style="border-top: none; padding: 0;">
+              <pre><code>DROP INDEX CONCURRENTLY <%= pghero_pretty_ident(index[:name], schema: index[:schema]) %>;
+<%= index[:definition].sub("CREATE INDEX ", "CREATE INDEX CONCURRENTLY ") %>;</code></pre>
+            </td>
           </tr>
         <% end %>
       </tbody>

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

@@ -34,11 +34,14 @@ ALTER INDEX new_index RENAME TO index;</code></pre>
           <tr>
             <td>
               <span style="word-break: break-all;"><%= index[:index] %></span>
+              <% if index[:primary] %>
+                <span class="primary-key">PRIMARY</span>
+              <% end %>
             </td>
             <td><%= PgHero.pretty_size(index[:bloat_bytes]) %></td>
             <td><%= PgHero.pretty_size(index[:index_bytes]) %></td>
           </tr>
-          <% if @show_sql %>
+          <% if @show_sql && !index[:primary] %>
             <tr>
               <td colspan="3" style="border-top: none; padding: 0;">
                 <% new_index = "new_#{index[:index]}".first(63) %>

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

@@ -32,7 +32,7 @@
     <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.sort_by { |q| q[:index] }.each do |query| %>
+      <pre style="overflow: scroll; white-space: pre; word-break: normal;"><% @unused_indexes.sort_by { |q| [-q[:size_bytes], q[:index]] }.each do |query| %>
 remove_index <%= query[:table].to_sym.inspect %>, name: <%= query[:index].to_s.inspect %><% end %></pre>
     </div>
   <% end %>
@@ -62,7 +62,7 @@ remove_index <%= query[:table].to_sym.inspect %>, name: <%= query[:index].to_s.i
             <% if query[:schema] != "public" %>
               <span class="text-muted"><%= query[:schema] %></span>
             <% end %>
-            <% if @unused_index_names.include?(query[:name]) %>
+            <% if @unused_index_names.include?(query[:relation]) %>
               <span class="unused-index">UNUSED</span>
             <% end %>
           </td>

data/guides/Docker.md

@@ -26,8 +26,8 @@ CREATE TABLE "pghero_query_stats" (
   "total_time" float,
   "calls" bigint,
   "captured_at" timestamp
-)
-CREATE INDEX ON "pghero_query_stats" ("database", "captured_at")
+);
+CREATE INDEX ON "pghero_query_stats" ("database", "captured_at");
 ```
 
 Schedule the task below to run every 5 minutes.
@@ -50,8 +50,8 @@ CREATE TABLE "pghero_space_stats" (
   "relation" text,
   "size" bigint,
   "captured_at" timestamp
-)
-CREATE INDEX ON "pghero_space_stats" ("database", "captured_at")
+);
+CREATE INDEX ON "pghero_space_stats" ("database", "captured_at");
 ```
 
 Schedule the task below to run once a day.
@@ -60,6 +60,18 @@ Schedule the task below to run once a day.
 docker run -ti -e DATABASE_URL=... ankane/pghero bin/rake pghero:capture_space_stats
 ```
 
+## Multiple Databases
+
+Create a file at `/app/config/pghero.yml` with:
+
+```yml
+databases:
+  primary:
+    url: postgres://...
+  replica:
+    url: postgres://...
+```
+
 ## Credits
 
 Thanks to [Brian Morton](https://github.com/bmorton) for the [original Docker image](https://github.com/bmorton/pghero_solo).

data/guides/Linux.md

@@ -1,82 +1,73 @@
 # PgHero for Linux
 
-Packaged for:
+Distributions
 
-- Ubuntu 16.04 (Xenial)
-- Ubuntu 14.04 (Trusty)
-- Ubuntu 12.04 (Precise)
-- Debian 7 (Wheezy)
-- Debian 8 (Jesse)
-- CentOS / RHEL 7
-- SUSE Linux Enterprise Server 12
+- [Ubuntu 16.04 (Xenial)](#ubuntu-1604-xenial)
+- [Ubuntu 14.04 (Trusty)](#ubuntu-1404-trusty)
+- [Debian 8 (Jesse)](#debian-8-jesse)
+- [Debian 7 (Wheezy)](#debian-7-wheezy)
+- [CentOS / RHEL 7](#centos--rhel-7)
+- [SUSE Linux Enterprise Server 12](#suse-linux-enterprise-server-12)
 
 64-bit only
 
 ## Installation
 
-Ubuntu 16.04 (Xenial)
+### Ubuntu 16.04 (Xenial)
 
 ```sh
-wget -qO - https://deb.packager.io/key | sudo apt-key add -
-echo "deb https://deb.packager.io/gh/pghero/pghero xenial master" | sudo tee /etc/apt/sources.list.d/pghero.list
+wget -qO- https://dl.packager.io/srv/pghero/pghero/key | sudo apt-key add -
+sudo wget -O /etc/apt/sources.list.d/pghero.list \
+  https://dl.packager.io/srv/pghero/pghero/master/installer/ubuntu/16.04.repo
 sudo apt-get update
 sudo apt-get -y install pghero
 ```
 
-Ubuntu 14.04 (Trusty)
+### Ubuntu 14.04 (Trusty)
 
 ```sh
-wget -qO - https://deb.packager.io/key | sudo apt-key add -
-echo "deb https://deb.packager.io/gh/pghero/pghero trusty master" | sudo tee /etc/apt/sources.list.d/pghero.list
+wget -qO- https://dl.packager.io/srv/pghero/pghero/key | sudo apt-key add -
+sudo wget -O /etc/apt/sources.list.d/pghero.list \
+  https://dl.packager.io/srv/pghero/pghero/master/installer/ubuntu/14.04.repo
 sudo apt-get update
 sudo apt-get -y install pghero
 ```
 
-Ubuntu 12.04 (Precise)
-
-```sh
-wget -qO - https://deb.packager.io/key | sudo apt-key add -
-echo "deb https://deb.packager.io/gh/pghero/pghero precise master" | sudo tee /etc/apt/sources.list.d/pghero.list
-sudo apt-get update
-sudo apt-get -y install pghero
-```
-
-Debian 7 (Wheezy)
+### Debian 8 (Jesse)
 
 ```sh
 sudo apt-get -y install apt-transport-https
-wget -qO - https://deb.packager.io/key | sudo apt-key add -
-echo "deb https://deb.packager.io/gh/pghero/pghero wheezy master" | sudo tee /etc/apt/sources.list.d/pghero.list
+wget -qO- https://dl.packager.io/srv/pghero/pghero/key | sudo apt-key add -
+sudo wget -O /etc/apt/sources.list.d/pghero.list \
+  https://dl.packager.io/srv/pghero/pghero/master/installer/debian/8.repo
 sudo apt-get update
 sudo apt-get -y install pghero
 ```
 
-Debian 8 (Jesse)
+### Debian 7 (Wheezy)
 
 ```sh
 sudo apt-get -y install apt-transport-https
-wget -qO - https://deb.packager.io/key | sudo apt-key add -
-echo "deb https://deb.packager.io/gh/pghero/pghero jessie master" | sudo tee /etc/apt/sources.list.d/pghero.list
+wget -qO- https://dl.packager.io/srv/pghero/pghero/key | sudo apt-key add -
+sudo wget -O /etc/apt/sources.list.d/pghero.list \
+  https://dl.packager.io/srv/pghero/pghero/master/installer/debian/7.repo
 sudo apt-get update
 sudo apt-get -y install pghero
 ```
 
-CentOS / RHEL 7
+### CentOS / RHEL 7
 
 ```sh
-sudo rpm --import https://rpm.packager.io/key
-echo "[pghero]
-name=Repository for pghero/pghero application.
-baseurl=https://rpm.packager.io/gh/pghero/pghero/centos7/master
-enabled=1" | sudo tee /etc/yum.repos.d/pghero.repo
+sudo wget -O /etc/yum.repos.d/pghero.repo \
+  https://dl.packager.io/srv/pghero/pghero/master/installer/el/7.repo
 sudo yum -y install pghero
 ```
 
-SUSE Linux Enterprise Server 12
+### SUSE Linux Enterprise Server 12
 
 ```sh
-sudo rpm --import https://rpm.packager.io/key
-sudo zypper addrepo "https://rpm.packager.io/gh/pghero/pghero/sles12/master" "pghero"
+sudo wget -O /etc/zypp/repos.d/pghero.repo \
+  https://dl.packager.io/srv/pghero/pghero/master/installer/sles/12.repo
 sudo zypper install pghero
 ```
 
@@ -158,8 +149,8 @@ CREATE TABLE "pghero_query_stats" (
   "total_time" float,
   "calls" bigint,
   "captured_at" timestamp
-)
-CREATE INDEX ON "pghero_query_stats" ("database", "captured_at")
+);
+CREATE INDEX ON "pghero_query_stats" ("database", "captured_at");
 ```
 
 This table can be in the current database or another database. If another database, run:
@@ -188,8 +179,8 @@ CREATE TABLE "pghero_space_stats" (
   "relation" text,
   "size" bigint,
   "captured_at" timestamp
-)
-CREATE INDEX ON "pghero_space_stats" ("database", "captured_at")
+);
+CREATE INDEX ON "pghero_space_stats" ("database", "captured_at");
 ```
 
 Schedule the task below to run once a day.
@@ -212,12 +203,11 @@ sudo pghero config:set PGHERO_DB_INSTANCE_IDENTIFIER=epona
 Create a `pghero.yml` with:
 
 ```yml
-production:
-  databases:
-    primary:
-      url: postgres://...
-    replica:
-      url: postgres://...
+databases:
+  primary:
+    url: postgres://...
+  replica:
+    url: postgres://...
 ```
 
 And run:
@@ -260,6 +250,7 @@ Ubuntu and Debian
 ```sh
 sudo apt-get update
 sudo apt-get install --only-upgrade pghero
+sudo service pghero restart
 ```
 
 CentOS and RHEL
@@ -267,12 +258,14 @@ CentOS and RHEL
 ```sh
 sudo yum update
 sudo yum install pghero
+sudo service pghero restart
 ```
 
 SUSE
 
 ```sh
 sudo zypper update pghero
+sudo service pghero restart
 ```
 
 ## Credits

data/guides/Rails.md

@@ -118,18 +118,11 @@ PGHERO_DB_INSTANCE_IDENTIFIER=epona
 Create `config/pghero.yml` with:
 
 ```yml
-default: &default
-  databases:
-    primary:
-      url: <%= ENV["PGHERO_DATABASE_URL"] %>
-    replica:
-      url: <%= ENV["REPLICA_DATABASE_URL"] %>
-
-development:
-  <<: *default
-
-production:
-  <<: *default
+databases:
+  primary:
+    url: <%= ENV["PGHERO_DATABASE_URL"] %>
+  replica:
+    url: <%= ENV["REPLICA_DATABASE_URL"] %>
 ```
 
 ## Customize

data/lib/pghero.rb

@@ -26,7 +26,8 @@ require "pghero/connection"
 require "pghero/query_stats"
 
 module PgHero
-  class NotEnabled < StandardError; end
+  class Error < StandardError; end
+  class NotEnabled < Error; end
 
   # settings
   class << self

data/lib/pghero/methods/indexes.rb

@@ -68,8 +68,8 @@ module PgHero
          SQL
       end
 
-      def unused_indexes(max_scans: 50)
-        select_all_size <<-SQL
+      def unused_indexes(max_scans: 50, across: [])
+        result = select_all_size <<-SQL
           SELECT
             schemaname AS schema,
             relname AS table,
@@ -87,6 +87,15 @@ module PgHero
             pg_relation_size(i.indexrelid) DESC,
             relname ASC
         SQL
+
+        across.each do |database_id|
+          database = PgHero.databases.values.find { |d| d.id == database_id }
+          raise PgHero::Error, "Database not found: #{database_id}" unless database
+          across_result = Set.new(database.unused_indexes(max_scans: max_scans).map { |v| [v[:schema], v[:index]] })
+          result.select! { |v| across_result.include?([v[:schema], v[:index]]) }
+        end
+
+        result
       end
 
       def reset_stats
@@ -108,7 +117,9 @@ module PgHero
       def invalid_indexes
         select_all <<-SQL
           SELECT
-            c.relname AS index
+            n.nspname AS schema,
+            c.relname AS index,
+            pg_get_indexdef(i.indexrelid) AS definition
           FROM
             pg_catalog.pg_class c,
             pg_catalog.pg_namespace n,
@@ -297,9 +308,12 @@ module PgHero
             index_name AS index,
             wastedbytes AS bloat_bytes,
             totalbytes AS index_bytes,
-            pg_get_indexdef(indexrelid) AS definition
+            pg_get_indexdef(rb.indexrelid) AS definition,
+            indisprimary AS primary
           FROM
-            raw_bloat
+            raw_bloat rb
+          INNER JOIN
+            pg_index i ON i.indexrelid = rb.indexrelid
           WHERE
             wastedbytes >= #{min_size.to_i}
           ORDER BY

data/lib/pghero/methods/query_stats.rb

@@ -103,6 +103,8 @@ module PgHero
           query_stats[database_id] = query_stats(limit: 1000000, database: database_name)
         end
 
+        supports_query_hash = supports_query_hash?
+
         if query_stats.any? { |_, v| v.any? } && reset_query_stats
           query_stats.each do |db_id, db_query_stats|
             if db_query_stats.any?
@@ -114,7 +116,7 @@ module PgHero
                     qs[:total_minutes] * 60 * 1000,
                     qs[:calls],
                     now,
-                    qs[:query_hash],
+                    supports_query_hash ? qs[:query_hash] : nil,
                     qs[:user]
                   ]
                 end

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -122,6 +122,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/images/pghero/favicon.png
 - app/assets/javascripts/pghero/Chart.bundle.js
 - app/assets/javascripts/pghero/application.js
 - app/assets/javascripts/pghero/chartkick.js