pghero 1.4.2 → 1.5.0

data/app/assets/javascripts/pghero/chartkick.js

@@ -2,7 +2,7 @@
  * Chartkick.js
  * Create beautiful JavaScript charts with minimal code
  * https://github.com/ankane/chartkick.js
- * v2.0.1
+ * v2.1.0
  * MIT License
  */
 
@@ -62,10 +62,10 @@
   function parseISO8601(input) {
     var day, hour, matches, milliseconds, minutes, month, offset, result, seconds, type, year;
     type = Object.prototype.toString.call(input);
-    if (type === '[object Date]') {
+    if (type === "[object Date]") {
       return input;
     }
-    if (type !== '[object String]') {
+    if (type !== "[object String]") {
       return;
     }
     matches = input.match(ISO8601_PATTERN);
@@ -83,7 +83,7 @@
         if (matches[17]) {
           offset += parseInt(matches[17], 10);
         }
-        offset *= matches[14] === '-' ? -1 : 1;
+        offset *= matches[14] === "-" ? -1 : 1;
         result -= offset * 60 * 1000;
       }
       return new Date(result);
@@ -164,18 +164,37 @@
   }
 
   function getJSON(element, url, success) {
-    var $ = window.jQuery || window.Zepto || window.$;
-    $.ajax({
-      dataType: "json",
-      url: url,
-      success: success,
-      error: function (jqXHR, textStatus, errorThrown) {
-        var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message;
-        chartError(element, message);
-      }
+    ajaxCall(url, success, function (jqXHR, textStatus, errorThrown) {
+      var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message;
+      chartError(element, message);
     });
   }
 
+  function ajaxCall(url, success, error) {
+    var $ = window.jQuery || window.Zepto || window.$;
+
+    if ($) {
+      $.ajax({
+        dataType: "json",
+        url: url,
+        success: success,
+        error: error
+      });
+    } else {
+      var xhr = new XMLHttpRequest();
+      xhr.open("GET", url, true);
+      xhr.setRequestHeader("Content-Type", "application/json");
+      xhr.onload = function () {
+        if (xhr.status === 200) {
+          success(JSON.parse(xhr.responseText), xhr.statusText, xhr);
+        } else {
+          error(xhr, "error", xhr.statusText);
+        }
+      };
+      xhr.send();
+    }
+  }
+
   function errorCatcher(chart, callback) {
     try {
       callback(chart);
@@ -344,7 +363,9 @@
           }
           var options = jsOptions(chart.data, chart.options, chartOptions), data, i, j;
           options.xAxis.type = chart.options.discrete ? "category" : "datetime";
-          options.chart.type = chartType;
+          if (!options.chart.type) {
+            options.chart.type = chartType;
+          }
           options.chart.renderTo = chart.element.id;
 
           var series = chart.data;
@@ -364,7 +385,7 @@
         this.renderScatterChart = function (chart) {
           var chartOptions = {};
           var options = jsOptions(chart.data, chart.options, chartOptions);
-          options.chart.type = 'scatter';
+          options.chart.type = "scatter";
           options.chart.renderTo = chart.element.id;
           options.series = chart.data;
           new Highcharts.Chart(options);
@@ -441,7 +462,7 @@
       };
       adapters.push(HighchartsAdapter);
     }
-    if (!GoogleChartsAdapter && window.google && window.google.setOnLoadCallback) {
+    if (!GoogleChartsAdapter && window.google && (window.google.setOnLoadCallback || window.google.charts)) {
       GoogleChartsAdapter = new function () {
         var google = window.google;
 
@@ -484,7 +505,12 @@
             if (config.language) {
               loadOptions.language = config.language;
             }
-            google.load("visualization", "1", loadOptions);
+
+            if (window.google.setOnLoadCallback) {
+              google.load("visualization", "1", loadOptions);
+            } else {
+              google.charts.load("current", loadOptions);
+            }
           }
         };
 
@@ -1006,7 +1032,8 @@
               } else if (day || timeDiff > 10) {
                 options.scales.xAxes[0].time.unit = "day";
                 step = 1;
-              } else if (hour) {
+              } else if (hour || timeDiff > 0.5) {
+                options.scales.xAxes[0].time.displayFormats = {hour: "MMM D, h a"};
                 options.scales.xAxes[0].time.unit = "hour";
                 step = 1 / 24.0;
               } else if (minute) {
@@ -1015,7 +1042,6 @@
                 step = 1 / 24.0 / 60.0;
               }
 
-
               if (step && timeDiff > 0) {
                 var unitStepSize = Math.ceil(timeDiff / step / (chart.element.offsetWidth / 100.0));
                 if (week && step === 1) {
@@ -1385,7 +1411,14 @@
     Timeline: function (element, dataSource, opts) {
       setElement(this, element, dataSource, opts, processTimelineData);
     },
-    charts: {}
+    charts: {},
+    configure: function (options) {
+      for (var key in options) {
+        if (options.hasOwnProperty(key)) {
+          config[key] = options[key];
+        }
+      }
+    }
   };
 
   if (typeof module === "object" && typeof module.exports === "object") {

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

@@ -102,6 +102,13 @@ hr {
   margin-left: 6px;
 }
 
+.user {
+  color: #999;
+  font-size: 12px;
+  float: right;
+  line-height: 20px;
+}
+
 .tiny {
   font-size: 12px;
   margin-left: 6px;

data/app/controllers/pg_hero/home_controller.rb

@@ -7,67 +7,65 @@ module PgHero
     http_basic_authenticate_with name: ENV["PGHERO_USERNAME"], password: ENV["PGHERO_PASSWORD"] if ENV["PGHERO_PASSWORD"]
 
     if respond_to?(:before_action)
-      around_action :set_database
-      before_action :set_current_database
+      before_action :set_database
       before_action :set_query_stats_enabled
     else
-      around_filter :set_database
-      before_filter :set_current_database
+      before_filter :set_database
       before_filter :set_query_stats_enabled
     end
 
     def index
       @title = "Overview"
-      @query_stats = PgHero.query_stats(historical: true, start_at: 3.hours.ago)
-      @slow_queries = PgHero.slow_queries(query_stats: @query_stats)
-      @long_running_queries = PgHero.long_running_queries
-      @index_hit_rate = PgHero.index_hit_rate
-      @table_hit_rate = PgHero.table_hit_rate
+      @query_stats = @database.query_stats(historical: true, start_at: 3.hours.ago)
+      @slow_queries = @database.slow_queries(query_stats: @query_stats)
+      @long_running_queries = @database.long_running_queries
+      @index_hit_rate = @database.index_hit_rate
+      @table_hit_rate = @database.table_hit_rate
       @missing_indexes =
-        if PgHero.suggested_indexes_enabled?
+        if @database.suggested_indexes_enabled?
           []
         else
-          PgHero.missing_indexes
+          @database.missing_indexes
         end
-      @unused_indexes = PgHero.unused_indexes.select { |q| q["index_scans"].to_i == 0 }
-      @invalid_indexes = PgHero.invalid_indexes
-      @duplicate_indexes = PgHero.duplicate_indexes if params[:duplicate_indexes]
-      @good_cache_rate = @table_hit_rate >= PgHero.cache_hit_rate_threshold.to_f / 100 && @index_hit_rate >= PgHero.cache_hit_rate_threshold.to_f / 100
+      @unused_indexes = @database.unused_indexes.select { |q| q["index_scans"].to_i == 0 }
+      @invalid_indexes = @database.invalid_indexes
+      @duplicate_indexes = @database.duplicate_indexes if params[:duplicate_indexes]
+      @good_cache_rate = @table_hit_rate >= @database.cache_hit_rate_threshold.to_f / 100 && @index_hit_rate >= @database.cache_hit_rate_threshold.to_f / 100
       unless @query_stats_enabled
-        @query_stats_available = PgHero.query_stats_available?
-        @query_stats_extension_enabled = PgHero.query_stats_extension_enabled? if @query_stats_available
+        @query_stats_available = @database.query_stats_available?
+        @query_stats_extension_enabled = @database.query_stats_extension_enabled? if @query_stats_available
       end
-      @total_connections = PgHero.total_connections
-      @good_total_connections = @total_connections < PgHero.total_connections_threshold
+      @total_connections = @database.total_connections
+      @good_total_connections = @total_connections < @database.total_connections_threshold
       if @replica
-        @replication_lag = PgHero.replication_lag
+        @replication_lag = @database.replication_lag
         @good_replication_lag = @replication_lag < 5
       end
-      @transaction_id_danger = PgHero.transaction_id_danger(threshold: 1500000000)
+      @transaction_id_danger = @database.transaction_id_danger(threshold: 1500000000)
       set_suggested_indexes((params[:min_average_time] || 20).to_f, (params[:min_calls] || 50).to_i)
       @show_migrations = PgHero.show_migrations
-      @sequence_danger = PgHero.sequence_danger(threshold: params[:sequence_threshold])
+      @sequence_danger = @database.sequence_danger(threshold: params[:sequence_threshold])
     end
 
     def index_usage
       @title = "Index Usage"
-      @index_usage = PgHero.index_usage
+      @index_usage = @database.index_usage
     end
 
     def space
       @title = "Space"
-      @database_size = PgHero.database_size
-      @relation_sizes = PgHero.relation_sizes
+      @database_size = @database.database_size
+      @relation_sizes = @database.relation_sizes
     end
 
     def live_queries
       @title = "Live Queries"
-      @running_queries = PgHero.running_queries
+      @running_queries = @database.running_queries
     end
 
     def queries
       @title = "Queries"
-      @historical_query_stats_enabled = PgHero.historical_query_stats_enabled?
+      @historical_query_stats_enabled = @database.historical_query_stats_enabled?
       @sort = %w(average_time calls).include?(params[:sort]) ? params[:sort] : nil
       @min_average_time = params[:min_average_time] ? params[:min_average_time].to_i : nil
       @min_calls = params[:min_calls] ? params[:min_calls].to_i : nil
@@ -82,7 +80,7 @@ module PgHero
           if @historical_query_stats_enabled && !request.xhr?
             []
           else
-            PgHero.query_stats(
+            @database.query_stats(
               historical: true,
               start_at: @start_at,
               end_at: @end_at,
@@ -116,21 +114,21 @@ module PgHero
     end
 
     def cpu_usage
-      render json: [{name: "CPU", data: PgHero.cpu_usage(system_params).map { |k, v| [k, v.round] }, library: chart_library_options}]
+      render json: [{name: "CPU", data: @database.cpu_usage(system_params).map { |k, v| [k, v.round] }, library: chart_library_options}]
     end
 
     def connection_stats
-      render json: [{name: "Connections", data: PgHero.connection_stats(system_params), library: chart_library_options}]
+      render json: [{name: "Connections", data: @database.connection_stats(system_params), library: chart_library_options}]
     end
 
     def replication_lag_stats
-      render json: [{name: "Lag", data: PgHero.replication_lag_stats(system_params), library: chart_library_options}]
+      render json: [{name: "Lag", data: @database.replication_lag_stats(system_params), library: chart_library_options}]
     end
 
     def load_stats
       render json: [
-        {name: "Read IOPS", data: PgHero.read_iops_stats(system_params).map { |k, v| [k, v.round] }, library: chart_library_options},
-        {name: "Write IOPS", data: PgHero.write_iops_stats(system_params).map { |k, v| [k, v.round] }, library: chart_library_options}
+        {name: "Read IOPS", data: @database.read_iops_stats(system_params).map { |k, v| [k, v.round] }, library: chart_library_options},
+        {name: "Write IOPS", data: @database.write_iops_stats(system_params).map { |k, v| [k, v.round] }, library: chart_library_options}
       ]
     end
 
@@ -141,8 +139,18 @@ module PgHero
       # need to prevent CSRF and DoS
       if request.post? && @query
         begin
-          @explanation = PgHero.explain("#{params[:commit] == "Analyze" ? "ANALYZE " : ""}#{@query}")
-          @suggested_index = PgHero.suggested_indexes(queries: [@query]).first
+          prefix =
+            case params[:commit]
+            when "Analyze"
+              "ANALYZE "
+            when "Visualize"
+              "(ANALYZE, COSTS, VERBOSE, BUFFERS, FORMAT JSON) "
+            else
+              ""
+            end
+          @explanation = @database.explain("#{prefix}#{@query}")
+          @suggested_index = @database.suggested_indexes(queries: [@query]).first
+          @visualize = params[:commit] == "Visualize"
         rescue ActiveRecord::StatementInvalid => e
           @error = e.message
         end
@@ -151,21 +159,23 @@ module PgHero
 
     def tune
       @title = "Tune"
-      @settings = PgHero.settings
+      @settings = @database.settings
     end
 
     def connections
       @title = "Connections"
-      @total_connections = PgHero.total_connections
+      @total_connections = @database.total_connections
+      @connection_sources = @database.connection_sources(by_database_and_user: true)
     end
 
     def maintenance
       @title = "Maintenance"
-      @maintenance_info = PgHero.maintenance_info
+      @maintenance_info = @database.maintenance_info
+      @time_zone = PgHero.time_zone
     end
 
     def kill
-      if PgHero.kill(params[:pid])
+      if @database.kill(params[:pid])
         redirect_to root_path, notice: "Query killed"
       else
         redirect_to :back, notice: "Query no longer running"
@@ -173,24 +183,24 @@ module PgHero
     end
 
     def kill_long_running_queries
-      PgHero.kill_long_running_queries
+      @database.kill_long_running_queries
       redirect_to :back, notice: "Queries killed"
     end
 
     def kill_all
-      PgHero.kill_all
+      @database.kill_all
       redirect_to :back, notice: "Connections killed"
     end
 
     def enable_query_stats
-      PgHero.enable_query_stats
+      @database.enable_query_stats
       redirect_to :back, notice: "Query stats enabled"
     rescue ActiveRecord::StatementInvalid
       redirect_to :back, alert: "The database user does not have permission to enable query stats"
     end
 
     def reset_query_stats
-      PgHero.reset_query_stats
+      @database.reset_query_stats
       redirect_to :back, notice: "Query stats reset"
     rescue ActiveRecord::StatementInvalid
       redirect_to :back, alert: "The database user does not have permission to reset query stats"
@@ -201,33 +211,27 @@ module PgHero
     def set_database
       @databases = PgHero.databases.values
       if params[:database]
-        PgHero.with(params[:database]) do
-          yield
-        end
+        @database = PgHero.databases[params[:database]]
       elsif @databases.size > 1
-        redirect_to url_for(params.slice(:controller, :action).merge(database: PgHero.primary_database))
+        redirect_to url_for(params.slice(:controller, :action).merge(database: @databases.first.id))
       else
-        yield
+        @database = @databases.first
       end
     end
 
-    def set_current_database
-      @current_database = PgHero.databases[PgHero.current_database]
-    end
-
     def default_url_options
       {database: params[:database]}
     end
 
     def set_query_stats_enabled
-      @query_stats_enabled = PgHero.query_stats_enabled?
-      @system_stats_enabled = PgHero.system_stats_enabled?
-      @replica = PgHero.replica?
+      @query_stats_enabled = @database.query_stats_enabled?
+      @system_stats_enabled = @database.system_stats_enabled?
+      @replica = @database.replica?
     end
 
     def set_suggested_indexes(min_average_time = 0, min_calls = 0)
-      @suggested_indexes_by_query = PgHero.suggested_indexes_by_query(query_stats: @query_stats.select { |qs| qs["average_time"].to_f >= min_average_time && qs["calls"].to_i >= min_calls })
-      @suggested_indexes = PgHero.suggested_indexes(suggested_indexes_by_query: @suggested_indexes_by_query)
+      @suggested_indexes_by_query = @database.suggested_indexes_by_query(query_stats: @query_stats.select { |qs| qs["average_time"].to_f >= min_average_time && qs["calls"].to_i >= min_calls })
+      @suggested_indexes = @database.suggested_indexes(suggested_indexes_by_query: @suggested_indexes_by_query)
       @query_stats_by_query = @query_stats.index_by { |q| q["query"] }
       @debug = params[:debug] == "true"
     end

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= [@databases.size > 1 ? @current_database.name : "PgHero", @title].compact.join(" / ") %></title>
+    <title><%= [@databases.size > 1 ? @database.name : "PgHero", @title].compact.join(" / ") %></title>
 
     <meta charset="utf-8" />
     <%= stylesheet_link_tag "pghero/application" %>
@@ -24,7 +24,7 @@
       <div class="grid">
         <div class="col-3-12">
           <% if @databases.size > 1 %>
-            <p class="nav-header"><%= @current_database.name %></p>
+            <p class="nav-header"><%= @database.name %></p>
           <% end %>
 
           <ul class="nav">
@@ -49,7 +49,7 @@
             <p class="nav-header">Databases</p>
             <ul class="nav">
               <% @databases.each do |database| %>
-                <li class="<%= ("active-database" if PgHero.current_database == database.id) %>">
+                <li class="<%= ("active-database" if @database.id == database.id) %>">
                   <%= link_to database.name, database: database.id %>
                 </li>
               <% end %>

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

@@ -15,7 +15,7 @@
   <tbody>
     <% connection_sources.each do |source| %>
       <tr>
-        <td><%= source["source"] %> <div class="text-muted"><%= [source["database"], source["ip"]].compact.join(" ") %></div></td>
+        <td><%= source["source"] %> <div class="text-muted"><%= [source["user"], source["database"], source["ip"]].compact.join(" - ") %></div></td>
         <td><%= number_with_delimiter(source["total_connections"]) %></td>
       </tr>
     <% end %>

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

@@ -38,7 +38,12 @@
           </span>
         </td>
         <td><%= number_with_delimiter(query["average_time"].to_f.round) %> ms</td>
-        <td><%= number_with_delimiter(query["calls"].to_i) %></td>
+        <td>
+          <%= number_with_delimiter(query["calls"].to_i) %>
+          <% if query["user"] %>
+            <span class="user"><%= query["user"] %></span>
+          <% end %>
+        </td>
       </tr>
       <tr>
         <td colspan="3" style="border-top: none; padding: 0;">