github · docs-bot · Aug 8, 2023 · Jul 18, 2023 · Jul 18, 2023 · Jul 18, 2023
diff --git a/assets/ghes-3.10-opentelemetry-attribute-mappings.csv b/assets/ghes-3.10-opentelemetry-attribute-mappings.csv
@@ -0,0 +1,159 @@
+Category,Old Attribute,New Attribute
+API,reason,gh.api.error_reason
+API,resource,gh.api.resource_type
+API,graphql,gh.api.graphql
+API,graphql_time,graphql.time
+API,graphql_query_byte_size,graphql.query.byte_size
+API,graphql_variables_byte_size,graphql.variables.byte_size
+API,graphql_operation_name,graphql.operation.name
+API,graphql_origin,graphql.origin
+API,graphql_success,graphql.success
+API,graphql_query_depth,graphql.query.depth
+API,graphql_query_complexity,graphql.query.complexity
+API,graphql_schema,graphql.schema
+API,graphql_query_hash,graphql.query.hash
+API,graphql_variables_hash,graphql.variables.hash
+API,graphql_query_name,graphql.query.name
+API,graphql_operation_id,graphql.operation.id
+Repos,rename_id,gh.branch_protection_rule.repository_branch_renamer.id
+Repos,end_date,gh.repo.purge.end_date
+Repos,deleted_count,gh.repo.mirror.deleted_count
+CodeScanning,pull_request_id,gh.pull_request.id
+CodeScanning,pull_request_number,gh.pull_request.number
+CodeScanning,pull_request_head,gh.pull_request.head_sha
+CodeScanning,alerts_count,gh.code_scanning.alert.count
+CodeScanning,file_path,gh.code_scanning.alert.file_path
+CodeScanning,alert_number,gh.code_scanning.alert.number
+CodeScanning,category,gh.code_scanning.analysis.category
+CodeScanning,check_run_id,gh.check_run.id
+CodeScanning,alerts_in_the_diff,gh.code_scanning.diff.alerts.in
+CodeScanning,alerts_out_the_diff,gh.code_scanning.diff.alerts.out
+CodeScanning,onboarding_comment_posted,gh.code_scanning.onboarding_comment.posted
+CodeScanning,onboarding_comments_count,gh.code_scanning.onboarding_comments.count
+CodeScanning,tool_name,gh.code_scanning.tool
+CodeScanning,code_scanning_review_comment,gh.code_scanning.review_comment.id
+CodeScanning,head_commit_oid,gh.pull_request.head_sha
+CodeScanning,merge_commit_oid,gh.pull_request.merge_sha
+CodeScanning,checkrun_previously_completed,gh.check_run.previously_completed
+CodeScanning,job_reason,gh.code_scanning.job.reason
+CodeScanning,time_in_secs,gh.code_scanning.job.time
+CodeScanning,code_scanning_check_suite,gh.check_suite.id
+CodeScanning,base_ref_name,gh.pull_request.base_ref.name
+CodeScanning,pull_request_old,gh.pull_request.id.old
+CodeScanning,pull_request_new,gh.pull_request.id.new
+CodeScanning,repo_nwo,gh.repo.nwo
+CodeScanning,skip_check_runs,gh.code_scanning.skip_check_runs
+CodeScanning,refs,git.refs
+CodeScanning,ref,git.ref
+CodeScanning,commit_oid,git.commit.oid
+CodeScanning,sarif_size,gh.code_scanning.sarif.size
+CodeScanning,sarif_id,gh.code_scanning.sarif.id
+CodeScanning,sarif_uri,gh.code_scanning.sarif.uri
+CodeScanning,old_base_ref,gh.pull_request.base_ref.old
+CodeScanning,new_base_ref,gh.pull_request.base_ref.new
+CodeScanning,replication_lag,gh.freno.replication_delay
+CodeScanning,key,gh.kv.key
+External Identities,external_id,gh.external_identities.external_id
+External Identities,oid,gh.external_identities.oid
+External Identities,refresh_token,gh.external_identities.refresh_token
+External Identities,email,gh.external_identities.email
+External Identities,type,gh.external_identities.type
+External Identities,key,gh.external_identities.cache_key
+External Identities,body,gh.external_identities.cache_body
+External Identities,expires,gh.external_identities.cache_expires
+External Identities,cap_message,gh.external_identities.cap_message
+External Identities,token_url,gh.external_identities.token_url
+External Identities,credential_auth_org_id,gh.external_identities.credential_auth_org_id
+External Identities,credential_auth_exists_for_target_org,gh.external_identities.credential_auth_exists_for_target_org
+External Identities,resource_type,gh.external_identities.resource_type
+External Identities,can_self_identify_internal_or_public,gh.external_identities.can_self_identify_internal_or_public
+Memex,column_id,gh.memex.column.id
+Memex,class_name,code.namespace
+Memex,actor_id,gh.actor.id
+Memex,project_item_id,gh.memex.item.id
+Memex,value,gh.memex.column.value
+Memex,result,gh.memex.column.update_result
+Memex,memex_id,gh.memex.id
+Memex,ns,code.namespace
+Memex,fn,code.function
+Memex,result,gh.job.result
+Memex,on_tasklist_waitlist,gh.memex.tasklist_waitlist
+Memex,id,gh.membership.id
+Memex,member_id,gh.membership.member.id
+Notifyd,subject_type,gh.notifyd.subject.type
+Webhooks,file,code.filepath
+Webhooks,catalog_service,gh.catalog_service
+Webhooks,request_id,gh.request_id
+Webhooks,fn,code.namespace & code.function
+Webhooks,event,gh.webhook.event_type
+Webhooks,action,gh.webhook.action
+Webhooks,method,code.function
+Webhooks,event_type,gh.webhook.event_type
+Webhooks,model_name,code.namespace
+Webhooks,id,gh.webhook.id
+Webhooks,push_sha,gh.webhook.push_sha
+Webhooks,parent,gh.webhook.parent
+Webhooks,guid,gh.webhook.delivery_guid
+Webhooks,hook_ids,gh.webhooks
+Webhooks,repo_id,gh.repo.id
+Webhooks,org_id,gh.org.id
+Webhooks,user_id,gh.user.id
+Webhooks,webhook_delivery_id,gh.webhook.delivery_guid
+Webhooks,repo_database_id,gh.repo.id
+Webhooks,repo_global_id,gh.repo.global_id
+Webhooks,event_at,gh.webhook.reminder_event.event_at
+Webhooks,event_type_db,gh.webhook.reminder_event.event_type_db
+Webhooks,personal,gh.webhook.reminder_event.reminder_event.personal
+Webhooks,pull_request_ids,gh.pull_request.id
+Webhooks,pull_request_ids_for_author,pull_request_ids_for_author
+Webhooks,actor_id,gh.actor.id
+Webhooks,actor_login,gh.actor.login
+Webhooks,user_login,gh.user.login
+Webhooks,path,code.filepath
+Webhooks,enterprise,gh.webhook.is_enterprise
+Webhooks,job,gh.job.name
+Webhooks,class,exception.type
+Webhooks,payload_size,gh.webhook.payload_size
+Webhooks,target_repository_nwo,gh.repo.name_with_owner
+Webhooks,target_repository_id,gh.repo.id
+Webhooks,target_organization_id,gh.org.id
+Webhooks,target_organization_name,gh.org.name
+Scheduled Reminders,transaction_id,gh.scheduled_reminders.transaction_id
+Camo,request_id,gh.request.id
+Camo,hmac,gh.camo.request_hmac
+Camo,url,gh.camo.encoded_url
+Camo,referer,gh.request.referer
+Camo,error,gh.camo.error
+Camo,dns-time,gh.camo.dns.time
+Camo,resp,gh.camo.upstream.response
+Camo,len,gh.camo.upstream.response.content_length
+Camo,request,gh.camo.upstream.request_buf
+Camo,response,gh.camo.upstream.response_buf
+Camo,code,gh.camo.upstream.response.code
+Camo,resp,gh.camo.response
+Camo,ctype,gh.camo.upstream.response.content_type
+Camo,pem,gh.camo.certfile.name
+Notifications,fn,code.function
+Notifications,id,gh.notifications.rollup_summary.id
+Notifications,fn,code.function
+repo migration,fn,code.namespace
+repo migration,migration_guid,gh.repo_migration.migration_guid
+repo migration,source_url,gh.repo_migration.model_source_url
+repo migration,resolution,gh.repo_migration.resolution
+repo migration,model_name,gh.repo_migration.model_name
+repo migration,migratable_resource_id,gh.repo_migration.migratable_resource_id
+repo migration,model_id,gh.repo_migration.model_id
+repo migration,source_owner,gh.repo_migration.source_owner
+repo migration,source_repository,gh.repo_migration.source_repository
+repo migration,target_url,gh.repo_migration.model_target_url
+repo migration,translator_url,gh.repo_migration.model_translator_url
+repo migration,state,gh.repo_migration.model_state
+repo migration,asset_storage,gh.repo_migration.asset_storage.type
+repo migration,asset_type,gh.repo_migration.asset_storage.asset_type
+repo migration,asset_id,gh.repo_migration.asset_storage.asset_id
+repo migration,http_response_code,gh.repo_migration.asset_storage.http_response_code
+repo migration,field,gh.repo_migration.field
+repo migration,state,gh.repo_migration.state
+repo migration,url,gh.repo_migration.repository.repository_url
+repo migration,validation_error,validation_error
+repo migration,code,code
diff --git a/...t/admin/administering-your-instance/enabling-and-scheduling-maintenance-mode.md b/...t/admin/administering-your-instance/enabling-and-scheduling-maintenance-mode.md
@@ -22,6 +22,7 @@ topics:
   - Upgrades
 shortTitle: Configure maintenance mode
 ---
