Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 13 insertions, 7 deletions

diff --git a/lib/gitlab/health_checks/redis/redis_check.rb b/lib/gitlab/health_checks/redis/redis_check.rb
index 25879c18f84..c793a939abd 100644
--- a/lib/gitlab/health_checks/redis/redis_check.rb
+++ b/lib/gitlab/health_checks/redis/redis_check.rb
@@ -14,16 +14,22 @@ module Gitlab
           end
 
           def successful?(result)
-            result == 'PONG'
+            result == true
           end
 
           def check
-            ::Gitlab::HealthChecks::Redis::CacheCheck.check_up &&
-              ::Gitlab::HealthChecks::Redis::QueuesCheck.check_up &&
-              ::Gitlab::HealthChecks::Redis::SharedStateCheck.check_up &&
-              ::Gitlab::HealthChecks::Redis::TraceChunksCheck.check_up &&
-              ::Gitlab::HealthChecks::Redis::RateLimitingCheck.check_up &&
-              ::Gitlab::HealthChecks::Redis::SessionsCheck.check_up
+            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