Commit bcce1723 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Merge branch '218546-topology-registry-nodes' into 'master'

Include container registry in topology pings

See merge request gitlab-org/gitlab!36797
parents f787caa5 859d5dab
...@@ -13,7 +13,8 @@ module Gitlab ...@@ -13,7 +13,8 @@ module Gitlab
'postgres' => 'postgres', 'postgres' => 'postgres',
'gitaly' => 'gitaly', 'gitaly' => 'gitaly',
'prometheus' => 'prometheus', 'prometheus' => 'prometheus',
'node' => 'node-exporter' 'node' => 'node-exporter',
'registry' => 'registry'
}.freeze }.freeze
CollectionFailure = Struct.new(:query, :error) do CollectionFailure = Struct.new(:query, :error) do
......
...@@ -82,6 +82,10 @@ RSpec.describe Gitlab::UsageData::Topology do ...@@ -82,6 +82,10 @@ RSpec.describe Gitlab::UsageData::Topology do
process_count: 1, process_count: 1,
process_memory_rss: 402 process_memory_rss: 402
}, },
{
name: 'registry',
process_count: 1
},
{ {
name: 'web', name: 'web',
server: 'unicorn' server: 'unicorn'
...@@ -133,6 +137,10 @@ RSpec.describe Gitlab::UsageData::Topology do ...@@ -133,6 +137,10 @@ RSpec.describe Gitlab::UsageData::Topology do
{ {
name: 'redis', name: 'redis',
process_count: 1 process_count: 1
},
{
name: 'registry',
process_count: 1
} }
] ]
}, },
...@@ -523,6 +531,10 @@ RSpec.describe Gitlab::UsageData::Topology do ...@@ -523,6 +531,10 @@ RSpec.describe Gitlab::UsageData::Topology do
'metric' => { 'instance' => 'instance2:9121', 'job' => 'redis' }, 'metric' => { 'instance' => 'instance2:9121', 'job' => 'redis' },
'value' => [1000, '1'] 'value' => [1000, '1']
}, },
{
'metric' => { 'instance' => 'instance2:8080', 'job' => 'registry' },
'value' => [1000, '1']
},
# unknown service => should be stripped out # unknown service => should be stripped out
{ {
'metric' => { 'instance' => 'instance2:9000', 'job' => 'not-a-gitlab-service' }, 'metric' => { 'instance' => 'instance2:9000', 'job' => 'not-a-gitlab-service' },
......
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