Skip to content

Commit 3f269e6

Browse files
docs-botdocs-bot
authored
Merge pull request #39780 from github/repo-sync
Repo sync
2 parents 0718f54 + 976008d commit 3f269e6

30 files changed

+504
-335
lines changed

‎content/billing/concepts/enterprise-billing/azure-devops-licenses.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
title: Combined use of GitHub Enterprise and Azure DevOps
3+
intro: '{% data variables.product.prodname_ghe_cloud %} customers can use Azure DevOps without additional costs.'
4+
versions:
5+
fpt: '*'
6+
ghec: '*'
7+
topics:
8+
- Billing
9+
- Enterprise
10+
- Licensing
11+
shortTitle: Azure DevOps licenses
12+
contentType: concepts
13+
---
14+
15+
{% data variables.product.prodname_ghe_cloud %} customers can use Azure DevOps without additional costs per user. For customers using Microsoft Entra, users can sign in with the same credentials on {% data variables.product.github %} and Azure DevOps.
16+
17+
No additional setup is required. {% data variables.product.prodname_enterprise %} users are detected automatically when they sign in to Azure DevOps. See [User and permissions management](https://learn.microsoft.com/en-us/azure/devops/organizations/accounts/faq-user-and-permissions-management?view=azure-devops#github-enterprise) in the Microsoft Learn documentation.
18+
19+
Combined use is not currently available with {% data variables.enterprise.data_residency %}, but this is planned as a future improvement.

‎content/billing/concepts/enterprise-billing/combined-enterprise-use.md

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,51 +15,56 @@ redirect_from:
1515
contentType: concepts
1616
---
1717

18-
19-
{% data reusables.billing.usage-based-billing %}
20-
2118
## About licensing for {% data variables.product.prodname_enterprise %}
2219

2320
{% data reusables.enterprise.about-deployment-methods %}
2421

25-
{% data reusables.enterprise-licensing.unique-user-licensing-model %} To understand how {% data variables.product.company_short %} bills you for consumed {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %}, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing). For more about the price of {% data variables.product.prodname_enterprise %} licenses, see [Pricing](https://github.com/pricing) on the {% data variables.product.prodname_dotcom %} website.
26-
27-
To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you can synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} deployments.
22+
{% data reusables.enterprise-licensing.unique-user-licensing-model %}
2823

29-
{% ifversion ghes %}
24+
To use a {% data variables.product.prodname_ghe_server %} instance, you must upload a license file that {% data variables.product.company_short %} provides. See [AUTOTITLE](/billing/concepts/enterprise-billing/ghes-license-files).
3025

31-
{% data reusables.billing.license-type-overview %}
32-
{% data reusables.billing.license-models %}
26+
## Syncing licenses
3327

34-
{% endif %}
28+
{% data reusables.enterprise-licensing.about-license-sync %}
3529

36-
In order to use a {% data variables.product.prodname_ghe_server %} instance, you must upload a license file that {% data variables.product.company_short %} provides when you purchase, renew, or add user licenses to {% data variables.product.prodname_enterprise %}.
30+
## Usage-based and volume licensing
3731

38-
{% data variables.product.prodname_ghe_cloud %} customers can use Azure DevOps without additional per user charges. Access is available to customers using Microsoft Entra and users logging in with the same credentials in {% data variables.product.github %} and Azure DevOps.
32+
There are two types of {% data variables.product.prodname_enterprise %} (GHE) licensing models, with different processes for enabling combined use of {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}.
3933

40-
There is no action required; {% data variables.product.prodname_enterprise %} users will be detected automatically when they log in to Azure DevOps. See [User and permissions management](https://learn.microsoft.com/en-us/azure/devops/organizations/accounts/faq-user-and-permissions-management?view=azure-devops#github-enterprise) in the Microsoft Learn documentation.
34+
* **GHE (Usage-based, also called metered)**: A cloud-first license where users must first be assigned to a {% data variables.product.prodname_ghe_cloud %} organization.
35+
* All Cloud users automatically receive a use right for {% data variables.product.prodname_ghe_server %}.
36+
* Billing is based on the number of active users each month.
37+
* Users can generate their own Server license, which covers the number of assigned Cloud seats at the time of generation and is valid for one year.
38+
* Server-only users will be added to GHE (Metered) billing. These users are de-duplicated with email matching to avoid double billing.
4139

42-
Access is not yet available in [new data residency regions](https://github.blog/engineering/engineering-principles/github-enterprise-cloud-with-data-residency/) but will be coming in the future.
40+
* **GHE (Volume/Subscription, also called GHE Unified)**: A bundled license for both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}.
41+
* One license covers both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, allowing users to work in either or both.
42+
* Users can access both services via {% data variables.product.prodname_github_connect %}.
43+
* This license requires manual setup and is provided by {% data variables.product.github %} Sales.
4344

44-
## About synchronization of license usage for {% data variables.product.prodname_enterprise %}
45-
46-
{% data reusables.enterprise-licensing.about-license-sync %} For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
47-
48-
## About license files for {% data variables.product.prodname_enterprise %}
49-
50-
When you purchase or renew {% data variables.product.prodname_enterprise %}, {% data variables.product.company_short %} provides a license file {% ifversion ghec %}for your deployments of {% data variables.product.prodname_ghe_server %}{% elsif ghes %}for {% data variables.location.product_location_enterprise %}{% endif %}. A license file has an expiration date and controls the number of people who can use {% data variables.location.product_location_enterprise %}. After you download and install {% data variables.product.prodname_ghe_server %}, you must upload the license file to unlock the application for you to use.
45+
{% data reusables.billing.usage-based-billing %}
5146

52-
For more information about downloading your license file, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise).
47+
### Detailed comparison
5348

54-
For more information about uploading your license file, see {% ifversion ghec %}[AUTOTITLE](/enterprise-server@latest/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server).{% endif %}
49+
{% rowheaders %}
5550

56-
If your license expires, you won't be able to access {% data variables.product.prodname_ghe_server %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see {% ifversion ghec %}[Configuring backups on your appliance](/enterprise-server@latest/admin/guides/installation/configuring-backups-on-your-appliance) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance).{% endif %}
51+
| License model | Usage-based | Volume or subscription |
52+
|----------------------------------|-------------------------------------|-----------------------------------------------------------------------------------------------|
53+
| **Cloud vs. Server** | Cloud-first, with a Server use right for Cloud users | 1 user license covers both Cloud and Server (hybrid, Cloud-only, or Server-only) |
54+
| **Setup** | Self-service | Manual setup via {% data variables.product.github %} Sales |
55+
| **Server license generation** | Users generate their own {% data variables.product.prodname_ghe_server %} license | Enterprise owners download their own {% data variables.product.prodname_ghe_server %} license |
56+
| **License file scope** | Covers Cloud-assigned users at time of generation | Covers all purchased users for both Cloud and Server |
57+
| **License expiration** | Expires in 12 months | Aligned with volume license term |
58+
| **License key usage** | Limits max Server users | Covers all users in the volume subscription |
59+
| **Required {% data variables.product.prodname_enterprise %} version** | {% data variables.product.prodname_enterprise %} 3.13+, with {% data variables.product.prodname_github_connect %} | No specific version required |
60+
| **Billing model** | Invoiced for users not assigned on Cloud via {% data variables.product.prodname_github_connect %} | Fixed cost based on purchased volume |
5761

58-
If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}.
62+
{% endrowheaders %}
5963

6064
## Further reading
6165

66+
* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
67+
* [Pricing](https://github.com/pricing)
6268
* [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise)
63-
* The [People that consume a license](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing#people-that-consume-a-license) section in "About per-user pricing"
6469
* [AUTOTITLE]({% ifversion fpt or ghec %}/enterprise-server@latest{% endif %}/admin/installation/setting-up-a-github-enterprise-server-instance)
6570
* The [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website

‎content/billing/concepts/enterprise-billing/ghes-license-files.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
title: License files for GitHub Enterprise Server
3+
intro: 'To use {% data variables.product.prodname_ghe_server %}, you must upload a license file.'
4+
versions:
5+
fpt: '*'
6+
ghec: '*'
7+
ghes: '*'
8+
topics:
9+
- Billing
10+
- Enterprise
11+
- Licensing
12+
shortTitle: GHES license files
13+
contentType: concepts
14+
---
15+
16+
## About license files
17+
18+
In order to use a {% data variables.product.prodname_ghe_server %} instance, you must upload a license file that {% data variables.product.company_short %} provides when you purchase, renew, or add user licenses to {% data variables.product.prodname_enterprise %}.
19+
20+
A license file has an expiration date and controls the number of people who can use {% data variables.location.product_location_enterprise %}. After you download and install {% data variables.product.prodname_ghe_server %}, you must upload the license file to unlock the application for you to use.
21+
22+
If your license expires, you won't be able to access {% data variables.product.prodname_ghe_server %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data.
23+
24+
## Next steps
25+
26+
* To download your license file, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise).
27+
* To upload your license file to {% data variables.product.prodname_ghe_server %}, see {% ifversion fpt or ghec %}[AUTOTITLE](/enterprise-server@latest/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server).{% endif %}
28+
* To back up your {% data variables.product.prodname_ghe_server %} instance, see {% ifversion fpt or ghec %}[Configuring backups on your appliance](/enterprise-server@latest/admin/guides/installation/configuring-backups-on-your-appliance) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance).{% endif %}
29+
* If you have questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}.

‎content/billing/concepts/enterprise-billing/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ children:
1111
- /billing-for-enterprises
1212
- /usage-based-licenses
1313
- /combined-enterprise-use
14+
- /ghes-license-files
1415
- /visual-studio-subs
16+
- /azure-devops-licenses
1517
contentType: concepts
1618
---
1719

‎content/billing/concepts/enterprise-billing/usage-based-licenses.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,22 @@ shortTitle: Usage-based licenses
2323
contentType: concepts
2424
---
2525

26-
## About usage-based billing
26+
With usage-based billing, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_cs_and_sp %} licenses you use. You do not need to buy a predefined number of licenses in advance.
2727

28-
You pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_cs_and_sp %} licenses you use. You do not need to buy a predefined number of licenses in advance. Usage-based billing for licenses provides flexibility and cost savings compared to more traditional licensing models, such as volume or subscription models.
28+
Usage-based billing for licenses provides flexibility and cost savings compared to more traditional licensing models, such as volume or subscription models.
2929

30-
{% data reusables.billing.license-type-overview %}
31-
{% data reusables.billing.license-models %}
30+
## Do I have usage-based billing?
31+
32+
{% data reusables.billing.do-i-have-usage-based %}
3233

3334
{% data variables.visual_studio.prodname_vss_ghe %} is currently not supported for usage-based billing.
3435

36+
## Can I use {% data variables.product.prodname_ghe_server %}?
37+
38+
Although you can sync licenses with {% data variables.product.prodname_ghe_server %}, usage-based licensing is a cloud-first license model where users must first be added to an organization on {% data variables.product.prodname_ghe_cloud %}.
39+
40+
For a detailed comparison between usage-based and volume licensing models, see [AUTOTITLE](/billing/concepts/enterprise-billing/combined-enterprise-use#about-licensing-models).
41+
3542
## How are metered licenses measured?
3643

3744
{% data reusables.billing.metered-license-measures %}

‎content/billing/concepts/enterprise-billing/visual-studio-subs.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ If the personal account for an enterprise member does not correspond with the em
4242

4343
For more information about {% data variables.product.prodname_enterprise %}, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans#github-enterprise). For more information about accounts on {% data variables.product.prodname_dotcom %}, see [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts).
4444

45-
You can view the number of {% data variables.product.prodname_enterprise %} licenses available to your enterprise on {% data variables.location.product_location %}. The list of pending invitations includes subscribers who are not yet members of at least one organization in your enterprise. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account) and [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-and-outside-collaborators).
46-
47-
> [!TIP] If you download a CSV file with your enterprise's license usage in step 6 of [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account#viewing-the-subscription-and-usage-for-your-enterprise-account), any members with a missing value for the "Name" or "Profile" columns have not yet accepted an invitation to join an organization within the enterprise.
48-
49-
You can also see pending {% data variables.product.prodname_enterprise %} invitations to subscribers in {% data variables.visual_studio.prodname_vss_admin_portal_with_url %}.
50-
5145
## About licenses for {% data variables.product.prodname_ghe_server %}
5246

5347
{% data reusables.enterprise.ghe-includes-ghec-and-ghes %} For more information, see [AUTOTITLE](/admin/overview/about-github-for-enterprises#about-deployment-options).

‎content/billing/concepts/license-consumption.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ In addition to {% ifversion enterprise-licensing-language %}showing billable {%
4444

4545
With usage-based billing, you pay for the number of licenses you use each month. You do not need to buy a predefined number of licenses in advance. See, [AUTOTITLE](/billing/managing-your-billing/about-usage-based-billing-for-licenses).
4646

47-
You are already enrolled in usage-based billing if you created a trial of {% data variables.product.prodname_ghe_cloud %} on or after August 1, 2024.
48-
49-
If you currently pay for your {% data variables.product.prodname_enterprise %} licenses by invoice with a volume, subscription, or prepaid agreement, you will continue to be billed in this way until your agreement expires. At renewal, you have the option to switch to the metered billing model.
47+
{% data reusables.billing.do-i-have-usage-based %}
5048

5149
## People that consume a license
5250

‎content/billing/how-tos/manage-server-licenses/download-your-license.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ contentType: how-tos
3232

3333
## About license files for {% data variables.product.prodname_enterprise %}
3434

35-
After you purchase or upgrade a license for {% data variables.product.prodname_enterprise %} from {% data variables.contact.contact_enterprise_sales %}, you must download your new license file. For more information about licenses for {% data variables.product.prodname_enterprise %}, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise).
35+
After you purchase or upgrade a license for {% data variables.product.prodname_enterprise %} from {% data variables.contact.contact_enterprise_sales %}, you must download your new license file. For more information about licenses for {% data variables.product.prodname_enterprise %}, see [AUTOTITLE](/billing/concepts/enterprise-billing/ghes-license-files).
3636

3737
{% data reusables.enterprise-licensing.contact-sales-for-renewals-or-seats %}
3838

0 commit comments

Comments
 (0)