Add prometheusListenAddr config setting for gitlab-workhorse

files/gitlab-config-template/gitlab.rb.template

@@ -398,6 +398,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_workhorse['auth_backend'] = "http://localhost:8080"
 # gitlab_workhorse['auth_socket'] = "''" # the empty string is the default in gitlab-workhorse option parser
 # gitlab_workhorse['pprof_listen_addr'] = "''" # put an empty string on the command line
+# gitlab_workhorse['prometheus_listen_addr'] = "''" # default is empty string
 # gitlab_workhorse['dir'] = "/var/opt/gitlab/gitlab-workhorse"
 # gitlab_workhorse['log_directory'] = "/var/log/gitlab/gitlab-workhorse"
 # gitlab_workhorse['proxy_headers_timeout'] = "1m0s"

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -460,6 +460,7 @@ default['gitlab']['gitlab-workhorse']['listen_addr'] = "/var/opt/gitlab/gitlab-w
 default['gitlab']['gitlab-workhorse']['auth_backend'] = "http://localhost:8080"
 default['gitlab']['gitlab-workhorse']['auth_socket'] = "''" # the empty string is the default in gitlab-workhorse option parser
 default['gitlab']['gitlab-workhorse']['pprof_listen_addr'] = "''" # put an empty string on the command line
+default['gitlab']['gitlab-workhorse']['prometheus_listen_addr'] = nil # default value is nil
 default['gitlab']['gitlab-workhorse']['dir'] = "/var/opt/gitlab/gitlab-workhorse"
 default['gitlab']['gitlab-workhorse']['log_directory'] = "/var/log/gitlab/gitlab-workhorse"
 default['gitlab']['gitlab-workhorse']['proxy_headers_timeout'] = nil

files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-workhorse-run.erb

@@ -31,6 +31,9 @@ exec chpst -e /opt/gitlab/etc/gitlab-workhorse/env -P \
     <% if node['gitlab']['gitlab-workhorse']['api_queue_limit'] %>
     -apiQueueLimit <%= node['gitlab']['gitlab-workhorse']['api_queue_limit'] %> \
     <% end %>
+    <% if node['gitlab']['gitlab-workhorse']['prometheus_listen_addr'] %>
+    -prometheusListenAddr <%= node['gitlab']['gitlab-workhorse']['prometheus_listen_addr'] %> \
+    <% end %>
     -secretPath /opt/gitlab/embedded/service/gitlab-rails/.gitlab_workhorse_secret \
 
 # Do not remove this line; it prevents trouble with the trailing backslashes above.