Merge branch 'sh-mark-sensitive-smtp' into 'master'

Mark SMTP settings as sensitive

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



Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: João Alexandre Cunha <j.a.cunha@gmail.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb

@@ -363,6 +363,7 @@ templatesymlink "Create a smtp_settings.rb and create a symlink to Rails root" d
   dependent_services.each { |svc| notifies :restart, svc }
   action :delete unless node['gitlab']['gitlab_rails']['smtp_enable']
+  sensitive true
 end
 templatesymlink "Create a gitlab.yml and create a symlink to Rails root" do

files/gitlab-cookbooks/monitoring/recipes/alertmanager.rb

@@ -70,6 +70,7 @@ file 'Alertmanager config' do
   owner prometheus_user
   mode '0644'
   notifies :restart, 'runit_service[alertmanager]'
+  sensitive true
 end
 runtime_flags = PrometheusHelper.new(node).kingpin_flags('alertmanager')