diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-11 21:09:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-11 21:09:43 +0300 |
commit | 6e7be08ca5d6fac981284e7b1383b320a03d3a5d (patch) | |
tree | 5ae3da5b41f79107b86874c393a2799b7d1b1f3c /config/metrics | |
parent | 14ae125e1c59ca3e9b535938707831c986dbbc43 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/metrics')
9 files changed, 89 insertions, 63 deletions
diff --git a/config/metrics/aggregates/common.yml b/config/metrics/aggregates/common.yml deleted file mode 100644 index ca6c664a6e9..00000000000 --- a/config/metrics/aggregates/common.yml +++ /dev/null @@ -1,62 +0,0 @@ -# Aggregated metrics that include EE only event names within `events:` attribute have to be defined at ee/config/metrics/aggregates/common.yml -# instead of this file. -# - name: unique name of aggregated metric -# operator: aggregation operator. Valid values are: -# - "OR": counts unique elements that were observed triggering any of following events -# - "AND": counts unique elements that were observed triggering all of following events -# events: list of events names to aggregate into metric. All events in this list must have the same 'redis_slot' and 'aggregation' attributes -# see from lib/gitlab/usage_data_counters/known_events/ for the list of valid events. -# source: defines which datasource will be used to locate events that should be included in aggregated metric. Valid values are: -# - database -# - redis -# time_frame: defines time frames for aggregated metrics: -# - 7d - last 7 days -# - 28d - last 28 days -# - all - all historical available data, this time frame is not available for redis source -# feature_flag: name of development feature flag that will be checked before metrics aggregation is performed. -# Corresponding feature flag should have `default_enabled` attribute set to `false`. -# This attribute is OPTIONAL and can be omitted, when `feature_flag` is missing no feature flag will be checked. ---- -- name: incident_management_incidents_total_unique_counts - operator: OR - source: redis - time_frame: [7d, 28d] - events: - - 'incident_management_incident_created' - - 'incident_management_incident_reopened' - - 'incident_management_incident_closed' - - 'incident_management_incident_assigned' - - 'incident_management_incident_todo' - - 'incident_management_incident_comment' - - 'incident_management_incident_zoom_meeting' - - 'incident_management_incident_published' - - 'incident_management_incident_relate' - - 'incident_management_incident_unrelate' - - 'incident_management_incident_change_confidential' -- name: xmau_plan - operator: OR - source: redis - time_frame: [7d, 28d] - events: - - users_creating_work_items - - users_updating_work_item_title - - users_updating_work_item_dates - feature_flag: track_work_items_activity -- name: xmau_project_management - operator: OR - source: redis - time_frame: [7d, 28d] - events: - - users_creating_work_items - - users_updating_work_item_title - - users_updating_work_item_dates - feature_flag: track_work_items_activity -- name: users_work_items - operator: OR - source: redis - time_frame: [7d, 28d] - events: - - users_creating_work_items - - users_updating_work_item_title - - users_updating_work_item_dates - feature_flag: track_work_items_activity diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml index 3174894384a..b5afcfa7ae6 100644 --- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml +++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml @@ -9,7 +9,24 @@ product_category: incident_management value_type: number status: active time_frame: 28d +instrumentation_class: AggregatedMetric data_source: redis_hll +options: + aggregate: + operator: OR + attribute: user_id + events: + - 'incident_management_incident_created' + - 'incident_management_incident_reopened' + - 'incident_management_incident_closed' + - 'incident_management_incident_assigned' + - 'incident_management_incident_todo' + - 'incident_management_incident_comment' + - 'incident_management_incident_zoom_meeting' + - 'incident_management_incident_published' + - 'incident_management_incident_relate' + - 'incident_management_incident_unrelate' + - 'incident_management_incident_change_confidential' distribution: - ce - ee diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml index aaa9558d5a6..9498c56e06f 100644 --- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml +++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml @@ -10,7 +10,16 @@ status: active milestone: '14.9' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336 time_frame: 28d +instrumentation_class: WorkItemsActivityAggregatedMetric data_source: redis_hll +options: + aggregate: + operator: OR + attribute: user_id + events: + - users_creating_work_items + - users_updating_work_item_title + - users_updating_work_item_dates data_category: optional distribution: - ce diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml index ede46c85292..a02616e06ce 100644 --- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml +++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml @@ -10,7 +10,16 @@ status: active milestone: '14.9' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336 time_frame: 28d +instrumentation_class: WorkItemsActivityAggregatedMetric data_source: redis_hll +options: + aggregate: + operator: OR + attribute: user_id + events: + - users_creating_work_items + - users_updating_work_item_title + - users_updating_work_item_dates data_category: optional distribution: - ce diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml index a0f892fcef2..3e6103a6dfd 100644 --- a/config/metrics/counts_28d/20220222215955_users_work_items.yml +++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml @@ -10,7 +10,16 @@ status: active milestone: '14.9' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336 time_frame: 28d +instrumentation_class: WorkItemsActivityAggregatedMetric data_source: redis_hll +options: + aggregate: + operator: OR + attribute: user_id + events: + - users_creating_work_items + - users_updating_work_item_title + - users_updating_work_item_dates data_category: optional distribution: - ce diff --git a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml index 6089b36401e..93228309855 100644 --- a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml +++ b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml @@ -9,7 +9,24 @@ product_category: incident_management value_type: number status: active time_frame: 7d +instrumentation_class: AggregatedMetric data_source: redis_hll +options: + aggregate: + operator: OR + attribute: user_id + events: + - 'incident_management_incident_created' + - 'incident_management_incident_reopened' + - 'incident_management_incident_closed' + - 'incident_management_incident_assigned' + - 'incident_management_incident_todo' + - 'incident_management_incident_comment' + - 'incident_management_incident_zoom_meeting' + - 'incident_management_incident_published' + - 'incident_management_incident_relate' + - 'incident_management_incident_unrelate' + - 'incident_management_incident_change_confidential' distribution: - ce - ee diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml index 170b1c595de..ebeaa6e5060 100644 --- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml +++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml @@ -9,8 +9,17 @@ value_type: number status: active milestone: '14.9' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336 -time_frame: 7d +instrumentation_class: WorkItemsActivityAggregatedMetric data_source: redis_hll +time_frame: 7d +options: + aggregate: + operator: OR + attribute: user_id + events: + - users_creating_work_items + - users_updating_work_item_title + - users_updating_work_item_dates data_category: optional distribution: - ce diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml index 061ee13722b..13f35df6530 100644 --- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml +++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml @@ -10,7 +10,16 @@ status: active milestone: '14.9' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336 time_frame: 7d +instrumentation_class: WorkItemsActivityAggregatedMetric data_source: redis_hll +options: + aggregate: + operator: OR + attribute: user_id + events: + - users_creating_work_items + - users_updating_work_item_title + - users_updating_work_item_dates data_category: optional distribution: - ce diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml index b749a7c9430..fec786715b7 100644 --- a/config/metrics/counts_7d/20220222215855_users_work_items.yml +++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml @@ -10,7 +10,16 @@ status: active milestone: '14.9' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336 time_frame: 7d +instrumentation_class: WorkItemsActivityAggregatedMetric data_source: redis_hll +options: + aggregate: + operator: OR + attribute: user_id + events: + - users_creating_work_items + - users_updating_work_item_title + - users_updating_work_item_dates data_category: optional distribution: - ce |