pghero 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28e8f13da0c65fcfae3c3cce03ced64eca97d709
-  data.tar.gz: 7b7523fc2d8a1c75cfb3e84d3a826755c2c03adf
+  metadata.gz: afbcdc4cdc3effd62204f1e0939797d86b04e315
+  data.tar.gz: 87a95863031e246f9d31663d09a400d1df392e7c
 SHA512:
-  metadata.gz: 9a5e9a0fa5d4884d4b3bdf2bfbc953300033022e1d2b2f67edc3b3393b1ba2e40bc38a06887ce36d2ef833e2c2faf41a94d84e908bb2ad063a774d26dd10c77a
-  data.tar.gz: 22ef1030b064f7208ad8e030aff13d66ff276246e75be27cb5e11286322ea95a0883fa025a07976116c565061bbfad35f9068368952f2627e0fb2ac130c291ad
+  metadata.gz: 8b318e1fea0c1976440c4d7473b0c423dac92c945cbe18ddb755c4748e45b928d0b2ea86253a3b2830e6236e8314a592a5d78995477012218da91f75c9dd165b
+  data.tar.gz: 37c1d9495c3cf959c2cbb22244c268cb49872f0df72b343df30d9b0f6bd636e72fc1329441504596750458d394f4315e082071a53fbd5660a06bd35026904c35

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.1
+
+- Fixed capture space stats
+
 ## 2.0.0
 
 New features

data/README.md

