Merge branch 'sc1-enable-gitlab-exporter-sk-probe-dual-namespace' into 'master'

Enable dual namespace polling for sidekiq probe in gitlab-exporter

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

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Andrew Patterson <[email protected]>
Reviewed-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Sylvester Chin <[email protected]>

Author: balasankarc

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

@@ -56,6 +56,8 @@ 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,7 +58,10 @@
           expect(settings.dig('server', 'name')).to eq('webrick')
           expect(settings.dig('probes', 'database')).not_to be_nil
           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/)