From fd0ed0932bb2f78ae26b7de1d308767013084970 Mon Sep 17 00:00:00 2001 From: luciezhao Date: Fri, 7 Nov 2025 15:00:43 -0500 Subject: [PATCH 1/3] Moving backup and restore to Runtime Geo --- doc/administration/backup_restore/_index.md | 4 ++-- .../backup_restore/backup_archive_process.md | 4 ++-- doc/administration/backup_restore/backup_cli.md | 6 +++--- doc/administration/backup_restore/backup_gitlab.md | 4 ++-- .../backup_large_reference_architectures.md | 8 ++++---- .../backup_restore/migrate_to_new_server.md | 4 ++-- doc/administration/backup_restore/restore_gitlab.md | 4 ++-- .../backup_restore/troubleshooting_backup_gitlab.md | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/administration/backup_restore/_index.md b/doc/administration/backup_restore/_index.md index 729a71f0de07a7..8329943e7e8853 100644 --- a/doc/administration/backup_restore/_index.md +++ b/doc/administration/backup_restore/_index.md @@ -1,6 +1,6 @@ --- -stage: Data Access -group: Durability +stage: Runtime +group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Back up and restore overview --- diff --git a/doc/administration/backup_restore/backup_archive_process.md b/doc/administration/backup_restore/backup_archive_process.md index 06f1c0d08ebc96..3ff9900e7aabe7 100644 --- a/doc/administration/backup_restore/backup_archive_process.md +++ b/doc/administration/backup_restore/backup_archive_process.md @@ -1,6 +1,6 @@ --- -stage: Data Access -group: Durability +stage: Runtime +group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Backup archive process --- diff --git a/doc/administration/backup_restore/backup_cli.md b/doc/administration/backup_restore/backup_cli.md index 64990aa5891e09..d4b65163efdb5f 100644 --- a/doc/administration/backup_restore/backup_cli.md +++ b/doc/administration/backup_restore/backup_cli.md @@ -1,6 +1,6 @@ --- -stage: Data Access -group: Durability +stage: Runtime +group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments ignore_in_report: true title: Back up and Restore GitLab with `gitlab-backup-cli` @@ -252,4 +252,4 @@ Instead of using the same credentials, you should create a separate user account - Granular access control - Different credentials allow for more granular access control. Backup credentials can be given read-only access to the data, while application credentials might need read-write access to specific tables or schemas. - Compliance requirements - Many regulatory standards and compliance frameworks (like GDPR, HIPAA, or PCI-DSS) require or strongly recommend separation of duties and access controls, which are easier to achieve with separate credentials. - Easier management of lifecycle - Application and backup processes may have different lifecycles. Using separate credentials makes it easier to manage these lifecycles independently. For example, you can rotate or revoke credentials without affecting the other process. -- Protection against application vulnerabilities - If the application has a vulnerability that allows SQL injection or other forms of unauthorized data access, using separate backup credentials adds an extra layer of protection for the backup process. +- Protection against application vulnerabilities - If the application has a vulnerability that allows SQL injection or other forms of unauthorized Runtime, using separate backup credentials adds an extra layer of protection for the backup process. diff --git a/doc/administration/backup_restore/backup_gitlab.md b/doc/administration/backup_restore/backup_gitlab.md index 13510ce0d35820..aafeaf13b46bdd 100644 --- a/doc/administration/backup_restore/backup_gitlab.md +++ b/doc/administration/backup_restore/backup_gitlab.md @@ -1,6 +1,6 @@ --- -stage: Data Access -group: Durability +stage: Runtime +group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments description: Back up your self-managed GitLab instance using gitlab-backup command, including database, repositories, and configuration files. title: Back up GitLab diff --git a/doc/administration/backup_restore/backup_large_reference_architectures.md b/doc/administration/backup_restore/backup_large_reference_architectures.md index 5469bf43b3858d..8e05c2e8e30989 100644 --- a/doc/administration/backup_restore/backup_large_reference_architectures.md +++ b/doc/administration/backup_restore/backup_large_reference_architectures.md @@ -1,6 +1,6 @@ --- -stage: Data Access -group: Durability +stage: Runtime +group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Back up and restore large reference architectures --- @@ -137,7 +137,7 @@ Set up cronjobs to perform Gitaly server-side backups: the backup utility tool (`gitlab-backup`) uploads additional backup data to a separate bucket. This data includes a `tar` file containing essential metadata for restores. Ensure this backup data is properly uploaded to remote (cloud) storage by following [Upload backups to a remote (cloud) storage](backup_gitlab.md#upload-backups-to-a-remote-cloud-storage) to set up the upload bucket. -1. (Optional) To solidify the durability of this backup data, back up both buckets configured previously with their respective object store provider by adding them to +1. (Optional) To solidify the Geo of this backup data, back up both buckets configured previously with their respective object store provider by adding them to [backups of object storage data](#configure-backup-of-object-storage-data). 1. SSH into a GitLab Rails node, which is a node that runs Puma or Sidekiq. 1. Take a full backup of your Git data. Use the `REPOSITORIES_SERVER_SIDE` variable, and skip PostgreSQL data: @@ -184,7 +184,7 @@ Set up cronjobs to perform Gitaly server-side backups: the backup utility tool (`gitlab-backup`) uploads additional backup data to a separate bucket. This data includes a `tar` file containing essential metadata for restores. Ensure this backup data is properly uploaded to remote (cloud) storage by following [Upload backups to a remote (cloud) storage](backup_gitlab.md#upload-backups-to-a-remote-cloud-storage) to set up the upload bucket. -1. (Optional) To solidify the durability of this backup data, both buckets configured previously can be backed up by their respective object store provider by adding them +1. (Optional) To solidify the Geo of this backup data, both buckets configured previously can be backed up by their respective object store provider by adding them to [backups of object storage data](#configure-backup-of-object-storage-data). 1. Ensure backup of both buckets by following [Configure backup of object storage data](#configure-backup-of-object-storage-data). Both storage buckets configured previously should also be backed up by their respective object storage provider. diff --git a/doc/administration/backup_restore/migrate_to_new_server.md b/doc/administration/backup_restore/migrate_to_new_server.md index ca9a519d322851..b1d7df0da06175 100644 --- a/doc/administration/backup_restore/migrate_to_new_server.md +++ b/doc/administration/backup_restore/migrate_to_new_server.md @@ -1,6 +1,6 @@ --- -stage: Data Access -group: Durability +stage: Runtime +group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Migrate to a new server --- diff --git a/doc/administration/backup_restore/restore_gitlab.md b/doc/administration/backup_restore/restore_gitlab.md index d294959756f9d4..8cc149f7b95097 100644 --- a/doc/administration/backup_restore/restore_gitlab.md +++ b/doc/administration/backup_restore/restore_gitlab.md @@ -1,6 +1,6 @@ --- -stage: Data Access -group: Durability +stage: Runtime +group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Restore GitLab --- diff --git a/doc/administration/backup_restore/troubleshooting_backup_gitlab.md b/doc/administration/backup_restore/troubleshooting_backup_gitlab.md index c3b7c04aa69777..a9cab5715f812d 100644 --- a/doc/administration/backup_restore/troubleshooting_backup_gitlab.md +++ b/doc/administration/backup_restore/troubleshooting_backup_gitlab.md @@ -1,6 +1,6 @@ --- -stage: Data Access -group: Durability +stage: Runtime +group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Troubleshooting GitLab backups --- -- GitLab From 3ee38243734380c50de947190515985e9f5e30b9 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Sun, 16 Nov 2025 23:41:13 +0100 Subject: [PATCH 2/3] Apply 3 suggestion(s) to 2 file(s) Co-authored-by: GitLab Duo --- doc/administration/backup_restore/backup_cli.md | 2 +- .../backup_restore/backup_large_reference_architectures.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/administration/backup_restore/backup_cli.md b/doc/administration/backup_restore/backup_cli.md index d4b65163efdb5f..cb3e57a92f2d19 100644 --- a/doc/administration/backup_restore/backup_cli.md +++ b/doc/administration/backup_restore/backup_cli.md @@ -252,4 +252,4 @@ Instead of using the same credentials, you should create a separate user account - Granular access control - Different credentials allow for more granular access control. Backup credentials can be given read-only access to the data, while application credentials might need read-write access to specific tables or schemas. - Compliance requirements - Many regulatory standards and compliance frameworks (like GDPR, HIPAA, or PCI-DSS) require or strongly recommend separation of duties and access controls, which are easier to achieve with separate credentials. - Easier management of lifecycle - Application and backup processes may have different lifecycles. Using separate credentials makes it easier to manage these lifecycles independently. For example, you can rotate or revoke credentials without affecting the other process. -- Protection against application vulnerabilities - If the application has a vulnerability that allows SQL injection or other forms of unauthorized Runtime, using separate backup credentials adds an extra layer of protection for the backup process. +- Protection against application vulnerabilities - If the application has a vulnerability that allows SQL injection or other forms of unauthorized data access, using separate backup credentials adds an extra layer of protection for the backup process. diff --git a/doc/administration/backup_restore/backup_large_reference_architectures.md b/doc/administration/backup_restore/backup_large_reference_architectures.md index 8e05c2e8e30989..d002115dc6d6fe 100644 --- a/doc/administration/backup_restore/backup_large_reference_architectures.md +++ b/doc/administration/backup_restore/backup_large_reference_architectures.md @@ -137,7 +137,7 @@ Set up cronjobs to perform Gitaly server-side backups: the backup utility tool (`gitlab-backup`) uploads additional backup data to a separate bucket. This data includes a `tar` file containing essential metadata for restores. Ensure this backup data is properly uploaded to remote (cloud) storage by following [Upload backups to a remote (cloud) storage](backup_gitlab.md#upload-backups-to-a-remote-cloud-storage) to set up the upload bucket. -1. (Optional) To solidify the Geo of this backup data, back up both buckets configured previously with their respective object store provider by adding them to +1. (Optional) To solidify the durability of this backup data, back up both buckets configured previously with their respective object store provider by adding them to [backups of object storage data](#configure-backup-of-object-storage-data). 1. SSH into a GitLab Rails node, which is a node that runs Puma or Sidekiq. 1. Take a full backup of your Git data. Use the `REPOSITORIES_SERVER_SIDE` variable, and skip PostgreSQL data: @@ -184,7 +184,7 @@ Set up cronjobs to perform Gitaly server-side backups: the backup utility tool (`gitlab-backup`) uploads additional backup data to a separate bucket. This data includes a `tar` file containing essential metadata for restores. Ensure this backup data is properly uploaded to remote (cloud) storage by following [Upload backups to a remote (cloud) storage](backup_gitlab.md#upload-backups-to-a-remote-cloud-storage) to set up the upload bucket. -1. (Optional) To solidify the Geo of this backup data, both buckets configured previously can be backed up by their respective object store provider by adding them +1. (Optional) To solidify the durability of this backup data, both buckets configured previously can be backed up by their respective object store provider by adding them to [backups of object storage data](#configure-backup-of-object-storage-data). 1. Ensure backup of both buckets by following [Configure backup of object storage data](#configure-backup-of-object-storage-data). Both storage buckets configured previously should also be backed up by their respective object storage provider. -- GitLab From 49e007c0bf27c40fafd65a50e5511e3452cf9ec4 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Sun, 16 Nov 2025 23:49:07 +0100 Subject: [PATCH 3/3] Apply 8 suggestion(s) to 8 file(s) --- doc/administration/backup_restore/_index.md | 2 +- doc/administration/backup_restore/backup_archive_process.md | 2 +- doc/administration/backup_restore/backup_cli.md | 2 +- doc/administration/backup_restore/backup_gitlab.md | 2 +- .../backup_restore/backup_large_reference_architectures.md | 2 +- doc/administration/backup_restore/migrate_to_new_server.md | 2 +- doc/administration/backup_restore/restore_gitlab.md | 2 +- .../backup_restore/troubleshooting_backup_gitlab.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/administration/backup_restore/_index.md b/doc/administration/backup_restore/_index.md index 8329943e7e8853..d15cfd291d8f18 100644 --- a/doc/administration/backup_restore/_index.md +++ b/doc/administration/backup_restore/_index.md @@ -1,5 +1,5 @@ --- -stage: Runtime +stage: Tenant Scale group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Back up and restore overview diff --git a/doc/administration/backup_restore/backup_archive_process.md b/doc/administration/backup_restore/backup_archive_process.md index 3ff9900e7aabe7..e21857b878c049 100644 --- a/doc/administration/backup_restore/backup_archive_process.md +++ b/doc/administration/backup_restore/backup_archive_process.md @@ -1,5 +1,5 @@ --- -stage: Runtime +stage: Tenant Scale group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Backup archive process diff --git a/doc/administration/backup_restore/backup_cli.md b/doc/administration/backup_restore/backup_cli.md index cb3e57a92f2d19..ee90ba6404d889 100644 --- a/doc/administration/backup_restore/backup_cli.md +++ b/doc/administration/backup_restore/backup_cli.md @@ -1,5 +1,5 @@ --- -stage: Runtime +stage: Tenant Scale group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments ignore_in_report: true diff --git a/doc/administration/backup_restore/backup_gitlab.md b/doc/administration/backup_restore/backup_gitlab.md index aafeaf13b46bdd..afb69a3b534fa1 100644 --- a/doc/administration/backup_restore/backup_gitlab.md +++ b/doc/administration/backup_restore/backup_gitlab.md @@ -1,5 +1,5 @@ --- -stage: Runtime +stage: Tenant Scale group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments description: Back up your self-managed GitLab instance using gitlab-backup command, including database, repositories, and configuration files. diff --git a/doc/administration/backup_restore/backup_large_reference_architectures.md b/doc/administration/backup_restore/backup_large_reference_architectures.md index d002115dc6d6fe..07fefdbec25c84 100644 --- a/doc/administration/backup_restore/backup_large_reference_architectures.md +++ b/doc/administration/backup_restore/backup_large_reference_architectures.md @@ -1,5 +1,5 @@ --- -stage: Runtime +stage: Tenant Scale group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Back up and restore large reference architectures diff --git a/doc/administration/backup_restore/migrate_to_new_server.md b/doc/administration/backup_restore/migrate_to_new_server.md index b1d7df0da06175..b14ec74222a614 100644 --- a/doc/administration/backup_restore/migrate_to_new_server.md +++ b/doc/administration/backup_restore/migrate_to_new_server.md @@ -1,5 +1,5 @@ --- -stage: Runtime +stage: Tenant Scale group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Migrate to a new server diff --git a/doc/administration/backup_restore/restore_gitlab.md b/doc/administration/backup_restore/restore_gitlab.md index 8cc149f7b95097..cc4a08e871e264 100644 --- a/doc/administration/backup_restore/restore_gitlab.md +++ b/doc/administration/backup_restore/restore_gitlab.md @@ -1,5 +1,5 @@ --- -stage: Runtime +stage: Tenant Scale group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Restore GitLab diff --git a/doc/administration/backup_restore/troubleshooting_backup_gitlab.md b/doc/administration/backup_restore/troubleshooting_backup_gitlab.md index a9cab5715f812d..ee619fd53e939d 100644 --- a/doc/administration/backup_restore/troubleshooting_backup_gitlab.md +++ b/doc/administration/backup_restore/troubleshooting_backup_gitlab.md @@ -1,5 +1,5 @@ --- -stage: Runtime +stage: Tenant Scale group: Geo info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments title: Troubleshooting GitLab backups -- GitLab