+
 ## About maintenance mode
 
 Some types of operations require that you take {% data variables.location.product_location %} offline and put it into maintenance mode:
@@ -48,10 +49,12 @@ You can perform initial validation of your maintenance operation by configuring
 1. In the top navigation bar, click **Maintenance**.
 
    ![Screenshot of the header of the {% data variables.enterprise.management_console %}. A tab, labeled "Maintenance", is highlighted with an orange outline.](/assets/images/enterprise/management-console/maintenance-tab.png)
-1. Under "Enable and schedule", select **Enable maintenance mode**, then decide whether to enable maintenance mode immediately or to schedule a maintenance window for a future time.
+1. Under "Enable and schedule", {% ifversion custom-maintenance-mode-message %}select **Enable maintenance mode**, then {% endif %}decide whether to enable maintenance mode immediately or to schedule a maintenance window for a future time.
     - To enable maintenance mode immediately, select the dropdown menu and click **now**.
     - To schedule a maintenance window for a future time, select the dropdown menu and click a start time.
-{% data reusables.enterprise_management_console.save-settings %}
+{% data reusables.enterprise_management_console.custom-maintenance-message %}
+{% ifversion custom-maintenance-mode-message %}1. When you're satisfied with the timing of the window and the optional message, click **Save**. If you selected "now", your instance will be put into maintenance mode immediately.
+{% else %}1. When you're satisfied with the timing of the window, select the checkbox next to "Enable maintenance mode". If you selected "now", your instance will be put into maintenance mode immediately.{% endif %}
 
 {% ifversion ip-exception-list %}
 
@@ -70,6 +73,7 @@ You can also use a command-line utility to configure the IP exception list. For
    ![Screenshot of the header of the {% data variables.enterprise.management_console %}. A tab, labeled "Maintenance", is highlighted with an orange outline.](/assets/images/enterprise/management-console/maintenance-tab.png)
 1. Under "Enable and configure IP exception list", select **Enable IP exception list**.
 1. To the right of the checkbox for enabling the list, type a valid list of space-separated IP addresses or CIDR blocks that should be allowed to access {% data variables.location.product_location %}.
+{% data reusables.enterprise_management_console.custom-maintenance-message %}
 1. Click **Save**.
 
 {% endif %}
@@ -89,6 +93,12 @@ $ ghe-maintenance -q
 # Queries the current mode
 $ ghe-maintenance -s
 # Sets maintenance mode
+{%- ifversion custom-maintenance-mode-message %}
+$ ghe-maintenance -s "MESSAGE"
+# Sets maintenance mode with a custom message
+$ ghe-maintenance -m "MESSAGE"
+# Updates the custom message
+{%- endif %}
 $ ghe-maintenance -u
 # Unsets maintenance mode
 ```
@@ -104,6 +114,12 @@ $ ghe-cluster-maintenance -q
 # Queries the current mode
 $ ghe-cluster-maintenance -s
 # Sets maintenance mode
+{%- ifversion custom-maintenance-mode-message %}
+$ ghe-cluster-maintenance -s "MESSAGE"
+# Sets maintenance mode with a custom message
+$ ghe-cluster-maintenance -m "MESSAGE"
+# Updates the custom message
+{%- endif %}
 $ ghe-cluster-maintenance -u
 # Unsets maintenance mode
 ```
diff --git a/.../backing-up-and-restoring-your-instance/configuring-backups-on-your-instance.md b/.../backing-up-and-restoring-your-instance/configuring-backups-on-your-instance.md
@@ -58,9 +58,9 @@ For more information, see [{% data variables.product.prodname_enterprise_backup_
 
 ## Installing {% data variables.product.prodname_enterprise_backup_utilities %}
 
-To install {% data variables.product.prodname_enterprise_backup_utilities %} on your backup host, we recommend cloning the project's Git repository. This approach allows you to fetch new releases directly using Git, and your existing backup configuration file, `backup.config`, will be preserved when installing a new version.
+To install {% data variables.product.prodname_enterprise_backup_utilities %} on your backup host, we recommend you download the relevant {% data variables.product.prodname_enterprise_backup_utilities %} release as a compressed archive, then extract and install the contents. For more information, see [Getting started](https://github.com/github/backup-utils/blob/master/docs/getting-started.md) in the github/backup-utils repository.
 
-Alternatively, if the host machine can't access the internet, you can download each {% data variables.product.prodname_enterprise_backup_utilities %} release as a compressed archive, then extract and install the contents. For more information, see [Getting started](https://github.com/github/backup-utils/blob/master/docs/getting-started.md) in the {% data variables.product.prodname_enterprise_backup_utilities %} project documentation.
+Downloading the release as a compressed archive ensures you are using the correct version of {% data variables.product.prodname_enterprise_backup_utilities %} for {% data variables.location.product_location %}, and that your existing backup configuration file, `backup.config`, will be preserved when installing a new version.
 
 Backup snapshots are written to the disk path set by the `GHE_DATA_DIR` data directory variable in your `backup.config` file. Snapshots need to be stored on a filesystem which supports symbolic and hard links.
 
@@ -70,10 +70,12 @@ Backup snapshots are written to the disk path set by the `GHE_DATA_DIR` data dir
 
 {% endnote %}
 
-1. To clone the [{% data variables.product.prodname_enterprise_backup_utilities %} project repository](https://github.com/github/backup-utils/) to a local directory on your backup host, run the following command.
+1. Download the relevant {% data variables.product.prodname_enterprise_backup_utilities %} release from the [Releases](https://github.com/github/backup-utils/releases) page of the github/backup-utils repository.
 
-   ```
-   git clone https://github.com/github/backup-utils.git /path/to/target/directory/backup-utils
+1. To extract the repository using tar, run the following command.
+
+   ```shell
+   tar -xzvf /path/to/github-backup-utils-vMAJOR.MINOR.PATCH.tar.gz
    ```
 
 1. To change into the local repository directory, run the following command.

diff --git a/...ed-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md b/...ed-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md
@@ -53,6 +53,11 @@ You can configure {% data variables.product.prodname_code_scanning %} to run {%
 
 {% ifversion code-scanning-runner-label %}
 If you are provisioning a self-hosted runner for {% data variables.product.prodname_codeql %} analysis, your runner must use a {% data variables.product.prodname_codeql %}-supported operating system version and CPU architecture. For more information, see the [{% data variables.product.prodname_codeql %} system requirements](https://codeql.github.com/docs/codeql-overview/system-requirements/).
+
+{% ifversion code-scanning-default-setup-self-hosted-310 %}
+If you are using default setup for {% data variables.product.prodname_code_scanning %}, assign the `code-scanning` label to your self-hosted runner. For more information about using labels with self-hosted runners, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/using-labels-with-self-hosted-runners)". For more information about using default setup for code scanning analysis of compiled languages, see "[AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/codeql-code-scanning-for-compiled-languages)."
+
+{% endif %}
 {% endif %}
 
 You must ensure that Git is in the PATH variable on any self-hosted runners you use to run {% data variables.product.prodname_codeql %} actions.
@@ -87,8 +92,7 @@ If you configure the {% data variables.product.prodname_codeql %} action sync to
 1. If you want to download action workflows on demand from {% data variables.product.prodname_dotcom_the_website %}, you need to enable {% data variables.product.prodname_github_connect %}. For more information, see "[AUTOTITLE](/admin/configuration/configuring-github-connect/managing-github-connect#enabling-github-connect)."
 1. You'll also need to enable {% data variables.product.prodname_actions %} for {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server)."
 1. The next step is to configure access to actions on {% data variables.product.prodname_dotcom_the_website %} using {% data variables.product.prodname_github_connect %}. For more information, see "[AUTOTITLE](/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect)."
-1. Add a self-hosted runner to your repository, organization, or enterprise account. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners)."{% ifversion code-scanning-runner-label %}
-1. If you are using default setup for {% data variables.product.prodname_code_scanning %}, assign the `code-scanning` label to your self-hosted runner. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/using-labels-with-self-hosted-runners)" and "[AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-default-setup-for-code-scanning)."{% endif %}
+1. Add a self-hosted runner to your repository, organization, or enterprise account. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners)."
 
 ## Running code scanning using the {% data variables.product.prodname_codeql_cli %}
 

diff --git a/...scanning-your-code-for-vulnerabilities-and-errors/about-the-tool-status-page.md b/...scanning-your-code-for-vulnerabilities-and-errors/about-the-tool-status-page.md
@@ -63,7 +63,7 @@ This view will also show error messages. For more information, see "[Debugging u
 
 A file is reported as scanned by {% data variables.product.prodname_codeql %} if some of the lines of code in that file were processed. If you're using a standard configuration of the {% data variables.product.prodname_codeql %} action, the scanned files shown in the {% data variables.code-scanning.tool_status_page %} will include source code files for all languages that {% data variables.product.prodname_codeql %} can analyze. If you use advanced setup, you can optionally define which files for interpreted languages should be scanned using the `paths` and `paths-ignore` configuration properties. For more information, see "[AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/about-code-scanning-with-codeql)" and "[AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning)."
 
-For compiled languages, the {% data variables.code-scanning.tool_status_page %} reports files that were present before running autobuild or any manual build steps. This means that files generated during the build process are not shown in the {% data variables.code-scanning.tool_status_page %}. For more information, see "[AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages#about-autobuild-for-codeql)."
+For compiled languages, the {% data variables.code-scanning.tool_status_page %} reports files that were present before running autobuild or any manual build steps. This means that files generated during the build process are not shown in the {% data variables.code-scanning.tool_status_page %}. For more information, see "[AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/codeql-code-scanning-for-compiled-languages#about-autobuild-for-codeql)."
 
 The tool status page will calculate the percentage of files that were scanned by {% data variables.product.prodname_codeql %} for each language supported by {% data variables.product.prodname_codeql %}. This percentage respects any files excluded by the `paths` and `paths-ignore` configuration properties.