@@ -6,6 +6,8 @@ A performance dashboard for Postgres - health checks, suggested indexes, and mor
 
 [![Screenshot](https://pghero.dokkuapp.com/assets/screenshot-5a368624ada55b32e7668c96926840f9.png)](https://pghero.dokkuapp.com/)
 
+PgHero 2.0 was just released! [Read details](https://medium.com/@ankane/pghero-2-0-has-arrived-266c3874d012).
+
 :speech_balloon: Get [handcrafted updates](http://chartkick.us7.list-manage.com/subscribe?u=952c861f99eb43084e0a49f98&id=6ea6541e8e&group[0][16]=true) for new features
 
 ## Installation

data/app/controllers/pg_hero/home_controller.rb

@@ -67,10 +67,10 @@ module PgHero
       @space_stats_enabled = @database.space_stats_enabled? && !params[:tables]
       if @space_stats_enabled
         space_growth = @database.space_growth(days: @days, relation_sizes: @relation_sizes)
-        @growth_bytes_by_relation = Hash[ space_growth.map { |r| [r[:relation], r[:growth_bytes]] } ]
+        @growth_bytes_by_relation = Hash[ space_growth.map { |r| [[r[:schema], r[:relation]], r[:growth_bytes]] } ]
         case params[:sort]
         when "growth"
-          @relation_sizes.sort_by! { |r| s = @growth_bytes_by_relation[r[:relation]]; [s ? 0 : 1, -s.to_i, r[:relation]] }
+          @relation_sizes.sort_by! { |r| s = @growth_bytes_by_relation[[r[:schema], r[:relation]]]; [s ? 0 : 1, -s.to_i, r[:schema], r[:relation]] }
         when "name"
           @relation_sizes.sort_by! { |r| r[:relation] || r[:table] }
         end
@@ -84,9 +84,10 @@ module PgHero
     end
 
     def relation_space
+      @schema = params[:schema] || "public"
       @relation = params[:relation]
       @title = @relation
-      relation_space_stats = @database.relation_space_stats(@relation)
+      relation_space_stats = @database.relation_space_stats(@relation, schema: @schema)
       @chart_data = [{name: "Value", data: relation_space_stats.map { |r| [r[:captured_at], (r[:size_bytes].to_f / 1.megabyte).round(1)] }, library: chart_library_options}]
     end
 

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

@@ -1,5 +1,10 @@
 <div class="content">
-  <h1><%= @relation %></h1>
+  <h1>
+    <%= @relation %>
+    <% if @schema != "public" %>
+      <small><%= @schema %></small>
+    <% end %>
+  </h1>
 
   <h1>Size <small>MB</small></h1>
   <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>

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

@@ -54,7 +54,7 @@ remove_index <%= query[:table].to_sym.inspect %>, name: <%= query[:index].to_s.i
             <span style="word-break: break-all;">
               <% name = query[:relation] || query[:table] %>
               <% if @space_stats_enabled %>
-                <%= link_to name, relation_space_path(name), target: "_blank", style: "color: inherit;" %>
+                <%= link_to name, relation_space_path(name, schema: query[:schema]), target: "_blank", style: "color: inherit;" %>
               <% else %>
                 <%= name %>
               <% end %>
@@ -69,8 +69,8 @@ remove_index <%= query[:table].to_sym.inspect %>, name: <%= query[:index].to_s.i
           <td><%= query[:size] %></td>
           <% if @space_stats_enabled %>
             <td>
-              <% if @growth_bytes_by_relation[query[:relation]] %>
-                <% if @growth_bytes_by_relation[query[:relation]] < 0 %>-<% end %><%= PgHero.pretty_size(@growth_bytes_by_relation[query[:relation]].abs) %>
+              <% if @growth_bytes_by_relation[[query[:schema], query[:relation]]] %>
+                <% if @growth_bytes_by_relation[[query[:schema], query[:relation]]] < 0 %>-<% end %><%= PgHero.pretty_size(@growth_bytes_by_relation[[query[:schema], query[:relation]]].abs) %>
               <% else %>
                 <span class="text-muted">Unknown</span>
               <% end %>

data/guides/Docker.md

@@ -38,6 +38,28 @@ docker run -ti -e DATABASE_URL=... ankane/pghero bin/rake pghero:capture_query_s
 
 After this, a time range slider will appear on the Queries tab.
 
+## Historical Space Stats
+
+To track space stats over time, create a table to store them.
+
+```sql
+CREATE TABLE "pghero_space_stats" (
+  "id" serial primary key,
+  "database" text,
+  "schema" text,
+  "relation" text,
+  "size" bigint,
+  "captured_at" timestamp
+)
+CREATE INDEX ON "pghero_space_stats" ("database", "captured_at")
+```
+
+Schedule the task below to run once a day.
+
+```sh
+docker run -ti -e DATABASE_URL=... ankane/pghero bin/rake pghero:capture_space_stats
+```
+
 ## Credits
 
 Thanks to [Brian Morton](https://github.com/bmorton) for the [original Docker image](https://github.com/bmorton/pghero_solo).

data/guides/Linux.md

@@ -176,6 +176,27 @@ sudo pghero run rake pghero:capture_query_stats
 
 After this, a time range slider will appear on the Queries tab.
 
+## Historical Space Stats
+
+To track space stats over time, create a table to store them.
+
+```sql
+CREATE TABLE "pghero_space_stats" (
+  "id" serial primary key,
+  "database" text,
+  "schema" text,
+  "relation" text,
+  "size" bigint,
+  "captured_at" timestamp
+)
+CREATE INDEX ON "pghero_space_stats" ("database", "captured_at")
+```
+
+Schedule the task below to run once a day.
+
+```sh
+sudo pghero run rake pghero:capture_space_stats
+
 ## System Stats
 
 CPU usage is available for Amazon RDS.  Add these variables to your environment:

data/guides/Rails.md

@@ -76,6 +76,27 @@ By default, query stats are stored in your app’s database. Change this with:
 ENV["PGHERO_STATS_DATABASE_URL"]
 ```
 
+## Historical Space Stats
+
+To track space stats over time, run:
+
+```sh
+rails generate pghero:space_stats
+rake db:migrate
+```
+
+And schedule the task below to run once a day.
+
+```sh
+rake pghero:capture_space_stats
+```
+
+Or with a scheduler like Clockwork, use:
+
+```ruby
+PgHero.capture_space_stats
+```
+
 ## System Stats
 
 CPU usage, IOPS, and other stats are available for Amazon RDS. Add these lines to your application’s Gemfile:

data/lib/pghero/methods/space.rb

@@ -49,12 +49,13 @@ module PgHero
       def space_growth(days: 7, relation_sizes: nil)
         if space_stats_enabled?
           relation_sizes ||= self.relation_sizes
-          sizes = Hash[ relation_sizes.map { |r| [r[:relation], r[:size_bytes]] } ]
+          sizes = Hash[ relation_sizes.map { |r| [[r[:schema], r[:relation]], r[:size_bytes]] } ]
           start_at = days.days.ago
 
           stats = select_all_stats <<-SQL
             WITH t AS (
               SELECT
+                schema,
                 relation,
                 array_agg(size ORDER BY captured_at) AS sizes
               FROM
@@ -63,19 +64,20 @@ module PgHero
                 database = #{quote(id)}
                 AND captured_at >= #{quote(start_at)}
               GROUP BY
-                1
+                1, 2
             )
             SELECT
+              schema,
               relation,
               sizes[1] AS size_bytes
             FROM
               t
             ORDER BY
-              1
+              1, 2
           SQL
 
           stats.each do |r|
-            relation = r[:relation]
+            relation = [r[:schema], r[:relation]]
             if sizes[relation]
               r[:growth_bytes] = sizes[relation] - r[:size_bytes]
             end
@@ -87,10 +89,10 @@ module PgHero
         end
       end
 
-      def relation_space_stats(relation)
+      def relation_space_stats(relation, schema: "public")
         if space_stats_enabled?
           relation_sizes ||= self.relation_sizes
-          sizes = Hash[ relation_sizes.map { |r| [r[:relation], r[:size_bytes]] } ]
+          sizes = Hash[ relation_sizes.map { |r| [[r[:schema], r[:relation]], r[:size_bytes]] } ]
           start_at = 30.days.ago
 
           stats = select_all_stats <<-SQL
@@ -102,6 +104,7 @@ module PgHero
             WHERE
               database = #{quote(id)}
               AND captured_at >= #{quote(start_at)}
+              AND schema = #{quote(schema)}
               AND relation = #{quote(relation)}
             ORDER BY
               1 ASC
@@ -109,7 +112,7 @@ module PgHero
 
           stats << {
             captured_at: Time.now,
-            size_bytes: sizes[relation].to_i
+            size_bytes: sizes[[schema, relation]].to_i
           }
         else
           raise NotEnabled, "Space stats not enabled"
@@ -121,7 +124,7 @@ module PgHero
         columns = %w(database schema relation size captured_at)
         values = []
         relation_sizes.each do |rs|
-          values << [id, rs[:schema], rs[:name], rs[:size_bytes].to_i, now]
+          values << [id, rs[:schema], rs[:relation], rs[:size_bytes].to_i, now]
         end
         insert_stats("pghero_space_stats", columns, values)
       end

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Andrew Kane