From 3ba5ff85f72cc8da83a3331552fa0d4481beb109 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 21 Feb 2024 06:07:05 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../javascripts/observability/constants.js | 4 ++-- .../pages/groups/work_items/show/index.js | 2 +- app/assets/javascripts/work_items/index.js | 13 +++++----- .../work_items/pages/create_work_item.vue | 5 +++- .../javascripts/work_items/router/index.js | 11 +++++++-- .../collapse_generated_diff_files.yml | 2 +- ...05_clusters_applications_cert_managers.yml | 2 +- ...10216175407_clusters_applications_helm.yml | 2 +- ...16175409_clusters_applications_ingress.yml | 2 +- ...16175411_clusters_applications_knative.yml | 2 +- ...0216175413_clusters_management_project.yml | 2 +- .../20210216175415_clusters_disabled.yml | 2 +- .../20210216175417_clusters_enabled.yml | 2 +- .../20210216175419_clusters_platforms_gke.yml | 2 +- .../20210216175420_clusters_platforms_eks.yml | 2 +- ...20210216175422_clusters_platforms_user.yml | 2 +- ...10216175424_instance_clusters_disabled.yml | 2 +- ...210216175426_instance_clusters_enabled.yml | 2 +- ...20210216175428_group_clusters_disabled.yml | 2 +- .../20210216175430_group_clusters_enabled.yml | 2 +- ...210216175432_project_clusters_disabled.yml | 2 +- ...0210216175434_project_clusters_enabled.yml | 2 +- ...523_p_ci_templates_auto_devops_monthly.yml | 2 +- ...erraform_state_api_unique_users_weekly.yml | 2 +- ..._templates_implicit_auto_devops_weekly.yml | 2 +- ...ates_implicit_auto_devops_build_weekly.yml | 2 +- ...tes_implicit_auto_devops_deploy_weekly.yml | 2 +- ...4520_p_ci_templates_auto_devops_weekly.yml | 2 +- ...ci_templates_auto_devops_deploy_weekly.yml | 2 +- ...lates_auto_devops_deploy_latest_weekly.yml | 2 +- ...templates_terraform_base_latest_weekly.yml | 2 +- ...i_templates_total_unique_counts_weekly.yml | 2 +- ...e_terraform_module_deploy_token_weekly.yml | 2 +- ...i_package_terraform_module_user_weekly.yml | 2 +- ...licit_auto_devops_deploy_latest_weekly.yml | 2 +- ...644_agent_users_using_ci_tunnel_weekly.yml | 2 +- ...p_ci_templates_terraform_module_weekly.yml | 2 +- ...templates_terraform_module_base_weekly.yml | 2 +- .../20210216175234_clusters_enabled.yml | 2 +- ...0210216175236_project_clusters_enabled.yml | 2 +- .../20210216175238_group_clusters_enabled.yml | 2 +- ...210216175240_instance_clusters_enabled.yml | 2 +- .../20210216175242_clusters_disabled.yml | 2 +- ...210216175244_project_clusters_disabled.yml | 2 +- ...20210216175246_group_clusters_disabled.yml | 2 +- ...10216175248_instance_clusters_disabled.yml | 2 +- .../20210216175250_clusters_platforms_eks.yml | 2 +- .../20210216175251_clusters_platforms_gke.yml | 2 +- ...20210216175253_clusters_platforms_user.yml | 2 +- ...10216175255_clusters_applications_helm.yml | 2 +- ...16175257_clusters_applications_ingress.yml | 2 +- ...59_clusters_applications_cert_managers.yml | 2 +- ...75301_clusters_applications_crossplane.yml | 2 +- ...75303_clusters_applications_prometheus.yml | 2 +- ...216175305_clusters_applications_runner.yml | 2 +- ...16175307_clusters_applications_knative.yml | 2 +- ...09_clusters_applications_elastic_stack.yml | 2 +- ...16175310_clusters_applications_jupyter.yml | 2 +- ...216175312_clusters_applications_cilium.yml | 2 +- ...0216175314_clusters_management_project.yml | 2 +- ...29_clusters_applications_cert_managers.yml | 2 +- ...10216175331_clusters_applications_helm.yml | 2 +- ...16175333_clusters_applications_ingress.yml | 2 +- ...16175335_clusters_applications_knative.yml | 2 +- ...0216175337_clusters_management_project.yml | 2 +- .../20210216175339_clusters_disabled.yml | 2 +- .../20210216175341_clusters_enabled.yml | 2 +- .../20210216175343_clusters_platforms_gke.yml | 2 +- .../20210216175345_clusters_platforms_eks.yml | 2 +- ...20210216175346_clusters_platforms_user.yml | 2 +- ...10216175348_instance_clusters_disabled.yml | 2 +- ...210216175350_instance_clusters_enabled.yml | 2 +- ...20210216175352_group_clusters_disabled.yml | 2 +- .../20210216175354_group_clusters_enabled.yml | 2 +- ...210216175356_project_clusters_disabled.yml | 2 +- ...0210216175358_project_clusters_enabled.yml | 2 +- ...175403_projects_with_prometheus_alerts.yml | 2 +- ...216181949_clusters_applications_runner.yml | 2 +- ...00930_clusters_integrations_prometheus.yml | 2 +- ...31_clusters_integrations_elastic_stack.yml | 2 +- ...204124856_instance_auto_devops_enabled.yml | 2 +- ...22181654_certificate_based_clusters_ff.yml | 2 +- ...6-9-deprecate-grype-container-scanning.yml | 14 ++++++++--- .../backfill_vs_code_settings_uuid.yml | 2 +- db/docs/group_group_links.yml | 2 ++ db/docs/ip_restrictions.yml | 2 ++ db/docs/namespace_admin_notes.yml | 10 +++++++- db/docs/namespace_ldap_settings.yml | 14 ++++++++--- db/docs/project_access_tokens.yml | 10 +++++++- db/docs/project_group_links.yml | 2 ++ db/docs/saml_group_links.yml | 10 +++++++- db/docs/saml_providers.yml | 2 ++ ...finalize_backfill_vs_code_settings_uuid.rb | 24 +++++++++++++++++++ db/schema_migrations/20240222000002 | 1 + doc/api/merge_requests.md | 1 + doc/update/deprecations.md | 14 ++++++++--- .../sast/troubleshooting.md | 8 +++++++ doc/user/project/merge_requests/changes.md | 7 +----- spec/frontend/work_items/router_spec.js | 21 +++++++++++++++- 99 files changed, 223 insertions(+), 110 deletions(-) create mode 100644 db/post_migrate/20240222000002_finalize_backfill_vs_code_settings_uuid.rb create mode 100644 db/schema_migrations/20240222000002 diff --git a/app/assets/javascripts/observability/constants.js b/app/assets/javascripts/observability/constants.js index 5d6bd4faed6..8a656666f34 100644 --- a/app/assets/javascripts/observability/constants.js +++ b/app/assets/javascripts/observability/constants.js @@ -36,9 +36,9 @@ export const TIME_RANGE_OPTIONS = [ ]; Object.freeze(TIME_RANGE_OPTIONS); -const OPERERATOR_LIKE = '=~'; +export const OPERERATOR_LIKE = '=~'; const OPERERATOR_LIKE_TEXT = s__('ObservabilityMetrics|is like'); -const OPERERATOR_NOT_LIKE = '!~'; +export const OPERERATOR_NOT_LIKE = '!~'; const OPERERATOR_NOT_LIKE_TEXT = s__('ObservabilityMetrics|is not like'); const OPERATORS_LIKE = [{ value: OPERERATOR_LIKE, description: OPERERATOR_LIKE_TEXT }]; diff --git a/app/assets/javascripts/pages/groups/work_items/show/index.js b/app/assets/javascripts/pages/groups/work_items/show/index.js index c091fbcc2b2..0e8ee3aa7c1 100644 --- a/app/assets/javascripts/pages/groups/work_items/show/index.js +++ b/app/assets/javascripts/pages/groups/work_items/show/index.js @@ -1,4 +1,4 @@ import { WORKSPACE_GROUP } from '~/issues/constants'; import { initWorkItemsRoot } from '~/work_items'; -initWorkItemsRoot(WORKSPACE_GROUP); +initWorkItemsRoot({ workspaceType: WORKSPACE_GROUP }); diff --git a/app/assets/javascripts/work_items/index.js b/app/assets/javascripts/work_items/index.js index 0b7f9290d6e..1ef5e851d4f 100644 --- a/app/assets/javascripts/work_items/index.js +++ b/app/assets/javascripts/work_items/index.js @@ -4,12 +4,11 @@ import { WORKSPACE_GROUP } from '~/issues/constants'; import { parseBoolean } from '~/lib/utils/common_utils'; import { apolloProvider } from '~/graphql_shared/issuable_client'; import App from './components/app.vue'; -import WorkItemRoot from './pages/work_item_root.vue'; import { createRouter } from './router'; Vue.use(VueApollo); -export const initWorkItemsRoot = (workspace) => { +export const initWorkItemsRoot = ({ workItemType, workspaceType } = {}) => { const el = document.querySelector('#js-work-items'); if (!el) { @@ -30,16 +29,16 @@ export const initWorkItemsRoot = (workspace) => { reportAbusePath, } = el.dataset; - const Component = workspace === WORKSPACE_GROUP ? WorkItemRoot : App; + const isGroup = workspaceType === WORKSPACE_GROUP; return new Vue({ el, name: 'WorkItemsRoot', - router: createRouter(el.dataset.fullPath), + router: createRouter({ fullPath, workItemType, workspaceType }), apolloProvider, provide: { fullPath, - isGroup: workspace === WORKSPACE_GROUP, + isGroup, hasIssueWeightsFeature: parseBoolean(hasIssueWeightsFeature), hasOkrsFeature: parseBoolean(hasOkrsFeature), issuesListPath, @@ -51,9 +50,9 @@ export const initWorkItemsRoot = (workspace) => { reportAbusePath, }, render(createElement) { - return createElement(Component, { + return createElement(App, { props: { - iid: workspace === WORKSPACE_GROUP ? iid : undefined, + iid: isGroup ? iid : undefined, }, }); }, diff --git a/app/assets/javascripts/work_items/pages/create_work_item.vue b/app/assets/javascripts/work_items/pages/create_work_item.vue index 435a1233dce..10c76cab878 100644 --- a/app/assets/javascripts/work_items/pages/create_work_item.vue +++ b/app/assets/javascripts/work_items/pages/create_work_item.vue @@ -9,6 +9,7 @@ import { sprintfWorkItem, } from '../constants'; import createWorkItemMutation from '../graphql/create_work_item.mutation.graphql'; +import groupWorkItemTypesQuery from '../graphql/group_work_item_types.query.graphql'; import projectWorkItemTypesQuery from '../graphql/project_work_item_types.query.graphql'; import groupWorkItemByIidQuery from '../graphql/group_work_item_by_iid.query.graphql'; import workItemByIidQuery from '../graphql/work_item_by_iid.query.graphql'; @@ -42,7 +43,9 @@ export default { }, apollo: { workItemTypes: { - query: projectWorkItemTypesQuery, + query() { + return this.isGroup ? groupWorkItemTypesQuery : projectWorkItemTypesQuery; + }, variables() { return { fullPath: this.fullPath, diff --git a/app/assets/javascripts/work_items/router/index.js b/app/assets/javascripts/work_items/router/index.js index 8d67bcaf84f..dcf9dcb10f5 100644 --- a/app/assets/javascripts/work_items/router/index.js +++ b/app/assets/javascripts/work_items/router/index.js @@ -1,16 +1,23 @@ import { GlToast } from '@gitlab/ui'; import Vue from 'vue'; import VueRouter from 'vue-router'; +import { WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants'; import { joinPaths } from '~/lib/utils/url_utility'; import { routes } from './routes'; Vue.use(GlToast); Vue.use(VueRouter); -export function createRouter(fullPath) { +export function createRouter({ + fullPath, + workItemType = 'work_items', + workspaceType = WORKSPACE_PROJECT, +}) { + const workspacePath = workspaceType === WORKSPACE_GROUP ? '/groups' : ''; + return new VueRouter({ routes: routes(), mode: 'history', - base: joinPaths(gon?.relative_url_root, fullPath, '-', 'work_items'), + base: joinPaths(gon?.relative_url_root, workspacePath, fullPath, '-', workItemType), }); } diff --git a/config/feature_flags/development/collapse_generated_diff_files.yml b/config/feature_flags/development/collapse_generated_diff_files.yml index 5d5cf5d98a0..0992f0d7e7b 100644 --- a/config/feature_flags/development/collapse_generated_diff_files.yml +++ b/config/feature_flags/development/collapse_generated_diff_files.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432670 milestone: '16.7' type: development group: group::code review -default_enabled: false +default_enabled: true diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml index 6647ed6e3b8..7bdef827c22 100644 --- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml +++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_cert_m description: Count user ids from GitLab Managed clusters with Cert Manager enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml index 249e7d85bad..83bc9e26503 100644 --- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml +++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_helm description: Count user ids from GitLab Managed clusters with Helm enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml index 7a95f6e5ac7..837a8affd4d 100644 --- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml +++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_ingres description: Count user ids from GitLab Managed clusters with Ingress enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml index 12c8dde9cff..796259b5ad1 100644 --- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml +++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_applications_knativ description: Count user ids from GitLab Managed clusters with Knative enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml index 286c5401068..b30a8693cd2 100644 --- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml +++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml @@ -5,7 +5,7 @@ description: Number of Kubernetes clusters with clusters management project bein set product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml index ca1c2bb72ad..4b83b246f48 100644 --- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml +++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_disabled description: Number of user ids from GitLab Managed disabled clusters product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml index ec116c7c2ac..b36d9292a57 100644 --- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml +++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_enabled description: Number of distict user ids from GitLab Managed clusters currently enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml index db348e8ffb0..9f847d2ebef 100644 --- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml +++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_gke description: Number of user ids from GitLab Managed clusters provisioned with GitLab on GCE GKE product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml index cb1b6b9e9e8..410cf6c8384 100644 --- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml +++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_eks description: Number of user ids from GitLab Managed clusters provisioned with GitLab on AWS EKS product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml index 17331ea5882..8aafee5b4cc 100644 --- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml +++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_user description: Number of user ids from GitLab Managed clusters that are user provisioned product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml index 5f4afa58ac9..05c6c398bef 100644 --- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml +++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.instance_clusters_disabled description: Number of users from GitLab Managed disabled clusters attached to the instance product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml index 6c750370bba..8b1840bd363 100644 --- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml +++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.instance_clusters_enabled description: Number of user ids from GitLab Managed enabled clusters attached to the instance product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml index 3eb3b05b0be..29652c974e7 100644 --- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml +++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.group_clusters_disabled description: Number of user ids GitLab Managed disabled clusters attached to groups product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml index f7be4ff3e68..7576f17f02b 100644 --- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml +++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.group_clusters_enabled description: Count disctinct user ids from GitLab Managed enabled clusters attached to groups product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml index eac8e143217..ea560279836 100644 --- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml +++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.project_clusters_disabled description: Number of user ids from GitLab Managed disabled clusters attached to projects product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml index 6e297a3bb8e..d57155d4f55 100644 --- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml +++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.configure.project_clusters_enabled description: Number of user ids from GitLab Managed enabled clusters attached to projects product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml index 723776de6f8..ae437b15772 100644 --- a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml +++ b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_monthly description: Count of pipelines using the Auto DevOps template product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active time_frame: 28d diff --git a/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml b/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml index 99cabcd6dc1..707b063c622 100644 --- a/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml +++ b/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_weekly description: Monthly active users of GitLab Managed Terraform states product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active time_frame: 7d diff --git a/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml b/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml index fa1b01b029e..dbdba4992d9 100644 --- a/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml +++ b/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_we description: Count of pipelines with implicit Auto Build runs product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active time_frame: 7d diff --git a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml index 3487a2306a2..1de0ffe36cd 100644 --- a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml +++ b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_bu description: Count of pipelines with implicit Auto Build runs product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: removed milestone_removed: '14.6' diff --git a/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml index 07868d1be43..8b1d86d8164 100644 --- a/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml +++ b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_de description: Count of pipelines with implicit Auto Deploy runs product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: removed milestone_removed: '14.6' diff --git a/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml b/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml index 422ab92b81e..1788d3c41da 100644 --- a/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml +++ b/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_weekly description: Count of pipelines using the latest Auto Deploy template product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active time_frame: 7d diff --git a/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml index 855c1365589..337f285dbfd 100644 --- a/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml +++ b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_week description: Count of pipelines using the stable Auto Deploy template product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: removed milestone: '14.3' diff --git a/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml index 3c3d297639c..f6596565e81 100644 --- a/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml +++ b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_late description: Count of pipelines using the latest Auto Deploy template product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: removed milestone_removed: '14.6' diff --git a/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml b/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml index 332e522c181..e49e0a8abfa 100644 --- a/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml +++ b/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_w description: Count of pipelines that include the terraform base template from GitLab product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active time_frame: 7d diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml index 291d05736cd..5710aaaf4b2 100755 --- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml +++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_weekl description: Total count of pipelines runs product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: removed milestone_removed: '14.3' diff --git a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml index 814b6c3352c..e392cab76fe 100644 --- a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml +++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_de description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 7 days product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active milestone: '13.11' diff --git a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml index 181d38b6fc7..071aaeb82ea 100644 --- a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml +++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_weekl description: Number of distinct users creating Terraform Module packages in recent 7 days product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active milestone: '13.11' diff --git a/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml index 98951919e65..6154c1f7524 100644 --- a/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml +++ b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml @@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_de description: Count of pipelines using the latest Auto Deploy template product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: removed milestone: '14.3' diff --git a/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml b/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml index 3c309eb1bb5..9988283de8a 100644 --- a/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml +++ b/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml @@ -3,7 +3,7 @@ key_path: redis_hll_counters.kubernetes_agent.agent_users_using_ci_tunnel_weekly description: WAU of the Agent for Kubernetes CI/CD Tunnel product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active milestone: "15.3" diff --git a/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml b/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml index 3d2ccd4083a..4d796f18518 100644 --- a/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml +++ b/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml @@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_module_weekly description: Count of pipelines using the Terraform Module template product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active milestone: "15.9" diff --git a/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml b/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml index 4f307e94be7..fae4695f710 100644 --- a/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml +++ b/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml @@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_module_base_w description: Count of pipelines using the Terraform Module Base template product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: number status: active milestone: "15.9" diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml index 2fc86649c4b..f995d872da7 100644 --- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml +++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_enabled description: Number of Kubernetes clusters attached to GitLab currently enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml index d6d5228d0fe..b0033f346b4 100644 --- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml +++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: counts.project_clusters_enabled description: Total GitLab Managed clusters attached to projects product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml index 6c818d48782..072702d11b7 100644 --- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml +++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: counts.group_clusters_enabled description: Total GitLab Managed clusters attached to groups product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml index 804e25da11c..7c7cdc336bd 100644 --- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml +++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: counts.instance_clusters_enabled description: Total GitLab Managed clusters attached to the instance product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml index c4d4f14fc2c..5d1b65ca0d6 100644 --- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml +++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_disabled description: Number of Kubernetes clusters attached to GitLab currently disabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml index 8ebcf09d7a2..ee710fc765c 100644 --- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml +++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: counts.project_clusters_disabled description: Total GitLab Managed disabled clusters previously attached to projects product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml index 59b42f1cabe..64f9ee339e8 100644 --- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml +++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: counts.group_clusters_disabled description: Total GitLab Managed disabled clusters previously attached to groups product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml index c9afefabf6c..bf46651c35e 100644 --- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml +++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: counts.instance_clusters_disabled description: Total GitLab Managed disabled clusters previously attached to the instance product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml index 6e9c86ea00f..0c58015d84d 100644 --- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml +++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_platforms_eks description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml index 9d909701fe8..5355e0d2088 100644 --- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml +++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_platforms_gke description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml index 4c073d61844..c1728972b49 100644 --- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml +++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_platforms_user description: Total GitLab Managed clusters that are user provisioned product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml index 16c1f26bf8e..c28027d3ff3 100644 --- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml +++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_helm description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml index 885de6e75a0..b88d77df176 100644 --- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml +++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_ingress description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml index 9ff2585d09d..a5d4ca79bcb 100644 --- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml +++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_cert_managers description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml index 63d06eb1af8..74d6e89470a 100644 --- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml +++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_crossplane description: Total GitLab Managed clusters with GitLab Managed App:Crossplane installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml index 29df1ab8ff3..9463971b6d9 100644 --- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml +++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_prometheus description: Total GitLab Managed clusters with GitLab Managed App:Prometheus installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml index 02ddd07636f..052b2a2788d 100644 --- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml +++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_runner description: Total GitLab Managed clusters with GitLab Managed App:Runner installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml index ee95e2812dc..b9c52cbc53c 100644 --- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml +++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_knative description: Total GitLab Managed clusters with GitLab Managed App:Knative installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml index 20afc0b4acf..3a5bcc702d2 100644 --- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml +++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_elastic_stack description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml index 101167e45d3..4c0b64bf65c 100644 --- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml +++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_jupyter description: Total GitLab Managed clusters with GitLab Managed App:Jupyter installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml index 0deff066abb..62d7d2e5eac 100644 --- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml +++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_applications_cilium description: Total GitLab Managed clusters with GitLab Managed App:Cilium installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml index 3e4a4c6a7af..7442529453b 100644 --- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml +++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_management_project description: Total GitLab Managed clusters with defined cluster management project product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml index 90347bb8207..cfa3ded3ba1 100644 --- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml +++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_cert_managers description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml index 2a1f18295df..9d0fd879c46 100644 --- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml +++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_helm description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml index fb3707aed9a..1cf2d803c1f 100644 --- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml +++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_ingress description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml index 4c6f0ce629c..654e6281f56 100644 --- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml +++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_applications_knative description: Total GitLab Managed clusters with GitLab Managed App:Knative installed product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml index 0a8899be1a3..171a56fbeb9 100644 --- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml +++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_management_project description: Total GitLab Managed clusters with defined cluster management project product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml index 510b66c02a2..38e1c1210aa 100644 --- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml +++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_disabled description: Total GitLab Managed disabled clusters product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml index be4ca306eff..1fb1817dfdf 100644 --- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml +++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_enabled description: Total GitLab Managed clusters currently enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml index 41a546f73ab..d937b191582 100644 --- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml +++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_platforms_gke description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml index 1711589636d..c6d758c8807 100644 --- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml +++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_platforms_eks description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml index ed86490ef9c..024c2fa08cc 100644 --- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml +++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.clusters_platforms_user description: Total GitLab Managed clusters that are user provisioned product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml index 8007b2fc277..95b1140c491 100644 --- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml +++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.instance_clusters_disabled description: Total GitLab Managed disabled clusters attached to the instance product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml index bfe2a41c6ef..524fb139a66 100644 --- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml +++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.instance_clusters_enabled description: Total GitLab Managed enabled clusters attached to the instance product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml index 92e39a8aa36..5a5998503b6 100644 --- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml +++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.group_clusters_disabled description: Total GitLab Managed disabled clusters attached to groups product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml index 263102b5a3b..77e6b3d8672 100644 --- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml +++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.group_clusters_enabled description: Total GitLab Managed enabled clusters attached to groups product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml index 741036b7cd3..f587df3154b 100644 --- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml +++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.project_clusters_disabled description: Total GitLab Managed disabled clusters attached to projects product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml index 7afa52d0aa5..32374878c36 100644 --- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml +++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.project_clusters_enabled description: Total GitLab Managed enabled clusters attached to projects product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml index 9b66261f91c..21f70a13a81 100644 --- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml +++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.configure.projects_with_prometheus_alerts description: Projects with Prometheus alerting enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml index 9baa428c72d..5a8d4fe7459 100644 --- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml +++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.verify.clusters_applications_runner description: Count of users creating managed clusters with Runner enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml index 296e218d7b6..e3e24abbcee 100644 --- a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml +++ b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_integrations_prometheus description: Total clusters with Clusters::Integrations::Prometheus enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: active diff --git a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml index 0e8b04ad660..daaec1ca34f 100644 --- a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml +++ b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml @@ -4,7 +4,7 @@ key_path: counts.clusters_integrations_elastic_stack description: Total clusters with Clusters::Integrations::ElasticStack enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments product_category: deployment_management value_type: number status: removed diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml index ccff2e5b472..72f13e22ddf 100644 --- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml +++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml @@ -4,7 +4,7 @@ key_path: instance_auto_devops_enabled description: Whether auto DevOps is enabled product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: boolean status: active time_frame: none diff --git a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml index 8ec9482b8c7..30287bea275 100644 --- a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml +++ b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml @@ -4,7 +4,7 @@ name: "certificate_based_clusters_ff" description: "Certificate-based clusters feature flag" product_section: ops product_stage: configure -product_group: configure +product_group: environments value_type: boolean status: active milestone: "14.9" diff --git a/data/deprecations/16-9-deprecate-grype-container-scanning.yml b/data/deprecations/16-9-deprecate-grype-container-scanning.yml index 6cb61be7009..84c6f4311e7 100644 --- a/data/deprecations/16-9-deprecate-grype-container-scanning.yml +++ b/data/deprecations/16-9-deprecate-grype-container-scanning.yml @@ -7,10 +7,18 @@ issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/439164 body: | # (required) Don't change this line. Support for the Grype scanner in the GitLab Container Scanning analyzer is deprecated in - GitLab 16.9 and will be removed in GitLab 17.0. + GitLab 16.9. - You should use the default setting for `CS_ANALYZER_IMAGE`, which uses the Trivy + From GitLab 17.0, the Grype analyzer will no longer be maintained, except for limited fixes as + explained in our [statement of support](https://about.gitlab.com/support/statement-of-support/#version-support). + + Users are advised to use the default setting for `CS_ANALYZER_IMAGE`, which uses the Trivy scanner. - To continue to use Grype, see the [Security scanner integration documentation](https://docs.gitlab.com/ee/development/integrations/secure.html) to learn how to + The existing current major version for the Grype analyzer image will continue to be updated + with the latest advisory database, and operating system packages until GitLab 19.0, at which + point the analyzer will stop working. + + To continue to use Grype past 19.0, see the [Security scanner integration + documentation](https://docs.gitlab.com/ee/development/integrations/secure.html) to learn how to create your own integration with GitLab. diff --git a/db/docs/batched_background_migrations/backfill_vs_code_settings_uuid.yml b/db/docs/batched_background_migrations/backfill_vs_code_settings_uuid.yml index 2ea945c17b5..b8d69971b02 100644 --- a/db/docs/batched_background_migrations/backfill_vs_code_settings_uuid.yml +++ b/db/docs/batched_background_migrations/backfill_vs_code_settings_uuid.yml @@ -6,4 +6,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138355 milestone: '16.7' queued_migration_version: 20231130140901 finalize_after: '2024-01-31' -finalized_by: # version of the migration that finalized this BBM +finalized_by: 20240222000002 diff --git a/db/docs/group_group_links.yml b/db/docs/group_group_links.yml index bdae1b21995..5aa215b2051 100644 --- a/db/docs/group_group_links.yml +++ b/db/docs/group_group_links.yml @@ -8,3 +8,5 @@ description: TODO introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17117 milestone: '12.5' gitlab_schema: gitlab_main_cell +sharding_key: + shared_group_id: namespaces diff --git a/db/docs/ip_restrictions.yml b/db/docs/ip_restrictions.yml index dd7615dce24..70b28f62f70 100644 --- a/db/docs/ip_restrictions.yml +++ b/db/docs/ip_restrictions.yml @@ -8,3 +8,5 @@ description: TODO introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/12669 milestone: '12.0' gitlab_schema: gitlab_main_cell +sharding_key: + group_id: namespaces diff --git a/db/docs/namespace_admin_notes.yml b/db/docs/namespace_admin_notes.yml index 80937cb728e..73dd5170e22 100644 --- a/db/docs/namespace_admin_notes.yml +++ b/db/docs/namespace_admin_notes.yml @@ -8,4 +8,12 @@ feature_categories: description: Contains notes about groups that are visible to server administrators. introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47825 milestone: '13.11' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_cell +allow_cross_joins: +- gitlab_main_clusterwide +allow_cross_transactions: +- gitlab_main_clusterwide +allow_cross_foreign_keys: +- gitlab_main_clusterwide +sharding_key: + namespace_id: namespaces diff --git a/db/docs/namespace_ldap_settings.yml b/db/docs/namespace_ldap_settings.yml index e2ebbf54fde..fa581e8c25c 100644 --- a/db/docs/namespace_ldap_settings.yml +++ b/db/docs/namespace_ldap_settings.yml @@ -1,10 +1,18 @@ --- table_name: namespace_ldap_settings classes: - - Namespaces::LdapSetting +- Namespaces::LdapSetting feature_categories: - - system_access +- system_access description: Used to store LDAP settings for namespaces introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108908 milestone: '15.10' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_cell +allow_cross_joins: +- gitlab_main_clusterwide +allow_cross_transactions: +- gitlab_main_clusterwide +allow_cross_foreign_keys: +- gitlab_main_clusterwide +sharding_key: + namespace_id: namespaces diff --git a/db/docs/project_access_tokens.yml b/db/docs/project_access_tokens.yml index 3c19e4dc19f..6c964126238 100644 --- a/db/docs/project_access_tokens.yml +++ b/db/docs/project_access_tokens.yml @@ -6,4 +6,12 @@ feature_categories: description: TODO introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33272 milestone: '13.1' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_cell +allow_cross_joins: +- gitlab_main_clusterwide +allow_cross_transactions: +- gitlab_main_clusterwide +allow_cross_foreign_keys: +- gitlab_main_clusterwide +sharding_key: + project_id: projects diff --git a/db/docs/project_group_links.yml b/db/docs/project_group_links.yml index 927fc05bf2a..769b5237645 100644 --- a/db/docs/project_group_links.yml +++ b/db/docs/project_group_links.yml @@ -8,3 +8,5 @@ description: TODO introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/3ac5a759e93e632539438d4564582c645a9f6799 milestone: "<6.0" gitlab_schema: gitlab_main_cell +sharding_key: + project_id: projects diff --git a/db/docs/saml_group_links.yml b/db/docs/saml_group_links.yml index 4dfb33e37a5..c1ef26a445a 100644 --- a/db/docs/saml_group_links.yml +++ b/db/docs/saml_group_links.yml @@ -7,4 +7,12 @@ feature_categories: description: TODO introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45061 milestone: '13.5' -gitlab_schema: gitlab_main +gitlab_schema: gitlab_main_cell +allow_cross_joins: +- gitlab_main_clusterwide +allow_cross_transactions: +- gitlab_main_clusterwide +allow_cross_foreign_keys: +- gitlab_main_clusterwide +sharding_key: + group_id: namespaces diff --git a/db/docs/saml_providers.yml b/db/docs/saml_providers.yml index e1396bf6877..489b063298c 100644 --- a/db/docs/saml_providers.yml +++ b/db/docs/saml_providers.yml @@ -8,3 +8,5 @@ description: TODO introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4549 milestone: '10.7' gitlab_schema: gitlab_main_cell +sharding_key: + group_id: namespaces diff --git a/db/post_migrate/20240222000002_finalize_backfill_vs_code_settings_uuid.rb b/db/post_migrate/20240222000002_finalize_backfill_vs_code_settings_uuid.rb new file mode 100644 index 00000000000..e18b61d51e6 --- /dev/null +++ b/db/post_migrate/20240222000002_finalize_backfill_vs_code_settings_uuid.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +class FinalizeBackfillVsCodeSettingsUuid < Gitlab::Database::Migration[2.2] + milestone '16.10' + + restrict_gitlab_migration gitlab_schema: :gitlab_main + disable_ddl_transaction! + + TABLE_NAME = 'vs_code_settings' + MIGRATION_NAME = 'BackfillVsCodeSettingsUuid' + + def up + ensure_batched_background_migration_is_finished( + job_class_name: MIGRATION_NAME, + table_name: TABLE_NAME, + column_name: 'id', + job_arguments: [] + ) + end + + def down + # no-op + end +end diff --git a/db/schema_migrations/20240222000002 b/db/schema_migrations/20240222000002 new file mode 100644 index 00000000000..a9d7173fb1c --- /dev/null +++ b/db/schema_migrations/20240222000002 @@ -0,0 +1 @@ +bb3c16304e73e66f7c7731524e756fd67272eaa554cae71ffcadbd55c702f13e \ No newline at end of file diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index ab3be2a8cb8..51508c8ea37 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -1118,6 +1118,7 @@ Example response: ## List merge request diffs > - `generated_file` was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141576) in GitLab 16.9 [with a flag](../administration/feature_flags.md) named `collapse_generated_diff_files`. Disabled by default. +> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/432670) in GitLab 16.10. List diffs of the files changed in a merge request. diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md index 9e4d7ebc563..ea725248989 100644 --- a/doc/update/deprecations.md +++ b/doc/update/deprecations.md @@ -623,12 +623,20 @@ The GraphQL fields, `isTemporaryStorageIncreaseEnabled` and `temporaryStorageInc Support for the Grype scanner in the GitLab Container Scanning analyzer is deprecated in -GitLab 16.9 and will be removed in GitLab 17.0. +GitLab 16.9. -You should use the default setting for `CS_ANALYZER_IMAGE`, which uses the Trivy +From GitLab 17.0, the Grype analyzer will no longer be maintained, except for limited fixes as +explained in our [statement of support](https://about.gitlab.com/support/statement-of-support/#version-support). + +Users are advised to use the default setting for `CS_ANALYZER_IMAGE`, which uses the Trivy scanner. -To continue to use Grype, see the [Security scanner integration documentation](https://docs.gitlab.com/ee/development/integrations/secure.html) to learn how to +The existing current major version for the Grype analyzer image will continue to be updated +with the latest advisory database, and operating system packages until GitLab 19.0, at which +point the analyzer will stop working. + +To continue to use Grype past 19.0, see the [Security scanner integration +documentation](https://docs.gitlab.com/ee/development/integrations/secure.html) to learn how to create your own integration with GitLab. diff --git a/doc/user/application_security/sast/troubleshooting.md b/doc/user/application_security/sast/troubleshooting.md index 2b7b86c13fd..56e90bfc92b 100644 --- a/doc/user/application_security/sast/troubleshooting.md +++ b/doc/user/application_security/sast/troubleshooting.md @@ -97,6 +97,14 @@ If your job is failing at the build step with the message "Project couldn't be b The solution is to use [pre-compilation](index.md#pre-compilation). Pre-compilation ensures the images required by SpotBugs are available in the job's container. +## SpotBugs message: `Exception analyzing ... using detector ...` followed by a Java stack trace + +If your job log contains a message of the form "Exception analyzing ... using detector ..." followed by a Java stack trace, this is **not** a failure of the SAST pipeline. SpotBugs has determined that the exception is [recoverable](https://github.com/spotbugs/spotbugs/blob/5ebd4439f6f8f2c11246b79f58c44324718d39d8/spotbugs/src/main/java/edu/umd/cs/findbugs/FindBugs2.java#L1200), logged it, and resumed analysis. + +The first "..." part of the message is the class being analyzed - if it's not part of your project, you can likely ignore the message and the stack trace that follows. + +If, on the other hand, the class being analyzed is part of your project, consider creating an issue with the SpotBugs project on [GitHub](https://github.com/spotbugs/spotbugs/issues). + ## Flawfinder encoding error This occurs when Flawfinder encounters an invalid UTF-8 character. To fix this, convert all source code in your project to UTF-8 character encoding. This can be done with [`cvt2utf`](https://github.com/x1angli/cvt2utf) or [`iconv`](https://www.gnu.org/software/libiconv/documentation/libiconv-1.13/iconv.1.html) either over the entire project or per job using the [`before_script`](../../../ci/yaml/index.md#before_script) feature. diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md index efb01316dcf..48b63140e5a 100644 --- a/doc/user/project/merge_requests/changes.md +++ b/doc/user/project/merge_requests/changes.md @@ -68,12 +68,7 @@ DETAILS: **Offering:** Self-managed > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140180) in GitLab 16.8 [with a flag](../../../administration/feature_flags.md) named `collapse_generated_diff_files`. Disabled by default. - -FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, -an administrator can [enable the feature flag](../../../administration/feature_flags.md) -named `collapse_generated_diff_files`. -On GitLab.com, this feature is not available. +> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/432670) in GitLab 16.10. To help reviewers focus on the files needed to perform a code review, GitLab collapses several common types of generated files. These files are collapsed by default, because diff --git a/spec/frontend/work_items/router_spec.js b/spec/frontend/work_items/router_spec.js index d4efcf78189..cb609fac882 100644 --- a/spec/frontend/work_items/router_spec.js +++ b/spec/frontend/work_items/router_spec.js @@ -25,7 +25,7 @@ describe('Work items router', () => { .mockResolvedValue({ data: { workItemUpdated: null } }); const createComponent = async (routeArg) => { - const router = createRouter('/work_item'); + const router = createRouter({ fullPath: '/work_item' }); if (routeArg !== undefined) { await router.push(routeArg); } @@ -89,4 +89,23 @@ describe('Work items router', () => { expect(wrapper.findComponent(CreateWorkItem).exists()).toBe(true); }); + + it('includes relative_url_root', () => { + gon.relative_url_root = '/my-org'; + const router = createRouter({ fullPath: '/work_item' }); + + expect(router.options.base).toBe('/my-org/work_item/-/work_items'); + }); + + it('includes groups in path for groups', () => { + const router = createRouter({ fullPath: '/work_item', workspaceType: 'group' }); + + expect(router.options.base).toBe('/groups/work_item/-/work_items'); + }); + + it('includes workItemType if provided', () => { + const router = createRouter({ fullPath: '/work_item', workItemType: 'epics' }); + + expect(router.options.base).toBe('/work_item/-/epics'); + }); });