health-monitor-rails 9.2.0 → 9.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 858a66e2e4f657e91a804126dba76651043c68dda2ed5c0a8df47fcea21cb334
-  data.tar.gz: 03f963b3e3f58d156596118819ca63ddd10ef46dcbceec25e43f984c8da89ce8
+  metadata.gz: 4e3901481f04e5dbca447ec01e0e551dc0d6788b82e48ecc681fdf598f7d1094
+  data.tar.gz: 1fb26a9ff50047e499d810834b0c44b354d23e5587dabb9d8da7d6dca2e7fa85
 SHA512:
-  metadata.gz: 1b654622855555830de5c3b164c51ef65f564d9ad3a0139b9a5dfcb1a4620a34abb4aa9db80a0593d928cb7f7057cebd2e8ff5c2666c801d80b5c5f5bac01969
-  data.tar.gz: 060d96195cd80e37795ddd7d95b2c73654ee724518ba9e189fdc665d215ff37d30cb1997a59ebe1e0cc69fb0ac2f9672823435b05ca87f6308fb4f4b890bebe9
+  metadata.gz: 2074e27e809d298e5b65eeef3d8a3c8b6215ae530f056a66cec0d8f561bdf04e45cefa62f5e7af14f5dc2457bd6823db671ff4ce8fdbd6aa6ccde486bb67c0d9
+  data.tar.gz: b62478c0bbcbd00295ab63a4846397ace4882d49508385faeb7cd794e3f09b1127a532603320c1567727882965cd840b59352a537913a488119bb8ee238a58c3

data/README.md

@@ -1,7 +1,7 @@
 # health-monitor-rails
 
 [![Gem Version](https://badge.fury.io/rb/health-monitor-rails.svg)](http://badge.fury.io/rb/health-monitor-rails)
-[![Build Status](https://travis-ci.com/lbeder/health-monitor-rails.svg?branch=master)](https://travis-ci.com/lbeder/health-monitor-rails)
+[![Build Status](https://github.com/lbeder/health-monitor-rails/actions/workflows/ci.yml/badge.svg)](https://github.com/lbeder/health-monitor-rails/actions/workflows/ci.yml)
 [![Coverage Status](https://coveralls.io/repos/lbeder/health-monitor-rails/badge.svg)](https://coveralls.io/r/lbeder/health-monitor-rails)
 
 This is a health monitoring Rails mountable plug-in, which checks various services (db, cache, sidekiq, redis, etc.).

data/app/controllers/health_monitor/health_controller.rb

@@ -12,6 +12,7 @@ module HealthMonitor
 
     def check
       @statuses = statuses
+      @hide_footer = HealthMonitor.configuration.hide_footer
 
       respond_to do |format|
         format.html

data/app/views/health_monitor/health/check.html.erb

@@ -17,7 +17,7 @@
     <main>
       <div class="max-w-7xl mx-auto py-12 sm:px-6 lg:px-8">
         <div class="max-w-4xl mx-auto">
-          <div class="bg-white shadow overflow-hidden sm:rounded-lg">
+          <div class="services bg-white shadow overflow-hidden sm:rounded-lg">
             <div class="px-4 py-5 sm:px-6">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 Services
@@ -43,13 +43,38 @@
               </dl>
             </div>
           </div>
+          <% if @statuses[:environment_variables].present? %>
+            <div class="env-variables bg-white shadow overflow-hidden sm:rounded-lg my-6">
+              <div class="px-4 py-5 sm:px-6">
+                <h3 class="text-lg leading-6 font-medium text-gray-900">
+                  Environment Variables
+                </h3>
+              </div>
+              <div class="border-t border-gray-200">
+                <dl>
+                  <% @statuses[:environment_variables].each_with_index do |env_var, index| %>
+                    <div class="<%= index.odd? ? 'bg-gray-50' : 'bg-white' %> px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                      <dt class="text-sm font-medium text-gray-500">
+                        <%= env_var[0] %>
+                      </dt>
+                      <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                        <%= env_var[1] %>
+                      </dd>
+                    </div>
+                  <% end %>
+                </dl>
+              </div>
+            </div>
+          <% end %>
         </div>
       </div>
     </main>
-    <footer>
-      <div class="font-light text-center text-slate-500 text-xs px-5">
-        Powered by <a href="https://github.com/lbeder/health-monitor-rails" target="_blank">health-monitor-rails</a>
-      </div>
-    </footer>
+    <% if !@hide_footer %>
+      <footer>
+        <div class="font-light text-center text-slate-500 text-xs px-5">
+          Powered by <a href="https://github.com/lbeder/health-monitor-rails" target="_blank">health-monitor-rails</a>
+        </div>
+      </footer>
+    <% end %>
   </body>
 </html>

data/lib/health_monitor/configuration.rb

@@ -7,6 +7,7 @@ module HealthMonitor
     attr_accessor :basic_auth_credentials,
                   :environment_variables,
                   :error_callback,
+                  :hide_footer,
                   :path
     attr_reader :providers
 
@@ -21,7 +22,11 @@ module HealthMonitor
     PROVIDERS.each do |provider_name|
       define_method provider_name do |&_block|
         require "health_monitor/providers/#{provider_name}"
-        add_provider("HealthMonitor::Providers::#{provider_name.to_s.titleize.delete(' ')}".constantize)
+
+        add_provider(
+          "HealthMonitor::Providers::#{provider_name.to_s.titleize.delete(' ')}"
+            .constantize
+        )
       end
     end
 

data/lib/health_monitor/providers/base.rb

@@ -3,6 +3,8 @@
 module HealthMonitor
   module Providers
     class Base
+      @global_configuration = nil
+
       attr_reader :request
       attr_accessor :configuration
 
@@ -10,10 +12,14 @@ module HealthMonitor
         @provider_name ||= name.demodulize
       end
 
+      def self.global_configuration
+        @global_configuration ||= configuration_class.new
+      end
+
       def self.configure
         return unless configurable?
 
-        @global_configuration = configuration_class.new
+        @global_configuration ||= configuration_class.new
 
         yield @global_configuration if block_given?
       end
@@ -23,7 +29,7 @@ module HealthMonitor
 
         return unless self.class.configurable?
 
-        self.configuration = self.class.instance_variable_get('@global_configuration')
+        self.configuration = self.class.global_configuration
       end
 
       # @abstract

data/lib/health_monitor/providers/redis.rb

@@ -4,6 +4,8 @@ require 'health_monitor/providers/base'
 
 module HealthMonitor
   module Providers
+    CONNECTION_POOL_SIZE = 1
+
     class RedisException < StandardError; end
 
     class Redis < Base
@@ -23,6 +25,10 @@ module HealthMonitor
         def configuration_class
           ::HealthMonitor::Providers::Redis::Configuration
         end
+
+        def as_connection_pool(connection)
+          ConnectionPool.new(size: CONNECTION_POOL_SIZE) { connection }
+        end
       end
 
       def check!
@@ -30,8 +36,6 @@ module HealthMonitor
         check_max_used_memory!
       rescue Exception => e
         raise RedisException.new(e.message)
-      ensure
-        redis.close
       end
 
       private
@@ -39,8 +43,8 @@ module HealthMonitor
       def check_values!
         time = Time.now.to_formatted_s(:rfc2822)
 
-        redis.set(key, time)
-        fetched = redis.get(key)
+        redis.with { |conn| conn.set(key, time) }
+        fetched = redis.with { |conn| conn.get(key) }
 
         raise "different values (now: #{time}, fetched: #{fetched})" if fetched != time
       end
@@ -59,11 +63,15 @@ module HealthMonitor
       def redis
         @redis =
           if configuration.connection
-            configuration.connection
+            if configuration.connection.is_a?(ConnectionPool)
+              configuration.connection
+            else
+              ConnectionPool.new(size: CONNECTION_POOL_SIZE) { configuration.connection }
+            end
           elsif configuration.url
-            ::Redis.new(url: configuration.url)
+            ConnectionPool.new(size: CONNECTION_POOL_SIZE) { ::Redis.new(url: configuration.url) }
           else
-            ::Redis.new
+            ConnectionPool.new(size: CONNECTION_POOL_SIZE) { ::Redis.new }
           end
       end
 
@@ -72,7 +80,7 @@ module HealthMonitor
       end
 
       def used_memory_mb
-        bytes_to_megabytes(redis.info['used_memory'])
+        bytes_to_megabytes(redis.with { |conn| conn.info['used_memory'] })
       end
     end
   end

data/lib/health_monitor/providers/sidekiq.rb

@@ -73,6 +73,7 @@ module HealthMonitor
 
       def check_processes!
         sidekiq_stats = ::Sidekiq::Stats.new
+
         return unless sidekiq_stats.processes_size.zero?
 
         raise 'Sidekiq alive processes number is 0!'
@@ -89,6 +90,7 @@ module HealthMonitor
       def check_queue_size!
         configuration.queues.each do |queue, config|
           size = queue(queue).size
+
           raise "queue '#{queue}': size #{size} is greater than #{config[:queue_size]}" if size > config[:queue_size]
         end
       end

data/lib/health_monitor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: health-monitor-rails
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.4.0
 platform: ruby
 authors:
 - Leonid Beder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: mock_redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,19 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rediska
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement