Skip to content

Commit c52b1a1

Browse files
authored
Merge pull request #38004 from github/repo-sync
Repo sync
2 parents 5bb2245 + c761906 commit c52b1a1

File tree

5 files changed

+44
-21
lines changed

5 files changed

+44
-21
lines changed

content/billing/using-the-new-billing-platform/estimating-spending.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,7 @@ In the "Current promotions and discounts" section in the top right, you can see
9898
At the bottom of the page, under "Budgets", you can see your current budgets, and how much you have spent against those budgets. If your role provides access, you can edit or delete a budget by clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} to the right of a budget. See [AUTOTITLE](/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform).
9999

100100
If you have used all of your budget, a red banner appears at the top of the page. You can click **Update your budget** to increase your budget.
101+
102+
## Creating a budget
103+
104+
As an enterprise owner or billing manager, you can set the budget for your enterprise, an organization within your enterprise, or a cost center. As an organization owner, you are able to set the budgets for the repositories you manage. See [AUTOTITLE](/billing/using-the-new-billing-platform/preventing-overspending#creating-a-budget).

content/billing/using-the-new-billing-platform/preventing-overspending.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ Budgets are not applicable to pre-paid volume licenses.
2424

2525
For license-based products such as {% data variables.product.prodname_copilot %}, {% data variables.product.prodname_AS %},{% ifversion fpt %} and {% data variables.product.prodname_team %}{% elsif ghec %} and {% data variables.product.prodname_enterprise %}{% endif %}, setting a budget does not prevent usage over the limit.
2626

27+
For the {% data variables.product.prodname_copilot %} Premium Request SKU, to set a spending limit for premium requests over your plan's allowance, you can update the default $0 SKU-level budget and select “Stop usage when budget limit is reached”.
28+
2729
> [!NOTE]
28-
> By default, paid usage will be limited to $0 for accounts that do not have a payment method on file. For accounts that do have a payment method on file, the default budget is unlimited.
30+
> By default, paid usage will be limited to $0 for accounts that do not have a payment method on file.
2931
3032
{% ifversion fpt %}
3133

@@ -100,13 +102,10 @@ As an {% data variables.enterprise.enterprise_or_org %} owner{% ifversion ghec %
100102

101103
{% endif %}
102104

103-
1. Click **Budgets and alerts**.
104-
1. Click **New budget**.
105-
1. Under "Products", select the metered product to include in this budget.
106-
1. Under "Budget scope", set the scope of spending for this budget.
105+
{% data reusables.billing.create-product-or-sku-budget %}
107106
1. Under "Budget", set a budget amount.
108107

109-
To stop any usage and further spending once your {% ifversion fpt %}organization{% elsif ghec %}enterprise or organization{% endif %} reaches the budget limit, select **Stop usage when budget limit is reached**. This does not apply to {% data variables.product.prodname_copilot %} usage.
108+
To stop any usage and further spending once your {% ifversion fpt %}organization{% elsif ghec %}enterprise or organization{% endif %} reaches the budget limit, select **Stop usage when budget limit is reached**, if available.
110109

111110
>[!IMPORTANT] If you do not select **Stop usage when budget limit is reached**, you will be notified by email if you exceed your budget, but usage **will not** be stopped.
112111

content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ shortTitle: Manage policies
1414

1515
You can set policies that control the availability of {% data variables.product.prodname_copilot_short %} and its features in your enterprise and organizations.
1616

17-
There are **three enforcement options** for {% data variables.product.prodname_copilot_short %} policies in your enterprise:
17+
There are **two enforcement options** for {% data variables.product.prodname_copilot_short %} policies in your enterprise:
1818

19-
* **No policy** - The feature is initially disabled at the organization level, but each organization with {% data variables.product.prodname_copilot_short %} enabled in your enterprise can set their own policy for the feature.
2019
* **Enabled** - The feature is available in all organizations with {% data variables.product.prodname_copilot_short %} enabled in your enterprise.
2120
* **Disabled** - The feature is blocked for all organizations with {% data variables.product.prodname_copilot_short %} enabled in your enterprise.
2221

@@ -46,7 +45,9 @@ You can configure any of the following policies for your enterprise:
4645
> This setting won't be available until then.
4746
<!-- end expires 2025-05-19 -->
4847
49-
If you enable this setting, additional premium requests beyond the limit of your {% data variables.product.prodname_copilot_short %} plan will be billed at {% data variables.copilot.additional_premium_requests %} per premium request. You will be charged for each additional premium request you use across all {% data variables.product.prodname_copilot_short %} interfaces, including {% data variables.product.prodname_mobile %}. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/monitoring-usage-and-entitlements/avoiding-unexpected-copilot-costs).
48+
By default, a $0 budget is created for the {% data variables.product.prodname_copilot_short %} Premium Request SKU for your enterprise. To use additional premium requests, edit the $0 budget. For more information on budget behavior, see [AUTOTITLE](/copilot/rolling-out-github-copilot-at-scale/managing-your-companys-spending-on-github-copilot#enabling-additional-premium-requests).
49+
50+
If you enable this setting by adjusting the default budget, additional premium requests beyond the limit of your {% data variables.product.prodname_copilot_short %} plan will be billed at {% data variables.copilot.additional_premium_requests %} per premium request. You will be charged for each additional premium request your users use across all {% data variables.product.prodname_copilot_short %} interfaces, including {% data variables.product.prodname_mobile %}. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/monitoring-usage-and-entitlements/avoiding-unexpected-copilot-costs).
5051

5152
### {% data variables.product.prodname_copilot_short %} in {% data variables.product.prodname_dotcom_the_website %}
5253

content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,31 @@ If you enable additional premium requests, premium requests over the allowance a
3636

3737
For pricing details and a list of available models, see [AUTOTITLE](/copilot/about-github-copilot/subscription-plans-for-github-copilot#comparing-copilot-plans).
3838

39-
### Enabling additional premium requests
39+
### Enable premium requests and manage budgets
4040

41-
<!-- expires 2025-05-08 -->
42-
> [!IMPORTANT] This policy setting will not be available to configure until May 8, 2025. After that date, enterprises can choose to enable additional premium requests. Until a budget is **set explicitly**, no additional charges will apply.
43-
<!-- end expires 2025-05-08 -->
41+
By default, a $0 budget for the {% data variables.product.prodname_copilot %} Premium Request SKU is created for your enterprise. You can edit this budget from the "Budgets and alerts" page. See [AUTOTITLE](/billing/using-the-new-billing-platform/preventing-overspending#editing-or-deleting-a-budget).
42+
43+
The default budget that is created applies to your whole enterprise. To set a new budget for a specific part of your enterprise, such as a cost center, you can create a new budget:
44+
45+
{% ifversion fpt %}
46+
47+
{% data reusables.profile.access_org %}
48+
{% data reusables.profile.org_settings %}
49+
{% data reusables.billing.org-billing-menu %}
4450

45-
You can enable or disable the ability for users in your enterprise or organization to make premium requests over your plan's allowance.
51+
{% elsif ghec %}
4652

47-
1. Go to the {% data variables.product.prodname_copilot_short %} policies page in your organization or enterprise.
48-
* Enterprise: Go to the enterprise, click **{% octicon "law" aria-hidden="true" %} Policies**, click **{% data variables.product.prodname_copilot_short %}** in the left sidebar, then click the **Policies** tab.
49-
* Organization: Go to the organization, click **Settings**, click **{% octicon "copilot" aria-hidden="true" %} {% data variables.product.prodname_copilot_short %}** in the left sidebar, then click **Policies**.
50-
1. Next to "Additional {% data variables.product.prodname_copilot_short %} premium requests", click the toggle to enable premium requests over the allowance included in your plan.
53+
1. Go to your enterprise or organization account settings and click **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing**.
54+
55+
{% endif %}
56+
1. Click **Budgets and alerts**.
57+
1. Click **New budget**.
58+
1. Under "Budget Type" select **SKU-level budget**.
59+
1. Select the "Product" dropdown and click **Copilot**.
60+
1. Select the "SKU" dropdown and click **Copilot Premium Request**
61+
1. Under "Budget scope", set the scope of spending for this budget.
62+
1. Under "Budget", set a budget amount. Optionally, choose to stop usage when the budget limit is reached.
63+
1. Click **Create budget**.
5164

5265
### Tracking premium requests
5366

@@ -88,14 +101,14 @@ For example, if you were running a pilot program for {% data variables.product.p
88101

89102
## Receive alerts for overspending
90103

91-
With {% data variables.product.github %}'s new billing platform, you can ensure your spending on {% data variables.product.prodname_copilot %} is manageable by setting a monthly budget. A budget for {% data variables.product.prodname_copilot_short %} won't limit usage, but you will receive notifications by email when spending exceeds certain percentages of the budget you've set.
104+
With {% data variables.product.github %}'s new billing platform, you can set a monthly budget on {% data variables.product.prodname_copilot %} spending. Setting a budget for license-based products, such as {% data variables.product.prodname_copilot_short %}, is for monitoring purposes only and will not prevent usage beyond the budgeted amount. However, you will receive notifications by email when spending exceeds certain percentages of the budget you've set. To prevent usage over the limit for the Copilot Premium Request SKU, update the default $0 SKU-level budget and select "Stop usage when budget limit is reached".
92105

93-
You can create the budget for the whole enterprise or for a cost center.
106+
{% ifversion ghec %}You can create the budget for the whole enterprise or for a cost center.{% endif %}
94107

95108
1. Go to your enterprise or organization account settings and click **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing**.
96109
1. In the left sidebar, click **Budgets and alerts**.
97110
1. Click **New budget**.
98-
1. Select **{% data variables.product.prodname_copilot_short %}** as the product, then configure the settings as required. You can choose who receives alerts when budget thresholds are reached.
111+
1. Select **{% data variables.product.prodname_copilot_short %}** for the product, or **{% data variables.product.prodname_copilot_short %} Premium Request** for the SKU, then configure the settings as required. You can choose who receives alerts when budget thresholds are reached.
99112
1. Click **Create budget**.
100113

101114
## Visualize spending trends
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
1. Click **Budgets and alerts**.
2+
1. Click **New budget**.
3+
1. Under "Budget Type" select either **Product-level budget** or **SKU-level budget**.
4+
* To create a Product-level budget, choose a metered product from the dropdown.
5+
* To create a SKU-level budget, choose a SKU from the dropdown. This limits spending for an individual SKU.
6+
1. Under "Budget scope", set the scope of spending for this budget.

0 commit comments

Comments
 (0)