Skip to content
Snippets Groups Projects
Commit 0cf48e51 authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'sh-fix-metrics-in-docker' into 'master'

Fix Prometheus metrics not working out of the box in Docker

Closes gitlab-ce#39384 and gitlab-ce#48064

See merge request gitlab-org/omnibus-gitlab!2618
parents 812c3674 49ac5f98
No related branches found
No related tags found
No related merge requests found
......@@ -12,6 +12,7 @@
- Tighten permission on Gitaly's config.toml file !2589
- Tighten permission on gitlab-shell's config.yml file !2585
- Add an option to activate verbose logging for GitLab Pages (maxmeyer)
- Fix Prometheus metrics not working out of the box in Docker
- Don't attempt to modify PostgreSQL users if database is in read-only mode
- Remove NGINX custom page for 422 errors
- Tighten permission on gitlab-monitor's gitlab-monitor.yml file !2584
......
......@@ -106,4 +106,5 @@
def parse_runtime_dir
Gitlab['runtime_dir'] ||= '/run'
run_dir = Gitlab['runtime_dir']
......@@ -109,7 +110,6 @@
run_dir = Gitlab['runtime_dir']
if Gitlab['node']['filesystem2'].nil?
Chef::Log.warn 'No filesystem2 variables in Ohai, disabling runtime_dir'
Gitlab['runtime_dir'] = nil
else
fs = Gitlab['node']['filesystem2']['by_mountpoint'][run_dir]
......@@ -111,9 +111,9 @@
if Gitlab['node']['filesystem2'].nil?
Chef::Log.warn 'No filesystem2 variables in Ohai, disabling runtime_dir'
Gitlab['runtime_dir'] = nil
else
fs = Gitlab['node']['filesystem2']['by_mountpoint'][run_dir]
if fs.nil? || fs['fs_type'] != 'tmpfs'
unless fs && %w(tmpfs overlay).include?(fs['fs_type'])
Chef::Log.warn "Runtime directory '#{run_dir}' is not a tmpfs."
Gitlab['runtime_dir'] = nil
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment