Merge branch 'sh-support-google-cloud-memorystore' into 'master'

Add support for Google Cloud Memorystore

See merge request gitlab-org/gitlab-monitor!85

config/gitlab-monitor.yml.example

@@ -78,6 +78,7 @@ probes:
       - probe_dead
     opts:
       redis_url: "redis://localhost:6379"
+      redis_enable_client: true
 
   metrics:
     multiple: true

lib/gitlab_monitor/sidekiq.rb

@@ -15,12 +15,7 @@ module GitLab
         @metrics = metrics
 
         Sidekiq.configure_client do |config|
-          config.redis = {
-            url: opts[:redis_url],
-            namespace: "resque:gitlab",
-            connect_timeout: 1,
-            reconnect_attempts: 0
-          }
+          config.redis = redis_options
         end
 
         ensure_queue_job_stats_script_loaded
@@ -110,6 +105,24 @@ module GitLab
 
       private
 
+      def redis_options
+        options = {
+          url: @opts[:redis_url],
+          namespace: "resque:gitlab",
+          connect_timeout: 1,
+          reconnect_attempts: 0
+        }
+
+        options[:id] = nil unless redis_enable_client?
+        options
+      end
+
+      def redis_enable_client?
+        return true if @opts[:redis_enable_client].nil?
+
+        @opts[:redis_enable_client]
+      end
+
       def connected?
         @connected ||= begin
                          Sidekiq.redis do |conn|