Merge branch 'sh-drop-http-version-health-check' into 'master'

Set proxy_http_version v1.0 for health monitoring endpoints

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

Merged-by: Robert Marshall <[email protected]>
Approved-by: Robert Marshall <[email protected]>
Reviewed-by: Clemens Beck <[email protected]>
Co-authored-by: Stan Hu <[email protected]>

Author: Robert Marshall

files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-health.conf.erb

@@ -15,7 +15,7 @@ location /error.json  {
 <% @monitoring_addresses.each do |address| %>
 location = <%= File.join(@path, address[:url]) %> {
   proxy_cache off;
-  proxy_http_version 1.1;
+  proxy_http_version 1.0;
   proxy_pass  http://gitlab-workhorse;
   error_page 404 500 502 /error.<%= address[:format] %>;
 }

files/gitlab-cookbooks/gitlab/templates/default/nginx-status.conf.erb

@@ -37,7 +37,7 @@ server  {
 
     location /rails-metrics {
       proxy_cache off;
-      proxy_http_version 1.1;
+      proxy_http_version 1.0;
       proxy_pass  http://gitlab-workhorse/-/metrics;
     <% @options.each do |key, value|
       if value.is_a?(String) -%>

spec/chef/cookbooks/gitlab/recipes/nginx_spec.rb

@@ -94,6 +94,13 @@
     }
   end
 
+  let(:metrics_http_conf) do
+    {
+      "gitlab-health" => "/var/opt/gitlab/nginx/conf/gitlab-health.conf",
+      "nginx-status" => "/var/opt/gitlab/nginx/conf/nginx-status.conf"
+    }
+  end
+
   before do
     allow(Gitlab).to receive(:[]).and_call_original
   end
@@ -428,6 +435,14 @@
         }
       end
     end
+
+    it 'sets proxy_http_version 1.0 when proxy_pass is used' do
+      metrics_http_conf.each_value do |conf|
+        expect(chef_run).to render_file(conf).with_content { |content|
+          expect(content).to include('proxy_http_version 1.0;') if content.include?('proxy_pass')
+        }
+      end
+    end
   end
 
   context 'when is enabled' do