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

Include container registry in topology pings

See merge request gitlab-org/gitlab!36797

lib/gitlab/usage_data/topology.rb

@@ -13,7 +13,8 @@ module Gitlab
         'postgres' => 'postgres',
         'gitaly' => 'gitaly',
         'prometheus' => 'prometheus',
-        'node' => 'node-exporter'
+        'node' => 'node-exporter',
+        'registry' => 'registry'
       }.freeze
 
       CollectionFailure = Struct.new(:query, :error) do

spec/lib/gitlab/usage_data/topology_spec.rb

@@ -82,6 +82,10 @@ RSpec.describe Gitlab::UsageData::Topology do
                     process_count: 1,
                     process_memory_rss: 402
                   },
+                  {
+                    name: 'registry',
+                    process_count: 1
+                  },
                   {
                     name: 'web',
                     server: 'unicorn'
@@ -133,6 +137,10 @@ RSpec.describe Gitlab::UsageData::Topology do
                   {
                     name: 'redis',
                     process_count: 1
+                  },
+                  {
+                    name: 'registry',
+                    process_count: 1
                   }
                 ]
               },
@@ -523,6 +531,10 @@ RSpec.describe Gitlab::UsageData::Topology do
           'metric' => { 'instance' => 'instance2:9121', 'job' => 'redis' },
           'value' => [1000, '1']
         },
+        {
+          'metric' => { 'instance' => 'instance2:8080', 'job' => 'registry' },
+          'value' => [1000, '1']
+        },
         # unknown service => should be stripped out
         {
           'metric' => { 'instance' => 'instance2:9000', 'job' => 'not-a-gitlab-service' },