10 files changed, 40 insertions, 110 deletions
diff --git a/lib/gitlab/health_checks/gitaly_check.rb b/lib/gitlab/health_checks/gitaly_check.rb
index f5f142c251f..2bd8ea711b5 100644
--- a/lib/gitlab/health_checks/gitaly_check.rb
+++ b/lib/gitlab/health_checks/gitaly_check.rb
@@ -27,17 +27,35 @@ module Gitlab
         end
 
         def check(storage_name)
-          serv = Gitlab::GitalyClient::HealthCheckService.new(storage_name)
-          result = serv.check
+          storage_healthy = healthy(storage_name)
+          unless storage_healthy[:success]
+            return HealthChecks::Result.new(
+              name,
+              storage_healthy[:success],
+              storage_healthy[:message],
+              shard: storage_name
+            )
+          end
 
+          storage_ready = ready(storage_name)
           HealthChecks::Result.new(
             name,
-            result[:success],
-            result[:message],
+            storage_ready[:success],
+            storage_ready[:message],
             shard: storage_name
           )
         end
 
+        def healthy(storage_name)
+          serv = Gitlab::GitalyClient::HealthCheckService.new(storage_name)
+          serv.check
+        end
+
+        def ready(storage_name)
+          serv = Gitlab::GitalyClient::ServerService.new(storage_name)
+          serv.readiness_check
+        end
+
         private
 
         def metric_prefix
diff --git a/lib/gitlab/health_checks/redis.rb b/lib/gitlab/health_checks/redis.rb
new file mode 100644
index 00000000000..895bce5a5a9
--- /dev/null
+++ b/lib/gitlab/health_checks/redis.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module HealthChecks
+    module Redis
+      ALL_INSTANCE_CHECKS =
+        ::Gitlab::Redis::ALL_CLASSES.map do |instance_class|
+          check_class = Class.new
+          check_class.extend(RedisAbstractCheck)
+          const_set("#{instance_class.store_name}Check", check_class)
+
+          check_class
+        end
+    end
+  end
+end
diff --git a/lib/gitlab/health_checks/redis/cache_check.rb b/lib/gitlab/health_checks/redis/cache_check.rb
deleted file mode 100644
index bd843bdaac4..00000000000
--- a/lib/gitlab/health_checks/redis/cache_check.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module HealthChecks
-    module Redis
-      class CacheCheck
-        extend RedisAbstractCheck
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/health_checks/redis/queues_check.rb b/lib/gitlab/health_checks/redis/queues_check.rb
deleted file mode 100644
index fb92db937dc..00000000000
--- a/lib/gitlab/health_checks/redis/queues_check.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module HealthChecks
-    module Redis
-      class QueuesCheck
-        extend RedisAbstractCheck
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/health_checks/redis/rate_limiting_check.rb b/lib/gitlab/health_checks/redis/rate_limiting_check.rb
deleted file mode 100644
index 0e9d94f7dff..00000000000
--- a/lib/gitlab/health_checks/redis/rate_limiting_check.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module HealthChecks
-    module Redis
-      class RateLimitingCheck
-        extend RedisAbstractCheck
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/health_checks/redis/redis_abstract_check.rb b/lib/gitlab/health_checks/redis/redis_abstract_check.rb
index ecad4b06ea9..9a9a4d1faba 100644
--- a/lib/gitlab/health_checks/redis/redis_abstract_check.rb
+++ b/lib/gitlab/health_checks/redis/redis_abstract_check.rb
@@ -10,12 +10,12 @@ module Gitlab
           successful?(check)
         end
 
-        private
-
         def redis_instance_class_name
           Gitlab::Redis.const_get(redis_instance_name.camelize, false)
         end
 
+        private
+
         def metric_prefix
           "redis_#{redis_instance_name}_ping"
         end
diff --git a/lib/gitlab/health_checks/redis/redis_check.rb b/lib/gitlab/health_checks/redis/redis_check.rb
deleted file mode 100644
index c793a939abd..00000000000
--- a/lib/gitlab/health_checks/redis/redis_check.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module HealthChecks
-    module Redis
-      class RedisCheck
-        extend SimpleAbstractCheck
-
-        class << self
-          private
-
-          def metric_prefix
-            'redis_ping'
-          end
-
-          def successful?(result)
-            result == true
-          end
-
-          def check
-            redis_health_checks.all?(&:check_up)
-          end
-
-          def redis_health_checks
-            [
-              Gitlab::HealthChecks::Redis::CacheCheck,
-              Gitlab::HealthChecks::Redis::QueuesCheck,
-              Gitlab::HealthChecks::Redis::SharedStateCheck,
-              Gitlab::HealthChecks::Redis::TraceChunksCheck,
-              Gitlab::HealthChecks::Redis::RateLimitingCheck,
-              Gitlab::HealthChecks::Redis::SessionsCheck
-            ]
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/health_checks/redis/sessions_check.rb b/lib/gitlab/health_checks/redis/sessions_check.rb
deleted file mode 100644
index 90a4c868f40..00000000000
--- a/lib/gitlab/health_checks/redis/sessions_check.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module HealthChecks
-    module Redis
-      class SessionsCheck
-        extend RedisAbstractCheck
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/health_checks/redis/shared_state_check.rb b/lib/gitlab/health_checks/redis/shared_state_check.rb
deleted file mode 100644
index 80f91784b8c..00000000000
--- a/lib/gitlab/health_checks/redis/shared_state_check.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module HealthChecks
-    module Redis
-      class SharedStateCheck
-        extend RedisAbstractCheck
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/health_checks/redis/trace_chunks_check.rb b/lib/gitlab/health_checks/redis/trace_chunks_check.rb
deleted file mode 100644
index 9a89a1ce51d..00000000000
--- a/lib/gitlab/health_checks/redis/trace_chunks_check.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module HealthChecks
-    module Redis
-      class TraceChunksCheck
-        extend RedisAbstractCheck
-      end
-    end
-  end
-end