postgres-vacuum-monitor 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db00fc91bc1a6bab49018555f0663b9ec892021cb2c65984ff7c32676bece583
-  data.tar.gz: 924748bb6d70683a656e3c0a51eed83508b9eba3e54a39291445b5c785f8b03f
+  metadata.gz: d73b82c8aa8fbc2cf16b5685a23b67069b5ff8b41ff37d8b7db91aa69fac3b28
+  data.tar.gz: 2ea1469236728dc0c60637739c59b2de265c86bc7116e33185cba0972d1fe06f
 SHA512:
-  metadata.gz: 13af0f7be1384e6582c4c2c8b037af0a9aa1d02f10ccb22a6717f1dd5a6060aa6e207cb16b198355a2c5b3f9ccb91b20d6f55414f6644107941215985b9dfab5
-  data.tar.gz: cc9d708511f7ca663f4578019b19fe4130ed5f497e1def24c7da937bdf364803037521b1ba06b0390c5fb723ebaf131868ecaf0d5aa2912e3dd35a244a71c574
+  metadata.gz: e8d61553c2c18274abbae680870b814a9f87093ae06e8fd55cd9201b86264abd44bd82f05ddb320ce64b2edae7d30a14a879b56bd4f856825bbb6ac9a497398a
+  data.tar.gz: 77d63951bded8bf220ae133a518ebf1d862e84a83253eaa37462f6998b599896de255514391ef0e67ae4baf5c04f7b9af6104d658383a054b11e54bd5bce3301

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # postgres-vacuum-monitor
+## v.0.3.2
+  - Monitor non-ActiveRecord::Base database connections
+
 ## v.0.3.1
   - Relax pg requirements
 

data/README.md

@@ -47,6 +47,7 @@ end
 For long running queries, the event name is `LongQueries` and the attributes are: 
 ```ruby 
 {
+  database_name: # The name of the database.
   start_time: # When the query started .
   running_time: # How long has it been running in seconds.
   application_name: # What's the application name that is running the query.
@@ -58,6 +59,7 @@ For auto vacuum the attributes are the following:
 
 ```ruby 
 {
+  database_name: # The name of the database.
   table: # Table name.
   table_size: # How big is the table.
   dead_tuples: # How many dead tuples are in the table.

data/lib/postgres/vacuum/jobs/monitor_job.rb

@@ -7,24 +7,28 @@ module Postgres
         LONG_QUERIES = 'LongQueries'.freeze
 
         def perform(*)
-          ActiveRecord::Base.connection.execute(Postgres::Vacuum::Monitor::Query.long_running_queries).each do |row|
-            reporter_class.report_event(
-              LONG_QUERIES,
-              start_time: row['xact_start'],
-              running_time: row['seconds'],
-              application_name: row['application_name'],
-              query: row['query']
-            )
-          end
-
-          ActiveRecord::Base.connection.execute(Postgres::Vacuum::Monitor::Query.tables_eligible_vacuuming).each do |row|
-            reporter_class.report_event(
-              AUTOVACUUM_QUERY_EVENT,
-              table: row['relation'],
-              table_size: row['table_size'],
-              dead_tuples: row['dead_tuples'].to_i,
-              tuples_over_limit: row['dead_tuples'].to_i - row['autovacuum_vacuum_tuples'].to_i
-            )
+          with_each_db_name_and_connection do |name, connection|
+            connection.execute(Postgres::Vacuum::Monitor::Query.long_running_queries).each do |row|
+              reporter_class.report_event(
+                LONG_QUERIES,
+                database_name: name,
+                start_time: row['xact_start'],
+                running_time: row['seconds'],
+                application_name: row['application_name'],
+                query: row['query']
+              )
+            end
+
+            connection.execute(Postgres::Vacuum::Monitor::Query.tables_eligible_vacuuming).each do |row|
+              reporter_class.report_event(
+                AUTOVACUUM_QUERY_EVENT,
+                database_name: name,
+                table: row['relation'],
+                table_size: row['table_size'],
+                dead_tuples: row['dead_tuples'].to_i,
+                tuples_over_limit: row['dead_tuples'].to_i - row['autovacuum_vacuum_tuples'].to_i
+              )
+            end
           end
 
           true
@@ -39,6 +43,17 @@ module Postgres
           @reporter_class_name
         end
 
+        def with_each_db_name_and_connection
+          databases = Set.new
+          ActiveRecord::Base.connection_handler.connection_pools.map do |connection_pool|
+            db_name = connection_pool.spec.config[:database]
+            # activerecord allocates a connection pool per call to establish_connection
+            # multiple pools might interact with the same database so we use the
+            # database name to dedup
+            connection_pool.with_connection { |conn| yield(db_name, conn) } if databases.add?(db_name)
+          end
+        end
+
         ConfigurationError = Class.new(StandardError)
       end
     end

data/lib/postgres/vacuum/monitor/version.rb

@@ -1,7 +1,7 @@
 module Postgres
   module Vacuum
     module Monitor
-      VERSION = '0.3.1'.freeze
+      VERSION = '0.3.2'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres-vacuum-monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Fernando Garces
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Simple stats collector for postgres auto vacuumer.