health-monitor-rails 9.4.0 → 10.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e3901481f04e5dbca447ec01e0e551dc0d6788b82e48ecc681fdf598f7d1094
-  data.tar.gz: 1fb26a9ff50047e499d810834b0c44b354d23e5587dabb9d8da7d6dca2e7fa85
+  metadata.gz: f31145948d53277b016035e3dd3b1580ccc47afc452f2a9a197141c3c96b21ad
+  data.tar.gz: 80f759c330d6086287abd668c6c9bf5c9666092a3ac2d8ac2f0a8439981a36ff
 SHA512:
-  metadata.gz: 2074e27e809d298e5b65eeef3d8a3c8b6215ae530f056a66cec0d8f561bdf04e45cefa62f5e7af14f5dc2457bd6823db671ff4ce8fdbd6aa6ccde486bb67c0d9
-  data.tar.gz: b62478c0bbcbd00295ab63a4846397ace4882d49508385faeb7cd794e3f09b1127a532603320c1567727882965cd840b59352a537913a488119bb8ee238a58c3
+  metadata.gz: c3b4d89aa49a1d799f23ec6e98bf718a584e8c7954e1c4544d61159f0ed012609bb8eb213714cf987f52a537dd00c14bfbce6b92fa8f5f7e64b50fdf1f94310f
+  data.tar.gz: 6e1f95ccc047a279d7cb8658a3186de8b20ae62260ea9832beec3ca7a944522b1a91171ee3aa9c4d9ddc672f964d8c55f2f8005a036d0423281d42dc038d34a0

data/README.md

@@ -214,7 +214,7 @@ HealthMonitor.configure do |config|
   end
 end
 
-# To configure specific queues
+# Sidekiq with specific queues
 HealthMonitor.configure do |config|
   config.sidekiq.configure do |sidekiq_config|
     sidekiq_config.add_queue_configuration('critical', latency: 10.seconds, queue_size: 20)
@@ -224,7 +224,7 @@ end
 ```
 
 ```ruby
-# Redis
+# Redis with existing connection
 HealthMonitor.configure do |config|
   config.redis.configure do |redis_config|
     redis_config.connection = Redis.current # Use your custom redis connection
@@ -236,7 +236,7 @@ end
 Additionally, you can configure an explicit URL:
 
 ```ruby
-# Redis
+# Redis with a URL configuration
 HealthMonitor.configure do |config|
   config.redis.configure do |redis_config|
     redis_config.url = 'redis://user:pass@example.redis.com:90210/'
@@ -245,12 +245,25 @@ HealthMonitor.configure do |config|
 end
 ```
 
+Or via a connection pool:
+
+```ruby
+# Redis using Connection Pools
+HealthMonitor.configure do |config|
+  config.redis.configure do |redis_config|
+    redis_config.connection = ConnectionPool.new(size: 5) { Redis.new } # Use your custom connection pool
+  end
+end
+```
+
 The currently supported settings are:
 
 #### Sidekiq
 
 * `latency`: the latency (in seconds) of a queue (now - when the oldest job was enqueued) which is considered unhealthy (the default is 30 seconds, but larger processing queue should have a larger latency value).
 * `queue_size`: the size (maximum) of a queue which is considered unhealthy (the default is 100).
+* `default_queue`: the default queue to check.
+* `add_queue_configuration`: add specific configuration per queue.
 
 #### Redis
 

data/lib/health_monitor/providers/database.rb

@@ -8,8 +8,15 @@ module HealthMonitor
 
     class Database < Base
       def check!
-        # Check connection to the DB:
-        ActiveRecord::Migrator.current_version
+        failed_databases = []
+
+        ActiveRecord::Base.connection_handler.all_connection_pools.each do |cp|
+          cp.connection.check_version
+        rescue Exception
+          failed_databases << cp.db_config.name
+        end
+
+        raise "unable to connect to: #{failed_databases.uniq.join(',')}" unless failed_databases.empty?
       rescue Exception => e
         raise DatabaseException.new(e.message)
       end

data/lib/health_monitor/providers/sidekiq.rb

@@ -12,6 +12,7 @@ module HealthMonitor
         DEFAULT_QUEUE_NAME = 'default'
         DEFAULT_LATENCY_TIMEOUT = 30
         DEFAULT_QUEUES_SIZE = 100
+        DEFAULT_RETRY_CHECK = 20
 
         attr_reader :queues
 
@@ -53,6 +54,7 @@ module HealthMonitor
         check_latency!
         check_queue_size!
         check_redis!
+        check_amount_of_retries!
       rescue Exception => e
         raise SidekiqException.new(e)
       end
@@ -95,6 +97,13 @@ module HealthMonitor
         end
       end
 
+      def check_amount_of_retries!
+        maximum_amount_of_retries = ::HealthMonitor::Providers::Sidekiq::Configuration::DEFAULT_RETRY_CHECK
+        jobs_over_limit = ::Sidekiq::RetrySet.new.select { |job| job.item['retry_count'] >= maximum_amount_of_retries }
+
+        raise "amount of retries for a job is greater than #{maximum_amount_of_retries}" if jobs_over_limit.any?
+      end
+
       def check_redis!
         if ::Sidekiq.respond_to?(:redis_info)
           ::Sidekiq.redis_info

data/lib/health_monitor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HealthMonitor
-  VERSION = '9.4.0'
+  VERSION = '10.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: health-monitor-rails
 version: !ruby/object:Gem::Version
-  version: 9.4.0
+  version: 10.1.0
 platform: ruby
 authors:
 - Leonid Beder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-10 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement