Adds healthchecks using the OKComputer gem

Author: danschmidt5189

Gemfile

@@ -53,3 +53,5 @@ group :test do
   gem 'simplecov', '~> 0.21', require: false
   gem 'simplecov-rcov', '~> 0.2', require: false
 end
+
+gem "okcomputer", "~> 1.19"

Gemfile.lock

@@ -166,6 +166,7 @@ GEM
     faraday-retry (2.2.1)
       faraday (~> 2.0)
     ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-arm64-darwin)
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     ffi (1.17.0-x86_64-linux-musl)
@@ -281,13 +282,16 @@ GEM
     nio4r (2.7.4)
     nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     oj (3.16.7)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
+    okcomputer (1.19.0)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
@@ -542,6 +546,7 @@ DEPENDENCIES
   importmap-rails
   jbuilder
   jquery-rails
+  okcomputer (~> 1.19)
   omniauth
   omniauth-cas (= 3.0.0)
   omniauth-rails_csrf_protection (~> 1.0)

config/initializers/okcomputer.rb

@@ -0,0 +1,14 @@
+# initializers/okcomputer.rb
+# Health checks configuration
+
+OkComputer.mount_at = '/health'
+OkComputer.logger = Rails.logger
+OkComputer.check_in_parallel = true
+
+# Check the Solr connection
+# Requires the ping handler on the solr core (<core>/admin/ping).
+core_baseurl = Blacklight.default_index.connection.uri.to_s.chomp('/')
+OkComputer::Registry.register 'solr', OkComputer::SolrCheck.new(core_baseurl)
+
+# Check that DB migrations have run
+OkComputer::Registry.register 'database-migrations', OkComputer::ActiveRecordMigrationsCheck.new

docker-compose.ci.yml

@@ -1,8 +1,6 @@
 ---
 
 services:
-  adminer: !reset
-
   app:
     build: !reset
     environment:

docker-compose.yml

@@ -1,12 +1,6 @@
 ---
 
 services:
-  adminer:
-    image: adminer
-    restart: always
-    ports:
-      - 8080:8080
-
   app:
     build:
       context: .

solr/geodata-test/solrconfig.xml

@@ -177,12 +177,6 @@
     <lst name="defaults">
       <str name="echoParams">all</str>
     </lst>
-    <!-- An optional feature of the PingRequestHandler is to configure the
-         handler with a "healthcheckFile" which can be used to enable/disable
-         the PingRequestHandler.
-         relative paths are resolved against the data dir
-      -->
-    <str name="healthcheckFile">server-enabled.txt</str>
   </requestHandler>
 
   <requestHandler name="/analysis/field"

solr/geodata/solrconfig.xml

@@ -177,12 +177,6 @@
     <lst name="defaults">
       <str name="echoParams">all</str>
     </lst>
-    <!-- An optional feature of the PingRequestHandler is to configure the
-         handler with a "healthcheckFile" which can be used to enable/disable
-         the PingRequestHandler.
-         relative paths are resolved against the data dir
-      -->
-    <str name="healthcheckFile">server-enabled.txt</str>
   </requestHandler>
 
   <requestHandler name="/analysis/field"