Skip to content

Commit bd517b9

Browse files
Merge branch 'main' into jm/mix_dep_sub
2 parents 895522d + 46d899e commit bd517b9

67 files changed

Lines changed: 786 additions & 299 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
21.8 KB
Loading
549 Bytes
Loading

content/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ With this approach, the value of the {% raw %}`${{ github.event.pull_request.tit
151151

152152
### Using workflow templates for {% data variables.product.prodname_code_scanning %}
153153

154-
{% data reusables.advanced-security.starter-workflows-beta %}
155154
{% data variables.product.prodname_code_scanning_caps %} allows you to find security vulnerabilities before they reach production. {% data variables.product.github %} provides workflow templates for {% data variables.product.prodname_code_scanning %}. You can use these suggested workflows to construct your {% data variables.product.prodname_code_scanning %} workflows, instead of starting from scratch. {% data variables.product.company_short %}'s workflow, the {% data variables.code-scanning.codeql_workflow %}, is powered by {% data variables.product.prodname_codeql %}. There are also third-party workflow templates available.
156155

157156
For more information, see [AUTOTITLE](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning) and [AUTOTITLE](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning#configuring-code-scanning-using-third-party-actions).
@@ -228,8 +227,6 @@ For more information on how to configure this setting, see {% ifversion ghes or
228227

229228
## Using {% data variables.product.prodname_code_scanning %} to secure workflows
230229

231-
{% data reusables.code-scanning.beta-actions-analysis %}
232-
233230
{% data variables.product.prodname_code_scanning_caps %} can automatically detect and suggest improvements for common vulnerable patterns used in {% data variables.product.prodname_actions %} workflows.
234231
For more information on how to enable {% data variables.product.prodname_code_scanning %}, see [AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning).
235232

@@ -347,6 +344,7 @@ For third-party images, such as the images for ARM-powered runners, you can find
347344
When a self-hosted runner is defined at the organization or enterprise level, {% data variables.product.github %} can schedule workflows from multiple repositories onto the same runner. Consequently, a security compromise of these environments can result in a wide impact. To help reduce the scope of a compromise, you can create boundaries by organizing your self-hosted runners into separate groups. You can restrict what {% ifversion ghec or ghes %}workflows, {% endif %}organizations and repositories can access runner groups. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/managing-access-to-self-hosted-runners-using-groups).
348345

349346
You should also consider the environment of the self-hosted runner machines:
347+
350348
* What sensitive information resides on the machine configured as a self-hosted runner? For example, private SSH keys, API access tokens, among others.
351349
* Does the machine have network access to sensitive services? For example, Azure or AWS metadata services. The amount of sensitive information in this environment should be kept to a minimum, and you should always be mindful that any user capable of invoking workflows has access to this environment.
352350

@@ -370,10 +368,12 @@ Once you have the config file from the REST API response, you can pass it to the
370368
A self-hosted runner can be added to various levels in your {% data variables.product.prodname_dotcom %} hierarchy: the enterprise, organization, or repository level. This placement determines who will be able to manage the runner:
371369

372370
**Centralized management:**
371+
373372
* If you plan to have a centralized team own the self-hosted runners, then the recommendation is to add your runners at the highest mutual organization or enterprise level. This gives your team a single location to view and manage your runners.
374373
* If you only have a single organization, then adding your runners at the organization level is effectively the same approach, but you might encounter difficulties if you add another organization in the future.
375374

376375
**Decentralized management:**
376+
377377
* If each team will manage their own self-hosted runners, then the recommendation is to add the runners at the highest level of team ownership. For example, if each team owns their own organization, then it will be simplest if the runners are added at the organization level too.
378378
* You could also add runners at the repository level, but this will add management overhead and also increases the numbers of runners you need, since you cannot share runners between repositories.
379379

content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-interactive-maps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ To generate credentials for Azure Maps, you must create an application for your
5050
1. Select **Delegated permissions**.
5151
1. Under "Select permissions", select "`user_impersonation`".
5252
1. To save the permissions, click **Add permissions**.
53-
1. Sign into an Azure Maps account. If you don't have an account, you can create one. For more information, see the [Azure Maps Account](https://www.microsoft.com/maps) website.
53+
1. Sign into an Azure Maps account. If you don't have an account, you can create one. For more information, see the [Azure Maps Account](https://azure.microsoft.com/en-us/products/azure-maps/) website.
5454
1. Configure RBAC for Azure Maps. For more information, see [Authentication with Azure Maps](https://learn.microsoft.com/azure/azure-maps/azure-maps-authentication#authorization-with-role-based-access-control) and [Assign Azure roles using the Azure portal](https://learn.microsoft.com/azure/role-based-access-control/role-assignments-portal) on Microsoft Learn.
5555

5656
* On your Entra ID tenant, from **Access control (IAM)**, you must assign the role of "Azure Maps Data Reader" to "User, group, or service principal", select the application you created earlier in these instructions, and complete the form.

content/admin/managing-iam/iam-configuration-reference/saml-configuration-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Depending on your environment, the SP metadata for an enterprise on {% data vari
5656
| :- | :- | :- | :- |
5757
| SP Entity ID | SP URL, audience restriction | The top-level URL for your enterprise on {% data variables.location.product_location %} | `https://github.com/enterprises/ENTERPRISE` |
5858
| SP Assertion Consumer Service (ACS) URL | Reply, recipient, or destination URL | URL where IdP sends SAML responses | `https://github.com/enterprises/ENTERPRISE/saml/consume` |
59-
| SP Single Sign-On (SSO) URL | | URL where IdP begins SSO | `https://github.com/enterprises/ENTERPRISE/saml/sso` |
59+
| SP Single Sign-On (SSO) URL | | URL where IdP begins SSO | `https://github.com/enterprises/ENTERPRISE/sso` |
6060

6161
{% elsif ghes %}
6262

content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-the-monitor-dashboards.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ Number of tasks queued for background processing on the {% data variables.produc
116116
Monitoring Git maintenance failures can help customers with large and active repositories proactively manage repository health. Occasional "spurious failures" and "retries" are expected, but if a repository consistently shows Git maintenance marked as "failed", we recommend contacting [GitHub Support](https://support.github.com/).
117117
{% endif %}
118118

119-
### Git Maintenance
120-
121-
Monitoring Git maintenance failures can help customers with large and active repositories proactively manage repository health. Occasional "spurious failures" and "retries" are expected, but if a repository consistently shows Git maintenance marked as "failed", we recommend contacting [GitHub Support](https://support.github.com/).
122-
123119
### Network
124120

125121
The network interface graphs can be useful in profiling user activity, and throughput of traffic in and out of the {% data variables.product.prodname_ghe_server %} appliance.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
title: Changing your platform
3+
shortTitle: Changing platform
4+
intro: 'How to change the platform that runs {% data variables.location.product_location %}'
5+
type: how_to
6+
topics:
7+
- Infrastructure
8+
- Migration
9+
- Enterprise
10+
versions:
11+
ghes: '*'
12+
---
13+
14+
In some cases, you may need to change the platform on which {% data variables.location.product_location %} runs, such as moving from VMware to Azure.
15+
16+
## Recommendations
17+
18+
You should carefully plan any out migration procedures and consider first testing on a staging environment. For more information, see [AUTOTITLE](/admin/installing-your-enterprise-server/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance).
19+
20+
Moving platforms using a replica will require the least amount of time for the migration process but will require you to make changes to your live environment in order to setup the replication.
21+
22+
Moving via backup and restore will not require any changes to your live environment, however the migration will take a significant amount of time. The specific amount of time to complete the migration will vary based the performance of your backup host, and the network speeds between your backup host and the new instance. Maintenance mode should also be enabled throughout the process otherwise users may be able to make changes which will not be reflected on your new instance.
23+
24+
> [!WARNING]
25+
> You should not use utilities which convert {% data variables.location.product_location %} from one platform to another. Doing so could cause unintended side effects such as system instability.
26+
27+
## Move platforms using a HA replica
28+
29+
1. Set up a new {% data variables.product.prodname_ghe_server %} instance on your chosen platform. See [AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance).
30+
1. Configure your new {% data variables.product.prodname_ghe_server %} instance as a replica. See [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-high-availability/creating-a-high-availability-replica).
31+
1. Failover to your replica. See [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-high-availability/initiating-a-failover-to-your-replica-appliance).
32+
33+
## Moving platforms using backup and restore
34+
35+
1. Setup backups for your existing {% data variables.product.prodname_ghe_server %} instance. See [AUTOTITLE](/admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance).
36+
1. Set up a new {% data variables.product.prodname_ghe_server %} instance on your chosen platform. See [AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance).
37+
1. Communicate the upcoming downtime to your users and enable maintenance mode. For more information, see the following articles.
38+
39+
* [AUTOTITLE](/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/customizing-user-messages-for-your-enterprise#creating-a-mandatory-message)
40+
* [AUTOTITLE](/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode)
41+
1. Create a new backup of your existing {% data variables.product.prodname_ghe_server %} instance.
42+
1. Restore the backup to your new {% data variables.product.prodname_ghe_server %} instance. If you are using {% data variables.product.prodname_actions %}, see [AUTOTITLE](/admin/managing-github-actions-for-your-enterprise/advanced-configuration-and-troubleshooting/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled)
43+
1. Update the DNS to point to the address of your new {% data variables.product.prodname_ghe_server %} instance.
44+
1. Disable maintenance mode and let users know they can continue normal operations.
45+
46+
## Further reading
47+
48+
* [AUTOTITLE](/admin/overview/about-github-enterprise-server)
49+
* [AUTOTITLE](/admin/monitoring-and-managing-your-instance/configuring-high-availability/about-high-availability-configuration)
50+
* [AUTOTITLE](/admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance#about-github-enterprise-server-backup-utilities)

content/admin/monitoring-and-managing-your-instance/updating-the-virtual-machine-and-physical-resources/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ children:
1616
- /increasing-storage-capacity
1717
- /increasing-cpu-or-memory-resources
1818
- /using-generation-2-virtual-machines
19+
- /changing-your-platform
1920
shortTitle: Update VM & resources
2021
---

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ You can view the current license limits and usage for your enterprise.
3232
{% ifversion ghec %}
3333
{% data reusables.enterprise-accounts.access-enterprise %}
3434
{% data reusables.enterprise-accounts.licensing-tab-both-platforms %}
35-
* The "{% data variables.product.prodname_GHAS %}" section shows details of the licenses you currently **consume**.
35+
* The "{% data variables.product.prodname_AS %}" section shows details of the licenses you currently **consume**.
3636
* If you have a volume/subscription license, the number of licenses **available** to use is also displayed.
3737
* If you run out of licenses, for volume/subscription only, the section is red and reports "Limit exceeded." You should either reduce your use or purchase more licenses.
3838

@@ -48,7 +48,7 @@ You can view the current license limits and usage for your enterprise.
4848
{% data reusables.enterprise-accounts.access-enterprise %}
4949
{% data reusables.enterprise-accounts.license-tab %}
5050

51-
The "{% data variables.product.prodname_GHAS %}" section shows details of the current usage. You can see the total number of licenses used, as well as a table with the number of committers and unique committers for each organization.
51+
The "{% data variables.product.prodname_AS %}" section shows details of the current usage. You can see the total number of licenses used, as well as a table with the number of committers and unique committers for each organization.
5252

5353
1. Optionally, to see a detailed breakdown of usage by repositories within an organization, click an organization name to display the "Global code security settings" for the organization.
5454

content/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning-at-scale.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ For repositories that are not eligible for default setup, you can configure adva
4545
A repository must meet all the following criteria to be eligible for default setup, otherwise you need to use advanced setup.
4646

4747
* Advanced setup for {% data variables.product.prodname_code_scanning %} is not already enabled.
48-
* {% data variables.product.prodname_actions %} are enabled.{% ifversion default-setup-pre-enablement %}
49-
* Uses Go, JavaScript/TypeScript, Python, or Ruby.{% endif %}
48+
{% ifversion default-setup-pre-enablement %}* Uses Go, JavaScript/TypeScript, Python, or Ruby.{% endif %}
5049
{% data reusables.code-scanning.require-actions-ghcs %}
5150

5251
{% ifversion default-setup-pre-enablement %}

0 commit comments

Comments
 (0)