From 0847321aeec58e8885c18b64abd6732581ec33a4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 27 Jun 2023 15:06:55 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../issue_templates/Broken Master - Flaky.md | 4 + .../Broken Master - Non-flaky.md | 4 + .rubocop.yml | 7 + ...king_finished_on_deprecated_migrations.yml | 3 + .../components/alerts_settings_form.vue | 5 +- .../drawer/cards/first_pipeline_card.vue | 3 +- .../components/pipeline_schedules.vue | 10 +- .../pipeline_schedules_empty_state.vue | 7 +- .../components/pipeline_schedules_form.vue | 167 +++++++++--------- .../table/cells/pipeline_schedule_actions.vue | 15 +- .../ci/pipeline_schedules/constants.js | 4 +- .../create_pipeline_schedule.mutation.graphql | 6 + .../get_pipeline_schedules.query.graphql | 1 + .../mount_pipeline_schedules_app.js | 4 +- .../mount_pipeline_schedules_form_app.js | 5 +- app/assets/javascripts/ci/runner/constants.js | 17 +- .../components/stop_environment_modal.vue | 15 +- .../gitlab_version_check/constants.js | 3 +- .../google_cloud/service_accounts/list.vue | 5 +- .../jobs/components/job/stuck_block.vue | 3 +- .../projects/pipeline_schedules/edit/index.js | 2 +- .../components/interval_pattern_input.vue | 7 +- .../empty_state/ios_templates.vue | 4 +- .../components/crm_contacts/crm_contacts.vue | 6 +- .../surveys/merge_request_experience/app.vue | 4 +- .../vue_merge_request_widget/constants.js | 3 +- .../runner_docker_instructions.vue | 3 +- .../runner_kubernetes_instructions.vue | 3 +- .../pipeline_schedules/index.html.haml | 2 +- .../projects/pipeline_schedules/new.html.haml | 2 +- danger/roulette/Dangerfile | 17 +- ...umber_of_shards_to_application_settings.rb | 9 + ..._in_application_settings_for_gitlab_com.rb | 19 ++ db/schema_migrations/20230621074446 | 1 + db/schema_migrations/20230621074611 | 1 + db/structure.sql | 1 + .../monitoring/prometheus/gitlab_metrics.md | 2 +- .../monitoring/prometheus/index.md | 16 -- doc/api/settings.md | 2 + .../arch.png | Bin .../index.md | 0 doc/development/feature_flags/index.md | 30 ++-- doc/install/installation.md | 10 +- doc/raketasks/index.md | 1 - .../cloud_deployments/auto_devops_with_eks.md | 1 - .../cloud_deployments/auto_devops_with_gke.md | 1 - doc/update/upgrading_from_source.md | 8 +- doc/user/group/index.md | 24 +++ doc/user/project/integrations/index.md | 1 - doc/user/project/settings/index.md | 1 - .../ci/templates/Terraform/Base.gitlab-ci.yml | 10 +- .../Terraform/Base.latest.gitlab-ci.yml | 10 +- lib/gitlab/sidekiq_middleware/defer_jobs.rb | 29 +-- locale/gitlab.pot | 9 + ...cking_finished_on_deprecated_migrations.rb | 38 ++++ scripts/rspec_helpers.sh | 4 +- .../pipeline_schedules_form_spec.js | 126 +++++++++++-- .../components/pipeline_schedules_spec.js | 5 + .../cells/pipeline_schedule_actions_spec.js | 13 ++ .../ci/pipeline_schedules/mock_data.js | 10 ++ .../components/interval_pattern_input_spec.js | 13 ++ .../alert_management_sidebar_todo_spec.js | 65 +++---- .../sidekiq_middleware/defer_jobs_spec.rb | 77 +++----- spec/lib/gitlab/sidekiq_middleware_spec.rb | 1 - ...pplication_settings_for_gitlab_com_spec.rb | 44 +++++ ..._finished_on_deprecated_migrations_spec.rb | 31 ++++ spec/spec_helper.rb | 2 +- 67 files changed, 645 insertions(+), 311 deletions(-) create mode 100644 .rubocop_todo/search/avoid_checking_finished_on_deprecated_migrations.yml create mode 100644 app/assets/javascripts/ci/pipeline_schedules/graphql/mutations/create_pipeline_schedule.mutation.graphql create mode 100644 db/migrate/20230621074446_add_elasticsearch_number_of_shards_to_application_settings.rb create mode 100644 db/migrate/20230621074611_update_elasticsearch_number_of_shards_in_application_settings_for_gitlab_com.rb create mode 100644 db/schema_migrations/20230621074446 create mode 100644 db/schema_migrations/20230621074611 rename doc/architecture/blueprints/{observability/tracing => observability_tracing}/arch.png (100%) rename doc/architecture/blueprints/{observability/tracing => observability_tracing}/index.md (100%) create mode 100644 rubocop/cop/search/avoid_checking_finished_on_deprecated_migrations.rb create mode 100644 spec/migrations/20230621074611_update_elasticsearch_number_of_shards_in_application_settings_for_gitlab_com_spec.rb create mode 100644 spec/rubocop/cop/search/avoid_checking_finished_on_deprecated_migrations_spec.rb diff --git a/.gitlab/issue_templates/Broken Master - Flaky.md b/.gitlab/issue_templates/Broken Master - Flaky.md index b87d9b5ee1f..5b01e67feab 100644 --- a/.gitlab/issue_templates/Broken Master - Flaky.md +++ b/.gitlab/issue_templates/Broken Master - Flaky.md @@ -27,4 +27,8 @@ Please refer to the [Resolution guidance](https://about.gitlab.com/handbook/engi Once the flaky failure has been fixed on the default branch, open merge requests to cherry-pick the fix to the active stable branches. +### Logs + + + /label ~"type::maintenance" ~"failure::flaky-test" ~"priority::3" ~"severity::3" diff --git a/.gitlab/issue_templates/Broken Master - Non-flaky.md b/.gitlab/issue_templates/Broken Master - Non-flaky.md index d2dc616ead8..0b92326ed42 100644 --- a/.gitlab/issue_templates/Broken Master - Non-flaky.md +++ b/.gitlab/issue_templates/Broken Master - Non-flaky.md @@ -21,4 +21,8 @@ Please read the below documentations for a workflow of triaging and resolving br Please refer to the [Resolution guidance](https://about.gitlab.com/handbook/engineering/workflow/#resolution-of-broken-master) to learn more about resolution of broken master. +### Logs + + + /label ~"master:broken" ~"Engineering Productivity" ~"priority::1" ~"severity::1" ~"type::maintenance" ~"maintenance::pipelines" diff --git a/.rubocop.yml b/.rubocop.yml index af1c7ad50f4..8edba38cc65 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1025,3 +1025,10 @@ RSpec/FactoryBot/LocalStaticAssignment: Rails/TransactionExitStatement: Enabled: true + +Search/AvoidCheckingFinishedOnDeprecatedMigrations: + Include: + - 'ee/app/models/**/*.rb' + - 'ee/lib/elastic/**/*.rb' + - 'ee/lib/gitlab/elastic/**/*.rb' + - 'ee/spec/support/helpers/elasticsearch_helpers.rb' diff --git a/.rubocop_todo/search/avoid_checking_finished_on_deprecated_migrations.yml b/.rubocop_todo/search/avoid_checking_finished_on_deprecated_migrations.yml new file mode 100644 index 00000000000..d4b532ff76c --- /dev/null +++ b/.rubocop_todo/search/avoid_checking_finished_on_deprecated_migrations.yml @@ -0,0 +1,3 @@ +--- +Search/AvoidCheckingFinishedOnDeprecatedMigrations: + Details: grace period diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue index 428291f2313..e88e0a3a344 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue @@ -16,7 +16,7 @@ import { import * as Sentry from '@sentry/browser'; import { isEqual, isEmpty, omit } from 'lodash'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import { PROMO_URL } from 'jh_else_ce/lib/utils/url_utility'; +import { PROMO_URL, DOCS_URL_IN_EE_DIR } from 'jh_else_ce/lib/utils/url_utility'; import { integrationTypes, integrationSteps, @@ -38,6 +38,7 @@ export default { placeholders: { prometheus: targetPrometheusUrlPlaceholder, }, + incidentManagementDocsLink: `${DOCS_URL_IN_EE_DIR}/operations/incident_management/integrations.html#configuration`, JSON_VALIDATE_DELAY, typeSet, integrationSteps, @@ -617,7 +618,7 @@ export default { > diff --git a/app/assets/javascripts/ci/pipeline_editor/components/drawer/cards/first_pipeline_card.vue b/app/assets/javascripts/ci/pipeline_editor/components/drawer/cards/first_pipeline_card.vue index 0b57433e894..8d670cb5389 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/drawer/cards/first_pipeline_card.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/drawer/cards/first_pipeline_card.vue @@ -2,6 +2,7 @@ import { GlLink, GlSprintf } from '@gitlab/ui'; import { s__ } from '~/locale'; import Tracking from '~/tracking'; +import { DOCS_URL } from 'jh_else_ce/lib/utils/url_utility'; import { pipelineEditorTrackingOptions } from '../../../constants'; export default { @@ -34,7 +35,7 @@ export default { this.track(actions.helpDrawerLinks.runners, { label }); }, }, - RUNNER_HELP_URL: 'https://docs.gitlab.com/runner/register/index.html', + RUNNER_HELP_URL: `${DOCS_URL}/runner/register/index.html`, };