pghero 3.7.0 → 4.0.0

data/lib/pghero/methods/sequences.rb

@@ -93,7 +93,7 @@ module PgHero
           SELECT
             n.nspname AS schema,
             c.relname AS sequence,
-            has_sequence_privilege(c.oid, 'SELECT') AS readable
+            has_sequence_privilege(c.oid, 'SELECT') AND (c.relpersistence <> 'u' OR NOT pg_is_in_recovery()) AS readable
           FROM
             pg_class c
           INNER JOIN

data/lib/pghero/methods/settings.rb

@@ -3,24 +3,19 @@ module PgHero
     module Settings
       def settings
         names =
-          if server_version_num >= 100000
+          if server_version_num >= 180000
             %i(
               max_connections shared_buffers effective_cache_size maintenance_work_mem
               checkpoint_completion_target wal_buffers default_statistics_target
               random_page_cost effective_io_concurrency work_mem huge_pages
-              min_wal_size max_wal_size
-            )
-          elsif server_version_num >= 90500
-            %i(
-              max_connections shared_buffers effective_cache_size work_mem
-              maintenance_work_mem min_wal_size max_wal_size checkpoint_completion_target
-              wal_buffers default_statistics_target
+              jit wal_compression io_method min_wal_size max_wal_size
             )
           else
             %i(
-              max_connections shared_buffers effective_cache_size work_mem
-              maintenance_work_mem checkpoint_segments checkpoint_completion_target
-              wal_buffers default_statistics_target
+              max_connections shared_buffers effective_cache_size maintenance_work_mem
+              checkpoint_completion_target wal_buffers default_statistics_target
+              random_page_cost effective_io_concurrency work_mem huge_pages
+              jit wal_compression min_wal_size max_wal_size
             )
           end
         fetch_settings(names)

data/lib/pghero/methods/space.rb

@@ -52,7 +52,7 @@ module PgHero
           sizes = relation_sizes.to_h { |r| [[r[:schema], r[:relation]], r[:size_bytes]] }
           start_at = days.days.ago
 
-          stats = select_all_stats <<~SQL
+          sql = <<~SQL
             WITH t AS (
               SELECT
                 schema,
@@ -61,8 +61,8 @@ module PgHero
               FROM
                 pghero_space_stats
               WHERE
-                database = #{quote(id)}
-                AND captured_at >= #{quote(start_at)}
+                database = :id
+                AND captured_at >= :start_at
               GROUP BY
                 1, 2
             )
@@ -75,6 +75,7 @@ module PgHero
             ORDER BY
               1, 2
           SQL
+          stats = select_all_stats(sql, {id: id, start_at: start_at})
 
           stats.each do |r|
             relation = [r[:schema], r[:relation]]
@@ -95,20 +96,22 @@ module PgHero
           sizes = relation_sizes.map { |r| [[r[:schema], r[:relation]], r[:size_bytes]] }.to_h
           start_at = 30.days.ago
 
-          stats = select_all_stats <<~SQL
+          sql = <<~SQL
             SELECT
               captured_at,
               size AS size_bytes
             FROM
               pghero_space_stats
             WHERE
-              database = #{quote(id)}
-              AND captured_at >= #{quote(start_at)}
-              AND schema = #{quote(schema)}
-              AND relation = #{quote(relation)}
+              database = :id
+              AND captured_at >= :start_at
+              AND schema = :schema
+              AND relation = :relation
             ORDER BY
               1 ASC
           SQL
