Skip to content
Snippets Groups Projects
Commit 25c08cd4 authored by Patrick Bajao's avatar Patrick Bajao :one:
Browse files

Move merge_requests_users under counts section

This is so it can show up on versions.gitlab.com. It also makes
sense to be added under that section since it's a count.
parent c6158f0a
No related branches found
No related tags found
1 merge request!34492Move merge_requests_users under counts section
...@@ -429,6 +429,7 @@ On GitLab.com, we have DangerBot setup to monitor Telemetry related files and Da ...@@ -429,6 +429,7 @@ On GitLab.com, we have DangerBot setup to monitor Telemetry related files and Da
| `projects_jira_dvcs_server_active` | `counts` | | | | | `projects_jira_dvcs_server_active` | `counts` | | | |
| `labels` | `counts` | | | | | `labels` | `counts` | | | |
| `merge_requests` | `counts` | | | | | `merge_requests` | `counts` | | | |
| `merge_requests_users` | `counts` | | | |
| `notes` | `counts` | | | | | `notes` | `counts` | | | |
| `wiki_pages_create` | `counts` | | | | | `wiki_pages_create` | `counts` | | | |
| `wiki_pages_update` | `counts` | | | | | `wiki_pages_update` | `counts` | | | |
......
...@@ -37,7 +37,6 @@ def uncached_data ...@@ -37,7 +37,6 @@ def uncached_data
.merge(object_store_usage_data) .merge(object_store_usage_data)
.merge(topology_usage_data) .merge(topology_usage_data)
.merge(recording_ce_finish_data) .merge(recording_ce_finish_data)
.merge(merge_requests_usage_data(default_time_period))
end end
def to_json(force_refresh: false) def to_json(force_refresh: false)
...@@ -162,7 +161,8 @@ def system_usage_data ...@@ -162,7 +161,8 @@ def system_usage_data
usage_counters, usage_counters,
user_preferences_usage, user_preferences_usage,
ingress_modsecurity_usage, ingress_modsecurity_usage,
container_expiration_policies_usage container_expiration_policies_usage,
merge_requests_usage(default_time_period)
) )
} }
end end
...@@ -400,7 +400,7 @@ def user_preferences_usage ...@@ -400,7 +400,7 @@ def user_preferences_usage
end end
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def merge_requests_usage_data(time_period) def merge_requests_usage(time_period)
query = query =
Event Event
.where(target_type: Event::TARGET_TYPES[:merge_request].to_s) .where(target_type: Event::TARGET_TYPES[:merge_request].to_s)
......
...@@ -580,7 +580,7 @@ def stub_runtime(runtime) ...@@ -580,7 +580,7 @@ def stub_runtime(runtime)
end end
end end
describe '#merge_requests_usage_data' do describe '#merge_requests_usage' do
let(:time_period) { { created_at: 2.days.ago..Time.current } } let(:time_period) { { created_at: 2.days.ago..Time.current } }
let(:merge_request) { create(:merge_request) } let(:merge_request) { create(:merge_request) }
let(:other_user) { create(:user) } let(:other_user) { create(:user) }
...@@ -597,7 +597,7 @@ def stub_runtime(runtime) ...@@ -597,7 +597,7 @@ def stub_runtime(runtime)
end end
it 'returns the distinct count of users using merge requests (via events table) within the specified time period' do it 'returns the distinct count of users using merge requests (via events table) within the specified time period' do
expect(described_class.merge_requests_usage_data(time_period)).to eq( expect(described_class.merge_requests_usage(time_period)).to eq(
merge_requests_users: 2 merge_requests_users: 2
) )
end end
......
...@@ -78,6 +78,7 @@ module UsageDataHelpers ...@@ -78,6 +78,7 @@ module UsageDataHelpers
labels labels
lfs_objects lfs_objects
merge_requests merge_requests
merge_requests_users
milestone_lists milestone_lists
milestones milestones
notes notes
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment