Merge branch 'sc1-stop-namespace-probe' into 'master'

Stop sidekiq namespaced probe for gitlab-exporter

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7237

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Sylvester Chin <schin@gitlab.com>

Author: balasankarc

config/software/gitlab-exporter.rb

@@ -15,7 +15,7 @@
 #
 
 name 'gitlab-exporter'
-default_version '13.5.0'
+default_version '14.0.0'
 license 'MIT'
 license_file 'LICENSE'
 

files/gitlab-cookbooks/monitoring/templates/gitlab-exporter.yml.erb

@@ -56,8 +56,6 @@ probes:
     opts:
       redis_url: "<%= @redis_url %>"
       redis_enable_client: <%= @redis_enable_client %>
-      probe_non_namespaced: true
-      probe_namespaced: true
 <% end %>
 
 <% if @probe_elasticsearch && @elasticsearch_url %>

spec/chef/cookbooks/monitoring/recipes/gitlab-exporter_spec.rb

@@ -58,8 +58,6 @@
           expect(settings.dig('probes', 'ruby')).not_to be_nil
           expect(settings.dig('probes', 'sidekiq')).not_to be_nil
           expect(settings.dig('probes', 'metrics', 'rows_count')).not_to be_nil
-          expect(settings.dig('probes', 'sidekiq', 'opts', 'probe_namespaced')).to be_truthy
-          expect(settings.dig('probes', 'sidekiq', 'opts', 'probe_non_namespaced')).to be_truthy
           expect(settings['server']).not_to include('tls_enabled')
 
           expect(content).to match(/host=\/var\/opt\/gitlab\/postgresql/)