Changed sample interval and renamed active_workersjprovazn-puma-metrics

5 files changed, 8 insertions, 8 deletions

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 2a3aae6cedd..c83f569d885 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -753,7 +753,7 @@ production: &base
     # Time between sampling of unicorn socket metrics, in seconds
     # unicorn_sampler_interval: 10
     # Time between sampling of Puma metrics, in seconds
-    # puma_sampler_interval: 10
+    # puma_sampler_interval: 5
     # IP whitelist to access monitoring endpoints
     ip_whitelist:
       - 127.0.0.0/8
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index ace4e1e21cb..0c8d94ccaed 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -491,7 +491,7 @@ Settings.webpack.dev_server['port']    ||= 3808
 Settings['monitoring'] ||= Settingslogic.new({})
 Settings.monitoring['ip_whitelist'] ||= ['127.0.0.1/8']
 Settings.monitoring['unicorn_sampler_interval'] ||= 10
-Settings.monitoring['puma_sampler_interval'] ||= 10
+Settings.monitoring['puma_sampler_interval'] ||= 5
 Settings.monitoring['ruby_sampler_interval'] ||= 60
 Settings.monitoring['sidekiq_exporter'] ||= Settingslogic.new({})
 Settings.monitoring.sidekiq_exporter['enabled'] ||= false
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index 5bb8db08070..9c75403dd4c 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -110,7 +110,7 @@ When Puma is used instead of Unicorn, following metrics are available:
 | Metric                                       | Type    | Since | Description |
 |:-------------------------------------------- |:------- |:----- |:----------- |
 | puma_workers                                 | Gauge   | 12.0 | Total number of workers |
-| puma_active_workers                          | Gauge   | 12.0 | Number of booted workers |
+| puma_running_workers                         | Gauge   | 12.0 | Number of booted workers |
 | puma_stale_workers                           | Gauge   | 12.0 | Number of old workers |
 | puma_phase                                   | Gauge   | 12.0 | Phase number (increased during phased restarts) |
 | puma_running                                 | Gauge   | 12.0 | Number of running threads |
diff --git a/lib/gitlab/metrics/samplers/puma_sampler.rb b/lib/gitlab/metrics/samplers/puma_sampler.rb
index 025f480e9ce..87669b253bc 100644
--- a/lib/gitlab/metrics/samplers/puma_sampler.rb
+++ b/lib/gitlab/metrics/samplers/puma_sampler.rb
@@ -13,7 +13,7 @@ module Gitlab
         def init_metrics
           {
             puma_workers:            ::Gitlab::Metrics.gauge(:puma_workers, 'Total number of workers'),
-            puma_active_workers:     ::Gitlab::Metrics.gauge(:puma_active_workers, 'Number of active workers'),
+            puma_running_workers:    ::Gitlab::Metrics.gauge(:puma_running_workers, 'Number of active workers'),
             puma_stale_workers:      ::Gitlab::Metrics.gauge(:puma_stale_workers, 'Number of stale workers'),
             puma_phase:              ::Gitlab::Metrics.gauge(:puma_phase, 'Phase number (increased during phased restarts)'),
             puma_running:            ::Gitlab::Metrics.gauge(:puma_running, 'Number of running threads'),
@@ -60,7 +60,7 @@ module Gitlab
 
         def sample_single_worker(stats)
           metrics[:puma_workers].set({}, 1)
-          metrics[:puma_active_workers].set({}, 1)
+          metrics[:puma_running_workers].set({}, 1)
 
           set_worker_metrics(stats)
         end
@@ -73,7 +73,7 @@ module Gitlab
           labels = { worker: "master" }
 
           metrics[:puma_workers].set(labels, stats['workers'])
-          metrics[:puma_active_workers].set(labels, stats['booted_workers'])
+          metrics[:puma_running_workers].set(labels, stats['booted_workers'])
           metrics[:puma_stale_workers].set(labels, stats['old_workers'])
           metrics[:puma_phase].set(labels, stats['phase'])
         end
diff --git a/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb
index 930b1461b0d..c471c30a194 100644
--- a/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb
@@ -44,7 +44,7 @@ describe Gitlab::Metrics::Samplers::PumaSampler do
         labels = { worker: 'master' }
 
         expect(subject.metrics[:puma_workers]).to receive(:set).with(labels, 2)
-        expect(subject.metrics[:puma_active_workers]).to receive(:set).with(labels, 2)
+        expect(subject.metrics[:puma_running_workers]).to receive(:set).with(labels, 2)
         expect(subject.metrics[:puma_stale_workers]).to receive(:set).with(labels, 0)
         expect(subject.metrics[:puma_phase]).to receive(:set).once.with(labels, 2)
         expect(subject.metrics[:puma_phase]).to receive(:set).once.with({ worker: 'worker_0' }, 1)
@@ -77,7 +77,7 @@ describe Gitlab::Metrics::Samplers::PumaSampler do
         labels = {}
 
         expect(subject.metrics[:puma_workers]).to receive(:set).with(labels, 1)
-        expect(subject.metrics[:puma_active_workers]).to receive(:set).with(labels, 1)
+        expect(subject.metrics[:puma_running_workers]).to receive(:set).with(labels, 1)
         expect_worker_stats(labels)
 
         subject.sample