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
51a70d9f
Commit
51a70d9f
authored
Aug 06, 2021
by
Vladimir Shushlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move feature flags service ping metric to CE
We moved feature flags to CE, but forgot move this metric
parent
66b297c8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
5 deletions
+4
-5
ee/lib/ee/gitlab/usage_data.rb
ee/lib/ee/gitlab/usage_data.rb
+0
-1
ee/spec/lib/ee/gitlab/usage_data_spec.rb
ee/spec/lib/ee/gitlab/usage_data_spec.rb
+0
-4
lib/gitlab/usage_data.rb
lib/gitlab/usage_data.rb
+1
-0
spec/factories/usage_data.rb
spec/factories/usage_data.rb
+2
-0
spec/lib/gitlab/usage_data_spec.rb
spec/lib/gitlab/usage_data_spec.rb
+1
-0
No files found.
ee/lib/ee/gitlab/usage_data.rb
View file @
51a70d9f
...
@@ -194,7 +194,6 @@ module EE
...
@@ -194,7 +194,6 @@ module EE
dependency_list_usages_total:
redis_usage_data
{
::
Gitlab
::
UsageCounters
::
DependencyList
.
usage_totals
[
:total
]
},
dependency_list_usages_total:
redis_usage_data
{
::
Gitlab
::
UsageCounters
::
DependencyList
.
usage_totals
[
:total
]
},
epics:
count
(
::
Epic
),
epics:
count
(
::
Epic
),
epic_issues:
count
(
::
EpicIssue
),
epic_issues:
count
(
::
EpicIssue
),
feature_flags:
count
(
Operations
::
FeatureFlag
),
geo_nodes:
count
(
::
GeoNode
),
geo_nodes:
count
(
::
GeoNode
),
geo_event_log_max_id:
alt_usage_data
{
maximum_id
(
Geo
::
EventLog
)
||
0
},
geo_event_log_max_id:
alt_usage_data
{
maximum_id
(
Geo
::
EventLog
)
||
0
},
ldap_group_links:
count
(
::
LdapGroupLink
),
ldap_group_links:
count
(
::
LdapGroupLink
),
...
...
ee/spec/lib/ee/gitlab/usage_data_spec.rb
View file @
51a70d9f
...
@@ -39,8 +39,6 @@ RSpec.describe Gitlab::UsageData do
...
@@ -39,8 +39,6 @@ RSpec.describe Gitlab::UsageData do
create
(
:jira_integration
,
project:
projects
[
0
],
issues_enabled:
true
,
project_key:
'GL'
)
create
(
:jira_integration
,
project:
projects
[
0
],
issues_enabled:
true
,
project_key:
'GL'
)
create
(
:operations_feature_flag
,
project:
projects
[
0
])
create
(
:issue
,
project:
projects
[
1
])
create
(
:issue
,
project:
projects
[
1
])
create
(
:issue
,
health_status: :on_track
,
project:
projects
[
1
])
create
(
:issue
,
health_status: :on_track
,
project:
projects
[
1
])
create
(
:issue
,
health_status: :at_risk
,
project:
projects
[
1
])
create
(
:issue
,
health_status: :at_risk
,
project:
projects
[
1
])
...
@@ -97,7 +95,6 @@ RSpec.describe Gitlab::UsageData do
...
@@ -97,7 +95,6 @@ RSpec.describe Gitlab::UsageData do
epics
epics
epics_deepest_relationship_level
epics_deepest_relationship_level
epic_issues
epic_issues
feature_flags
geo_nodes
geo_nodes
geo_event_log_max_id
geo_event_log_max_id
issues_with_health_status
issues_with_health_status
...
@@ -124,7 +121,6 @@ RSpec.describe Gitlab::UsageData do
...
@@ -124,7 +121,6 @@ RSpec.describe Gitlab::UsageData do
network_policy_drops
network_policy_drops
)
)
)
)
expect
(
count_data
[
:feature_flags
]).
to
eq
(
1
)
expect
(
count_data
[
:status_page_projects
]).
to
eq
(
1
)
expect
(
count_data
[
:status_page_projects
]).
to
eq
(
1
)
expect
(
count_data
[
:status_page_issues
]).
to
eq
(
1
)
expect
(
count_data
[
:status_page_issues
]).
to
eq
(
1
)
expect
(
count_data
[
:issues_with_health_status
]).
to
eq
(
2
)
expect
(
count_data
[
:issues_with_health_status
]).
to
eq
(
2
)
...
...
lib/gitlab/usage_data.rb
View file @
51a70d9f
...
@@ -108,6 +108,7 @@ module Gitlab
...
@@ -108,6 +108,7 @@ module Gitlab
deployments:
deployment_count
(
Deployment
),
deployments:
deployment_count
(
Deployment
),
successful_deployments:
deployment_count
(
Deployment
.
success
),
successful_deployments:
deployment_count
(
Deployment
.
success
),
failed_deployments:
deployment_count
(
Deployment
.
failed
),
failed_deployments:
deployment_count
(
Deployment
.
failed
),
feature_flags:
count
(
Operations
::
FeatureFlag
),
# rubocop: enable UsageData/LargeTable:
# rubocop: enable UsageData/LargeTable:
environments:
count
(
::
Environment
),
environments:
count
(
::
Environment
),
clusters:
count
(
::
Clusters
::
Cluster
),
clusters:
count
(
::
Clusters
::
Cluster
),
...
...
spec/factories/usage_data.rb
View file @
51a70d9f
...
@@ -123,6 +123,8 @@ FactoryBot.define do
...
@@ -123,6 +123,8 @@ FactoryBot.define do
create_list
(
:project_snippet
,
2
,
project:
projects
[
0
],
created_at:
n
.
days
.
ago
)
create_list
(
:project_snippet
,
2
,
project:
projects
[
0
],
created_at:
n
.
days
.
ago
)
create
(
:personal_snippet
,
created_at:
n
.
days
.
ago
)
create
(
:personal_snippet
,
created_at:
n
.
days
.
ago
)
end
end
create
(
:operations_feature_flag
,
project:
projects
[
0
])
end
end
end
end
end
end
spec/lib/gitlab/usage_data_spec.rb
View file @
51a70d9f
...
@@ -622,6 +622,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
...
@@ -622,6 +622,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
expect
(
count_data
[
:deployments
]).
to
eq
(
4
)
expect
(
count_data
[
:deployments
]).
to
eq
(
4
)
expect
(
count_data
[
:successful_deployments
]).
to
eq
(
2
)
expect
(
count_data
[
:successful_deployments
]).
to
eq
(
2
)
expect
(
count_data
[
:failed_deployments
]).
to
eq
(
2
)
expect
(
count_data
[
:failed_deployments
]).
to
eq
(
2
)
expect
(
count_data
[
:feature_flags
]).
to
eq
(
1
)
expect
(
count_data
[
:snippets
]).
to
eq
(
6
)
expect
(
count_data
[
:snippets
]).
to
eq
(
6
)
expect
(
count_data
[
:personal_snippets
]).
to
eq
(
2
)
expect
(
count_data
[
:personal_snippets
]).
to
eq
(
2
)
expect
(
count_data
[
:project_snippets
]).
to
eq
(
4
)
expect
(
count_data
[
:project_snippets
]).
to
eq
(
4
)
...
...
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