Usage ping port
What does this MR do?
Port the usage ping from EE to CE. To do this, I manually applied the main MRs, and cherry-picked commits where possible.
Are there points in the code the reviewer needs to double check?
Did I miss anything? I did git diff --name-only master | xargs -I _ git diff _ ../../gdk-ee/gitlab/_ to manually inspect the results, and I'll comment below if things need to change in EE.
Why was this MR needed?
So that we can get more data to make a better product.
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated - Tests
-
Added for this feature/bug -
All builds are passing
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Branch has no merge conflicts with master(if it does - rebase it please) -
Squashed related commits together
What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/27750.
Merge request reports
Activity
assigned to @smcgivern
added 458 commits
-
92dd0dda...15e87cea - 445 commits from branch
master - 3aa73503 - Port 'Add EE usage ping' to CE
- c090d43b - Port 'Add more usage data to EE ping' to CE
- 402977fb - Remove pushes count from usage ping payload
- f92ae885 - Add documentation on Usage statistics and link from the admin area
- ae2a1aff - Track Mattermost usage
- 0e3dc677 - Port 'Add uuid to usage ping' to CE
- 25f7f631 - Cache the last usage data to avoid unicorn timeouts
- db66240c - Used named parameter for refreshing usage data
- 7067a66d - Add Upload count to usage data
- acfe79e5 - Add changelog for usage ping in CE
- 41f62d4d - Fix usage ping worker queue
- 4258de47 - Add edition to usage ping
- 98b121d2 - Add prometheus services to usage ping
Toggle commit list-
92dd0dda...15e87cea - 445 commits from branch
added 2 commits
added 376 commits
-
cc16e99c...069c54a7 - 355 commits from branch
master - ab0317b7 - Port 'Add EE usage ping' to CE
- cce7014f - Port 'Add more usage data to EE ping' to CE
- cecfa74a - Remove pushes count from usage ping payload
- 9c24804b - Add documentation on Usage statistics and link from the admin area
- 89809b71 - Track Mattermost usage
- 95104d5c - Port 'Add uuid to usage ping' to CE
- c7e6857d - Cache the last usage data to avoid unicorn timeouts
- c0c53ece - Used named parameter for refreshing usage data
- d5a33676 - Add Upload count to usage data
- ec65acff - Add changelog for usage ping in CE
- 81efeac5 - Fix usage ping worker queue
- 2abc48d7 - Add edition to usage ping
- bdc76ad9 - Add prometheus services to usage ping
- 04a8fafc - Add user activity service and spec. Also added relevant - NOT offline - migration
- 08b2c853 - Remove user activities table and use redis instead of PG for recording activities
- 6dfe1d42 - Port 'Add user activities API' to CE
- 02243bef - Add a new Gitlab::UserActivities class to track user activities
- d74cef1b - Add new ScheduleUpdateUserActivityWorker and UpdateUserActivityWorker
-
45e57428 - Expose
last_activity_onin the User API - 72375dae - Add a post-deploy migration to migrate from former Redis activity to DB
- 221d8d9c - Port 'Add user cohorts table to admin area' to CE
Toggle commit list-
cc16e99c...069c54a7 - 355 commits from branch
@rymai would you be able to review this, please? My intention was to preserve history as much as possible (balanced with my sanity), and port the following things to CE:
- The usage ping.
- The user activities tracking.
- The user cohorts table.
assigned to @rymai
@smcgivern Massive work, congrats! I had a few remarks.
assigned to @smcgivern
added 18 commits
- 02189023 - Add user cohorts table to admin area
- 42ac49f2 - Add user cohorts and usage ping documentation
- 4cc6d05f - Make UserCohortsService more understandable
- 9d3e387c - Cache user cohorts results for a day
- 00b116e5 - Fix usage ping doc location
- a9786b7a - Fix column name in user cohorts
- 3dee83de - Rename user cohorts -> cohorts
- 8cf9d901 - Fix documentation links from cohorts
- 8bf20e94 - Move documentation as per Axil comment
- 31f8a388 - Use serializer for formatting cohorts data
- 8b106213 - Remove redundant sentence from cohorts disabled
- e450bfe0 - Tidy up usage ping and cohorts docs
- 297e883c - Add missing links in the documentation
- 52fa5839 - Use last_activity_on in cohorts
- 2929f815 - Fix doc links
- 2531d646 - Remove unused user activities code
-
7d61f4be - Don't use
sendin settings initializer - 6315e179 - Make downtime_check happy
Toggle commit list@rymai fixed my terrible git skills, let's see what fails this time
assigned to @rymai
@smcgivern LGTM otherwise!
added 77 commits
-
7a035832...0b35dd07 - 76 commits from branch
master - bcf81bcb - Merge remote-tracking branch 'origin/master' into usage-ping-port
-
7a035832...0b35dd07 - 76 commits from branch
@rymai I'm sure I'm doing something dumb, but I don't understand failures like https://gitlab.com/gitlab-org/gitlab-ce/builds/14238062. I didn't touch that in here?
@smcgivern https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10481/diffs#4ed0c03b53dbc8320da88e7887465514cd9e90a4_952_952 makes methods private that shouldn't be!
added 2 commits
added 133 commits
-
ff1afbf3...c3bb21ff - 91 commits from branch
master - ebd5e9b4 - Port 'Add EE usage ping' to CE
- 0483019e - Port 'Add more usage data to EE ping' to CE
- f41b693f - Remove pushes count from usage ping payload
- a19dd9ad - Add documentation on Usage statistics and link from the admin area
- f5b42881 - Track Mattermost usage
- c53afeda - Port 'Add uuid to usage ping' to CE
- bca36899 - Cache the last usage data to avoid unicorn timeouts
- f30a46b4 - Used named parameter for refreshing usage data
- e21ed5fe - Add Upload count to usage data
- 945bf66d - Add changelog for usage ping in CE
- 856dcd18 - Fix usage ping worker queue
- 092258e9 - Add edition to usage ping
- b61199ce - Add prometheus services to usage ping
- 2951a854 - Add user activity service and spec. Also added relevant - NOT offline - migration
- 3cb84e06 - Remove user activities table and use redis instead of PG for recording activities
- 91ac0e03 - Port 'Add user activities API' to CE
- cfe19b79 - Add a new Gitlab::UserActivities class to track user activities
- d4da926f - Add new ScheduleUpdateUserActivityWorker and UpdateUserActivityWorker
-
81421262 - Expose
last_activity_onin the User API - 73c57fd3 - Add a post-deploy migration to migrate from former Redis activity to DB
- 81022d76 - Add user cohorts table to admin area
- 44f3fc49 - Add user cohorts and usage ping documentation
- cc677c8f - Make UserCohortsService more understandable
- af8a3e35 - Cache user cohorts results for a day
- a4a8f0db - Fix usage ping doc location
- 0d7645e1 - Fix column name in user cohorts
- 5b698082 - Rename user cohorts -> cohorts
- 9fa00d69 - Fix documentation links from cohorts
- 61eaf4fe - Move documentation as per Axil comment
- ac0146a0 - Use serializer for formatting cohorts data
- 44c6ef61 - Remove redundant sentence from cohorts disabled
- 800baa42 - Tidy up usage ping and cohorts docs
- a67b6b38 - Add missing links in the documentation
- f17f6040 - Use last_activity_on in cohorts
- 00e9568e - Fix doc links
- 380e40fe - Remove unused user activities code
-
fce5738e - Don't use
sendin settings initializer - a4e2a84f - Make downtime_check happy
- 73a8caf1 - Fix method visibility
- b5d9d9e8 - Remove Geo references
- 4b1e25fa - Fix git HTTP spec
-
41b71efd - Fix
last_activity_attolast_activity_on
Toggle commit list-
ff1afbf3...c3bb21ff - 91 commits from branch
assigned to @smcgivern
added 2 commits
mentioned in issue #27750 (closed)
@rspeicher Rémy is off, so could you review please? It's finally green
assigned to @rspeicher
mentioned in issue gitlab-com/www-gitlab-com#1301 (closed)
assigned to @smcgivern
added 2 commits
@rspeicher fixed! If you're happy, I'll update the EE MR and merge tomorrow. Thanks for opening https://gitlab.com/gitlab-com/www-gitlab-com/issues/1301
assigned to @rspeicher
@smcgivern Thanks, LGTM!
assigned to @smcgivern
mentioned in commit 40a97205
mentioned in merge request !10809 (merged)
mentioned in commit b9fff815
