Commit 8e983d33 authored by Yorick Peterse's avatar Yorick Peterse

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

See merge request !2252
parents 7945cf41 c936e4e3
...@@ -19,11 +19,8 @@ module Gitlab ...@@ -19,11 +19,8 @@ module Gitlab
{ {
series: @series, series: @series,
tags: @tags.merge( tags: @tags.merge(
hostname: Metrics.hostname, hostname: Metrics.hostname,
ruby_engine: RUBY_ENGINE, process_type: Sidekiq.server? ? 'sidekiq' : 'rails'
ruby_version: RUBY_VERSION,
gitlab_version: Gitlab::VERSION,
process_type: Sidekiq.server? ? 'sidekiq' : 'rails'
), ),
values: @values, values: @values,
timestamp: @created_at.to_i * 1_000_000_000 timestamp: @created_at.to_i * 1_000_000_000
......
...@@ -39,9 +39,6 @@ describe Gitlab::Metrics::Metric do ...@@ -39,9 +39,6 @@ describe Gitlab::Metrics::Metric do
expect(hash[:tags]).to be_an_instance_of(Hash) expect(hash[:tags]).to be_an_instance_of(Hash)
expect(hash[:tags][:hostname]).to be_an_instance_of(String) 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) expect(hash[:tags][:process_type]).to be_an_instance_of(String)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment