pghero 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca2a34abdf1aa45e33214683e898ef7b38cf4b5
-  data.tar.gz: d538fd497d9e85adef16551f3e4f54b2c0f81ae0
+  metadata.gz: b2ceee79d2694edb6770f2fd2f41d466c530e552
+  data.tar.gz: 0ea166a5189ee67ac67a96a0dc30f7f9b4835727
 SHA512:
-  metadata.gz: 3af44d86c65e316555e8a6ac6a8692214025649d2c4b05e64244b55e1bd6b7b538d5b13efc857238330d51adc8bd9cd6e222678679bbc5dd31740017a0d95191
-  data.tar.gz: 6ccddb176e5131effd878d5efb7074812918e3fe5ed80733e84a9621edf77127a1c3222ec6d3f011e974020bd6752539b853ce809c2aa50ca2982fd01b02703b
+  metadata.gz: 35d700acc843dab6c8cd99186da0314ef04440fed39eb911ec322290508d84595441766698c399efe89a09a003c5b6c50c9a4f154f67498e9d06792d35532e98
+  data.tar.gz: 80c608de2ad8dfe8bccb4ee34d39cdfb28d7859e089500378ef83ba304081151e89386a45549471007a06be583bf828de6bb7ec2e5b3ffcbcb48e7df5f9c9bf5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.2
+
+- Added invalid indexes
+- Fixed RDS stats for aws-sdk 2
+
 ## 1.1.1
 
 - Added `tables` option to `create_user` method

data/app/controllers/pg_hero/home_controller.rb

@@ -17,6 +17,7 @@ module PgHero
       @table_hit_rate = PgHero.table_hit_rate
       @missing_indexes = PgHero.missing_indexes
       @unused_indexes = PgHero.unused_indexes.select { |q| q["index_scans"].to_i == 0 }
+      @invalid_indexes = PgHero.invalid_indexes
       @good_cache_rate = @table_hit_rate >= 0.99 && @index_hit_rate >= 0.99
       @query_stats_available = PgHero.query_stats_available?
       @total_connections = PgHero.total_connections

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

@@ -40,6 +40,13 @@
       No slow queries
     <% end %>
   </div>
+  <div class="alert alert-<%= @invalid_indexes.empty? ? "success" : "warning" %>">
+    <% if @invalid_indexes.any? %>
+      <%= pluralize(@invalid_indexes.size, "invalid index", "invalid indexes") %>
+    <% else %>
+      No invalid indexes
+    <% end %>
+  </div>
   <div class="alert alert-<%= @missing_indexes.empty? ? "success" : "warning" %>">
     <% if @missing_indexes.any? %>
       <%= pluralize(@missing_indexes.size, "table appears", "tables appear") %> to be missing indexes
@@ -126,6 +133,29 @@ pg_stat_statements.track = all</pre>
   </div>
 <% end %>
 
+<% if @invalid_indexes.any? %>
+  <div class="content">
+    <h1>Invalid Indexes</h1>
+
+    <p>These indexes exist, but can’t be used. You should recreate them.</p>
+
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Name</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @invalid_indexes.each do |query| %>
+          <tr>
+            <td><%= query["index"] %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% end %>
+
 <% if @missing_indexes.any? %>
   <div class="content">
     <h1>Missing Indexes</h1>

data/guides/Rails.md

