From 26b7ec2c6a7ffb01850dbecb0930b4f9412fe0f2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Dec 2021 15:13:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- metrics_server/metrics_server.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'metrics_server/metrics_server.rb') diff --git a/metrics_server/metrics_server.rb b/metrics_server/metrics_server.rb index 09171d8220b..9dc3ba91536 100644 --- a/metrics_server/metrics_server.rb +++ b/metrics_server/metrics_server.rb @@ -1,16 +1,17 @@ # frozen_string_literal: true -require_relative '../config/bundler_setup' +require_relative '../config/boot' require_relative 'dependencies' class MetricsServer # rubocop:disable Gitlab/NamespacedClass class << self - def spawn(target, gitlab_config: nil) + def spawn(target, gitlab_config: nil, wipe_metrics_dir: false) cmd = "#{Rails.root}/bin/metrics-server" env = { 'METRICS_SERVER_TARGET' => target, - 'GITLAB_CONFIG' => gitlab_config + 'GITLAB_CONFIG' => gitlab_config, + 'WIPE_METRICS_DIR' => wipe_metrics_dir.to_s } Process.spawn(env, cmd, err: $stderr, out: $stdout).tap do |pid| @@ -19,9 +20,10 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass end end - def initialize(target, metrics_dir) + def initialize(target, metrics_dir, wipe_metrics_dir) @target = target @metrics_dir = metrics_dir + @wipe_metrics_dir = wipe_metrics_dir end def start @@ -30,7 +32,7 @@ class MetricsServer # rubocop:disable Gitlab/NamespacedClass end FileUtils.mkdir_p(@metrics_dir, mode: 0700) - ::Prometheus::CleanupMultiprocDirService.new.execute + ::Prometheus::CleanupMultiprocDirService.new.execute if @wipe_metrics_dir settings = Settings.monitoring.sidekiq_exporter exporter_class = "Gitlab::Metrics::Exporter::#{@target.camelize}Exporter".constantize -- cgit v1.2.3