Merge branch 'reduce-influxdb-tags' into 'master'

See merge request !2252

2 files changed, 2 insertions, 8 deletions

diff --git a/lib/gitlab/metrics/metric.rb b/lib/gitlab/metrics/metric.rb
index 79241f56874..753008df99a 100644
--- a/lib/gitlab/metrics/metric.rb
+++ b/lib/gitlab/metrics/metric.rb
@@ -19,11 +19,8 @@ module Gitlab
         {
           series: @series,
           tags:   @tags.merge(
-            hostname:       Metrics.hostname,
-            ruby_engine:    RUBY_ENGINE,
-            ruby_version:   RUBY_VERSION,
-            gitlab_version: Gitlab::VERSION,
-            process_type:   Sidekiq.server? ? 'sidekiq' : 'rails'
+            hostname:     Metrics.hostname,
+            process_type: Sidekiq.server? ? 'sidekiq' : 'rails'
           ),
           values:    @values,
           timestamp: @created_at.to_i * 1_000_000_000
diff --git a/spec/lib/gitlab/metrics/metric_spec.rb b/spec/lib/gitlab/metrics/metric_spec.rb
index ec39bc9cce8..aa76315c79c 100644
--- a/spec/lib/gitlab/metrics/metric_spec.rb
+++ b/spec/lib/gitlab/metrics/metric_spec.rb
@@ -39,9 +39,6 @@ describe Gitlab::Metrics::Metric do
         expect(hash[:tags]).to be_an_instance_of(Hash)
 
         expect(hash[:tags][:hostname]).to be_an_instance_of(String)
-        expect(hash[:tags][:ruby_engine]).to be_an_instance_of(String)
-        expect(hash[:tags][:ruby_version]).to be_an_instance_of(String)
-        expect(hash[:tags][:gitlab_version]).to be_an_instance_of(String)
         expect(hash[:tags][:process_type]).to be_an_instance_of(String)
       end