diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-18 15:10:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-18 15:10:09 +0300 |
| commit | 4c3f961bd94656e64cee5b0ad07b3f49a84338a5 (patch) | |
| tree | eb9afef2d82734c64869ab4a78b99ea6d1805501 /config | |
| parent | 16887b928c9b4f26aabdb2f37ec5fe4ee97e73fe (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
6 files changed, 11 insertions, 5 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 0d7110be68a..9f00439294c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -39,6 +39,11 @@ en: grafana_enabled: "Grafana integration enabled" service_desk_setting: project_key: "Project name suffix" + system_access/microsoft_application: + tenant_xid: "Tenant ID" + client_xid: "Client ID" + login_endpoint: "Login API endpoint" + graph_endpoint: "Graph API endpoint" user/user_detail: job_title: 'Job title' bio: 'Bio' diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml index fbcacf73dfc..400d7f2600d 100644 --- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml +++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml @@ -8,7 +8,7 @@ product_group: code_review value_type: number status: active time_frame: 28d -data_source: redis_hll +data_source: internal_events instrumentation_class: RedisHLLMetric options: events: diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml index cd5f4142e80..1171cf48812 100644 --- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml +++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml @@ -8,7 +8,7 @@ product_group: project_management value_type: number status: active time_frame: 28d -data_source: redis_hll +data_source: internal_events instrumentation_class: RedisHLLMetric options: events: diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml index 0159d8c6507..71a0be2fe13 100644 --- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml +++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml @@ -8,7 +8,7 @@ product_group: code_review value_type: number status: active time_frame: 7d -data_source: redis_hll +data_source: internal_events instrumentation_class: RedisHLLMetric options: events: diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml index ca0194db21b..97c32f8f7ae 100644 --- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml +++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml @@ -8,7 +8,7 @@ product_group: project_management value_type: number status: active time_frame: 7d -data_source: redis_hll +data_source: internal_events instrumentation_class: RedisHLLMetric options: events: diff --git a/config/metrics/schema.json b/config/metrics/schema.json index 56fd617932c..90951f1b3dc 100644 --- a/config/metrics/schema.json +++ b/config/metrics/schema.json @@ -135,7 +135,8 @@ "redis_hll", "prometheus", "system", - "license" + "license", + "internal_events" ] }, "data_category": { |