pghero 3.1.0 → 3.7.0

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

@@ -55,9 +55,11 @@
       Vacuuming healthy
     <% end %>
   </div>
-  <div class="alert alert-<%= @sequence_danger && @sequence_danger.empty? ? "success" : "warning" %>">
+  <div class="alert alert-<%= @sequence_danger && @sequence_danger.empty? && !@sequences_timeout ? "success" : "warning" %>">
     <% if @sequence_danger.any? %>
       <%= pluralize(@sequence_danger.size, "column") %> approaching overflow
+    <% elsif @sequences_timeout %>
+      Sequences not available (system catalog locked)
     <% else %>
       No columns near integer overflow
     <% end %>
@@ -125,7 +127,7 @@
     <table class="table">
       <thead>
         <tr>
-          <th style="width: 33%;">Column</th>
+          <th class="width-33">Column</th>
           <th>Sequence</th>
         </tr>
       </thead>
@@ -249,7 +251,7 @@
       <thead>
         <tr>
           <th>Table</th>
-          <th style="width: 20%;">Transactions Left</th>
+          <th class="width-20">Transactions Left</th>
         </tr>
       </thead>
       <tbody>
@@ -277,9 +279,9 @@
       <thead>
         <tr>
           <th>Column</th>
-          <th style="width: 20%;">Type</th>
-          <th style="width: 20%;">Values Left</th>
-          <th style="width: 10%;">% Left</th>
+          <th class="width-20">Type</th>
+          <th class="width-20">Values Left</th>
+          <th class="width-10">% Left</th>
         </tr>
       </thead>
       <tbody>
@@ -330,7 +332,7 @@
             </td>
           </tr>
           <tr>
-            <td style="border-top: none; padding: 0;">
+            <td class="query-row">
               <pre><code>DROP INDEX CONCURRENTLY <%= pghero_pretty_ident(index[:name], schema: index[:schema]) %>;
 <%= index[:definition].sub("CREATE INDEX ", "CREATE INDEX CONCURRENTLY ") %>;</code></pre>
             </td>
@@ -364,7 +366,7 @@
             </td>
           </tr>
           <tr>
-            <td style="border-top: none; padding: 0;">
+            <td class="query-row">
               <pre><code>ALTER TABLE <%= pghero_pretty_ident(constraint[:table], schema: constraint[:schema]) %> VALIDATE CONSTRAINT <%= pghero_pretty_ident(constraint[:name]) %>;</code></pre>
             </td>
           </tr>
@@ -381,15 +383,15 @@
     <p>
       These indexes exist, but aren’t needed. Remove them
       <% if @show_migrations %>
-      <a href="javascript: void(0);" onclick="document.getElementById('migration2').style.display = 'block';">with a migration</a>
+      <a href="#" class="migration-link">with a migration</a>
       <% end %>
       for faster writes.
     </p>
 
-    <div id="migration2" style="display: none;">
+    <div class="migration">
       <pre>rails generate migration remove_unneeded_indexes</pre>
       <p>And paste</p>
-      <pre style="overflow: scroll; white-space: pre; word-break: normal;"><% @duplicate_indexes.each do |query| %>
+      <pre><% @duplicate_indexes.each do |query| %>
 <%= pghero_remove_index(query[:unneeded_index]) %><% end %></pre>
     </div>
 
@@ -424,14 +426,14 @@
       Add indexes to speed up queries.
       <% if @show_migrations %>
       Here’s a
-      <a href="javascript: void(0);" onclick="document.getElementById('migration3').style.display = 'block';">migration</a> to help.
+      <a href="#" class="migration-link">migration</a> to help.
       <% end %>
     </p>
 
-    <div id="migration3" style="display: none;">
+    <div class="migration">
       <pre>rails generate migration add_suggested_indexes</pre>
       <p>And paste</p>
-      <pre style="overflow: scroll; white-space: pre; word-break: normal;">commit_db_transaction
+      <pre>commit_db_transaction
 <% @suggested_indexes.each do |index| %>
 <% if index[:using] && index[:using] != "btree" %>
 add_index <%= index[:table].to_sym.inspect %>, <%= index[:columns].first.inspect %>, using: <%= index[:using].inspect %>, algorithm: :concurrently
@@ -485,15 +487,15 @@ pg_stat_statements.track = all</pre>
     <p>
       Unused indexes cause unnecessary overhead. Remove them
       <% if @show_migrations %>
-        <a href="javascript: void(0);" onclick="document.getElementById('migration').style.display = 'block';">with a migration</a>
+        <a href="#" class="migration-link">with a migration</a>
       <% end %>
       for faster writes.
     </p>
 
-    <div id="migration" style="display: none;">
+    <div class="migration">
       <pre>rails generate migration remove_unused_indexes</pre>
       <p>And paste</p>
-      <pre style="overflow: scroll; white-space: pre; word-break: normal;"><% @unused_indexes.each do |query| %>
+      <pre><% @unused_indexes.each do |query| %>
 <%= pghero_remove_index(query)%><% end %></pre>
     </div>
 
@@ -501,7 +503,7 @@ pg_stat_statements.track = all</pre>
       <thead>
         <tr>
           <th>Name</th>
-          <th style="width: 20%;">Index Size</th>
+          <th class="width-20">Index Size</th>
         </tr>
       </thead>
       <tbody>
@@ -516,6 +518,6 @@ pg_stat_statements.track = all</pre>
   </div>
 <% end %>
 
-<script>
+<%= javascript_tag nonce: true do %>
   highlightQueries();
-</script>
+<% end %>

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

@@ -25,15 +25,15 @@ ALTER INDEX new_index RENAME TO index;</code></pre>
       <thead>
         <tr>
           <th>Index</th>
-          <th style="width: 15%;">Bloat</th>
-          <th style="width: 15%;">Size</th>
+          <th class="width-15">Bloat</th>
+          <th class="width-15">Size</th>
         </tr>
       </thead>
       <tbody>
         <% @index_bloat.each do |index| %>
           <tr>
             <td>
-              <span style="word-break: break-all;"><%= index[:index] %></span>
+              <span class="break-all"><%= index[:index] %></span>
               <% if index[:primary] %>
                 <span class="primary-key">PRIMARY</span>
               <% end %>
@@ -43,7 +43,7 @@ ALTER INDEX new_index RENAME TO index;</code></pre>
           </tr>
           <% if @show_sql && !index[:primary] %>
             <tr>
-              <td colspan="3" style="border-top: none; padding: 0;">
+              <td colspan="3" class="query-row">
                 <% new_index = "new_#{index[:index]}".first(63) %>
                 <pre><code><%= index[:definition].sub(" INDEX ", " INDEX CONCURRENTLY \n    ").sub(index[:index], new_index) %>;
 
@@ -67,6 +67,6 @@ ALTER INDEX <%= pghero_pretty_ident(new_index) %>
   <% end %>
 </div>
 
-<script>
+<%= javascript_tag nonce: true do %>
   highlightQueries();
-</script>
+<% end %>

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

@@ -5,10 +5,10 @@
     <thead>
       <tr>
         <th>Table</th>
-        <th style="width: 20%;">Last Vacuum</th>
-        <th style="width: 20%;">Last Analyze</th>
+        <th class="width-20">Last Vacuum</th>
+        <th class="width-20">Last Analyze</th>
         <% if @show_dead_rows %>
-          <th style="width: 20%;">Dead Rows</th>
+          <th class="width-20">Dead Rows</th>
         <% end %>
       </tr>
     </thead>

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

@@ -1,14 +1,16 @@
 <div class="content">
-  <% if @query_stats_enabled %>
+  <% if @query_stats_enabled && !@historical_query_stats_enabled %>
     <%= button_to "Reset", reset_query_stats_path, class: "btn btn-danger", style: "float: right;" %>
   <% end %>
 
-  <h1 style="float: left;">Queries</h1>
+  <% if !@historical_query_stats_enabled %>
+    <h1 class="push-left">Queries</h1>
+  <% end %>
 
   <% if @historical_query_stats_enabled %>
     <%= render partial: "query_stats_slider" %>
   <% elsif @database.query_stats_table_exists? && (columns = @database.missing_query_stats_columns).any? %>
-    <div style="clear: both;">
+    <div class="clear-both">
       <p>Add missing columns to re-enable historical query stats.</p>
       <pre><code><% @database.missing_query_stats_columns.each do |column| %>ALTER TABLE pghero_query_stats ADD COLUMN "<%= column %>" <%= column == "query_hash" ? "bigint" : "text" %>;
 <% end %></code></pre>
@@ -21,9 +23,9 @@
       <div class="alert alert-danger">Cannot understand start or end time.</div>
     <% elsif @query_stats.any? || @historical_query_stats_enabled %>
       <%= render partial: "queries_table", locals: {queries: @query_stats, sort_headers: true} %>
-      <script>
+      <%= javascript_tag nonce: true do %>
         highlightQueries();
-      </script>
+      <% end %>
     <% else %>
       <p>Stats are not available yet. Come back soon!</p>
     <% end %>

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

@@ -7,8 +7,8 @@
   </h1>
 
   <h1>Size</h1>
-  <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>
-  <script>
-    new Chartkick.LineChart("chart-1", <%= json_escape(@chart_data.to_json).html_safe %>, {colors: ["#5bc0de"], legend: false, min: null, bytes: true, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-  </script>
+  <div id="chart-1" class="chart">Loading...</div>
+  <%= javascript_tag nonce: true do %>
+    new Chartkick.LineChart("chart-1", <%= pghero_js_value(@chart_data) %>, {colors: ["#5bc0de"], legend: false, min: null, bytes: true, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
+  <% end %>
 </div>

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

@@ -1,8 +1,8 @@
 <div class="content">
-  <pre><code style="max-height: 230px; overflow: hidden;" onclick="this.style.maxHeight = 'none';"><%= @query %></code></pre>
-  <script>
+  <pre><code class="query-code"><%= @query %></code></pre>
+  <%= javascript_tag nonce: true do %>
     highlightQueries()
-  </script>
+  <% end %>
 
   <% if @explain_enabled && @explainable_query %>
     <p>
@@ -11,11 +11,11 @@
   <% end %>
 
   <% if @origins && @origins.keys.select { |k| k.length > 0 }.any? %>
-    <table style="table-layout: auto;">
+    <table class="origins-table">
       <thead>
         <tr>
           <th colspan="2">
-            <div style="float: right;">Approx. Time</div>
+            <div class="push-right">Approx. Time</div>
             Origin
           </th>
         </tr>
@@ -23,14 +23,14 @@
       <tbody>
         <% @origins.sort_by { |o, c| [-c, o.to_s] }.each do |origin, count| %>
           <tr>
-            <td class="origin" style="width: 90%;">
+            <td class="origin">
               <% if origin.length > 0 %>
                 <%= origin %>
               <% else %>
                 <span class="text-muted">Unknown</span>
               <% end %>
             </td>
-            <td style="text-align: right; width: 10%;">
+            <td class="origin-pct">
               <% pct = (100.0 * count / @total_count).round %>
               <% if pct == 0 %>
                 &lt; 1%
@@ -47,22 +47,22 @@
   <!-- chart -->
   <% if @chart_data %>
     <h1>Total Time <small>ms</small></h1>
-    <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
-      new Chartkick.LineChart("chart-1", <%= json_escape(@chart_data.to_json).html_safe %>, {colors: ["#5bc0de"], legend: false, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <div id="chart-1" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
+      new Chartkick.LineChart("chart-1", <%= pghero_js_value(@chart_data) %>, {colors: ["#5bc0de"], legend: false, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
+    <% end %>
 
     <h1>Average Time <small>ms</small></h1>
-    <div id="chart-2" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
-      new Chartkick.LineChart("chart-2", <%= json_escape(@chart2_data.to_json).html_safe %>, {colors: ["#5bc0de"], legend: false, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <div id="chart-2" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
+      new Chartkick.LineChart("chart-2", <%= pghero_js_value(@chart2_data) %>, {colors: ["#5bc0de"], legend: false, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
+    <% end %>
 
     <h1>Calls</h1>
-    <div id="chart-3" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
-      new Chartkick.LineChart("chart-3", <%= json_escape(@chart3_data.to_json).html_safe %>, {colors: ["#5bc0de"], legend: false, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <div id="chart-3" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
+      new Chartkick.LineChart("chart-3", <%= pghero_js_value(@chart3_data) %>, {colors: ["#5bc0de"], legend: false, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
+    <% end %>
   <% else %>
     <p>
       Enable
@@ -77,8 +77,8 @@
     <table>
       <thead>
         <tr>
-          <th style="width: 25%;">Name</th>
-          <th style="width: 25%;">Rows</th>
+          <th class="width-25">Name</th>
+          <th class="width-25">Rows</th>
           <th>Indexes</th>
         </tr>
       </thead>
@@ -86,17 +86,21 @@
         <% @tables.each do |table| %>
           <tr>
             <td><%= table %></td>
-            <td><%= @row_counts[table] %></td>
+            <td><%= number_with_delimiter(@row_counts[table]) if @row_counts[table] %></td>
             <td>
-              <ul>
-                <% @indexes_by_table[table].to_a.sort_by { |i| [i[:primary] ? 0 : 1, i[:columns]] }.each do |i3| %>
-                  <li>
-                    <%= i3[:columns].join(", ") %><% if i3[:using] != "btree" %>
-                    <%= i3[:using].to_s.upcase %><% end %>
-                    <% if i3[:primary] %> PRIMARY<% elsif i3[:unique] %> UNIQUE<% end %>
-                  </li>
-                <% end %>
-              </ul>
+              <% if @indexes_timeout %>
+                Not available
+              <% else %>
+                <ul>
+                  <% @indexes_by_table[table].to_a.sort_by { |i| [i[:primary] ? 0 : 1, i[:columns]] }.each do |i3| %>
+                    <li>
+                      <%= i3[:columns].join(", ") %><% if i3[:using] != "btree" %>
+                      <%= i3[:using].to_s.upcase %><% end %>
+                      <% if i3[:primary] %> PRIMARY<% elsif i3[:unique] %> UNIQUE<% end %>
+                    </li>
+                  <% end %>
+                </ul>
+              <% end %>
             </td>
           </tr>
         <% end %>

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

@@ -4,10 +4,10 @@
   <p>Database Size: <%= @database_size %></p>
 
   <% if @system_stats_enabled %>
-    <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
-      new Chartkick.LineChart("chart-1", <%= json_escape(free_space_stats_path.to_json).html_safe %>, {colors: ["#5bc0de"], bytes: true, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <div id="chart-1" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
+      new Chartkick.LineChart("chart-1", <%= pghero_js_value(free_space_stats_path) %>, {colors: ["#5bc0de"], bytes: true, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
+    <% end %>
   <% end %>
 
   <!--
@@ -20,7 +20,7 @@
     <p>
       <%= pluralize(@unused_indexes.size, "unused index") %>. Remove them
       <% if @show_migrations %>
-        <a href="javascript: void(0);" onclick="document.getElementById('migration').style.display = 'block';">with a migration</a>
+        <a href="#" class="migration-link">with a migration</a>
       <% end %>
       for faster writes.
 
@@ -29,55 +29,59 @@
       <% end %>
     </p>
 
-    <div id="migration" style="display: none;">
+    <div class="migration">
       <pre>rails generate 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[:size_bytes], q[:index]] }.each do |query| %>
+      <pre><% @unused_indexes.sort_by { |q| [-q[:size_bytes], q[:index]] }.each do |query| %>
 <%= pghero_remove_index(query) %><% end %></pre>
     </div>
   <% end %>
 
-  <table class="table space-table">
-    <thead>
-      <tr>
-        <th><%= link_to (@only_tables ? "Table" : "Relation"), @header_options.merge(sort: "name") %></th>
-        <th style="width: 15%;"><%= link_to "Size", @header_options %></th>
-        <% if @space_stats_enabled %>
-          <th style="width: 15%;"><%= link_to "#{@days}d Growth", @header_options.merge(sort: "growth") %></th>
-        <% end %>
-      </tr>
-    </thead>
-    <tbody>
-      <% @relation_sizes.each do |query| %>
+  <% if @sizes_timeout %>
+    <p>Breakdown not available (system catalog locked)</p>
+  <% else %>
+    <table class="table space-table">
+      <thead>
         <tr>
-          <td style="<%= query[:type] == "index" ? "font-style: italic;" : "" %>">
-            <span style="word-break: break-all;">
-              <% name = query[:relation] || query[:table] %>
-              <% if @space_stats_enabled %>
-                <%= link_to name, relation_space_path(name, schema: query[:schema]), target: "_blank", style: "color: inherit;" %>
-              <% else %>
-                <%= name %>
-              <% end %>
-            </span>
-            <% if query[:schema] != "public" %>
-              <span class="text-muted"><%= query[:schema] %></span>
-            <% end %>
-            <% if @unused_index_names.include?(query[:relation]) %>
-              <span class="unused-index">UNUSED</span>
-            <% end %>
-          </td>
-          <td><%= query[:size] %></td>
+          <th><%= link_to (@only_tables ? "Table" : "Relation"), @header_options.merge(sort: "name") %></th>
+          <th class="width-15"><%= link_to "Size", @header_options %></th>
           <% if @space_stats_enabled %>
-            <td>
-              <% 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 %>
-            </td>
+            <th class="width-15"><%= link_to "#{@days}d Growth", @header_options.merge(sort: "growth") %></th>
           <% end %>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @relation_sizes.each do |query| %>
+          <tr>
+            <td class="<%= query[:type] == "index" ? "space-index" : "" %>">
+              <span class="break-all">
+                <% name = query[:relation] || query[:table] %>
+                <% if @space_stats_enabled %>
+                  <%= link_to name, relation_space_path(name, schema: query[:schema]), target: "_blank", class: "relation-link" %>
+                <% else %>
+                  <%= name %>
+                <% end %>
+              </span>
+              <% if query[:schema] != "public" %>
+                <span class="text-muted"><%= query[:schema] %></span>
+              <% end %>
+              <% if @unused_index_names.include?(query[:relation]) %>
+                <span class="unused-index">UNUSED</span>
+              <% end %>
+            </td>
+            <td><%= query[:size] %></td>
+            <% if @space_stats_enabled %>
+              <td>
+                <% 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 %>
+              </td>
+            <% end %>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% end %>
 </div>

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

@@ -1,34 +1,34 @@
 <div class="content">
   <p id="periods">
     <% @periods.each do |name, options| %>
-      <%= link_to name, system_path(options) %>
+      <%= link_to name, system_path(params: options) %>
     <% end %>
   </p>
-  <% path_options = {duration: @duration, period: @period} %>
+  <% path_options = {params: {duration: @duration, period: @period}} %>
 
   <h1>CPU</h1>
-  <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>
-  <script>
-    new Chartkick.LineChart("chart-1", <%= json_escape(cpu_usage_path(path_options).to_json).html_safe %>, {max: 100, colors: ["#5bc0de"], suffix: "%", library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-  </script>
+  <div id="chart-1" class="chart">Loading...</div>
+  <%= javascript_tag nonce: true do %>
+    new Chartkick.LineChart("chart-1", <%= pghero_js_value(cpu_usage_path(path_options)) %>, {max: 100, colors: ["#5bc0de"], suffix: "%", library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
+  <% end %>
 
   <h1>Load</h1>
-  <div id="chart-2" class="chart" style="margin-bottom: 20px;">Loading...</div>
-  <script>
-    new Chartkick.LineChart("chart-2", <%= json_escape(load_stats_path(path_options).to_json).html_safe %>, {colors: ["#5bc0de", "#d9534f"], library: {plugins: {tooltip: {intersect: false, mode: "nearest"}}}})
-  </script>
+  <div id="chart-2" class="chart">Loading...</div>
+  <%= javascript_tag nonce: true do %>
+    new Chartkick.LineChart("chart-2", <%= pghero_js_value(load_stats_path(path_options)) %>, {colors: ["#5bc0de", "#d9534f"], library: {plugins: {tooltip: {intersect: false, mode: "nearest"}}}})
+  <% end %>
 
   <h1>Connections</h1>
-  <div id="chart-3" class="chart" style="margin-bottom: 20px;">Loading...</div>
-  <script>
-    new Chartkick.LineChart("chart-3", <%= json_escape(connection_stats_path(path_options).to_json).html_safe %>, {colors: ["#5bc0de"], library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-  </script>
+  <div id="chart-3" class="chart">Loading...</div>
+  <%= javascript_tag nonce: true do %>
+    new Chartkick.LineChart("chart-3", <%= pghero_js_value(connection_stats_path(path_options)) %>, {colors: ["#5bc0de"], library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
+  <% end %>
 
   <% if @database.replica? %>
     <h1>Replication Lag</h1>
-    <div id="chart-4" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
-      new Chartkick.LineChart("chart-4", <%= json_escape(replication_lag_stats_path(path_options).to_json).html_safe %>, {colors: ["#5bc0de"], library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <div id="chart-4" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
+      new Chartkick.LineChart("chart-4", <%= pghero_js_value(replication_lag_stats_path(path_options)) %>, {colors: ["#5bc0de"], library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
+    <% end %>
   <% end %>
 </div>

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

@@ -5,7 +5,7 @@
     <thead>
       <tr>
         <th>Setting</th>
-        <th style="width: 20%;">Value</th>
+        <th class="width-20">Value</th>
       </tr>
     </thead>
     <tbody>
@@ -30,7 +30,7 @@
       <thead>
         <tr>
           <th>Setting</th>
-          <th style="width: 20%;">Value</th>
+          <th class="width-20">Value</th>
         </tr>
       </thead>
       <tbody>

data/lib/generators/pghero/query_stats_generator.rb

@@ -1,3 +1,4 @@
+require "rails/generators"
 require "rails/generators/active_record"
 
 module Pghero

data/lib/generators/pghero/space_stats_generator.rb

@@ -1,3 +1,4 @@
+require "rails/generators"
 require "rails/generators/active_record"
 
 module Pghero

data/lib/pghero/database.rb

@@ -126,7 +126,7 @@ module PgHero
         # rough check for Postgres adapter
         # keep this message generic so it's useful
         # when empty url set in Docker image pghero.yml
-        unless @connection_model.connection.adapter_name =~ /postg/i
+        unless @connection_model.connection_db_config.adapter.to_s.match?(/postg/i)
           raise Error, "Invalid connection URL"
         end
         @adapter_checked = true
@@ -145,7 +145,7 @@ module PgHero
         config_options = {env_name: PgHero.env, PgHero.spec_name_key => config["spec"], PgHero.include_replicas_key => true}
         resolved = ActiveRecord::Base.configurations.configs_for(**config_options)
         raise Error, "Spec not found: #{config["spec"]}" unless resolved
-        url = ActiveRecord::VERSION::STRING.to_f >= 6.1 ? resolved.configuration_hash : resolved.config
+        url = resolved.configuration_hash
       end
 
       url = url.dup

data/lib/pghero/engine.rb

@@ -4,8 +4,8 @@ module PgHero
 
     initializer "pghero", group: :all do |app|
       # check if Rails api mode
-      if app.config.respond_to?(:assets)
-        if defined?(Sprockets) && Sprockets::VERSION >= "4"
+      if app.config.respond_to?(:assets) && defined?(Sprockets)
+        if Sprockets::VERSION.to_i >= 4
           app.config.assets.precompile << "pghero/application.js"
           app.config.assets.precompile << "pghero/application.css"
           app.config.assets.precompile << "pghero/favicon.png"
@@ -17,7 +17,8 @@ module PgHero
         end
       end
 
-      PgHero.time_zone = PgHero.config["time_zone"] if PgHero.config["time_zone"]
+      file_config = PgHero.file_config || {}
+      PgHero.time_zone = file_config["time_zone"] if file_config["time_zone"]
     end
   end
 end