@@ -24,6 +24,7 @@ Be sure to [secure the dashboard](#security) in production.
 PgHero.running_queries
 PgHero.long_running_queries
 PgHero.index_usage
+PgHero.invalid_indexes
 PgHero.missing_indexes
 PgHero.unused_indexes
 PgHero.unused_tables

data/lib/pghero.rb

@@ -1,5 +1,6 @@
 require "pghero/version"
 require "active_record"
+require "pghero/database"
 require "pghero/engine" if defined?(Rails)
 require "pghero/tasks"
 
@@ -49,8 +50,18 @@ module PgHero
       end
     end
 
+    def databases
+      @databases ||= begin
+        Hash[
+          config["databases"].map do |id, c|
+            [id, PgHero::Database.new(id, c)]
+          end
+        ]
+      end
+    end
+
     def primary_database
-      config["databases"].keys.first
+      databases.keys.first
     end
 
     def current_database
@@ -58,20 +69,11 @@ module PgHero
     end
 
     def current_database=(database)
-      raise "Database not found" unless database_config(database)
+      raise "Database not found" unless databases[database]
       Thread.current[:pghero_current_database] = database.to_s
-      Thread.current[:pghero_connection] = nil
       database
     end
 
-    def database_config(database)
-      config["databases"][database.to_s]
-    end
-
-    def current_config
-      database_config(current_database)
-    end
-
     def with(database)
       previous_database = current_database
       begin
@@ -238,6 +240,26 @@ module PgHero
       SQL
     end
 
+    def invalid_indexes
+      select_all <<-SQL
+        SELECT
+          c.relname AS index
+        FROM
+          pg_catalog.pg_class c,
+          pg_catalog.pg_namespace n,
+          pg_catalog.pg_index i
+        WHERE
+          i.indisvalid = false
+          AND i.indexrelid = c.oid
+          AND c.relnamespace = n.oid
+          AND n.nspname != 'pg_catalog'
+          AND n.nspname != 'information_schema'
+          AND n.nspname != 'pg_toast'
+        ORDER BY
+          c.relname
+      SQL
+    end
+
     def relation_sizes
       select_all <<-SQL
         SELECT
@@ -414,7 +436,7 @@ module PgHero
 
     def ssl_used?
       ssl_used = nil
-      Connection.transaction do
+      connection_model.transaction do
         execute("CREATE EXTENSION IF NOT EXISTS sslinfo")
         ssl_used = select_all("SELECT ssl_is_used()").first["ssl_is_used"] == "t"
         raise ActiveRecord::Rollback
@@ -436,9 +458,15 @@ module PgHero
 
     def rds_stats(metric_name)
       if system_stats_enabled?
-        cw = AWS::CloudWatch.new(access_key_id: access_key_id, secret_access_key: secret_access_key)
+        client =
+          if defined?(Aws)
+            Aws::CloudWatch::Client.new(access_key_id: access_key_id, secret_access_key: secret_access_key)
+          else
+            AWS::CloudWatch.new(access_key_id: access_key_id, secret_access_key: secret_access_key).client
+          end
+
         now = Time.now
-        resp = cw.client.get_metric_statistics(
+        resp = client.get_metric_statistics(
           namespace: "AWS/RDS",
           metric_name: metric_name,
           dimensions: [{name: "DBInstanceIdentifier", value: db_instance_identifier}],
@@ -458,7 +486,7 @@ module PgHero
     end
 
     def system_stats_enabled?
-      !!(defined?(AWS) && access_key_id && secret_access_key && db_instance_identifier)
+      !!((defined?(Aws) || defined?(AWS)) && access_key_id && secret_access_key && db_instance_identifier)
     end
 
     def random_password
@@ -469,7 +497,7 @@ module PgHero
     def create_user(user, options = {})
       password = options[:password] || random_password
       schema = options[:schema] || "public"
-      database = options[:database] || Connection.connection_config[:database]
+      database = options[:database] || connection_model.connection_config[:database]
 
       commands =
         [
@@ -496,7 +524,7 @@ module PgHero
       end
 
       # run commands
-      Connection.transaction do
+      connection_model.transaction do
         commands.each do |command|
           execute command
         end
@@ -507,7 +535,7 @@ module PgHero
 
     def drop_user(user, options = {})
       schema = options[:schema] || "public"
-      database = options[:database] || Connection.connection_config[:database]
+      database = options[:database] || connection_model.connection_config[:database]
 
       # thanks shiftb
       commands =
@@ -524,7 +552,7 @@ module PgHero
         ]
 
       # run commands
-      Connection.transaction do
+      connection_model.transaction do
         commands.each do |command|
           execute command
         end
@@ -542,7 +570,7 @@ module PgHero
     end
 
     def db_instance_identifier
-      current_config["db_instance_identifier"]
+      databases[current_database].db_instance_identifier
     end
 
     def explain(sql)
@@ -551,7 +579,7 @@ module PgHero
       explain_safe = explain_safe?
 
       # use transaction for safety
-      Connection.transaction do
+      connection_model.transaction do
         if !explain_safe && (sql.sub(/;\z/, "").include?(";") || sql.upcase.include?("COMMIT"))
           raise ActiveRecord::StatementInvalid, "Unsafe statement"
         end
@@ -575,7 +603,7 @@ module PgHero
         maintenance_work_mem checkpoint_segments checkpoint_completion_target
         wal_buffers default_statistics_target
       )
-      values = Hash[select_all(Connection.send(:sanitize_sql_array, ["SELECT name, setting, unit FROM pg_settings WHERE name IN (?)", names])).sort_by { |row| names.index(row["name"]) }.map { |row| [row["name"], friendly_value(row["setting"], row["unit"])] }]
+      values = Hash[select_all(connection_model.send(:sanitize_sql_array, ["SELECT name, setting, unit FROM pg_settings WHERE name IN (?)", names])).sort_by { |row| names.index(row["name"]) }.map { |row| [row["name"], friendly_value(row["setting"], row["unit"])] }]
       Hash[names.map { |name| [name, values[name]] }]
     end
 
@@ -696,12 +724,12 @@ module PgHero
       connection.execute(sql)
     end
 
+    def connection_model
+      databases[current_database].connection_model
+    end
+
     def connection
-      unless Thread.current[:pghero_connection]
-        Connection.establish_connection(current_config["url"])
-        Thread.current[:pghero_connection] = true
-      end
-      Connection.connection
+      connection_model.connection
     end
 
     # from ActiveSupport

data/lib/pghero/database.rb

@@ -0,0 +1,21 @@
+module PgHero
+  class Database
+    attr_reader :id, :config, :connection_model
+
+    def initialize(id, config)
+      @id = id
+      @config = config
+      @connection_model =
+        Class.new(PgHero::Connection) do
+          def self.name
+            "PgHero::Connection::#{object_id}"
+          end
+          establish_connection(config["url"]) if config["url"]
+        end
+    end
+
+    def db_instance_identifier
+      @config["database_instance_identifier"]
+    end
+  end
+end

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,7 @@ files:
 - lib/generators/pghero/query_stats_generator.rb
 - lib/generators/pghero/templates/query_stats.rb
 - lib/pghero.rb
+- lib/pghero/database.rb
 - lib/pghero/engine.rb
 - lib/pghero/tasks.rb
 - lib/pghero/version.rb