+          binds = {id: id, start_at: start_at, schema: schema, relation: relation}
+          stats = select_all_stats(sql, binds)
 
           stats << {
             captured_at: Time.now,

data/lib/pghero/methods/suggested_indexes.rb

@@ -2,7 +2,7 @@ module PgHero
   module Methods
     module SuggestedIndexes
       def suggested_indexes_enabled?
-        defined?(PgQuery) && Gem::Version.new(PgQuery::VERSION) >= Gem::Version.new("2") && query_stats_enabled?
+        defined?(PgQuery) && Gem::Version.new(PgQuery::VERSION) >= Gem::Version.new("6") && query_stats_enabled?
       end
 
       # TODO clean this mess
@@ -102,9 +102,9 @@ module PgHero
         end
 
         # get stats about columns for relevant tables
-        tables = parts.values.map { |t| t[:table] }.uniq
+        tables = parts.values.filter_map { |t| t[:table] }.uniq
         # TODO get schema from query structure, then try search path
-        schema = PgHero.connection_config(connection_model)[:schema] || "public"
+        schema = connection_model.connection_db_config.configuration_hash[:schema] || "public"
         if tables.any?
           row_stats = table_stats(table: tables, schema: schema).to_h { |i| [i[:table], i[:estimated_rows]] }
           col_stats = column_stats(table: tables, schema: schema).group_by { |i| i[:table] }
@@ -287,33 +287,29 @@ module PgHero
           if tree.bool_expr.boolop == :AND_EXPR
             tree.bool_expr.args.flat_map { |v| parse_where(v) }
           else
-            raise "Not Implemented"
+            raise Error, "Not Implemented"
           end
-        elsif aexpr && ["=", "<>", ">", ">=", "<", "<=", "~~", "~~*", "BETWEEN"].include?(aexpr.name.first.string.send(str_method))
-          [{column: aexpr.lexpr.column_ref.fields.last.string.send(str_method), op: aexpr.name.first.string.send(str_method)}]
+        elsif aexpr && ["=", "<>", ">", ">=", "<", "<=", "~~", "~~*", "BETWEEN"].include?(aexpr.name.first.string.sval)
+          [{column: aexpr.lexpr.column_ref.fields.last.string.sval, op: aexpr.name.first.string.sval}]
         elsif tree.null_test
           op = tree.null_test.nulltesttype == :IS_NOT_NULL ? "not_null" : "null"
-          [{column: tree.null_test.arg.column_ref.fields.last.string.send(str_method), op: op}]
+          [{column: tree.null_test.arg.column_ref.fields.last.string.sval, op: op}]
         else
-          raise "Not Implemented"
+          raise Error, "Not Implemented"
         end
       end
 
-      def str_method
-        @str_method ||= Gem::Version.new(PgQuery::VERSION) >= Gem::Version.new("4") ? :sval : :str
-      end
-
       def parse_sort(sort_clause)
         sort_clause.map do |v|
           {
-            column: v.sort_by.node.column_ref.fields.last.string.send(str_method),
+            column: v.sort_by.node.column_ref.fields.last.string.sval,
             direction: v.sort_by.sortby_dir == :SORTBY_DESC ? "desc" : "asc"
           }
         end
       end
 
       def column_stats(schema: nil, table: nil)
-        select_all <<~SQL
+        sql = <<~SQL
           SELECT
             schemaname AS schema,
             tablename AS table,
@@ -323,11 +319,14 @@ module PgHero
           FROM
             pg_stats
           WHERE
-            schemaname = #{quote(schema)}
-            #{table ? "AND tablename IN (#{Array(table).map { |t| quote(t) }.join(", ")})" : ""}
+            schemaname = :schema
+            #{"AND tablename IN (:table)" if table}
           ORDER BY
             1, 2, 3
         SQL
+        binds = {schema: schema}
+        binds[:table] = Array(table) if table
+        select_all(sql, binds)
       end
     end
   end

data/lib/pghero/methods/system.rb

@@ -10,8 +10,6 @@ module PgHero
           :aws
         elsif gcp_database_id
           :gcp
-        elsif azure_resource_id
-          :azure
         end
       end
 
@@ -77,54 +75,6 @@ module PgHero
         end
       end
 
-      def azure_stats(metric_name, duration: nil, period: nil, offset: nil, series: false)
-        # TODO DRY with RDS stats
-        duration = (duration || 1.hour).to_i
-        period = (period || 1.minute).to_i
-        offset = (offset || 0).to_i
-        end_time = Time.at(((Time.now - offset).to_f / period).ceil * period)
-        start_time = end_time - duration
-
-        interval =
-          case period
-          when 60
-            "PT1M"
-          when 300
-            "PT5M"
-          when 900
-            "PT15M"
-          when 1800
-            "PT30M"
-          when 3600
-            "PT1H"
-          else
-            raise Error, "Unsupported period"
-          end
-
-        client = Azure::Monitor::Profiles::Latest::Mgmt::Client.new
-        # call utc to convert +00:00 to Z
-        timespan = "#{start_time.utc.iso8601}/#{end_time.utc.iso8601}"
-        results = client.metrics.list(
-          azure_resource_id,
-          metricnames: metric_name,
-          aggregation: "Average",
-          timespan: timespan,
-          interval: interval
-        )
-
-        data = {}
-        result = results.value.first
-        if result
-          result.timeseries.first.data.each do |point|
-            data[point.time_stamp.to_time] = point.average
-          end
-        end
-
-        add_missing_data(data, start_time, end_time, period) if series
-
-        data
-      end
-
       private
 
       def gcp_stats(metric_name, duration: nil, period: nil, offset: nil, series: false)
@@ -139,25 +89,19 @@ module PgHero
         raise Error, "Invalid metric name" unless /\A[a-z\/_]+\z/i.match?(metric_name)
         raise Error, "Invalid database id" unless /\A[a-z0-9\-:]+\z/i.match?(gcp_database_id)
 
-        # we handle four situations:
+        # we handle three situations:
         # 1. google-cloud-monitoring-v3
-        # 2. google-cloud-monitoring >= 1
-        # 3. google-cloud-monitoring < 1
-        # 4. google-apis-monitoring_v3
+        # 2. google-cloud-monitoring
+        # 3. google-apis-monitoring_v3
         begin
           require "google/cloud/monitoring/v3"
         rescue LoadError
-          begin
-            require "google/cloud/monitoring"
-          rescue LoadError
-            require "google/apis/monitoring_v3"
-          end
+          require "google/apis/monitoring_v3"
         end
 
         # for situations 1 and 2
-        # Google::Cloud::Monitoring.metric_service is documented
-        # but doesn't work for situation 1
-        if defined?(Google::Cloud::Monitoring::V3::MetricService::Client)
+        # Google::Cloud::Monitoring.metric_service doesn't work for situation 1
+        if defined?(Google::Cloud::Monitoring::V3)
           client = Google::Cloud::Monitoring::V3::MetricService::Client.new
 
           interval = Google::Cloud::Monitoring::V3::TimeInterval.new
@@ -178,29 +122,6 @@ module PgHero
             view: Google::Cloud::Monitoring::V3::ListTimeSeriesRequest::TimeSeriesView::FULL,
             aggregation: aggregation
           })
-        elsif defined?(Google::Cloud::Monitoring)
-          require "google/cloud/monitoring"
-
-          client = Google::Cloud::Monitoring::Metric.new
-
-          interval = Google::Monitoring::V3::TimeInterval.new
-          interval.end_time = Google::Protobuf::Timestamp.new(seconds: end_time.to_i)
-          # subtract period to make sure we get first data point
-          interval.start_time = Google::Protobuf::Timestamp.new(seconds: (start_time - period).to_i)
-
-          aggregation = Google::Monitoring::V3::Aggregation.new
-          # may be better to use ALIGN_NEXT_OLDER for space stats to show most recent data point
-          # stick with average for now to match AWS
-          aggregation.per_series_aligner = Google::Monitoring::V3::Aggregation::Aligner::ALIGN_MEAN
-          aggregation.alignment_period = period
-
-          results = client.list_time_series(
-            "projects/#{gcp_database_id.split(":").first}",
-            "metric.type = \"cloudsql.googleapis.com/database/#{metric_name}\" AND resource.label.database_id = \"#{gcp_database_id}\"",
-            interval,
-            Google::Monitoring::V3::ListTimeSeriesRequest::TimeSeriesView::FULL,
-            aggregation: aggregation
-          )
         else
           client = Google::Apis::MonitoringV3::MonitoringService.new
 
@@ -264,32 +185,11 @@ module PgHero
             }
             gcp_stats(metrics[metric_key], **options)
           end
-        when :azure
-          if metric_key == :free_space
-            quota = azure_stats("storage_limit", **options)
-            used = azure_stats("storage_used", **options)
-            free_space(quota, used)
-          else
-            replication_lag_stat = azure_flexible_server? ? "physical_replication_delay_in_seconds" : "pg_replica_log_delay_in_seconds"
-            metrics = {
-              cpu: "cpu_percent",
-              connections: "active_connections",
-              replication_lag: replication_lag_stat,
-              read_iops: "read_iops", # flexible server only
-              write_iops: "write_iops" # flexible server only
-            }
-            raise Error, "Metric not supported" unless metrics[metric_key]
-            azure_stats(metrics[metric_key], **options)
-          end
         else
           raise NotEnabled, "System stats not enabled"
         end
       end
 
-      def azure_flexible_server?
-        azure_resource_id.include?("/Microsoft.DBforPostgreSQL/flexibleServers/")
-      end
-
       # only use data points included in both series
       # this also eliminates need to align Time.now
       def free_space(quota, used)

