pghero 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35e051862227173af7785b2c94c18e8adb212c7b
-  data.tar.gz: e59c139875040a33db54c06263569792cae6901c
+  metadata.gz: a8c789e4669162dfec733b43ff6eb73f093671c3
+  data.tar.gz: 97992756ef94315ce617f324890f2357300b60e7
 SHA512:
-  metadata.gz: 01bf19bcaadab5a8cc039cc15bd0934ddb9d77b45c8b0cbabbf05aca2f0445ae1f0191907ee92f7f9a67a1ed7ad22bdeb4ded66285aa6f4662d41a9e77238e19
-  data.tar.gz: f8662218394eafdf740aa70f7e32fce9bb32b9f7412e41b50bd8ca063bef778b51b4b3abe360df96289b81327e9b0a7a6949b8b234d847dbe2461074a1fd7711
+  metadata.gz: 0b515756a401576febaeced7334e40dbdbd707f3f8e4405f7d33ba908bbdbbe0601234339e9e100cc7fa1087def73b7f5259a761314c33f2c8bd86a8191d6c84
+  data.tar.gz: 9f55d15a14dfe01b717c589e8a4948d5fbb541b50cd0b4132cc63fa692f2a50a70a01524c9b3b38fda365f18c5af842467e07b9f4b5dd7c0a5b4bd35e255cbeb

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.6
+
+- More robust methods for multiple databases
+- Added support for `RAILS_RELATIVE_URL_ROOT` for Linux and Docker
+
 ## 2.0.5
 
 - Fixed error with sequences in different schemas

data/app/controllers/pg_hero/home_controller.rb

@@ -7,10 +7,12 @@ module PgHero
     http_basic_authenticate_with name: ENV["PGHERO_USERNAME"], password: ENV["PGHERO_PASSWORD"] if ENV["PGHERO_PASSWORD"]
 
     if respond_to?(:before_action)
+      before_action :check_api
       before_action :set_database
       before_action :set_query_stats_enabled
       before_action :set_show_details, only: [:index, :queries, :show_query]
     else
+      # no need to check API in earlier versions
       before_filter :set_database
       before_filter :set_query_stats_enabled
       before_filter :set_show_details, only: [:index, :queries, :show_query]
@@ -179,7 +181,7 @@ module PgHero
           @indexes_by_table = @database.indexes.group_by { |i| i[:table] }
         end
       else
-        render text: "Unknown query"
+        render_text "Unknown query"
       end
     end
 
@@ -191,6 +193,12 @@ module PgHero
         "1 week" => {duration: 1.week, period: 30.minutes},
         "2 weeks" => {duration: 2.weeks, period: 1.hours}
       }
+      @duration = (params[:duration] || 1.hour).to_i
+      @period = (params[:period] || 60.seconds).to_i
+
+      if @duration / @period > 1440
+        render_text "Too many data points"
+      end
     end
 
     def cpu_usage
@@ -364,5 +372,17 @@ module PgHero
       end
       top_connections.sort_by { |k, v| [-v, k] }
     end
+
+    def check_api
+      render_text "No support for Rails API. See https://github.com/pghero/pghero for a standalone app." if Rails.application.config.try(:api_only)
+    end
+
+    def render_text(message)
+      if Rails::VERSION::MAJOR >= 5
+        render plain: message
+      else
+        render text: message
+      end
+    end
   end
 end

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

@@ -4,7 +4,7 @@
       <%= link_to name, system_path(options) %>
     <% end %>
   </p>
-  <% path_options = {duration: params[:duration], period: params[:period]} %>
+  <% path_options = {duration: @duration, period: @period} %>
 
   <h1>CPU</h1>
   <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>

data/guides/Rails.md

@@ -102,6 +102,8 @@ PgHero.capture_space_stats
 CPU usage, IOPS, and other stats are available for Amazon RDS. Add these lines to your application’s Gemfile:
 
 ```ruby
+gem 'aws-sdk-cloudwatch'
+# or
 gem 'aws-sdk'
 ```
 
@@ -113,6 +115,21 @@ PGHERO_SECRET_ACCESS_KEY=secret123
 PGHERO_DB_INSTANCE_IDENTIFIER=epona
 ```
 
+This requires the following IAM policy:
+
+```json
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": "cloudwatch:GetMetricStatistics",
+            "Resource": "*"
+        }
+    ]
+}
+```
+
 ## Multiple Databases
 
 Create `config/pghero.yml` with:

data/lib/pghero.rb

@@ -107,37 +107,56 @@ module PgHero
       databases.values.first
     end
 
-    def capture_query_stats
-      databases.each do |_, database|
+    def capture_query_stats(verbose: false)
+      each_database do |database|
+        puts "Capturing query stats for #{database.id}..." if verbose
         database.capture_query_stats
       end
-      true
     end
 
-    def capture_space_stats
-      databases.each do |_, database|
+    def capture_space_stats(verbose: false)
+      each_database do |database|
+        puts "Capturing space stats for #{database.id}..." if verbose
         database.capture_space_stats
       end
-      true
     end
 
     def analyze_all(**options)
-      databases.reject { |_, d| d.replica? }.each do |_, database|
+      each_database do |database|
+        next if database.replica?
         database.analyze_tables(**options)
       end
-      true
     end
 
-    def autoindex_all(create: false)
-      databases.each do |_, database|
-        puts "Autoindexing #{database}..."
+    def autoindex_all(create: false, verbose: true)
+      each_database do |database|
+        puts "Autoindexing #{database}..." if verbose
         database.autoindex(create: create)
       end
-      true
     end
 
     def pretty_size(value)
       ActiveSupport::NumberHelper.number_to_human_size(value, precision: 3)
     end
+
+    private
+
+    def each_database
+      first_error = nil
+
+      databases.each do |_, database|
+        begin
+          yield database
+        rescue => e
+          puts "#{e.class.name}: #{e.message}"
+          puts
+          first_error ||= e
+        end
+      end
+
+      raise first_error if first_error
+
+      true
+    end
   end
 end

data/lib/pghero/methods/space.rb

@@ -126,7 +126,7 @@ module PgHero
         relation_sizes.each do |rs|
           values << [id, rs[:schema], rs[:relation], rs[:size_bytes].to_i, now]
         end
-        insert_stats("pghero_space_stats", columns, values)
+        insert_stats("pghero_space_stats", columns, values) if values.any?
       end
 
       def space_stats_enabled?

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

data/lib/tasks/pghero.rake

@@ -1,12 +1,12 @@
 namespace :pghero do
   desc "capture query stats"
   task capture_query_stats: :environment do
-    PgHero.capture_query_stats
+    PgHero.capture_query_stats(verbose: true)
   end
 
   desc "capture space stats"
   task capture_space_stats: :environment do
-    PgHero.capture_space_stats
+    PgHero.capture_space_stats(verbose: true)
   end
 
   desc "analyze tables"
@@ -16,6 +16,6 @@ namespace :pghero do
 
   desc "autoindex"
   task autoindex: :environment do
-    PgHero.autoindex_all(create: true)
+    PgHero.autoindex_all(verbose: true, create: true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord