diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 18:09:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 18:09:43 +0300 |
| commit | 15714832c817685512f2ea1f2d91a94cb1cf67b9 (patch) | |
| tree | e49977a709bba2a83cd30b92ea5578e1a99ba9ca /db | |
| parent | 213bd7e9d3d071e88f342511bdc48905b9d7e39c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/development/29_usage_trends.rb (renamed from db/fixtures/development/29_instance_statistics.rb) | 2 | ||||
| -rw-r--r-- | db/post_migrate/20210215144909_migrate_usage_trends_sidekiq_queue.rb | 19 | ||||
| -rw-r--r-- | db/schema_migrations/20210215144909 | 1 |
3 files changed, 21 insertions, 1 deletions
diff --git a/db/fixtures/development/29_instance_statistics.rb b/db/fixtures/development/29_usage_trends.rb index 02afdc61339..88f2ff210dd 100644 --- a/db/fixtures/development/29_instance_statistics.rb +++ b/db/fixtures/development/29_usage_trends.rb @@ -7,7 +7,7 @@ Gitlab::Seeder.quiet do max_increase = 10000 max_decrease = 1000 - model_class = Analytics::InstanceStatistics::Measurement + model_class = Analytics::UsageTrends::Measurement measurements = model_class.identifiers.flat_map do |_, id| recorded_at = 60.days.ago diff --git a/db/post_migrate/20210215144909_migrate_usage_trends_sidekiq_queue.rb b/db/post_migrate/20210215144909_migrate_usage_trends_sidekiq_queue.rb new file mode 100644 index 00000000000..3e6eabfba97 --- /dev/null +++ b/db/post_migrate/20210215144909_migrate_usage_trends_sidekiq_queue.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class MigrateUsageTrendsSidekiqQueue < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + sidekiq_queue_migrate 'cronjob:analytics_instance_statistics_count_job_trigger', to: 'cronjob:analytics_usage_trends_count_job_trigger' + sidekiq_queue_migrate 'analytics_instance_statistics_counter_job', to: 'analytics_usage_trends_counter_job' + end + + def down + sidekiq_queue_migrate 'cronjob:analytics_usage_trends_count_job_trigger', to: 'cronjob:analytics_instance_statistics_count_job_trigger' + sidekiq_queue_migrate 'analytics_usage_trends_counter_job', to: 'analytics_instance_statistics_counter_job' + end +end diff --git a/db/schema_migrations/20210215144909 b/db/schema_migrations/20210215144909 new file mode 100644 index 00000000000..02939e3dba5 --- /dev/null +++ b/db/schema_migrations/20210215144909 @@ -0,0 +1 @@ +2965d990ec9cf2edd610b063686f9a1d9de4c38bcba3c8439a18159812d529d4
\ No newline at end of file |