data/lib/pghero/methods/tables.rb

@@ -44,7 +44,7 @@ module PgHero
       end
 
       def table_stats(schema: nil, table: nil)
-        select_all <<~SQL
+        sql = <<~SQL
           SELECT
             nspname AS schema,
             relname AS table,
@@ -56,11 +56,15 @@ module PgHero
             pg_namespace ON pg_namespace.oid = pg_class.relnamespace
           WHERE
             relkind = 'r'
-            #{schema ? "AND nspname = #{quote(schema)}" : nil}
-            #{table ? "AND relname IN (#{Array(table).map { |t| quote(t) }.join(", ")})" : nil}
+            #{"AND nspname = :schema" if schema}
+            #{"AND relname IN (:table)" if table}
           ORDER BY
             1, 2
         SQL
+        binds = {}
+        binds[:schema] = schema if schema
+        binds[:table] = Array(table) if table
+        select_all(sql, binds)
       end
     end
   end

data/lib/pghero/query.rb

@@ -0,0 +1,8 @@
+module PgHero
+  class Query < Stats
+    self.table_name = "pghero_queries"
+
+    # do not use outside of testing since no index on query_id
+    has_many :query_stats, class_name: "QueryStats"
+  end
+end

data/lib/pghero/query_stats.rb

@@ -1,5 +1,8 @@
 module PgHero
   class QueryStats < Stats
     self.table_name = "pghero_query_stats"
+
+    # do not add belongs_to :query
+    # as it breaks backfill if query column exists
   end
 end

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "3.7.0"
+  VERSION = "4.0.0"
 end

data/lib/pghero.rb

@@ -1,9 +1,6 @@
 # dependencies
 require "active_support"
 
-# stdlib
-require "forwardable"
-
 # methods
 require_relative "pghero/methods/basic"
 require_relative "pghero/methods/connections"
@@ -21,7 +18,6 @@ require_relative "pghero/methods/space"
 require_relative "pghero/methods/suggested_indexes"
 require_relative "pghero/methods/system"
 require_relative "pghero/methods/tables"
-require_relative "pghero/methods/users"
 
 require_relative "pghero/database"
 require_relative "pghero/engine" if defined?(Rails)
@@ -30,6 +26,7 @@ require_relative "pghero/version"
 module PgHero
   autoload :Connection, "pghero/connection"
   autoload :Stats, "pghero/stats"
+  autoload :Query, "pghero/query"
   autoload :QueryStats, "pghero/query_stats"
   autoload :SpaceStats, "pghero/space_stats"
 
@@ -54,20 +51,6 @@ module PgHero
   self.filter_data = ENV["PGHERO_FILTER_DATA"].to_s.size > 0
 
   class << self
-    extend Forwardable
-    def_delegators :primary_database, :aws_access_key_id, :analyze, :analyze_tables, :autoindex, :autovacuum_danger,
-      :best_index, :blocked_queries, :connections, :connection_sources, :connection_states, :connection_stats,
-      :cpu_usage, :create_user, :database_size, :aws_db_instance_identifier, :disable_query_stats, :drop_user,
-      :duplicate_indexes, :enable_query_stats, :explain, :historical_query_stats_enabled?, :index_caching,
-      :index_hit_rate, :index_usage, :indexes, :invalid_constraints, :invalid_indexes, :kill, :kill_all, :kill_long_running_queries,
-      :last_stats_reset_time, :long_running_queries, :maintenance_info, :missing_indexes, :query_stats,
-      :query_stats_available?, :query_stats_enabled?, :query_stats_extension_enabled?, :query_stats_readable?,
-      :rds_stats, :read_iops_stats, :aws_region, :relation_sizes, :replica?, :replication_lag, :replication_lag_stats,
-      :reset_query_stats, :reset_stats, :running_queries, :aws_secret_access_key, :sequence_danger, :sequences, :settings,
-      :slow_queries, :space_growth, :ssl_used?, :suggested_indexes, :suggested_indexes_by_query,
-      :suggested_indexes_enabled?, :system_stats_enabled?, :table_caching, :table_hit_rate, :table_stats,
-      :total_connections, :transaction_id_danger, :unused_indexes, :unused_tables, :write_iops_stats
-
     def time_zone=(time_zone)
       @time_zone = time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone.to_s]
     end
@@ -107,6 +90,10 @@ module PgHero
       @visualize_url ||= config["visualize_url"] || ENV["PGHERO_VISUALIZE_URL"] || "https://tatiyants.com/pev/#/plans/new"
     end
 
+    def kill_enabled?
+      !config["disable_kill"]
+    end
+
     def config
       @config ||= file_config || default_config
     end
@@ -130,7 +117,7 @@ module PgHero
           elsif config["databases"] # preferred format
             config
           elsif config_file_exists
-            raise "Invalid config file"
+            raise Error, "Invalid config file"
           else
             nil
           end
@@ -144,8 +131,8 @@ module PgHero
       databases = {}
 
       unless ENV["PGHERO_DATABASE_URL"]
-        ActiveRecord::Base.configurations.configs_for(env_name: env, include_replicas_key => true).each do |db|
-          databases[db.send(spec_name_key)] = {"spec" => db.send(spec_name_key)}
+        ActiveRecord::Base.configurations.configs_for(env_name: env, include_hidden: true).each do |db|
+          databases[db.name] = {"spec" => db.name}
         end
       end
 
@@ -158,8 +145,7 @@ module PgHero
       if databases.size == 1
         databases.values.first.merge!(
           "aws_db_instance_identifier" => ENV["PGHERO_DB_INSTANCE_IDENTIFIER"],
-          "gcp_database_id" => ENV["PGHERO_GCP_DATABASE_ID"],
-          "azure_resource_id" => ENV["PGHERO_AZURE_RESOURCE_ID"]
+          "gcp_database_id" => ENV["PGHERO_GCP_DATABASE_ID"]
         )
       end
 
@@ -184,10 +170,6 @@ module PgHero
       @databases
     end
 
-    def primary_database
-      databases.values.first
-    end
-
     def capture_query_stats(verbose: false)
       each_database do |database|
         next unless database.capture_query_stats?
@@ -224,6 +206,7 @@ module PgHero
     # delete previous stats
     # go database by database to use an index
     # stats for old databases are not cleaned up since we can't use an index
+    # TODO clean queries
     def clean_query_stats(before: nil)
       each_database do |database|
         database.clean_query_stats(before: before)
@@ -236,21 +219,6 @@ module PgHero
       end
     end
 
-    # private
-    def connection_config(model)
-      model.connection_db_config.configuration_hash
-    end
-
-    # private
-    def spec_name_key
-      :name
-    end
-
-    # private
-    def include_replicas_key
-      :include_hidden
-    end
-
     private
 
     def each_database

data/licenses/LICENSE-chart.js.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2022 Chart.js Contributors
+Copyright (c) 2014-2024 Chart.js Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Andrew Kane
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 email: andrew@ankane.org
 executables: []
 extensions: []
@@ -37,7 +37,6 @@ files:
 - app/assets/javascripts/pghero/application.js
 - app/assets/javascripts/pghero/chartkick.js
 - app/assets/javascripts/pghero/highlight.min.js
-- app/assets/javascripts/pghero/jquery.js
 - app/assets/javascripts/pghero/nouislider.js
 - app/assets/stylesheets/pghero/application.css
 - app/assets/stylesheets/pghero/arduino-light.css
@@ -69,6 +68,8 @@ files:
 - lib/generators/pghero/templates/config.yml.tt
 - lib/generators/pghero/templates/query_stats.rb.tt
 - lib/generators/pghero/templates/space_stats.rb.tt
+- lib/generators/pghero/templates/upgrade_query_stats.rb.tt
+- lib/generators/pghero/upgrade_query_stats_generator.rb
 - lib/pghero.rb
 - lib/pghero/connection.rb
 - lib/pghero/database.rb
@@ -89,7 +90,7 @@ files:
 - lib/pghero/methods/suggested_indexes.rb
 - lib/pghero/methods/system.rb
 - lib/pghero/methods/tables.rb
-- lib/pghero/methods/users.rb
+- lib/pghero/query.rb
 - lib/pghero/query_stats.rb
 - lib/pghero/space_stats.rb
 - lib/pghero/stats.rb
@@ -100,7 +101,6 @@ files:
 - licenses/LICENSE-chartkick.js.txt
 - licenses/LICENSE-date-fns.txt
 - licenses/LICENSE-highlight.js.txt
-- licenses/LICENSE-jquery.txt
 - licenses/LICENSE-kurkle-color.txt
 - licenses/LICENSE-nouislider.txt
 homepage: https://github.com/ankane/pghero
@@ -114,14 +114,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A performance dashboard for Postgres
 test_files: []