Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
e612fbe905
commit
ccc2dc45a3
|
|
@ -168,10 +168,12 @@ export default {
|
|||
})
|
||||
.then(({ data }) => {
|
||||
this.users =
|
||||
data?.project?.projectMembers?.nodes?.map(({ user }) => ({
|
||||
...user,
|
||||
id: getIdFromGraphQLId(user.id),
|
||||
})) || [];
|
||||
data?.project?.projectMembers?.nodes
|
||||
.filter((x) => x?.user)
|
||||
.map(({ user }) => ({
|
||||
...user,
|
||||
id: getIdFromGraphQLId(user.id),
|
||||
})) || [];
|
||||
return this.users;
|
||||
})
|
||||
.finally(() => {
|
||||
|
|
|
|||
|
|
@ -26,14 +26,7 @@ const isValidDateString = (dateString) => {
|
|||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
// dateformat throws error that can be caught.
|
||||
// This is better than using `new Date()`
|
||||
dateformat(dateString, 'isoUtcDateTime');
|
||||
return true;
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
return !Number.isNaN(Date.parse(dateformat(dateString, 'isoUtcDateTime')));
|
||||
};
|
||||
|
||||
const handleRangeDirection = ({ direction = DEFAULT_DIRECTION, anchorDate, minDate, maxDate }) => {
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ export function formatDateAsMonth(datetime, options = {}) {
|
|||
|
||||
/**
|
||||
* @example
|
||||
* dateFormat('2017-12-05','mmm d, yyyy h:MMtt Z' ) -> "Dec 5, 2017 12:00am GMT+0000"
|
||||
* dateFormat('2017-12-05','mmm d, yyyy h:MMtt Z' ) -> "Dec 5, 2017 12:00am UTC"
|
||||
* @param {date} datetime
|
||||
* @param {String} format
|
||||
* @param {Boolean} UTC convert local time to UTC
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ export default {
|
|||
update(data) {
|
||||
// TODO Remove null filter (BE fix required)
|
||||
// https://gitlab.com/gitlab-org/gitlab/-/issues/329750
|
||||
return data.workspace?.users?.nodes.filter((x) => x).map(({ user }) => user) || [];
|
||||
return data.workspace?.users?.nodes.filter((x) => x?.user).map(({ user }) => user) || [];
|
||||
},
|
||||
debounce: ASSIGNEES_DEBOUNCE_DELAY,
|
||||
error({ graphQLErrors }) {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
- checkbox_id = 'check-all-issues'
|
||||
%label.gl-sr-only{ for: checkbox_id }= _('Select all')
|
||||
= check_box_tag checkbox_id, nil, false, class: "check-all-issues left"
|
||||
- if Feature.enabled?(:boards_filtered_search, @group) && is_epic_board
|
||||
- if is_epic_board
|
||||
#js-board-filtered-search{ data: { full_path: @group&.full_path } }
|
||||
- else
|
||||
.issues-other-filters.filtered-search-wrapper.d-flex.flex-column.flex-md-row
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
---
|
||||
name: boards_filtered_search
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54641
|
||||
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322778
|
||||
milestone: '13.10'
|
||||
type: development
|
||||
group: group::project management
|
||||
default_enabled: false
|
||||
|
|
@ -11,6 +11,9 @@ if Gitlab::Database::LoadBalancing.enable?
|
|||
|
||||
# This needs to be executed after fork of clustered processes
|
||||
Gitlab::Cluster::LifecycleEvents.on_worker_start do
|
||||
# For Host-based LB, we need to re-connect as Rails discards connections on fork
|
||||
Gitlab::Database::LoadBalancing.configure_proxy
|
||||
|
||||
# Service discovery must be started after configuring the proxy, as service
|
||||
# discovery depends on this.
|
||||
Gitlab::Database::LoadBalancing.start_service_discovery
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
- 'i_code_review_user_reviewers_changed'
|
||||
- 'i_code_review_user_milestone_changed'
|
||||
- 'i_code_review_user_labels_changed'
|
||||
- 'i_code_review_click_diff_view_setting'
|
||||
- 'i_code_review_click_single_file_mode_setting'
|
||||
- 'i_code_review_click_file_browser_setting'
|
||||
- 'i_code_review_click_whitespace_setting'
|
||||
|
|
@ -109,6 +110,7 @@
|
|||
- 'i_code_review_user_reviewers_changed'
|
||||
- 'i_code_review_user_milestone_changed'
|
||||
- 'i_code_review_user_labels_changed'
|
||||
- 'i_code_review_click_diff_view_setting'
|
||||
- 'i_code_review_click_single_file_mode_setting'
|
||||
- 'i_code_review_click_file_browser_setting'
|
||||
- 'i_code_review_click_whitespace_setting'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts_monthly.personal_snippets
|
||||
description: Monthly count of Personal Snippets
|
||||
description: Monthly count of personal Snippets
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts_monthly.project_snippets
|
||||
description: Monthly count of Project Snippets
|
||||
description: Monthly count of project Snippets
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
---
|
||||
key_path: usage_activity_by_stage_monthly.create.snippets
|
||||
description: Monthly Snippets
|
||||
name: count_distinct_author_id_from_snippets
|
||||
description: Count of distinct author_id from snippets for last 28 days
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +9,7 @@ product_category: snippets
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source:
|
||||
data_source: database
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +17,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_web_ide_edit
|
||||
description: Count unique edit actions using the web IDE
|
||||
description: Number of users editing using web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,9 +8,11 @@ product_category: web_ide
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source:
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit
|
||||
description: Count unique edit actions using the single file editor
|
||||
description: Number of users using single file editor
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,9 +8,11 @@ product_category: web_ide
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source:
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_snippet_editor_edit
|
||||
description: Count unique edit actions using the snippet editor
|
||||
description: Number of users using the snippet editor
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: web_ide
|
||||
product_category: snippets
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source:
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sse_edit
|
||||
description: Count unique edit actions using the static site editor
|
||||
description: Number of users using the static site editor
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: web_ide
|
||||
product_category: static_site_editor
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source:
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit
|
||||
description: Count unique edit actions when users used an IDE, no matter which one
|
||||
description: Number of unique users per month who edited a file from any web editor
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,9 +8,11 @@ product_category: web_ide
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source:
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_monthly
|
||||
description:
|
||||
description: Number of users editing a file from the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category:
|
||||
product_category: web_ide
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_monthly
|
||||
description:
|
||||
description: Number of users editing a file from the single file editor
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category:
|
||||
product_category: web_ide
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_monthly
|
||||
description:
|
||||
description: Count of monthly edits to a snippet
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category:
|
||||
product_category: snippets
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_monthly
|
||||
description:
|
||||
description: Count of unique users per month who edited a file from the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category:
|
||||
product_category: web_ide
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_wiki_repo
|
||||
description:
|
||||
description: Unique monthly active users of the Wiki
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::knowledge
|
||||
product_group: group::editor
|
||||
product_category: wiki
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source:
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.g_edit_by_sse_monthly
|
||||
description: ''
|
||||
product_section: ''
|
||||
product_stage: ''
|
||||
product_group: ''
|
||||
product_category: ''
|
||||
description: Number of user editing files using the Static Site Editor
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: static_site_editor
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.snippets.i_snippets_show_monthly
|
||||
description: ''
|
||||
product_section: ''
|
||||
product_stage: ''
|
||||
product_group: ''
|
||||
product_category: ''
|
||||
description: Monthly number of users viewing snippets
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: snippets
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 28d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
---
|
||||
key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_monthly
|
||||
description: Count of users clicking diff view setting
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::code review
|
||||
product_category: code_review
|
||||
value_type: number
|
||||
status: implemented
|
||||
milestone: '13.12'
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
|
||||
time_frame: 28d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
tier:
|
||||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_weekly
|
||||
description: Weekly number of users editing using the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: web_ide
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 7d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_weekly
|
||||
description: Weekly number of users editing from the single file editor
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: web_ide
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 7d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_weekly
|
||||
description: Weekly number of users editing Snippets
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: snippets
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 7d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_weekly
|
||||
description: Weekly number of users editing a file using the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: web_ide
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 7d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.ide_edit.g_edit_by_sse_weekly
|
||||
description: Weekly number of users editing using the Static Site Editor
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: static_site_editor
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 7d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
---
|
||||
key_path: redis_hll_counters.snippets.i_snippets_show_weekly
|
||||
description: Weekly number of users viewing snippets
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: snippets
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: 7d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
---
|
||||
key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_weekly
|
||||
description: Count of users clicking diff view setting
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::code review
|
||||
product_category: code_review
|
||||
value_type: number
|
||||
status: implemented
|
||||
milestone: '13.12'
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
|
||||
time_frame: 7d
|
||||
data_source: redis_hll
|
||||
distribution:
|
||||
- ce
|
||||
tier:
|
||||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.personal_snippets
|
||||
description: Count of Personal Snippets
|
||||
description: Count of personal Snippets
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.project_snippets
|
||||
description: Count of Project Snippetss
|
||||
description: Count of project Snippets
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.web_ide_commits
|
||||
description: Count of Commits made from Web IDE
|
||||
description: Count of commits made from the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +8,7 @@ product_category: web_ide
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.web_ide_views
|
||||
description: Count of Views of the Web IDE
|
||||
description: Count of views of the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +8,7 @@ product_category: web_ide
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.web_ide_merge_requests
|
||||
description: Count of merge requests created from Web IDE
|
||||
description: Count of merge requests created from the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +8,7 @@ product_category: web_ide
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.web_ide_previews
|
||||
description: Count of Live Preview tab views in Web IDE
|
||||
description: Count of Live Preview tab views in the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +8,7 @@ product_category: web_ide
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.web_ide_terminals
|
||||
description: Count of Web Terminal Tab views in Web IDE
|
||||
description: Count of Web Terminal tab views in the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +8,7 @@ product_category: web_ide
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.web_ide_pipelines
|
||||
description: Count of Pipeline tab views in Web IDE
|
||||
description: Count of Pipeline tab views in the Web IDE
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +8,7 @@ product_category: web_ide
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ product_category: snippets
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ product_category: snippets
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ product_category: snippets
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.static_site_editor_views
|
||||
description:
|
||||
description: Count of Static Site Editor views
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +8,7 @@ product_category: static_site_editor
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: counts.static_site_editor_commits
|
||||
description: Count of commits created via Static Site Editor
|
||||
description: Count of commits created from the Static Site Editor
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,9 +8,11 @@ product_category: static_site_editor
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -8,9 +8,11 @@ product_category: static_site_editor
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
---
|
||||
key_path: counts.user_preferences_user_gitpod_enabled
|
||||
description: Count all users with their GitPod setting enabled
|
||||
description: Count of users with the GitPod integration enabled
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: editor_extension
|
||||
product_category: web_ide
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
---
|
||||
key_path: usage_activity_by_stage.create.snippets
|
||||
description: Snippets
|
||||
name: count_distinct_author_id_from_snippets
|
||||
description: Count of distinct author_id from snippets
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +9,7 @@ product_category: snippets
|
|||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source:
|
||||
data_source: database
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +17,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: counts.wiki_pages_create
|
||||
description:
|
||||
description: Count of all Wiki pages created
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::knowledge
|
||||
product_group: group::editor
|
||||
product_category: wiki
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: counts.wiki_pages_update
|
||||
description:
|
||||
description: Count of all Wiki page updates
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::knowledge
|
||||
product_group: group::editor
|
||||
product_category: wiki
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: counts.wiki_pages_delete
|
||||
description:
|
||||
description: Count of all Wiki pages deleted
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::knowledge
|
||||
product_group: group::editor
|
||||
product_category: wiki
|
||||
value_type: number
|
||||
status: data_available
|
||||
time_frame: all
|
||||
data_source: database
|
||||
data_source: redis
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: active_user_count
|
||||
description: This is named the instance_user_count in the Versions application.
|
||||
description: The number of active users existing in the instance. This is named the instance_user_count in the Versions application.
|
||||
product_section: growth
|
||||
product_stage: growth
|
||||
product_group: group::product intelligence
|
||||
|
|
@ -16,4 +16,4 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
---
|
||||
key_path: license_trial_ends_on
|
||||
description: Date the license ends on
|
||||
product_section: growth
|
||||
product_stage: growth
|
||||
product_group: group::product intelligence
|
||||
product_category: collection
|
||||
value_type: string
|
||||
status: data_available
|
||||
time_frame: none
|
||||
data_source: system
|
||||
distribution:
|
||||
- ce
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
},
|
||||
"data_source": {
|
||||
"type": "string",
|
||||
"enum": ["database", "redis", "redis_hll", "prometheus", "system"]
|
||||
"enum": ["database", "redis", "redis_hll", "prometheus", "system", "license"]
|
||||
},
|
||||
"instrumentation_class": {
|
||||
"type": "string",
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
---
|
||||
key_path: web_ide_clientside_preview_enabled
|
||||
description: Whether web ide clientside preview is enabled
|
||||
product_section: growth
|
||||
product_stage: growth
|
||||
product_group: group::product intelligence
|
||||
description: Whether Web IDE clientside preview is enabled
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
product_category: collection
|
||||
value_type: boolean
|
||||
status: data_available
|
||||
time_frame: none
|
||||
data_source: system
|
||||
data_source: database
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
tier:
|
||||
- free
|
||||
skip_validation: true
|
||||
- premium
|
||||
- ultimate
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
key_path: gitpod_enabled
|
||||
description: Whether gitpod is enabled in the instance
|
||||
description: Whether Gitpod is enabled in the instance
|
||||
product_section: dev
|
||||
product_stage: create
|
||||
product_group: group::editor
|
||||
|
|
@ -8,7 +8,7 @@ product_category: integrations
|
|||
value_type: boolean
|
||||
status: data_available
|
||||
time_frame: none
|
||||
data_source: system
|
||||
data_source: database
|
||||
distribution:
|
||||
- ce
|
||||
- ee
|
||||
|
|
@ -16,4 +16,3 @@ tier:
|
|||
- free
|
||||
- premium
|
||||
- ultimate
|
||||
skip_validation: true
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ was released.
|
|||
|
||||
### `active_user_count`
|
||||
|
||||
This is named the instance_user_count in the Versions application.
|
||||
The number of active users existing in the instance. This is named the instance_user_count in the Versions application.
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210204124829_active_user_count.yml)
|
||||
|
||||
|
|
@ -4104,7 +4104,7 @@ Tiers: `free`
|
|||
|
||||
### `counts.personal_snippets`
|
||||
|
||||
Count of Personal Snippets
|
||||
Count of personal Snippets
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180239_personal_snippets.yml)
|
||||
|
||||
|
|
@ -4176,7 +4176,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts.project_snippets`
|
||||
|
||||
Count of Project Snippetss
|
||||
Count of project Snippets
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180241_project_snippets.yml)
|
||||
|
||||
|
|
@ -5772,7 +5772,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts.static_site_editor_commits`
|
||||
|
||||
Count of commits created via Static Site Editor
|
||||
Count of commits created from the Static Site Editor
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml)
|
||||
|
||||
|
|
@ -5780,7 +5780,7 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `counts.static_site_editor_merge_requests`
|
||||
|
||||
|
|
@ -5792,11 +5792,11 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `counts.static_site_editor_views`
|
||||
|
||||
Missing description
|
||||
Count of Static Site Editor views
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180259_static_site_editor_views.yml)
|
||||
|
||||
|
|
@ -6420,7 +6420,7 @@ Tiers: `ultimate`
|
|||
|
||||
### `counts.user_preferences_user_gitpod_enabled`
|
||||
|
||||
Count all users with their GitPod setting enabled
|
||||
Count of users with the GitPod integration enabled
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml)
|
||||
|
||||
|
|
@ -6444,7 +6444,7 @@ Tiers: `free`
|
|||
|
||||
### `counts.web_ide_commits`
|
||||
|
||||
Count of Commits made from Web IDE
|
||||
Count of commits made from the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180242_web_ide_commits.yml)
|
||||
|
||||
|
|
@ -6456,7 +6456,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts.web_ide_merge_requests`
|
||||
|
||||
Count of merge requests created from Web IDE
|
||||
Count of merge requests created from the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml)
|
||||
|
||||
|
|
@ -6468,7 +6468,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts.web_ide_pipelines`
|
||||
|
||||
Count of Pipeline tab views in Web IDE
|
||||
Count of Pipeline tab views in the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml)
|
||||
|
||||
|
|
@ -6480,7 +6480,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts.web_ide_previews`
|
||||
|
||||
Count of Live Preview tab views in Web IDE
|
||||
Count of Live Preview tab views in the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180248_web_ide_previews.yml)
|
||||
|
||||
|
|
@ -6492,7 +6492,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts.web_ide_terminals`
|
||||
|
||||
Count of Web Terminal Tab views in Web IDE
|
||||
Count of Web Terminal tab views in the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180250_web_ide_terminals.yml)
|
||||
|
||||
|
|
@ -6504,7 +6504,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts.web_ide_views`
|
||||
|
||||
Count of Views of the Web IDE
|
||||
Count of views of the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180244_web_ide_views.yml)
|
||||
|
||||
|
|
@ -6516,39 +6516,39 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts.wiki_pages_create`
|
||||
|
||||
Missing description
|
||||
Count of all Wiki pages created
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180734_wiki_pages_create.yml)
|
||||
|
||||
Group: `group::knowledge`
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `counts.wiki_pages_delete`
|
||||
|
||||
Missing description
|
||||
Count of all Wiki pages deleted
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml)
|
||||
|
||||
Group: `group::knowledge`
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `counts.wiki_pages_update`
|
||||
|
||||
Missing description
|
||||
Count of all Wiki page updates
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180736_wiki_pages_update.yml)
|
||||
|
||||
Group: `group::knowledge`
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `counts.wiki_pages_view`
|
||||
|
||||
|
|
@ -6708,7 +6708,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts_monthly.personal_snippets`
|
||||
|
||||
Monthly count of Personal Snippets
|
||||
Monthly count of personal Snippets
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180308_personal_snippets.yml)
|
||||
|
||||
|
|
@ -6720,7 +6720,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `counts_monthly.project_snippets`
|
||||
|
||||
Monthly count of Project Snippets
|
||||
Monthly count of project Snippets
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180310_project_snippets.yml)
|
||||
|
||||
|
|
@ -7068,7 +7068,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `gitpod_enabled`
|
||||
|
||||
Whether gitpod is enabled in the instance
|
||||
Whether Gitpod is enabled in the instance
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216180314_gitpod_enabled.yml)
|
||||
|
||||
|
|
@ -7104,11 +7104,11 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `historical_max_users`
|
||||
|
||||
The maximum active user count. Active is defined in UsersStatistics model.
|
||||
The peak active user count. Active is defined in UsersStatistics model.
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124835_historical_max_users.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -7192,7 +7192,7 @@ The date the license ends
|
|||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124847_license_expires_at.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -7204,7 +7204,7 @@ The ID of the license
|
|||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124833_license_id.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -7212,15 +7212,15 @@ Tiers: `premium`, `ultimate`
|
|||
|
||||
### `license_md5`
|
||||
|
||||
The license key of the GitLab instance
|
||||
The MD5 hash of license key of the GitLab instance
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124831_license_md5.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
Tiers: `premium`, `ultimate`
|
||||
|
||||
### `license_plan`
|
||||
|
||||
|
|
@ -7228,7 +7228,7 @@ The plan of the GitLab license
|
|||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124849_license_plan.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -7240,7 +7240,7 @@ The date the license starts
|
|||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124845_license_starts_at.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -7252,7 +7252,7 @@ Licese zuora_subscription_id
|
|||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124852_license_subscription_id.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -7272,23 +7272,23 @@ Tiers: `premium`, `ultimate`
|
|||
|
||||
### `license_trial_ends_on`
|
||||
|
||||
Date the license ends on
|
||||
Date the trial license ends on
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210204124926_license_trial_ends_on.yml)
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `license_user_count`
|
||||
|
||||
The number of users included in the license
|
||||
The number of seats included in the license
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124843_license_user_count.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -7300,7 +7300,7 @@ Company on the GitLab license
|
|||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124841_company.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -7312,7 +7312,7 @@ Email on the GitLab license
|
|||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124839_email.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -7324,7 +7324,7 @@ Name on the GitLab license
|
|||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124837_name.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::license`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
|
|
@ -8614,6 +8614,30 @@ Status: `data_available`
|
|||
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.code_review.i_code_review_click_diff_view_setting_monthly`
|
||||
|
||||
Count of users clicking diff view setting
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml)
|
||||
|
||||
Group: `group::code review`
|
||||
|
||||
Status: `implemented`
|
||||
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.code_review.i_code_review_click_diff_view_setting_weekly`
|
||||
|
||||
Count of users clicking diff view setting
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml)
|
||||
|
||||
Group: `group::code review`
|
||||
|
||||
Status: `implemented`
|
||||
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.code_review.i_code_review_click_file_browser_setting_monthly`
|
||||
|
||||
Count of users clicking merge request file browser setting
|
||||
|
|
@ -11544,7 +11568,7 @@ Tiers: `premium`, `ultimate`
|
|||
|
||||
### `redis_hll_counters.ide_edit.g_edit_by_sfe_monthly`
|
||||
|
||||
Missing description
|
||||
Number of users editing a file from the single file editor
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml)
|
||||
|
||||
|
|
@ -11552,23 +11576,23 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.ide_edit.g_edit_by_sfe_weekly`
|
||||
|
||||
Missing description
|
||||
Weekly number of users editing from the single file editor
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml)
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml)
|
||||
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers:
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.ide_edit.g_edit_by_snippet_ide_monthly`
|
||||
|
||||
Missing description
|
||||
Count of monthly edits to a snippet
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml)
|
||||
|
||||
|
|
@ -11576,47 +11600,47 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.ide_edit.g_edit_by_snippet_ide_weekly`
|
||||
|
||||
Missing description
|
||||
Weekly number of users editing Snippets
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml)
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml)
|
||||
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers:
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.ide_edit.g_edit_by_sse_monthly`
|
||||
|
||||
Missing description
|
||||
Number of user editing files using the Static Site Editor
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml)
|
||||
|
||||
Group: ``
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.ide_edit.g_edit_by_sse_weekly`
|
||||
|
||||
Missing description
|
||||
Weekly number of users editing using the Static Site Editor
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml)
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml)
|
||||
|
||||
Group: ``
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers:
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.ide_edit.g_edit_by_web_ide_monthly`
|
||||
|
||||
Missing description
|
||||
Number of users editing a file from the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml)
|
||||
|
||||
|
|
@ -11624,23 +11648,23 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.ide_edit.g_edit_by_web_ide_weekly`
|
||||
|
||||
Missing description
|
||||
Weekly number of users editing using the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml)
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml)
|
||||
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers:
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.ide_edit.ide_edit_total_unique_counts_monthly`
|
||||
|
||||
Missing description
|
||||
Count of unique users per month who edited a file from the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml)
|
||||
|
||||
|
|
@ -11648,19 +11672,19 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.ide_edit.ide_edit_total_unique_counts_weekly`
|
||||
|
||||
Missing description
|
||||
Weekly number of users editing a file using the Web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml)
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml)
|
||||
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers:
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.incident_management.incident_management_alert_assigned_monthly`
|
||||
|
||||
|
|
@ -14712,27 +14736,27 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `redis_hll_counters.snippets.i_snippets_show_monthly`
|
||||
|
||||
Missing description
|
||||
Monthly number of users viewing snippets
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml)
|
||||
|
||||
Group: ``
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.snippets.i_snippets_show_weekly`
|
||||
|
||||
Missing description
|
||||
Weekly number of users viewing snippets
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml)
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml)
|
||||
|
||||
Group: ``
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers:
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `redis_hll_counters.source_code.design_action_monthly`
|
||||
|
||||
|
|
@ -16154,7 +16178,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `usage_activity_by_stage.create.snippets`
|
||||
|
||||
Snippets
|
||||
Count of distinct author_id from snippets
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180316_snippets.yml)
|
||||
|
||||
|
|
@ -17800,7 +17824,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit`
|
||||
|
||||
Count unique edit actions when users used an IDE, no matter which one
|
||||
Number of unique users per month who edited a file from any web editor
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml)
|
||||
|
||||
|
|
@ -17808,7 +17832,7 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `usage_activity_by_stage_monthly.create.action_monthly_active_users_project_repo`
|
||||
|
||||
|
|
@ -17824,7 +17848,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit`
|
||||
|
||||
Count unique edit actions using the single file editor
|
||||
Number of users using single file editor
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml)
|
||||
|
||||
|
|
@ -17832,11 +17856,11 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `usage_activity_by_stage_monthly.create.action_monthly_active_users_snippet_editor_edit`
|
||||
|
||||
Count unique edit actions using the snippet editor
|
||||
Number of users using the snippet editor
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml)
|
||||
|
||||
|
|
@ -17844,11 +17868,11 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `usage_activity_by_stage_monthly.create.action_monthly_active_users_sse_edit`
|
||||
|
||||
Count unique edit actions using the static site editor
|
||||
Number of users using the static site editor
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml)
|
||||
|
||||
|
|
@ -17856,11 +17880,11 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `usage_activity_by_stage_monthly.create.action_monthly_active_users_web_ide_edit`
|
||||
|
||||
Count unique edit actions using the web IDE
|
||||
Number of users editing using web IDE
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml)
|
||||
|
||||
|
|
@ -17868,19 +17892,19 @@ Group: `group::editor`
|
|||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `usage_activity_by_stage_monthly.create.action_monthly_active_users_wiki_repo`
|
||||
|
||||
Missing description
|
||||
Unique monthly active users of the Wiki
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml)
|
||||
|
||||
Group: `group::knowledge`
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
||||
### `usage_activity_by_stage_monthly.create.approval_project_rules`
|
||||
|
||||
|
|
@ -18136,7 +18160,7 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `usage_activity_by_stage_monthly.create.snippets`
|
||||
|
||||
Monthly Snippets
|
||||
Count of distinct author_id from snippets for last 28 days
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180317_snippets.yml)
|
||||
|
||||
|
|
@ -19612,12 +19636,12 @@ Tiers: `free`, `premium`, `ultimate`
|
|||
|
||||
### `web_ide_clientside_preview_enabled`
|
||||
|
||||
Whether web ide clientside preview is enabled
|
||||
Whether Web IDE clientside preview is enabled
|
||||
|
||||
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml)
|
||||
|
||||
Group: `group::product intelligence`
|
||||
Group: `group::editor`
|
||||
|
||||
Status: `data_available`
|
||||
|
||||
Tiers: `free`
|
||||
Tiers: `free`, `premium`, `ultimate`
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 153 KiB |
|
|
@ -47,12 +47,6 @@ module Gitlab
|
|||
|
||||
option_parser.parse!(argv)
|
||||
|
||||
# Remove with https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
|
||||
if @queue_selector && @experimental_queue_selector
|
||||
raise CommandError,
|
||||
'You cannot specify --queue-selector and --experimental-queue-selector together'
|
||||
end
|
||||
|
||||
worker_metadatas = SidekiqConfig::CliMethods.worker_metadatas(@rails_path)
|
||||
worker_queues = SidekiqConfig::CliMethods.worker_queues(@rails_path)
|
||||
|
||||
|
|
@ -63,8 +57,7 @@ module Gitlab
|
|||
# as a worker attribute query, and resolve the queues for the
|
||||
# queue group using this query.
|
||||
|
||||
# Simplify with https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
|
||||
if @queue_selector || @experimental_queue_selector
|
||||
if @queue_selector
|
||||
SidekiqConfig::CliMethods.query_queues(queues_or_query_string, worker_metadatas)
|
||||
else
|
||||
SidekiqConfig::CliMethods.expand_queues(queues_or_query_string.split(','), worker_queues)
|
||||
|
|
@ -194,11 +187,6 @@ module Gitlab
|
|||
@queue_selector = queue_selector
|
||||
end
|
||||
|
||||
# Remove with https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
|
||||
opt.on('--experimental-queue-selector', 'DEPRECATED: use --queue-selector-instead') do |experimental_queue_selector|
|
||||
@experimental_queue_selector = experimental_queue_selector
|
||||
end
|
||||
|
||||
opt.on('-n', '--negate', 'Run workers for all queues in sidekiq_queues.yml except the given ones') do
|
||||
@negate_queues = true
|
||||
end
|
||||
|
|
|
|||
|
|
@ -164,6 +164,11 @@
|
|||
category: code_review
|
||||
aggregation: weekly
|
||||
# Diff settings events
|
||||
- name: i_code_review_click_diff_view_setting
|
||||
redis_slot: code_review
|
||||
category: code_review
|
||||
aggregation: weekly
|
||||
feature_flag: diff_settings_usage_data
|
||||
- name: i_code_review_click_single_file_mode_setting
|
||||
redis_slot: code_review
|
||||
category: code_review
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
"d3-sankey": "^0.12.3",
|
||||
"d3-scale": "^2.2.2",
|
||||
"d3-selection": "^1.2.0",
|
||||
"dateformat": "^3.0.3",
|
||||
"dateformat": "^4.5.1",
|
||||
"deckar01-task_list": "^2.3.1",
|
||||
"diff": "^3.4.0",
|
||||
"document-register-element": "1.14.3",
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ RSpec.describe 'bin/sidekiq-cluster' do
|
|||
where(:args, :included, :excluded) do
|
||||
%w[--negate cronjob] | '-qdefault,1' | '-qcronjob,1'
|
||||
%w[--queue-selector resource_boundary=cpu] | '-qupdate_merge_requests,1' | '-qdefault,1'
|
||||
# Remove with https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
|
||||
%w[--experimental-queue-selector resource_boundary=cpu] | '-qupdate_merge_requests,1' | '-qdefault,1'
|
||||
end
|
||||
|
||||
with_them do
|
||||
|
|
@ -31,9 +29,7 @@ RSpec.describe 'bin/sidekiq-cluster' do
|
|||
context 'when selecting all queues' do
|
||||
[
|
||||
%w[*],
|
||||
%w[--queue-selector *],
|
||||
# Remove with https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
|
||||
%w[--experimental-queue-selector *]
|
||||
%w[--queue-selector *]
|
||||
].each do |args|
|
||||
it "runs successfully with `#{args}`", :aggregate_failures do
|
||||
cmd = %w[bin/sidekiq-cluster --dryrun] + args
|
||||
|
|
|
|||
|
|
@ -336,7 +336,7 @@ describe('IssuableItem', () => {
|
|||
const createdAtEl = wrapper.find('[data-testid="issuable-created-at"]');
|
||||
|
||||
expect(createdAtEl.exists()).toBe(true);
|
||||
expect(createdAtEl.attributes('title')).toBe('Jun 29, 2020 1:52pm GMT+0000');
|
||||
expect(createdAtEl.attributes('title')).toBe('Jun 29, 2020 1:52pm UTC');
|
||||
expect(createdAtEl.text()).toBe(wrapper.vm.createdAt);
|
||||
});
|
||||
|
||||
|
|
@ -450,7 +450,7 @@ describe('IssuableItem', () => {
|
|||
const updatedAtEl = wrapper.find('[data-testid="issuable-updated-at"]');
|
||||
|
||||
expect(updatedAtEl.exists()).toBe(true);
|
||||
expect(updatedAtEl.find('span').attributes('title')).toBe('Sep 10, 2020 11:41am GMT+0000');
|
||||
expect(updatedAtEl.find('span').attributes('title')).toBe('Sep 10, 2020 11:41am UTC');
|
||||
expect(updatedAtEl.text()).toBe(wrapper.vm.updatedAt);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ describe('JiraImportProgress', () => {
|
|||
});
|
||||
|
||||
it('shows the time of import', () => {
|
||||
expect(getParagraphText()).toContain('Time of import: Apr 8, 2020 12:17pm GMT+0000');
|
||||
expect(getParagraphText()).toContain('Time of import: Apr 8, 2020 12:17pm UTC');
|
||||
});
|
||||
|
||||
it('shows the project key of the import', () => {
|
||||
|
|
|
|||
|
|
@ -101,13 +101,13 @@ describe('Date time utils', () => {
|
|||
it('should format date properly', () => {
|
||||
const formattedDate = datetimeUtility.formatDate(new Date('07/23/2016'));
|
||||
|
||||
expect(formattedDate).toBe('Jul 23, 2016 12:00am GMT+0000');
|
||||
expect(formattedDate).toBe('Jul 23, 2016 12:00am UTC');
|
||||
});
|
||||
|
||||
it('should format ISO date properly', () => {
|
||||
const formattedDate = datetimeUtility.formatDate('2016-07-23T00:00:00.559Z');
|
||||
|
||||
expect(formattedDate).toBe('Jul 23, 2016 12:00am GMT+0000');
|
||||
expect(formattedDate).toBe('Jul 23, 2016 12:00am UTC');
|
||||
});
|
||||
|
||||
it('should throw an error if date is invalid', () => {
|
||||
|
|
@ -878,7 +878,7 @@ describe('localTimeAgo', () => {
|
|||
it.each`
|
||||
timeagoArg | title
|
||||
${false} | ${'some time'}
|
||||
${true} | ${'Feb 18, 2020 10:22pm GMT+0000'}
|
||||
${true} | ${'Feb 18, 2020 10:22pm UTC'}
|
||||
`('converts $seconds seconds to $approximation', ({ timeagoArg, title }) => {
|
||||
const element = document.querySelector('time');
|
||||
datetimeUtility.localTimeAgo($(element), timeagoArg);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ describe('ExpiresAt', () => {
|
|||
const tooltipDirective = getTooltipDirective(expiredText);
|
||||
|
||||
expect(tooltipDirective).not.toBeUndefined();
|
||||
expect(expiredText.attributes('title')).toBe('Mar 15, 2019 12:00am GMT+0000');
|
||||
expect(expiredText.attributes('title')).toBe('Mar 15, 2019 12:00am UTC');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ describe('Time series component', () => {
|
|||
});
|
||||
|
||||
it('formats tooltip title', () => {
|
||||
expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (GMT+0000)');
|
||||
expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (UTC)');
|
||||
});
|
||||
|
||||
it('formats tooltip content', () => {
|
||||
|
|
@ -282,7 +282,7 @@ describe('Time series component', () => {
|
|||
});
|
||||
|
||||
it('formats tooltip title', () => {
|
||||
expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (GMT+0000)');
|
||||
expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (UTC)');
|
||||
});
|
||||
|
||||
it('formats tooltip sha', () => {
|
||||
|
|
@ -301,7 +301,7 @@ describe('Time series component', () => {
|
|||
});
|
||||
|
||||
it('formats tooltip title', () => {
|
||||
expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (GMT+0000)');
|
||||
expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (UTC)');
|
||||
});
|
||||
|
||||
it('formats tooltip sha', () => {
|
||||
|
|
@ -334,7 +334,7 @@ describe('Time series component', () => {
|
|||
|
||||
it('formats tooltip title and sets tooltip content', () => {
|
||||
const formattedTooltipData = wrapper.vm.formatAnnotationsTooltipText(mockMarkPoint);
|
||||
expect(formattedTooltipData.title).toBe('19 Feb 2020, 10:01AM (GMT+0000)');
|
||||
expect(formattedTooltipData.title).toBe('19 Feb 2020, 10:01AM (UTC)');
|
||||
expect(formattedTooltipData.content).toBe(annotationsMetadata.tooltipData.content);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -313,10 +313,10 @@ describe('tags list row', () => {
|
|||
});
|
||||
|
||||
describe.each`
|
||||
name | finderFunction | text | icon | clipboard
|
||||
${'published date detail'} | ${findPublishedDateDetail} | ${'Published to the gitlab-org/gitlab-test/rails-12009 image repository at 01:29 GMT+0000 on 2020-11-03'} | ${'clock'} | ${false}
|
||||
${'manifest detail'} | ${findManifestDetail} | ${'Manifest digest: sha256:2cf3d2fdac1b04a14301d47d51cb88dcd26714c74f91440eeee99ce399089062'} | ${'log'} | ${true}
|
||||
${'configuration detail'} | ${findConfigurationDetail} | ${'Configuration digest: sha256:c2613843ab33aabf847965442b13a8b55a56ae28837ce182627c0716eb08c02b'} | ${'cloud-gear'} | ${true}
|
||||
name | finderFunction | text | icon | clipboard
|
||||
${'published date detail'} | ${findPublishedDateDetail} | ${'Published to the gitlab-org/gitlab-test/rails-12009 image repository at 01:29 UTC on 2020-11-03'} | ${'clock'} | ${false}
|
||||
${'manifest detail'} | ${findManifestDetail} | ${'Manifest digest: sha256:2cf3d2fdac1b04a14301d47d51cb88dcd26714c74f91440eeee99ce399089062'} | ${'log'} | ${true}
|
||||
${'configuration detail'} | ${findConfigurationDetail} | ${'Configuration digest: sha256:c2613843ab33aabf847965442b13a8b55a56ae28837ce182627c0716eb08c02b'} | ${'cloud-gear'} | ${true}
|
||||
`('$name details row', ({ finderFunction, text, icon, clipboard }) => {
|
||||
it(`has ${text} as text`, async () => {
|
||||
mountComponent();
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ describe('User Lists Table', () => {
|
|||
|
||||
it('should set the title for a tooltip on the created stamp', () => {
|
||||
expect(wrapper.find('[data-testid="ffUserListTimestamp"]').attributes('title')).toBe(
|
||||
'Feb 4, 2020 8:13am GMT+0000',
|
||||
'Feb 4, 2020 8:13am UTC',
|
||||
);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ describe('MRWidgetPipeline', () => {
|
|||
|
||||
it('should render pipeline finished timestamp', () => {
|
||||
expect(findPipelineFinishedAt().attributes()).toMatchObject({
|
||||
title: 'Apr 7, 2017 2:00pm GMT+0000',
|
||||
title: 'Apr 7, 2017 2:00pm UTC',
|
||||
datetime: mockData.pipeline.details.finished_at,
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ describe('MRWidgetClosed', () => {
|
|||
avatarUrl:
|
||||
'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
|
||||
},
|
||||
mergedAt: 'Jan 24, 2018 1:02pm GMT+0000',
|
||||
closedAt: 'Jan 24, 2018 1:02pm GMT+0000',
|
||||
mergedAt: 'Jan 24, 2018 1:02pm UTC',
|
||||
closedAt: 'Jan 24, 2018 1:02pm UTC',
|
||||
readableMergedAt: '',
|
||||
readableClosedAt: 'less than a minute ago',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -37,10 +37,10 @@ describe('MRWidgetMerged', () => {
|
|||
avatarUrl:
|
||||
'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
|
||||
},
|
||||
mergedAt: 'Jan 24, 2018 1:02pm GMT+0000',
|
||||
mergedAt: 'Jan 24, 2018 1:02pm UTC',
|
||||
readableMergedAt: '',
|
||||
closedBy: {},
|
||||
closedAt: 'Jan 24, 2018 1:02pm GMT+0000',
|
||||
closedAt: 'Jan 24, 2018 1:02pm UTC',
|
||||
readableClosedAt: '',
|
||||
},
|
||||
updatedAt: 'mergedUpdatedAt',
|
||||
|
|
@ -236,6 +236,6 @@ describe('MRWidgetMerged', () => {
|
|||
});
|
||||
|
||||
it('should use mergedEvent mergedAt as tooltip title', () => {
|
||||
expect(vm.$el.querySelector('time').getAttribute('title')).toBe('Jan 24, 2018 1:02pm GMT+0000');
|
||||
expect(vm.$el.querySelector('time').getAttribute('title')).toBe('Jan 24, 2018 1:02pm UTC');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -108,114 +108,101 @@ RSpec.describe Gitlab::SidekiqCluster::CLI do
|
|||
end
|
||||
end
|
||||
|
||||
# Remove with https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
|
||||
context 'with --queue-selector and --experimental-queue-selector' do
|
||||
it 'errors' do
|
||||
context "with --queue-selector" do
|
||||
where do
|
||||
{
|
||||
'memory-bound queues' => {
|
||||
query: 'resource_boundary=memory',
|
||||
included_queues: %w(project_export),
|
||||
excluded_queues: %w(merge)
|
||||
},
|
||||
'memory- or CPU-bound queues' => {
|
||||
query: 'resource_boundary=memory,cpu',
|
||||
included_queues: %w(auto_merge:auto_merge_process project_export),
|
||||
excluded_queues: %w(merge)
|
||||
},
|
||||
'high urgency CI queues' => {
|
||||
query: 'feature_category=continuous_integration&urgency=high',
|
||||
included_queues: %w(pipeline_cache:expire_job_cache pipeline_cache:expire_pipeline_cache),
|
||||
excluded_queues: %w(merge)
|
||||
},
|
||||
'CPU-bound high urgency CI queues' => {
|
||||
query: 'feature_category=continuous_integration&urgency=high&resource_boundary=cpu',
|
||||
included_queues: %w(pipeline_cache:expire_pipeline_cache),
|
||||
excluded_queues: %w(pipeline_cache:expire_job_cache merge)
|
||||
},
|
||||
'CPU-bound high urgency non-CI queues' => {
|
||||
query: 'feature_category!=continuous_integration&urgency=high&resource_boundary=cpu',
|
||||
included_queues: %w(new_issue),
|
||||
excluded_queues: %w(pipeline_cache:expire_pipeline_cache)
|
||||
},
|
||||
'CI and SCM queues' => {
|
||||
query: 'feature_category=continuous_integration|feature_category=source_code_management',
|
||||
included_queues: %w(pipeline_cache:expire_job_cache merge),
|
||||
excluded_queues: %w(mailers)
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
with_them do
|
||||
it 'expands queues by attributes' do
|
||||
expect(Gitlab::SidekiqCluster).to receive(:start) do |queues, opts|
|
||||
expect(opts).to eq(default_options)
|
||||
expect(queues.first).to include(*included_queues)
|
||||
expect(queues.first).not_to include(*excluded_queues)
|
||||
|
||||
[]
|
||||
end
|
||||
|
||||
cli.run(%W(--queue-selector #{query}))
|
||||
end
|
||||
|
||||
it 'works when negated' do
|
||||
expect(Gitlab::SidekiqCluster).to receive(:start) do |queues, opts|
|
||||
expect(opts).to eq(default_options)
|
||||
expect(queues.first).not_to include(*included_queues)
|
||||
expect(queues.first).to include(*excluded_queues)
|
||||
|
||||
[]
|
||||
end
|
||||
|
||||
cli.run(%W(--negate --queue-selector #{query}))
|
||||
end
|
||||
end
|
||||
|
||||
it 'expands multiple queue groups correctly' do
|
||||
expect(Gitlab::SidekiqCluster)
|
||||
.to receive(:start)
|
||||
.with([['chat_notification'], ['project_export']], default_options)
|
||||
.and_return([])
|
||||
|
||||
cli.run(%w(--queue-selector feature_category=chatops&has_external_dependencies=true resource_boundary=memory&feature_category=importers))
|
||||
end
|
||||
|
||||
it 'allows the special * selector' do
|
||||
worker_queues = %w(foo bar baz)
|
||||
|
||||
expect(Gitlab::SidekiqConfig::CliMethods)
|
||||
.to receive(:worker_queues).and_return(worker_queues)
|
||||
|
||||
expect(Gitlab::SidekiqCluster)
|
||||
.to receive(:start).with([worker_queues], default_options)
|
||||
|
||||
cli.run(%w(--queue-selector *))
|
||||
end
|
||||
|
||||
it 'errors when the selector matches no queues' do
|
||||
expect(Gitlab::SidekiqCluster).not_to receive(:start)
|
||||
|
||||
expect { cli.run(%w(--queue-selector name=foo --experimental-queue-selector name=bar)) }
|
||||
expect { cli.run(%w(--queue-selector has_external_dependencies=true&has_external_dependencies=false)) }
|
||||
.to raise_error(described_class::CommandError)
|
||||
end
|
||||
end
|
||||
|
||||
# Simplify with https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
|
||||
['--queue-selector', '--experimental-queue-selector'].each do |flag|
|
||||
context "with #{flag}" do
|
||||
where do
|
||||
{
|
||||
'memory-bound queues' => {
|
||||
query: 'resource_boundary=memory',
|
||||
included_queues: %w(project_export),
|
||||
excluded_queues: %w(merge)
|
||||
},
|
||||
'memory- or CPU-bound queues' => {
|
||||
query: 'resource_boundary=memory,cpu',
|
||||
included_queues: %w(auto_merge:auto_merge_process project_export),
|
||||
excluded_queues: %w(merge)
|
||||
},
|
||||
'high urgency CI queues' => {
|
||||
query: 'feature_category=continuous_integration&urgency=high',
|
||||
included_queues: %w(pipeline_cache:expire_job_cache pipeline_cache:expire_pipeline_cache),
|
||||
excluded_queues: %w(merge)
|
||||
},
|
||||
'CPU-bound high urgency CI queues' => {
|
||||
query: 'feature_category=continuous_integration&urgency=high&resource_boundary=cpu',
|
||||
included_queues: %w(pipeline_cache:expire_pipeline_cache),
|
||||
excluded_queues: %w(pipeline_cache:expire_job_cache merge)
|
||||
},
|
||||
'CPU-bound high urgency non-CI queues' => {
|
||||
query: 'feature_category!=continuous_integration&urgency=high&resource_boundary=cpu',
|
||||
included_queues: %w(new_issue),
|
||||
excluded_queues: %w(pipeline_cache:expire_pipeline_cache)
|
||||
},
|
||||
'CI and SCM queues' => {
|
||||
query: 'feature_category=continuous_integration|feature_category=source_code_management',
|
||||
included_queues: %w(pipeline_cache:expire_job_cache merge),
|
||||
excluded_queues: %w(mailers)
|
||||
}
|
||||
}
|
||||
end
|
||||
it 'errors on an invalid query multiple queue groups correctly' do
|
||||
expect(Gitlab::SidekiqCluster).not_to receive(:start)
|
||||
|
||||
with_them do
|
||||
it 'expands queues by attributes' do
|
||||
expect(Gitlab::SidekiqCluster).to receive(:start) do |queues, opts|
|
||||
expect(opts).to eq(default_options)
|
||||
expect(queues.first).to include(*included_queues)
|
||||
expect(queues.first).not_to include(*excluded_queues)
|
||||
|
||||
[]
|
||||
end
|
||||
|
||||
cli.run(%W(#{flag} #{query}))
|
||||
end
|
||||
|
||||
it 'works when negated' do
|
||||
expect(Gitlab::SidekiqCluster).to receive(:start) do |queues, opts|
|
||||
expect(opts).to eq(default_options)
|
||||
expect(queues.first).not_to include(*included_queues)
|
||||
expect(queues.first).to include(*excluded_queues)
|
||||
|
||||
[]
|
||||
end
|
||||
|
||||
cli.run(%W(--negate #{flag} #{query}))
|
||||
end
|
||||
end
|
||||
|
||||
it 'expands multiple queue groups correctly' do
|
||||
expect(Gitlab::SidekiqCluster)
|
||||
.to receive(:start)
|
||||
.with([['chat_notification'], ['project_export']], default_options)
|
||||
.and_return([])
|
||||
|
||||
cli.run(%W(#{flag} feature_category=chatops&has_external_dependencies=true resource_boundary=memory&feature_category=importers))
|
||||
end
|
||||
|
||||
it 'allows the special * selector' do
|
||||
worker_queues = %w(foo bar baz)
|
||||
|
||||
expect(Gitlab::SidekiqConfig::CliMethods)
|
||||
.to receive(:worker_queues).and_return(worker_queues)
|
||||
|
||||
expect(Gitlab::SidekiqCluster)
|
||||
.to receive(:start).with([worker_queues], default_options)
|
||||
|
||||
cli.run(%W(#{flag} *))
|
||||
end
|
||||
|
||||
it 'errors when the selector matches no queues' do
|
||||
expect(Gitlab::SidekiqCluster).not_to receive(:start)
|
||||
|
||||
expect { cli.run(%W(#{flag} has_external_dependencies=true&has_external_dependencies=false)) }
|
||||
.to raise_error(described_class::CommandError)
|
||||
end
|
||||
|
||||
it 'errors on an invalid query multiple queue groups correctly' do
|
||||
expect(Gitlab::SidekiqCluster).not_to receive(:start)
|
||||
|
||||
expect { cli.run(%W(#{flag} unknown_field=chatops)) }
|
||||
.to raise_error(Gitlab::SidekiqConfig::WorkerMatcher::QueryError)
|
||||
end
|
||||
expect { cli.run(%w(--queue-selector unknown_field=chatops)) }
|
||||
.to raise_error(Gitlab::SidekiqConfig::WorkerMatcher::QueryError)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4169,10 +4169,10 @@ date-now@^0.1.4:
|
|||
resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
|
||||
integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
|
||||
|
||||
dateformat@^3.0.3:
|
||||
version "3.0.3"
|
||||
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
|
||||
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
|
||||
dateformat@^4.5.1:
|
||||
version "4.5.1"
|
||||
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.5.1.tgz#c20e7a9ca77d147906b6dc2261a8be0a5bd2173c"
|
||||
integrity sha512-OD0TZ+B7yP7ZgpJf5K2DIbj3FZvFvxgFUuaqA/V5zTjAtAAXZ1E8bktHxmAGs4x5b7PflqA9LeQ84Og7wYtF7Q==
|
||||
|
||||
de-indent@^1.0.2:
|
||||
version "1.0.2"
|
||||
|
|
|
|||
Loading…
Reference in New Issue