Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
859d5dab
Commit
859d5dab
authored
Jul 14, 2020
by
Matthias Kaeppler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include container registry in topology pings
We forgot to map this, so registry nodes aren't currently reported.
parent
362fa7b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
lib/gitlab/usage_data/topology.rb
lib/gitlab/usage_data/topology.rb
+2
-1
spec/lib/gitlab/usage_data/topology_spec.rb
spec/lib/gitlab/usage_data/topology_spec.rb
+12
-0
No files found.
lib/gitlab/usage_data/topology.rb
View file @
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
...
...
spec/lib/gitlab/usage_data/topology_spec.rb
View file @
859d5dab
...
@@ -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
}
}
]
]
},
},
...
@@ -356,6 +364,10 @@ RSpec.describe Gitlab::UsageData::Topology do
...
@@ -356,6 +364,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'
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment