Skip to content

Commit 861a1bf

Browse files
authored
Merge pull request #44500 from github/repo-sync
Repo sync
2 parents 6d40351 + b5de52f commit 861a1bf

166 files changed

Lines changed: 1240 additions & 1346 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.
168 KB
Loading
115 KB
Loading

content/billing/concepts/budgets-and-alerts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ category:
99
- Track spending and control costs
1010
---
1111

12-
Budgets and alerts allow you to track spending on metered products for your enterprise, organizations, cost centers (enterprise only), and repositories. Budgets and alerts are not available for pre-paid volume licenses.
12+
Budgets and alerts allow you to track spending on metered products for your enterprise, organizations, cost centers (enterprise only), users, and repositories. Budgets and alerts are not available for pre-paid volume licenses.
1313

1414
By setting a monthly budget, you can monitor your spending and receive notifications by email when your spending exceeds certain preset percentages of your budget threshold. This can help you stay within your budget and avoid overspending.
1515

1616
## Stopping usage
1717

1818
For most license-based products such as {% data variables.product.prodname_copilot %}, {% data variables.product.prodname_team %}, and {% data variables.product.prodname_enterprise %}, setting a budget does not prevent usage over the budget amount but does provide alerts. {% data variables.product.prodname_GHAS %} SKUs are an exception to this, as they can be set to stop usage when the budget amount is reached. See [AUTOTITLE](/billing/concepts/product-billing/github-advanced-security#hard-budgets-for-github-advanced-security-skus).
1919

20-
For metered products such as {% data variables.product.prodname_actions %} or {% data variables.product.prodname_copilot %} premium requests, you can choose for budgets to prevent usage once the budget amount is reached.
20+
For metered products such as {% data variables.product.prodname_actions %} or {% data variables.product.prodname_copilot_short %} {% data variables.product.prodname_ai_credits_short %}, you can set budgets to prevent usage once the budget threshold is reached.
2121

2222
## Types and scopes
2323

2424
Each budget has a type and a scope that define which paid use contributes to spending against the budget.
2525

2626
* **Type**: Defines which metered product or SKU is measured.
27-
* **Scope**: Defines whether the budget applies to the whole account, or to a subset of repositories, organizations, or cost centers (enterprise only).
27+
* **Scope**: Defines whether the budget applies to the whole account, or to a subset of repositories, organizations, cost centers (enterprise only), or users. User-scoped budgets are currently only supported for {% data variables.product.prodname_copilot_short %} {% data variables.product.prodname_ai_credits_short %}. There are two types: a universal budget that applies to all licensed users by default, and individual budgets that override the universal for specific users. See [AUTOTITLE](/copilot/concepts/billing/budgets-for-usage-based-billing).
2828

2929
## Budget alerts
3030

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ There are two types of {% data variables.product.prodname_enterprise %} (GHE) li
3838
* **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.
3939
* All Cloud users automatically receive a right to use {% data variables.product.prodname_ghe_server %}.
4040
* Billing is based on the number of active users each month.
41-
* 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.
41+
* Users can generate their own Server license, and the seat count is based on the number of consumed enterprise Cloud licenses at the time of generation. The license is valid for one year.
42+
43+
You can find your enterprise's consumed Cloud license count on your enterprise's **Billing & Licensing > Licensing** page. Do **not** use the "Total consumed" licenses count on the **People > Members** page: that number will be higher than the Cloud-only count used for license generation.
4244
* Server-only users will be added to GHE (Metered) billing. These users are de-duplicated with email matching to avoid double billing.
4345

4446
* **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 %}.
@@ -57,7 +59,7 @@ There are two types of {% data variables.product.prodname_enterprise %} (GHE) li
5759
| **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) |
5860
| **Setup** | Self-service | Manual setup via {% data variables.product.github %} Sales |
5961
| **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 |
60-
| **License file scope** | Covers Cloud-assigned users at time of generation | Covers all purchased users for both Cloud and Server |
62+
| **License file scope** | Covers consumed Cloud licenses at time of generation | Covers all purchased users for both Cloud and Server |
6163
| **License expiration** | Expires in 12 months | Aligned with volume license term |
6264
| **License key usage** | Limits max Server users | Covers all users in the volume subscription |
6365
| **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 |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ In order to use a {% data variables.product.prodname_ghe_server %} instance, you
1717

1818
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.
1919

20+
If your enterprise uses metered (usage-based) billing, the seat count in your license file is based on the number of consumed Cloud licenses at the time you generated the license. To see this count, go to your enterprise's **Billing & Licensing > Licensing** page.
21+
2022
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.
2123

2224
## Next steps

content/billing/concepts/product-billing/github-actions.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ For **private repositories**, each {% data variables.product.github %} account r
3131
> [!TIP]
3232
> Anyone with write access to a repository can run actions. Any costs of running the actions are billed to the repository owner.
3333
34+
### {% data variables.copilot.copilot_code-review_short %} and {% data variables.product.prodname_actions %} minutes
35+
36+
Each {% data variables.copilot.copilot_code-review_short %} consumes {% data variables.product.prodname_actions %} minutes in addition to {% data variables.product.prodname_ai_credits_short %}.
37+
38+
* **Private repositories:** Minutes are consumed from your account or organization's existing plan entitlement. Any usage beyond your included minutes is billed at standard {% data variables.product.prodname_actions %} rates.
39+
* **Public repositories:** Minutes remain free.
40+
41+
{% data variables.copilot.copilot_code-review_short %} runs on standard {% data variables.product.github %}-hosted Ubuntu Linux runners by default. You can also configure {% data variables.actions.github_hosted_larger_runners %} or self-hosted runners via Actions Runner Controller (ARC), which are billed at different rates.
42+
3443
## How storage billing works
3544

3645
{% data variables.product.prodname_actions %} storage billing operates on an **hourly accrual model**:
@@ -48,11 +57,13 @@ It's important to understand the difference between what you see on {% data vari
4857
* **Accrued storage:** The cumulative total of storage used throughout the billing cycle (determines your bill)
4958

5059
**When you delete artifacts:**
60+
5161
* Current storage decreases immediately
5262
* Future hourly charges stop accumulating
5363
* Storage already accrued during the current billing cycle remains in your total and will appear on your bill
5464

5565
**Example (30-day billing cycle):** If you store 10 GB of artifacts for 10 days, then delete everything on day 11:
66+
5667
* Days 1-10: Accruing 240 GB-Hours per day (10 GB × 24 hours)
5768
* Day 11: Delete artifacts → current storage drops to 0 GB
5869
* Days 11-30: Accruing 0 GB-Hours (no storage)
@@ -63,11 +74,13 @@ Deleting artifacts reduces your current storage and prevents future charges, but
6374
### Storage measurement units
6475

6576
{% data variables.product.prodname_actions %} measures storage in **binary gigabytes (GB)**, where:
77+
6678
* 1 GB = 2^30 bytes = 1,073,741,824 bytes
6779
* This is also known as a gibibyte (GiB)
6880
* 1 GB = 1,024 megabytes (MB)
6981

7082
**Billing calculations use GB-Hours:**
83+
7184
* 1 GB-Hour = 1 GB of storage for 1 hour
7285
* Example: Storing 3 GB for 10 days = 720 GB-Hours (3 GB × 10 days × 24 hours)
7386

@@ -109,6 +122,7 @@ The following amounts of time for standard runners, artifact storage, and cache
109122
{% data reusables.billing.actions-included-quotas %}
110123

111124
The use of standard {% data variables.product.github %}-hosted runners is free:
125+
112126
* In public repositories
113127
* For {% data variables.product.prodname_pages %}
114128
* For {% data variables.product.prodname_dependabot %}
@@ -117,6 +131,7 @@ The use of standard {% data variables.product.github %}-hosted runners is free:
117131
>
118132
> * Larger runners are always charged for, even when used by public repositories or when you have quota available from your plan.
119133
> * The storage amounts shown are **shared** with {% data variables.product.prodname_registry %}. This means your total storage across Actions artifacts, Actions caches, and Packages cannot exceed the included amount for your plan.
134+
> * {% data variables.copilot.copilot_code-review_short %} consumes {% data variables.product.prodname_actions %} minutes on private repositories. For public repositories, {% data variables.product.prodname_actions %} minutes remain free.
120135
121136
## Using more than your included quota
122137

content/billing/concepts/product-billing/github-code-quality.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ category:
1919

2020
When {% data variables.product.prodname_code_quality_short %} is generally available, scanning repositories will incur two types of costs for an organization:
2121

22-
* Premium requests
22+
* {% data variables.product.prodname_ai_credits_short %}
2323
* {% data variables.product.prodname_actions %} minutes needed to run the scans unless you use self-hosted runners
2424

2525
### For the {% data variables.release-phases.public_preview %}
2626

27-
When you scan private repositories during the {% data variables.release-phases.public_preview %}, you **will not be billed** for premium request usage, but {% data variables.product.prodname_actions %} minutes **will be consumed**.
27+
When you scan private repositories during the {% data variables.release-phases.public_preview %}, you **will not be billed** for {% data variables.product.prodname_ai_credits_short %} usage, but {% data variables.product.prodname_actions %} minutes **will be consumed**.
2828

2929
To view consumption of actions by the `{% data variables.code-quality.workflow_name_billing %}` workflow, download a detailed usage report from the "Billing and licensing" tab. See [AUTOTITLE](/billing/how-tos/products/view-productlicense-use).
3030

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
title: GitHub Copilot billing
3+
intro: '{% data variables.product.prodname_copilot_short %} usage is measured and billed according to your plan.'
4+
versions:
5+
feature: copilot
6+
contentType: concepts
7+
category:
8+
- Understand product costs
9+
---
10+
11+
{% data variables.product.prodname_copilot_short %} usage is measured in {% data variables.product.prodname_ai_credits_short %}—a usage-based billing unit where 1 {% data variables.product.prodname_ai_credit_singular %} = {% data variables.product.prodname_ai_credits_value %}.
12+
13+
## Individual plans
14+
15+
All individual plans—{% data variables.copilot.copilot_free_short %}, {% data variables.copilot.copilot_pro_short %}, {% data variables.copilot.copilot_pro_plus_short %}, and {% data variables.copilot.copilot_max_short %}—include a monthly {% data variables.product.prodname_ai_credits %} allowance that varies by plan.
16+
17+
To understand how {% data variables.product.prodname_ai_credits_short %} work for individual plans, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-individuals).
18+
19+
## Organizations and enterprises
20+
21+
For organizations and enterprises, each assigned {% data variables.product.prodname_copilot_short %} license comes with a monthly amount of included {% data variables.product.prodname_ai_credits_short %}, which can be pooled at the billing entity level.
22+
23+
* To understand how {% data variables.product.prodname_ai_credits_short %} work and what happens when your pool is exhausted, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises).
24+
* To understand budget controls and how to prevent unexpected charges, see [AUTOTITLE](/copilot/concepts/billing/budgets-for-usage-based-billing).
25+
* To compare per-token costs across models and how they translate to {% data variables.product.prodname_ai_credits_short %}, see [AUTOTITLE](/copilot/reference/copilot-billing/models-and-pricing).

content/billing/concepts/product-billing/github-copilot-licenses.md

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,15 @@ category:
1515
- Understand product costs
1616
---
1717

18-
<!-- expires 2026-06-01 -->
19-
20-
{% data reusables.copilot.ubb-announcement-cfi-cb-ce %}
21-
22-
<!-- end expires 2026-06-01 -->
23-
24-
Usage of {% data variables.product.prodname_copilot %} is measured through a combination of licenses and monthly usage tracking. For more information about how usage costs in {% data variables.product.prodname_copilot_short %} work, see [AUTOTITLE](/billing/concepts/product-billing/github-copilot-premium-requests).
18+
Usage of {% data variables.product.prodname_copilot %} is measured through a combination of licenses and {% data variables.product.prodname_ai_credits_short %}. See [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-individuals) and [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises).
2519

