diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
| commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
| tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /metrics_server | |
| parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) | |
| download | gitlab-ce-b595cb0c1dec83de5bdee18284abe86614bed33b.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'metrics_server')
| -rw-r--r-- | metrics_server/dependencies.rb | 1 | ||||
| -rw-r--r-- | metrics_server/metrics_server.rb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/metrics_server/dependencies.rb b/metrics_server/dependencies.rb index 3f188658ba2..233511eb505 100644 --- a/metrics_server/dependencies.rb +++ b/metrics_server/dependencies.rb @@ -20,6 +20,7 @@ require_relative '../lib/prometheus/cleanup_multiproc_dir_service' require_relative '../lib/gitlab/metrics/prometheus' require_relative '../lib/gitlab/metrics' require_relative '../lib/gitlab/metrics/system' +require_relative '../lib/gitlab/metrics/memory' require_relative '../lib/gitlab/metrics/samplers/base_sampler' require_relative '../lib/gitlab/metrics/samplers/ruby_sampler' require_relative '../lib/gitlab/metrics/exporter/base_exporter' diff --git a/metrics_server/metrics_server.rb b/metrics_server/metrics_server.rb index a5c448b5105..d1a64aa5b79 100644 --- a/metrics_server/metrics_server.rb +++ b/metrics_server/metrics_server.rb @@ -56,6 +56,11 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass env['GME_LOG_LEVEL'] = 'quiet' end + if settings['tls_enabled'] + env['GME_CERT_FILE'] = settings['tls_cert_path'] + env['GME_CERT_KEY'] = settings['tls_key_path'] + end + Process.spawn(env, cmd, err: $stderr, out: $stdout, pgroup: true).tap do |pid| Process.detach(pid) end |