Skip to content

G
gitlab-ce
Commit aaead3d2 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Merge branch '340847-remove-deprecated-metric-status-3' into 'master' 

Remove deprecateds Stage Manage  metrics

See merge request gitlab-org/gitlab!76701
parents 84804e8c b193734a
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 96 deletions
config/metrics/counts_28d/20210216183640_gitlab.yml
View file @ aaead3d2
--- ---
data_category: optional data_category: optional
key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab
description: DEPRECATED - Count of projects imported using bulk imports description: REMOVED - Count of projects imported using bulk imports
product_section: dev product_section: dev
product_stage: manage product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183712_total.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183714_gitlab_project.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183716_gitlab.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183718_github.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183720_bitbucket.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183722_bitbucket_server.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183724_gitea.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183726_git.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183728_manifest.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183730_jira.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183731_fogbugz.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183733_phabricator.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183735_csv.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_28d/20210216183737_groups_imported.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: 28d time_frame: 28d
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180634_gitlab.yml
View file @ aaead3d2
...@@ -8,7 +8,7 @@ product_stage: manage ...@@ -8,7 +8,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180705_total.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180707_gitlab_project.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180709_gitlab.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180711_github.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180713_bitbucket.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180715_bitbucket_server.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180716_gitea.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180718_git.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180720_manifest.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180722_jira.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180724_fogbugz.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180726_phabricator.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180727_csv.yml
View file @ aaead3d2
...@@ -8,7 +8,7 @@ product_stage: manage ...@@ -8,7 +8,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
config/metrics/counts_all/20210216180729_groups_imported.yml
View file @ aaead3d2
...@@ -7,7 +7,7 @@ product_stage: manage ...@@ -7,7 +7,7 @@ product_stage: manage
product_group: group::import product_group: group::import
product_category: importers product_category: importers
value_type: number value_type: number
status: deprecated status: removed
time_frame: all time_frame: all
data_source: database data_source: database
distribution: distribution:
......
lib/gitlab/usage_data.rb
View file @ aaead3d2
...@@ -553,33 +553,11 @@ module Gitlab ...@@ -553,33 +553,11 @@ module Gitlab
user_auth_by_provider: distinct_count_user_auth_by_provider(time_period), user_auth_by_provider: distinct_count_user_auth_by_provider(time_period),
unique_users_all_imports: unique_users_all_imports(time_period), unique_users_all_imports: unique_users_all_imports(time_period),
bulk_imports: { bulk_imports: {
gitlab: DEPRECATED_VALUE,
gitlab_v1: count(::BulkImport.where(**time_period, source_type: :gitlab)) gitlab_v1: count(::BulkImport.where(**time_period, source_type: :gitlab))
}, },
project_imports: project_imports(time_period), project_imports: project_imports(time_period),
issue_imports: issue_imports(time_period), issue_imports: issue_imports(time_period),
group_imports: group_imports(time_period), group_imports: group_imports(time_period)
# Deprecated data to be removed
projects_imported: {
total: DEPRECATED_VALUE,
gitlab_project: DEPRECATED_VALUE,
gitlab: DEPRECATED_VALUE,
github: DEPRECATED_VALUE,
bitbucket: DEPRECATED_VALUE,
bitbucket_server: DEPRECATED_VALUE,
gitea: DEPRECATED_VALUE,
git: DEPRECATED_VALUE,
manifest: DEPRECATED_VALUE
},
issues_imported: {
jira: DEPRECATED_VALUE,
fogbugz: DEPRECATED_VALUE,
phabricator: DEPRECATED_VALUE,
csv: DEPRECATED_VALUE
},
groups_imported: DEPRECATED_VALUE
# End of deprecated keys
} }
end end
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
......
spec/lib/gitlab/usage_data_spec.rb
View file @ aaead3d2
...@@ -279,8 +279,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do ...@@ -279,8 +279,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
expect(described_class.usage_activity_by_stage_manage({})).to include( expect(described_class.usage_activity_by_stage_manage({})).to include(
{ {
bulk_imports: { bulk_imports: {
gitlab_v1: 2, gitlab_v1: 2
gitlab: Gitlab::UsageData::DEPRECATED_VALUE
}, },
project_imports: { project_imports: {
bitbucket: 2, bitbucket: 2,
...@@ -303,32 +302,13 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do ...@@ -303,32 +302,13 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
group_imports: { group_imports: {
group_import: 2, group_import: 2,
gitlab_migration: 2 gitlab_migration: 2
}, }
projects_imported: {
total: Gitlab::UsageData::DEPRECATED_VALUE,
gitlab_project: Gitlab::UsageData::DEPRECATED_VALUE,
gitlab: Gitlab::UsageData::DEPRECATED_VALUE,
github: Gitlab::UsageData::DEPRECATED_VALUE,
bitbucket: Gitlab::UsageData::DEPRECATED_VALUE,
bitbucket_server: Gitlab::UsageData::DEPRECATED_VALUE,
gitea: Gitlab::UsageData::DEPRECATED_VALUE,
git: Gitlab::UsageData::DEPRECATED_VALUE,
manifest: Gitlab::UsageData::DEPRECATED_VALUE
},
issues_imported: {
jira: Gitlab::UsageData::DEPRECATED_VALUE,
fogbugz: Gitlab::UsageData::DEPRECATED_VALUE,
phabricator: Gitlab::UsageData::DEPRECATED_VALUE,
csv: Gitlab::UsageData::DEPRECATED_VALUE
},
groups_imported: Gitlab::UsageData::DEPRECATED_VALUE
} }
) )
expect(described_class.usage_activity_by_stage_manage(described_class.monthly_time_range_db_params)).to include( expect(described_class.usage_activity_by_stage_manage(described_class.monthly_time_range_db_params)).to include(
{ {
bulk_imports: { bulk_imports: {
gitlab_v1: 1, gitlab_v1: 1
gitlab: Gitlab::UsageData::DEPRECATED_VALUE
}, },
project_imports: { project_imports: {
bitbucket: 1, bitbucket: 1,
...@@ -351,25 +331,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do ...@@ -351,25 +331,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
group_imports: { group_imports: {
group_import: 1, group_import: 1,
gitlab_migration: 1 gitlab_migration: 1
}, }
projects_imported: {
total: Gitlab::UsageData::DEPRECATED_VALUE,
gitlab_project: Gitlab::UsageData::DEPRECATED_VALUE,
gitlab: Gitlab::UsageData::DEPRECATED_VALUE,
github: Gitlab::UsageData::DEPRECATED_VALUE,
bitbucket: Gitlab::UsageData::DEPRECATED_VALUE,
bitbucket_server: Gitlab::UsageData::DEPRECATED_VALUE,
gitea: Gitlab::UsageData::DEPRECATED_VALUE,
git: Gitlab::UsageData::DEPRECATED_VALUE,
manifest: Gitlab::UsageData::DEPRECATED_VALUE
},
issues_imported: {
jira: Gitlab::UsageData::DEPRECATED_VALUE,
fogbugz: Gitlab::UsageData::DEPRECATED_VALUE,
phabricator: Gitlab::UsageData::DEPRECATED_VALUE,
csv: Gitlab::UsageData::DEPRECATED_VALUE
},
groups_imported: Gitlab::UsageData::DEPRECATED_VALUE
} }
) )
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7