2620
## Licenses for {% data variables.product.prodname_copilot_short %}
2721

2822
{% data variables.product.prodname_copilot_short %} licenses are required for each user who uses {% data variables.product.prodname_copilot_short %}. Licenses are available through different plans depending on your account type.
2923

3024
| Account type | Options |
3125
|-------------------|-------------------------------------------------------------------------|
32-
| **Personal accounts** | <ul><li>{% data variables.copilot.copilot_pro_short %}: {% data variables.copilot.cfi_price_per_month %} per calendar month.</li><li>{% data variables.copilot.copilot_pro_plus_short %}: {% data variables.copilot.cpp_price_per_month %} per calendar month.</li><li>{% data variables.copilot.copilot_student_short %}: access to {% data variables.product.prodname_copilot_short %} premium features at no cost.</li><li>{% data variables.copilot.copilot_free_short %}: limited access to {% data variables.product.prodname_copilot_short %} features at no cost.</li></ul> |
26+
| **Personal accounts** | <ul><li>{% data variables.copilot.copilot_pro_short %}: {% data variables.copilot.cfi_price_per_month %} per calendar month.</li><li>{% data variables.copilot.copilot_pro_plus_short %}: {% data variables.copilot.cpp_price_per_month %} per calendar month.</li><li>{% data variables.copilot.copilot_max_short %}: {% data variables.copilot.cm_price_per_month %} per calendar month.</li><li>{% data variables.copilot.copilot_student_short %}: access to {% data variables.product.prodname_copilot_short %} premium features at no cost.</li><li>{% data variables.copilot.copilot_free_short %}: limited access to {% data variables.product.prodname_copilot_short %} features at no cost.</li></ul> |
3327
| **Organizations** | {% data variables.copilot.copilot_business_short %}: {% data variables.copilot.cfb_price_per_month %} per user per month (billed monthly). |
3428
| **Enterprises** | Choose {% data variables.copilot.copilot_business_short %} or {% data variables.copilot.copilot_enterprise_short %}, or mix them across organizations. Both are billed monthly, pricing varies. |
3529

@@ -42,7 +36,7 @@ There are several ways to use {% data variables.product.prodname_copilot_short %
4236
### {% data variables.copilot.copilot_free_short %}
4337

4438
* Provides limited access to {% data variables.product.prodname_copilot_short %} features at no cost.
45-
* Includes a monthly allowance of completions and premium requests.
39+
* Includes a monthly allowance of completions and limited chat and agent usage.
4640
* Intended for **individual use only** (not suitable for organizations or enterprises).
4741
* For usage beyond the free plan limits, upgrade to {% data variables.copilot.copilot_pro_short %}.
4842

@@ -97,12 +91,10 @@ To help manage your budget for {% data variables.product.prodname_copilot_short
9791
* You can set budgets for your personal account to receive email alerts at 75%, 90%, and 100% of the budget.
9892
* Budgets help you monitor spending but do not stop license charges.
9993

94+
{% data reusables.copilot.plans.ai-cap-recommend-upgrade %}
95+
10096
For more information about using budgets to control spending, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).
10197

10298
### Organizations and enterprises
10399

104-
* Owners and billing managers can set budgets at the organization or enterprise level, or by cost center.
105-
* Budgets for licenses are monitoring-only: spending can exceed the budget, but alerts notify you when thresholds are reached.
106-
* Use cost centers to track spending across teams or initiatives.
107-
108-
For more information about managing company spending, see [AUTOTITLE](/copilot/how-tos/spending/manage-company-spending).
100+
Owners and billing managers can set budgets at the user, organization, cost center, and enterprise level to monitor and control {% data variables.product.prodname_ai_credits_short %} consumption. See [AUTOTITLE](/copilot/tutorials/budgets/getting-started-with-budget-controls).

0 commit comments

Comments
 (0)