diff --git a/assets/images/help/billing/org-budget-example.png b/assets/images/help/billing/org-budget-example.png new file mode 100644 index 000000000000..9b6ba13cf122 Binary files /dev/null and b/assets/images/help/billing/org-budget-example.png differ diff --git a/assets/images/help/billing/overview-chart-download-button.png b/assets/images/help/billing/overview-chart-download-button.png new file mode 100644 index 000000000000..5edd8c665175 Binary files /dev/null and b/assets/images/help/billing/overview-chart-download-button.png differ diff --git a/assets/images/help/billing/overview-product-summary.png b/assets/images/help/billing/overview-product-summary.png new file mode 100644 index 000000000000..4e9dc18ce55a Binary files /dev/null and b/assets/images/help/billing/overview-product-summary.png differ diff --git a/assets/images/help/billing/product-usage-chart.png b/assets/images/help/billing/product-usage-chart.png new file mode 100644 index 000000000000..4381cbd9eeb1 Binary files /dev/null and b/assets/images/help/billing/product-usage-chart.png differ diff --git a/content/billing/index.md b/content/billing/index.md index 1aba79588009..1cd4e29e1443 100644 --- a/content/billing/index.md +++ b/content/billing/index.md @@ -12,17 +12,17 @@ featuredLinks: - '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-the-new-billing-platform{% endif %}' - '{% ifversion fpt or ghec %}/billing/managing-your-billing/managing-your-payment-and-billing-information{% endif %}' - '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-the-billing-cycle{% endif %}' - - '{% ifversion fpt or ghec %}/billing/managing-your-billing/preventing-overspending{% endif %}' + - '{% ifversion fpt or ghec %}/billing/managing-your-billing/using-budgets-control-spending{% endif %}' - '{% ifversion ghes %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}' - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise{% endif %}' - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise{% endif %}' popular: - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}' - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan{% endif %}' - - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions{% endif %}' - - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces{% endif %}' + - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/about-billing-for-github-actions{% endif %}' + - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/about-billing-for-github-codespaces{% endif %}' - '{% ifversion ghes %}/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security{% endif %}' - - '{% ifversion ghes %}/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage{% endif %}' + - '{% ifversion ghes %}/billing/managing-billing-for-your-products/viewing-your-product-usage{% endif %}' - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server{% endif %}' guideCards: - /billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process @@ -43,4 +43,3 @@ children: - /managing-billing-for-your-products - /setting-up-paid-accounts-for-procurement-companies --- - diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md b/content/billing/managing-billing-for-your-products/about-billing-for-github-actions.md similarity index 86% rename from content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md rename to content/billing/managing-billing-for-your-products/about-billing-for-github-actions.md index 5559c52be1a3..c6feceb01e69 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md +++ b/content/billing/managing-billing-for-your-products/about-billing-for-github-actions.md @@ -6,6 +6,11 @@ redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/about-billing-for-github-actions - /billing/managing-billing-for-github-actions/about-billing-for-github-actions - /early-access/billing/actions-billing-update + - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions + # Redirect for old maptopic + - /billing/managing-billing-for-your-products/managing-billing-for-github-actions + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions + - /billing/managing-billing-for-github-actions versions: fpt: '*' ghec: '*' @@ -13,7 +18,7 @@ type: overview topics: - Actions - Spending limits -shortTitle: Billing for GitHub Actions +shortTitle: GitHub Actions --- ## About billing for {% data variables.product.prodname_actions %} @@ -22,9 +27,7 @@ shortTitle: Billing for GitHub Actions {% data reusables.actions.actions-billing %} -{% data reusables.actions.actions-spending-limit-brief %} For more information, see [About spending limits](#about-spending-limits). - -If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif %}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif %} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts included with your account. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription). +If you are an organization owner or enterprise owner, you can connect an Azure Subscription ID to your organization or enterprise account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts included with your account. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription). Minutes reset every month, while storage usage does not. @@ -42,7 +45,7 @@ Minutes reset every month, while storage usage does not. | {% data variables.product.prodname_team %} | 2 GB | 3,000 | | {% data variables.product.prodname_ghe_cloud %} | 50 GB | 50,000 | -If your account's storage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.008 USD per GB of storage per day. +If your account's storage surpasses these limits and you have a valid payment method on file, you will pay $0.008 USD per GB of storage per day. ### Minute multipliers @@ -131,7 +134,7 @@ At the end of the month, {% data variables.product.prodname_dotcom %} calculates ### Sample minutes cost calculation -For example, if your organization uses {% data variables.product.prodname_team %} and allows unlimited spending, using 5,000 minutes could have a total storage and minute overage cost of $56 USD, depending on the operating systems used to run jobs. +For example, if your organization uses {% data variables.product.prodname_team %} and allows unlimited spending, using 5,000 minutes beyond the included quota could have a total storage and minute cost of $56 USD, depending on the operating systems used to run jobs. * 5,000 (3,000 Linux and 2,000 Windows) minutes = $56 USD ($24 USD + $32 USD). * 3,000 Linux minutes at $0.008 USD per minute = $24 USD. @@ -155,10 +158,6 @@ At the end of the month, {% data variables.product.prodname_dotcom %} rounds you Your {% data variables.product.prodname_actions %} usage shares your account's existing billing date, payment method, and receipt. {% data reusables.dotcom_billing.view-all-subscriptions %} -## About spending limits - -{% data reusables.actions.actions-spending-limit-detailed %} - -For information on managing and changing your account's spending limit, see [AUTOTITLE](/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions). +## Managing your budget for {% data variables.product.prodname_actions %} -{% data reusables.dotcom_billing.actions-packages-unpaid-account %} +{% data reusables.billing.default-over-quota-behavior %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md b/content/billing/managing-billing-for-your-products/about-billing-for-github-codespaces.md similarity index 92% rename from content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md rename to content/billing/managing-billing-for-your-products/about-billing-for-github-codespaces.md index 173bde22c642..d1e8b9491d8d 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md +++ b/content/billing/managing-billing-for-your-products/about-billing-for-github-codespaces.md @@ -1,6 +1,6 @@ --- title: About billing for GitHub Codespaces -shortTitle: About billing +shortTitle: GitHub Codespaces intro: 'Learn about the costs for using {% data variables.product.prodname_github_codespaces %}, and the monthly usage quotas included with {% data variables.product.prodname_dotcom %} personal accounts.' versions: fpt: '*' @@ -15,8 +15,12 @@ redirect_from: - /codespaces/getting-started-with-codespaces/about-billing-for-codespaces - /codespaces/codespaces-reference/about-billing-for-codespaces - /codespaces/codespaces-reference/understanding-billing-for-codespaces - - /codespaces/codespaces-reference/understanding-billing-for-github-codespaces.md + - /codespaces/codespaces-reference/understanding-billing-for-github-codespaces - /billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces + - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces + # Redirect for old maptopic + - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces + - /billing/managing-billing-for-github-codespaces --- ## About {% data variables.product.prodname_github_codespaces %} pricing @@ -69,19 +73,19 @@ A "core hour" is a measure used for included compute usage. To calculate core ho ### Using your included usage -You will be notified by email when you have used 75%, 90%, and 100% of your included quotas. Notifications are also displayed in a "toast" message within {% data variables.product.prodname_vscode_shortname %} and the {% data variables.product.prodname_vscode_shortname %} web client. You can turn off email notifications if required. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-usage-and-spending-limit-email-notifications). +You will be notified by email when you have used 75%, 90%, and 100% of your included quotas. Notifications are also displayed in a "toast" message within {% data variables.product.prodname_vscode_shortname %} and the {% data variables.product.prodname_vscode_shortname %} web client. You can turn off email notifications if required. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). -When a personal account has used all of either the included storage or compute usage (whichever is reached first), and has no spending limit configured, use of {% data variables.product.prodname_github_codespaces %} will be blocked. You must set up a payment method and a spending limit to continue using {% data variables.product.prodname_github_codespaces %} during the current billing month. At the beginning of the next monthly billing cycle the included usage is reset. Storage will not be billed while use of {% data variables.product.prodname_github_codespaces %} is blocked. +When a personal account has used all of either the included storage or compute usage (whichever is reached first), and has no payment method defined, use of {% data variables.product.prodname_github_codespaces %} will be blocked. You must set up a payment method to continue using {% data variables.product.prodname_github_codespaces %} during the current billing month. At the beginning of the next monthly billing cycle the included usage is reset. Storage will not be billed while use of {% data variables.product.prodname_github_codespaces %} is blocked. You can view details of your usage for the current month at any time. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage). If you are blocked from resuming a codespace and you want to continue to work on changes you have made in your codespace, you can do any of the following: -* Add a payment method and a spending limit greater than $0 USD. +* Add a payment method and set a budget greater than $0 USD. * Export the changes from the codespace to a branch. See [AUTOTITLE](/codespaces/troubleshooting/exporting-changes-to-a-branch). * Wait for your monthly included usage to reset at the start of the next monthly billing cycle. -If you have used all of either your included storage usage or your included compute usage, and you have set up a payment method and a spending limit, any further use of codespaces owned by your personal account will incur charges for whichever type of usage has no remaining included quota. You will not be charged for the other type of usage until you have also used all of its included quota. +If you have used all of either your included storage usage or your included compute usage, and you have set up a payment method, any further use of codespaces owned by your personal account will incur charges for whichever type of usage has no remaining included quota. You will not be charged for the other type of usage until you have also used all of its included quota. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). {% data reusables.codespaces.tips-included-usage %} @@ -122,7 +126,7 @@ You can control compute usage by stopping your codespaces. For information, see ## About billing for storage usage -For {% data variables.product.prodname_github_codespaces %} billing purposes, storage comprises the disk space used by all of the codespaces and prebuilds in your account. This includes any files you use in a codespace, such as cloned repositories, configuration files, data loaded to the codespace (for example as input or output of the software running in the repository), and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or inactive with the exception of blocked usage due to exhausted included usage quota or reaching your spending limit. The storage billing for a codespace ends when it is deleted. However, deleting a codespace does not reduce your used storage amount for the current billing month as this is a cumulative figure. +For {% data variables.product.prodname_github_codespaces %} billing purposes, storage comprises the disk space used by all of the codespaces and prebuilds in your account. This includes any files you use in a codespace, such as cloned repositories, configuration files, data loaded to the codespace (for example as input or output of the software running in the repository), and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or inactive with the exception of blocked usage due to exhausted included usage quota or reaching your budget limit. The storage billing for a codespace ends when it is deleted. However, deleting a codespace does not reduce your used storage amount for the current billing month as this is a cumulative figure. ### Storage billing for containers based on the default image @@ -196,11 +200,9 @@ Prebuilds can be updated multiple times during a billing month. Each update may Use of codespaces created using prebuilds is charged at the same rate as regular codespaces. -## Setting a spending limit +## Managing your budget for {% data variables.product.prodname_github_codespaces %} -{% data reusables.codespaces.codespaces-spending-limit-requirement %} - -For information on managing and changing your account's spending limit, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces). +{% data reusables.billing.default-over-quota-behavior %} {% data reusables.codespaces.exporting-changes %} @@ -244,7 +246,7 @@ Usage is calculated every hour. An organization pays for usage of codespaces cre You can get started on a new project by creating a codespace from a template. Codespaces created from templates aren't initially associated with a repository, but you can publish the codespace to a repository owned by your personal account. See [AUTOTITLE](/codespaces/developing-in-codespaces/creating-a-codespace-from-a-template). -Any organization can maintain a template repository for use with {% data variables.product.prodname_github_codespaces %}. As with any other repository in an organization, a codespace created from a template repository is billed to the organization if the organization has set a spending limit for {% data variables.product.prodname_github_codespaces %} and allowed the user creating the codespace to do so at the organization's expense. Otherwise, the codespace is billed to the user who creates the codespace. +Any organization can maintain a template repository for use with {% data variables.product.prodname_github_codespaces %}. As with any other repository in an organization, a codespace created from a template repository is billed to the organization if the organization allows the user creating the codespace to do so at the organization's expense. Otherwise, the codespace is billed to the user who creates the codespace. If a user publishes a codespace created from a template, the codespace is published to a new repository owned by the user's personal account. If the codespace is currently billed to an organization, ownership and billing of the codespace transfer to the user who created the codespace. diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot.md b/content/billing/managing-billing-for-your-products/about-billing-for-github-copilot.md similarity index 95% rename from content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot.md rename to content/billing/managing-billing-for-your-products/about-billing-for-github-copilot.md index ea1a21ea397b..3dd546c15e7a 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot.md +++ b/content/billing/managing-billing-for-your-products/about-billing-for-github-copilot.md @@ -1,6 +1,6 @@ --- title: About billing for GitHub Copilot -shortTitle: Billing for GitHub Copilot +shortTitle: GitHub Copilot intro: '{% data variables.product.prodname_dotcom %} offers several {% data variables.product.prodname_copilot_short %} plans for enterprises, organizations, and individual developers.' versions: feature: copilot @@ -8,6 +8,10 @@ topics: - Copilot redirect_from: - /billing/managing-billing-for-github-copilot/about-billing-for-github-copilot + - /billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot + # Redirect for old maptopic + - /billing/managing-billing-for-your-products/managing-billing-for-github-copilot + - /billing/managing-billing-for-github-copilot --- ## {% data variables.product.prodname_copilot %} in your enterprise @@ -73,7 +77,7 @@ For more information about {% data variables.copilot.copilot_coding_agent %}, se ### What happens if you have used up your monthly quota? -If you run out of free Actions minutes or free premium requests, and you have set up billing and a spending limit, you will be charged at the normal rates for additional minutes and premium requests. See [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) and [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests#additional-premium-requests). +If you run out of free Actions minutes or free premium requests, and you have set up a payment method for billing, you will be charged at the normal rates for additional minutes and premium requests. See [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) and [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests#additional-premium-requests). If you run out of free minutes or premium requests, and you have _not_ set up billing, a message is displayed explaining why {% data variables.product.prodname_copilot_short %} cannot work on the task. diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md b/content/billing/managing-billing-for-your-products/about-billing-for-github-packages.md similarity index 53% rename from content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md rename to content/billing/managing-billing-for-your-products/about-billing-for-github-packages.md index 7fc4a8ea699c..4f6412841f43 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md +++ b/content/billing/managing-billing-for-your-products/about-billing-for-github-packages.md @@ -6,6 +6,11 @@ redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/about-billing-for-github-packages - /billing/managing-billing-for-github-packages/about-billing-for-github-packages + - /billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages + # Redirect for old maptopic + - /billing/managing-billing-for-your-products/managing-billing-for-github-packages + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages + - /billing/managing-billing-for-github-packages versions: fpt: '*' ghec: '*' @@ -13,7 +18,7 @@ type: overview topics: - Packages - Spending limits -shortTitle: About billing +shortTitle: GitHub Packages --- ## About billing for {% data variables.product.prodname_registry %} @@ -22,12 +27,7 @@ shortTitle: About billing {% data reusables.package_registry.packages-billing %} -{% data reusables.package_registry.packages-spending-limit-brief %} For more information, see [About spending limits](#about-spending-limits). - -> [!NOTE] -> **Billing update for container image storage:** The period of free use for container image storage and bandwidth for the {% data variables.product.prodname_container_registry %} has been extended. If you are using {% data variables.product.prodname_container_registry %} you'll be informed at least one month in advance of billing commencing and you'll be given an estimate of how much you should expect to pay. For more information about the {% data variables.product.prodname_container_registry %}, see [AUTOTITLE](/packages/working-with-a-github-packages-registry/working-with-the-container-registry). - -If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif %}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif %} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription). +If you are an organization or enterprise owner, you can connect an Azure Subscription ID to your organization or enterprise account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts included with your account. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription). Data transfer resets every month, while storage usage does not. @@ -56,9 +56,9 @@ All data transferred out, when triggered by {% data variables.product.prodname_a Storage usage is shared with build artifacts produced by {% data variables.product.prodname_actions %} for repositories owned by your account. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions). -{% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.008 USD per GB of storage per day and $0.50 USD per GB of data transfer. +{% data variables.product.prodname_dotcom %} charges usage to the account that owns the repository where the package is published. If your account's usage surpasses these limits and you have a valid payment method on file, you will pay $0.008 USD per GB of storage per day and $0.50 USD per GB of data transfer. -For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would have overages of 148GB for storage and 40GB for data transfer for that month. The storage overage would cost $0.008 USD per GB per day or approximately $37 USD for a 31-day month. The overage for data transfer would cost $0.50 USD per GB or $20 USD. +For example, if your organization uses {% data variables.product.prodname_team %}, allows unlimited spending, uses 150GB of storage, and has 50GB of data transfer out during a month, the organization would use 148GB for storage and 40GB for data transfer for that month beyond their included quota. The additional storage would cost $0.008 USD per GB per day or approximately $37 USD for a 31-day month. The additional data transfer would cost $0.50 USD per GB or $20 USD. {% data reusables.dotcom_billing.pricing_calculator.pricing_cal_packages %} @@ -87,16 +87,6 @@ Your {% data variables.product.prodname_registry %} usage shares your account's {% data reusables.user-settings.context_switcher %} -## About spending limits - -{% data reusables.package_registry.packages-spending-limit-detailed %} - -To prevent exceeding your spending limit, {% data variables.product.prodname_dotcom %} checks your storage consumption continuously throughout the month by looking at your current usage and calculating what your projected usage will be at the end of the month if no changes are made before that time. If at any point during the billing cycle your projected monthly usage exceeds your spending limit, both {% data variables.product.prodname_registry %} and {% data variables.product.prodname_actions %} will be disabled to prevent overages. - -You should set a spending limit that will cover your maximum projected storage usage at any given point in the billing cycle. For example, imagine you have an organization that uses {% data variables.product.prodname_team %}, and you set a spending limit of $50 USD. {% data variables.product.prodname_team %} provides 2 GB of free storage. For any storage you use over that amount, {% data variables.product.prodname_dotcom %} will charge $0.008 USD per GB per day, or approximately $0.25 USD per GB for a 31-day month. That means the $50 spending limit you set will pay for an extra 200 GB of storage in that period. If on day ten of the billing cycle you reach 202 GB of storage, the next push of a package or {% data variables.product.prodname_actions %} artifact will fail, because you have reached the maximum storage amount that can be paid for by your spending limit in this billing cycle, even if your average consumption for the period is below 202 GB. - -To avoid reaching your spending limit in the current billing cycle, you can delete some of your current storage usage to free up projected usage for the rest of the month. This method is more effective toward the beginning of a billing cycle. The closer you get to the end of a billing cycle, the less impact this method will have on projected monthly usage. - -For more information about managing and changing your account's spending limit, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages). +## Managing your budget for {% data variables.product.prodname_registry %} -{% data reusables.dotcom_billing.actions-packages-unpaid-account %} +{% data reusables.billing.default-over-quota-behavior %} diff --git a/content/billing/managing-billing-for-your-products/index.md b/content/billing/managing-billing-for-your-products/index.md index 86436965451c..b1a1561490b0 100644 --- a/content/billing/managing-billing-for-your-products/index.md +++ b/content/billing/managing-billing-for-your-products/index.md @@ -9,14 +9,15 @@ versions: topics: - Billing children: - - /managing-licenses-for-visual-studio-subscriptions-with-github-enterprise - - /managing-billing-for-github-actions - - /managing-billing-for-github-codespaces - - /managing-billing-for-github-packages - - /managing-billing-for-github-copilot + - /viewing-your-product-usage + - /about-billing-for-github-actions + - /about-billing-for-github-codespaces + - /about-billing-for-github-copilot + - /about-billing-for-github-packages - /managing-billing-for-github-advanced-security - - /managing-billing-for-github-sponsors + - /managing-billing-for-git-large-file-storage - /managing-billing-for-github-marketplace-apps - - /managing-billing-for-git-large-file-storage + - /managing-billing-for-github-sponsors + - /managing-licenses-for-visual-studio-subscriptions-with-github-enterprise --- diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md index 899135dfd042..bd8feb33059c 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md @@ -31,8 +31,6 @@ Bandwidth is billed for each GiB of data downloaded. Storage is billed by calcul {% data reusables.large_files.owner_quota_only %} -{% data reusables.large_files.does_not_carry %} - ## Included bandwidth and storage (per month) The following amounts of bandwidth and storage are included for free with your {% data variables.product.company_short %} account. @@ -54,7 +52,7 @@ If you use more than the included amount of bandwidth or storage for your plan t | Bandwidth | $0.0875 | | Storage | $0.07 | -For more information about how to purchase additional storage and bandwidth, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage). +To view your current storage and bandwidth, see [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage). ### Sample storage cost calculation @@ -69,11 +67,10 @@ In this example, {% data variables.product.company_short %} would bill for 1.5 G ## Managing your budget for {% data variables.large_files.product_name_long %} -The default budget for paid usage is $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. You can take steps to manage your {% data variables.large_files.product_name_short %} budget. See [AUTOTITLE](/billing/managing-your-billing/preventing-overspending). +{% data reusables.billing.default-over-quota-behavior %} ## Further reading * [AUTOTITLE](/repositories/working-with-files/managing-large-files/about-git-large-file-storage) * [AUTOTITLE](/repositories/working-with-files/managing-large-files/installing-git-large-file-storage) * [AUTOTITLE](/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage) -* diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md index d3ac1fc3d7a9..e27d5e83c1ce 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md @@ -1,6 +1,6 @@ --- title: Downgrading Git Large File Storage -intro: 'You can downgrade storage and bandwidth for {% data variables.large_files.product_name_short %} by increments of 50 GB per month.' +intro: '{% data variables.large_files.product_name_short %} has moved to metered billing so that you pay only for the amount of bandwidth and storage you use.' redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-git-large-file-storage - /articles/downgrading-storage-and-bandwidth-for-a-personal-account @@ -13,26 +13,26 @@ versions: ghec: '*' type: how_to topics: - - Downgrades - LFS - Organizations - User account shortTitle: Downgrade Git LFS storage --- -When you downgrade your number of data packs, your change takes effect on your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage). + -## Downgrading storage and bandwidth for a personal account + + -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} -{% data reusables.dotcom_billing.lfs-remove-data %} -{% data reusables.large_files.downgrade_data_packs %} +## Billing has changed to metered billing -## Downgrading storage and bandwidth for an organization +There is no need to edit data packs to reduce your allowance, you can pay as you go. -{% data reusables.dotcom_billing.org-billing-perms %} +This change to metered billing brings additional benefits: -{% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.lfs-remove-data %} -{% data reusables.large_files.downgrade_data_packs %} +* **Visualize your usage**: use new views to see your usage and export data to other systems, see [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage) +* **Budget setting**: use budgets to control spending, see [AUTOTITLE](/billing/managing-your-billing/preventing-overspending) + +For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage). + + diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md index 4768138e9629..20675a8298b7 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md @@ -15,8 +15,6 @@ versions: ghec: '*' children: - /about-billing-for-git-large-file-storage - - /viewing-your-git-large-file-storage-usage - /upgrading-git-large-file-storage - /downgrading-git-large-file-storage --- - diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md index 7a8d9585562a..01c78ea04ba2 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md @@ -1,6 +1,6 @@ --- title: Upgrading Git Large File Storage -intro: 'You can purchase additional data packs to increase your monthly bandwidth quota and total storage capacity for {% data variables.large_files.product_name_short %}.' +intro: '{% data variables.large_files.product_name_short %} has moved to metered billing so that you pay only for the amount of bandwidth and storage you use. You no longer need to buy data packs to increase your quota and storage capacity.' redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-git-large-file-storage - /articles/purchasing-additional-storage-and-bandwidth-for-a-personal-account @@ -15,49 +15,24 @@ type: how_to topics: - LFS - Organizations - - Upgrades - User account shortTitle: Upgrade Git LFS storage --- -## Purchasing additional storage and bandwidth for a personal account + -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} -{% data reusables.dotcom_billing.lfs-add-data %} -{% data reusables.large_files.pack_selection %} -{% data reusables.large_files.pack_confirm %} + + -## Purchasing additional storage and bandwidth for an organization +## Billing has changed to metered billing -{% data reusables.dotcom_billing.org-billing-perms %} +There is no need to purchase data packs to expand your allowance, you can pay as you go. -{% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.lfs-add-data %} -{% data reusables.large_files.pack_selection %} -{% data reusables.large_files.pack_confirm %} +This change to metered billing brings additional benefits: -{% ifversion ghec %} +* **Visualize your usage**: use new views to see your usage and export data to other systems, see [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage) +* **Budget setting**: use budgets to control spending, see [AUTOTITLE](/billing/managing-your-billing/preventing-overspending) -## Purchasing additional storage and bandwidth for an enterprise account +For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage). -{% data reusables.enterprise-accounts.billing-perms %} - -> [!NOTE] -> If your enterprise account is invoiced, you may not be able to purchase Git LFS data packs on {% data variables.product.prodname_dotcom %}. Instead, contact {% data variables.contact.contact_enterprise_sales %}. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -1. To the right of "Git LFS", click **Purchase more data packs**. -1. Select the "Choose an organization" dropdown menu and click the organization you want to purchase a data pack for. -{% data reusables.large_files.pack_selection %} -{% data reusables.large_files.pack_confirm %} -{% endif %} - -## Further reading - -* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage) -* [AUTOTITLE](/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage) -* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage) -* [AUTOTITLE](/repositories/working-with-files/managing-large-files) + diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md deleted file mode 100644 index 3b8580b88fc5..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md +++ /dev/null @@ -1,64 +0,0 @@ ---- -title: Viewing your Git Large File Storage usage -intro: 'You can audit your account''s monthly bandwidth quota and remaining storage for {% data variables.large_files.product_name_short %}.' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-git-large-file-storage-usage - - /articles/viewing-storage-and-bandwidth-usage-for-a-personal-account - - /articles/viewing-storage-and-bandwidth-usage-for-an-organization - - /articles/viewing-your-git-large-file-storage-usage - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage - - /billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage -versions: - fpt: '*' - ghec: '*' -type: how_to -topics: - - LFS - - Organizations - - User account -shortTitle: View Git LFS usage ---- - -{% data reusables.large_files.owner_quota_only %} {% data reusables.large_files.does_not_carry %} - -## Viewing storage and bandwidth usage for a personal account - -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} -{% data reusables.dotcom_billing.lfs-data %} - -## Viewing storage and bandwidth usage for an organization - -{% ifversion billing-beta-enterprise %} - -> [!NOTE] -> If your organization belongs to an enterprise enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages. - -{% endif %} - -{% data reusables.dotcom_billing.org-billing-perms %} - -{% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.lfs-data %} - -{% ifversion ghec %} - -## Viewing storage and bandwidth for an enterprise account - -{% ifversion billing-beta-enterprise %} - -> [!NOTE] -> If your enterprise is enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages. - -{% endif %} - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -1. Scroll to the "Git LFS" section. -{% endif %} - -## Further reading - -* [AUTOTITLE](/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage) -* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage) diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md deleted file mode 100644 index 953b0302c685..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Managing billing for GitHub Actions -shortTitle: GitHub Actions -intro: 'You can view your usage and set a spending limit for {% data variables.product.prodname_actions %}.' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions - - /billing/managing-billing-for-github-actions -versions: - fpt: '*' - ghec: '*' -children: - - /about-billing-for-github-actions - - /viewing-your-github-actions-usage - - /managing-your-spending-limit-for-github-actions ---- - diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md deleted file mode 100644 index 7aa905ff6c51..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md +++ /dev/null @@ -1,77 +0,0 @@ ---- -title: Managing your spending limit for GitHub Actions -intro: 'You can set a spending limit for {% data variables.product.prodname_actions %} usage.' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions - - /billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions -versions: - fpt: '*' - ghec: '*' -type: how_to -topics: - - Actions - - Enterprise - - Organizations - - Spending limits - - User account -shortTitle: Spending limits for Actions ---- - -## About spending limits for {% data variables.product.prodname_actions %} - -{% data reusables.actions.actions-billing %} - -{% data reusables.actions.actions-spending-limit-brief %} - -{% data reusables.actions.actions-packages-set-spending-limit %} For more information about pricing for {% data variables.product.prodname_actions %} usage, see [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions). - -If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif %}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif %} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription). - -As soon as you set a spending limit other than $0, you will be responsible for any existing overages in the current billing period. For example, if your organization uses {% data variables.product.prodname_team %}, does not allow overages, and creates workflow artifacts that increase your storage usage for the month from 1.9GB to 2.1GB, you will use slightly more storage than the 2GB your product includes. - -Because you have not enabled overages, your next attempt to create a workflow artifact will fail. You will not receive a bill for the 0.1GB overage that month. However, if you enable overages, your first bill will include the 0.1GB of existing overage for the current billing cycle, as well as any additional overages you accrue. - -## Managing the spending limit for {% data variables.product.prodname_actions %} for your personal account - -Anyone can manage the spending limit for {% data variables.product.prodname_actions %} for their own personal account. - -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans_spending %} -{% data reusables.dotcom_billing.manage-spending-limit %} -{% data reusables.dotcom_billing.monthly-spending-limit %} -{% data reusables.dotcom_billing.update-spending-limit %} - -## Managing the spending limit for {% data variables.product.prodname_actions %} for your organization - -Organizations owners and billing managers can manage the spending limit for {% data variables.product.prodname_actions %} for an organization. - -{% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.manage-spending-limit %} -1. Under "Monthly spending limit", choose to limit spending or allow unlimited spending. - - > [!NOTE] - > If {% data variables.product.prodname_github_codespaces %} is enabled for your organization, scroll to "Actions & Packages", then choose to limit spending or allow unlimited spending. - -{% data reusables.dotcom_billing.update-spending-limit %} - -{% ifversion ghec %} - -## Managing the spending limit for {% data variables.product.prodname_actions %} for your enterprise account - -Enterprise owners and billing managers can manage the spending limit for {% data variables.product.prodname_actions %} for an enterprise account. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -1. On the "Billing" page, click the **Spending limit** tab. - - ![Screenshot of the "Billing" page. A tab labeled "Spending limit" is highlighted with an orange outline.](/assets/images/help/settings/spending-limit-tab-enterprise.png) - -{% data reusables.dotcom_billing.monthly-spending-limit %} -{% data reusables.dotcom_billing.update-spending-limit %} -{% endif %} - -## Managing usage and spending limit email notifications - -{% data reusables.billing.email-notifications %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md deleted file mode 100644 index 1c47c1207cb6..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md +++ /dev/null @@ -1,50 +0,0 @@ ---- -title: Viewing your GitHub Actions usage -intro: 'You can view details of your usage of minutes and storage for {% data variables.product.prodname_actions %}.' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/viewing-your-github-actions-usage - - /billing/managing-billing-for-github-actions/viewing-your-github-actions-usage -versions: - fpt: '*' - ghec: '*' -type: how_to -topics: - - Actions - - Enterprise - - Organizations - - User account -shortTitle: View your Actions usage ---- - -You can also view the billable job execution minutes for an individual workflow run. For more information, see [AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/viewing-job-execution-time). - -## Viewing {% data variables.product.prodname_actions %} usage for your personal account - -Anyone can view {% data variables.product.prodname_actions %} usage for their own personal account. - -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} -{% data reusables.dotcom_billing.actions-view-usage %} -{% data reusables.dotcom_billing.actions-report-download %} - -## Viewing {% data variables.product.prodname_actions %} usage for your organization - -Organization owners and billing managers can view {% data variables.product.prodname_actions %} usage for an organization. For organizations managed by an enterprise account, only the organization owners can view {% data variables.product.prodname_actions %} usage in the organization billing page. - -{% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.actions-view-usage %} -{% data reusables.dotcom_billing.actions-report-download-org-account %} - -{% ifversion ghec %} - -## Viewing {% data variables.product.prodname_actions %} usage for your enterprise account - -Enterprise owners and billing managers can view {% data variables.product.prodname_actions %} usage for an enterprise account. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.billing-tab %} -{% data reusables.dotcom_billing.actions-view-usage %} -{% data reusables.enterprise-accounts.actions-report-download-enterprise-accounts %} - -{% endif %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md index df5de920ac37..f08f6b454bf2 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md @@ -148,8 +148,11 @@ The following example timeline demonstrates how the active committer count for { ## Further reading +{% ifversion fpt or ghec %} +* [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending) * [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage) -{% ifversion ghec %} -* [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing){% elsif ghes %} -* [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing) in the documentation for {% data variables.product.prodname_ghe_cloud %}{% endif %} -* {% ifversion fpt or ghec %}[AUTOTITLE](/billing/managing-your-billing/preventing-overspending){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-billing/preventing-overspending) in the documentation for {% data variables.product.prodname_ghe_cloud %}{% endif %} +* [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing) +{% elsif ghes %} +* [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage) in the documentation for {% data variables.product.prodname_ghe_cloud %} +* [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing) in the documentation for {% data variables.product.prodname_ghe_cloud %} +* [AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-billing/using-budgets-control-spending) in the documentation for {% data variables.product.prodname_ghe_cloud %}{% endif %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/downloading-your-github-advanced-security-usage.md similarity index 52% rename from content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/downloading-your-github-advanced-security-usage.md index dbc82d2a2513..55d914cfcc19 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/downloading-your-github-advanced-security-usage.md @@ -1,16 +1,9 @@ --- -title: Viewing and downloading licensed use of {% data variables.product.prodname_AS %} -intro: 'You can view and download consumption of {% data variables.product.prodname_GHAS %} licenses by your {% data variables.enterprise.enterprise_or_org %}: volume/subscription licenses or metered usage.' +title: Downloading licensed use of {% data variables.product.prodname_AS %} +intro: 'You can download consumption of {% data variables.product.prodname_GHAS %} licenses by your {% data variables.enterprise.enterprise_or_org %}: volume/subscription licenses or metered usage.' allowTitleToDifferFromFilename: true permissions: '{% ifversion fpt %}Organization{% else %}Enterprise{% endif %} owners with {% data variables.product.prodname_AS %}' product: '{% data reusables.gated-features.ghas-billing %}' -redirect_from: - - /billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage - - /admin/advanced-security/viewing-your-github-advanced-security-usage - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage - - /github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account - - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage - - /billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage versions: fpt: '*' ghes: '*' @@ -19,73 +12,9 @@ type: how_to topics: - Advanced Security - Enterprise -shortTitle: View or download GHAS license use +shortTitle: Download GHAS license use --- -{% ifversion ghec or ghes %} - - -## Viewing {% data variables.product.prodname_AS %} usage for your enterprise{% ifversion ghec %} account{% endif %} - -You can view the current license limits and usage for your enterprise. - -{% ifversion ghec %} -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.licensing-tab-both-platforms %} - * The "{% data variables.product.prodname_AS %}" section shows details of the licenses you currently **consume**. - * If you have a volume/subscription license, the number of licenses **available** to use is also displayed. - * 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. - -1. Optionally, to see a detailed breakdown of usage per organization{% ifversion secret-scanning-user-owned-repos %} and user namespace when using {% data variables.product.prodname_emus %}{% endif %}, in the "{% data variables.product.prodname_AS %}" section click **More details**. - - In the "{% data variables.product.prodname_AS %}" section, you can see a summary of your current license usage, as well as the number of committers and unique committers for each organization{% ifversion secret-scanning-user-owned-repos %} and user namespace when using {% data variables.product.prodname_emus %}{% endif %}. The organizations{% ifversion secret-scanning-user-owned-repos %} and user namespaces{% endif %} in the billing table are sorted by the highest number of unique committers in descending order. - -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. - - On the "Global code security settings" page, scroll to the "{% data variables.product.prodname_GHAS_cs_or_sp %} repositories" section to see a detailed breakdown of usage by repository for this organization. See [AUTOTITLE](/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage). - -{% elsif security-configurations %} -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.license-tab %} - - 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. - -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. - - On the "Global code security settings" settings page, scroll to the "{% data variables.product.prodname_GHAS_cs_or_sp %} repositories" section to see a detailed breakdown of usage by repository for this organization, see [AUTOTITLE](/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage). - -{% elsif pre-security-configurations %} -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.license-tab %} - - 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. - -1. Optionally, to see a detailed breakdown of usage by repositories within an organization, click an organization name to display the "Security & analysis" for the organization. - - * On the "Security & analysis" settings page, scroll to the "{% data variables.product.prodname_GHAS %} repositories" section to see a detailed breakdown of usage by repository for this organization. For more information, see [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization). -{% endif %} - -{% endif %} - -{% ifversion fpt %} - -## Viewing {% data variables.product.prodname_AS %} usage for your organization account - -You can view the organization account's current license limits and usage. - -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -{% data reusables.organizations.billing_plans_or_licensing %} - - The "{% data variables.product.prodname_AS %}" section shows details of the current usage. - -{% endif %} - -{% ifversion enhanced-billing-platform %} -> [!TIP] -> For more tips, see [AUTOTITLE](/billing/managing-your-billing/gathering-insights-on-your-spending) and [AUTOTITLE](/billing/managing-your-billing/preventing-overspending). -{% endif %} - ## Downloading {% data variables.product.prodname_AS %} license usage information You can download a CSV file with details of paid use of {% data variables.product.prodname_GHAS %} products at both the {% data variables.enterprise.enterprise_and_org %} level. The CSV file contains information about each {% data variables.product.prodname_AS %} license that is in use, including: @@ -101,8 +30,7 @@ You can download a CSV report of license usage through the {% data variables.pro ## Using the UI to download license and metered usage -{% ifversion fpt %}You can download a CSV report for a repository or an organization.{% endif %} -{% ifversion ghec %}You can download a CSV report for a repository, an organization, or an enterprise.{% endif %} +You can download a CSV report for a repository, an organization, or an enterprise. {% ifversion fpt or ghec %} @@ -130,10 +58,6 @@ You can download a CSV report of license usage through the {% data variables.pro 1. For license consumption, in the sidebar click **{% octicon "law" aria-hidden="true" aria-label="law" %} Licensing**. 1. Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**. -{% endif %} - -{% ifversion ghec %} - ### For an enterprise {% data reusables.enterprise-accounts.access-enterprise %} @@ -144,7 +68,7 @@ You can download a CSV report of license usage through the {% data variables.pro * To view usage by SKU, select the **Group** dropdown, then click **SKU**. This will allow you to view usage for both {% data variables.product.prodname_GH_cs_and_sp %}. * To filter by time, select **Time Frame**, then click a time period. * Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, gross amount (the amount actually used), and billed amount (the amount you are charged). - 1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**. + 1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**. 1. For license consumption, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing**. * Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**. diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md index f8b7b7165ba5..7a776a44a0f9 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md @@ -14,7 +14,7 @@ children: - /about-billing-for-github-advanced-security - /setting-up-a-trial-of-github-advanced-security - /signing-up-for-github-advanced-security - - /viewing-your-github-advanced-security-usage + - /downloading-your-github-advanced-security-usage - /migrating-from-ghas-to-cs-and-sp - /viewing-committer-information-for-github-advanced-security - /managing-your-github-advanced-security-licensing diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md index 9c65ae398350..04a067ccf32d 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md @@ -2,7 +2,7 @@ title: Managing volume/subscription licenses for {% data variables.product.prodname_AS %} intro: 'You can monitor and control the availability and consumption of licenses for {% data variables.product.prodname_AS %} in repositories in your enterprise.' allowTitleToDifferFromFilename: true -permissions: 'Enterprise owners with **volume/subscription licenses** for {% data variables.product.prodname_AS %}.
For metered usage on the new platform, see [AUTOTITLE](/billing/managing-your-billing/preventing-overspending).' +permissions: 'Enterprise owners with **volume/subscription licenses** for {% data variables.product.prodname_AS %}.
For metered usage on the new platform, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).' versions: ghec: '*' type: how_to diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md deleted file mode 100644 index 6990128b83ed..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Managing billing for GitHub Codespaces -shortTitle: Codespaces -intro: 'You can view your usage and set a spending limit for {% data variables.product.prodname_github_codespaces %}.' -versions: - fpt: '*' - ghec: '*' -redirect_from: - - /billing/managing-billing-for-github-codespaces -children: - - /about-billing-for-github-codespaces - - /viewing-your-github-codespaces-usage - - /managing-the-spending-limit-for-github-codespaces ---- - diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md deleted file mode 100644 index bcdc79cb2bd4..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md +++ /dev/null @@ -1,90 +0,0 @@ ---- -title: Managing the spending limit for GitHub Codespaces -intro: 'You can set a spending limit for {% data variables.product.prodname_github_codespaces %} usage.' -shortTitle: Spending limit -versions: - fpt: '*' - ghec: '*' -type: how_to -topics: - - Codespaces - - Enterprise - - Organizations - - Spending limits - - User account - - Billing -redirect_from: - - /billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces - - /billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces ---- - -## About the {% data variables.product.prodname_github_codespaces %} spending limit - -{% data reusables.codespaces.codespaces-free-for-personal-intro %} See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces). - -{% data reusables.codespaces.codespaces-spending-limit-requirement %} -{% data reusables.codespaces.codespaces-monthly-billing %} - -Once you've reached your spending limit, you will no longer be able to create new codespaces, and you won't be able to start existing codespaces. Any existing codespaces that are still running will be shut down in a short time, but you will not be charged for usage after you have reached your spending limit. - -## Using your Azure Subscription - -If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif %}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif %} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. See [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription). - -## Managing the {% data variables.product.prodname_github_codespaces %} spending limit for your personal account - -You can set a spending limit for {% data variables.product.prodname_github_codespaces %} for your own personal account. - -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans_spending %} -{% data reusables.dotcom_billing.manage-spending-limit %} -{% data reusables.codespaces.monthly-spending-limit-codespaces %} -{% data reusables.dotcom_billing.update-spending-limit %} - -## Managing the {% data variables.product.prodname_github_codespaces %} spending limit for your organization account - -Organizations owners and billing managers can manage the spending limit for {% data variables.product.prodname_github_codespaces %} for an organization. - -> [!NOTE] -> Organizations that are owned by an enterprise account cannot specify their own spending limit as this is specified in the enterprise settings. - -{% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.manage-spending-limit %} -{% data reusables.codespaces.monthly-spending-limit-codespaces %} -{% data reusables.dotcom_billing.update-spending-limit %} - -{% ifversion ghec %} - -## Managing the {% data variables.product.prodname_github_codespaces %} spending limit for your enterprise account - -Enterprise owners and billing managers can manage the spending limit for {% data variables.product.prodname_github_codespaces %} for an enterprise account. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -1. On the "Billing" page, click the **Spending limit** tab. - - ![Screenshot of the "Billing" page. A tab labeled "Spending limit" is highlighted with an orange outline.](/assets/images/help/settings/spending-limit-tab-enterprise.png) - -{% data reusables.codespaces.monthly-spending-limit-codespaces %} -{% data reusables.dotcom_billing.update-spending-limit %} -{% endif %} - -## Exporting changes when you have reached your spending limit - -{% data reusables.codespaces.exporting-changes %} - -## Managing usage and spending limit email notifications - -Email notifications are sent to account owners and billing managers when spending reaches 75%, 90%, and 100% of an account's spending limit. - -You can turn off these notifications at any time from the "Billing and plans" page. To turn off notifications, under "Email alerts", deselect the **Spending limits alerts** checkbox. - -For personal accounts only, you can also choose to turn off email notifications that are sent when you have used 75%, 90%, and 100% of the free usage included with your personal account. To do this, clear the **Included resources alerts** checkbox. - -![Screenshot of the "Email alerts" settings. The options "Included resources alerts" and "Spending limit alerts" are both selected.](/assets/images/help/codespaces/codespaces-spending-limit-notifications.png) - -## Further reading - -* [AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types) -* [AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization) diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md deleted file mode 100644 index 9844e698678c..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md +++ /dev/null @@ -1,48 +0,0 @@ ---- -title: Viewing your GitHub Codespaces usage -shortTitle: Viewing your usage -intro: 'You can view the compute hours and storage used by {% data variables.product.prodname_github_codespaces %}.' -versions: - fpt: '*' - ghec: '*' -type: overview -topics: - - Codespaces - - Billing -redirect_from: - - /billing/managing-billing-for-github-codespaces/viewing-your-codespaces-usage - - /billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage ---- - -## Viewing {% data variables.product.prodname_github_codespaces %} usage for your personal account - -Anyone can view {% data variables.product.prodname_github_codespaces %} usage for their own personal account. - -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} -{% data reusables.dotcom_billing.codespaces-view-usage %} -{% data reusables.dotcom_billing.codespaces-report-download %} - -## Viewing {% data variables.product.prodname_github_codespaces %} usage for your organization account - -Organization owners and billing managers can view {% data variables.product.prodname_github_codespaces %} usage for an organization. For organizations managed by an enterprise account, only the organization owners can view {% data variables.product.prodname_github_codespaces %} usage in the organization billing page. - -{% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.codespaces-view-usage %} -{% data reusables.dotcom_billing.codespaces-report-download %} - -{% ifversion ghec %} - -## Viewing {% data variables.product.prodname_codespaces %} usage for your enterprise account - -Enterprise owners and billing managers can view {% data variables.product.prodname_github_codespaces %} usage for an enterprise account. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.billing-tab %} -{% data reusables.dotcom_billing.codespaces-view-usage %} -{% data reusables.dotcom_billing.codespaces-report-download %} -{% endif %} - -## Further reading - -* [AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization) diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md deleted file mode 100644 index 06ba20cf145a..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Managing billing for GitHub Copilot -shortTitle: GitHub Copilot -intro: '{% ifversion fpt %}You can set up a {% data variables.product.prodname_copilot %} subscription through your personal or organization account. You can modify or cancel your subscription at any time.{% endif %}{% ifversion ghec %}You can view your usage of {% data variables.copilot.copilot_for_business %}, and learn about how the costs are calculated.{% endif %}' -versions: - feature: copilot -redirect_from: - - /billing/managing-billing-for-github-copilot -children: - - /about-billing-for-github-copilot ---- - diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md deleted file mode 100644 index 66ce91ab08c0..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Managing billing for GitHub Packages -shortTitle: GitHub Packages -intro: 'You can view your {% data variables.product.prodname_registry %} usage and set a spending limit for {% data variables.product.prodname_registry %}.' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages - - /billing/managing-billing-for-github-packages -versions: - fpt: '*' - ghec: '*' -children: - - /about-billing-for-github-packages - - /viewing-your-github-packages-usage - - /managing-your-spending-limit-for-github-packages ---- - diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md deleted file mode 100644 index 17a0ba03d29a..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md +++ /dev/null @@ -1,78 +0,0 @@ ---- -title: Managing your spending limit for GitHub Packages -intro: 'You can set a spending limit for {% data variables.product.prodname_registry %} usage.' -product: '{% data reusables.gated-features.packages %}' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages - - /billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages -versions: - fpt: '*' - ghec: '*' -type: how_to -topics: - - Enterprise - - Organizations - - Packages - - Spending limits - - User account -shortTitle: Your spending limit ---- - -## About spending limits for {% data variables.product.prodname_registry %} - -{% data reusables.package_registry.packages-billing %} - -{% data reusables.package_registry.packages-spending-limit-brief %} - -{% data reusables.actions.actions-packages-set-spending-limit %} For more information about pricing for {% data variables.product.prodname_registry %} usage, see [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages). - -If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif %}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif %} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription). - -As soon as you set a spending limit other than $0, you will be responsible for any existing overages in the current billing period. For example, if your organization uses {% data variables.product.prodname_team %}, does not allow overages, and publishes a new version of a private package that increases your storage usage for the month from 1.9GB to 2.1GB, publishing the version will use slightly more than the 2GB your product includes. - -Because you have not enabled overages, your next attempt to publish a version of the package will fail. You will not receive a bill for the 0.1GB overage that month. However, if you enable overages, your first bill will include the 0.1GB of existing overage for the current billing cycle, as well as any additional overages you accrue. - -## Managing the spending limit for {% data variables.product.prodname_registry %} for your personal account - -Anyone can manage the spending limit for {% data variables.product.prodname_registry %} for their own personal account. - -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} -{% data reusables.dotcom_billing.manage-spending-limit %} -{% data reusables.dotcom_billing.monthly-spending-limit-actions-packages %} -{% data reusables.dotcom_billing.update-spending-limit %} - -## Managing the spending limit for {% data variables.product.prodname_registry %} for your organization - -Organizations owners and billing managers can manage the spending limit for {% data variables.product.prodname_registry %} for an organization. - -{% data reusables.organizations.billing-settings %} -{% data reusables.dotcom_billing.manage-spending-limit %} -1. Under "Monthly spending limit", choose to limit spending or allow unlimited spending. - - > [!NOTE] - > If {% data variables.product.prodname_github_codespaces %} is enabled for your organization, scroll to "Actions & Packages", then choose to limit spending or allow unlimited spending. - -{% data reusables.dotcom_billing.update-spending-limit %} - -{% ifversion ghec %} - -## Managing the spending limit for {% data variables.product.prodname_registry %} for your enterprise account - -Enterprise owners and billing managers can manage the spending limit for {% data variables.product.prodname_registry %} for an enterprise account. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -1. On the "Billing" page, click the **Spending limit** tab. - - ![Screenshot of the "Billing" page. A tab labeled "Spending limit" is highlighted with an orange outline.](/assets/images/help/settings/spending-limit-tab-enterprise.png) - -{% data reusables.dotcom_billing.monthly-spending-limit-actions-packages %} -{% data reusables.dotcom_billing.update-spending-limit %} -{% endif %} - -## Managing usage and spending limit email notifications - -{% data reusables.billing.email-notifications %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md deleted file mode 100644 index a91fd93d48c9..000000000000 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md +++ /dev/null @@ -1,49 +0,0 @@ ---- -title: Viewing your GitHub Packages usage -intro: 'You can view details of your usage of storage and data transfer for {% data variables.product.prodname_registry %}.' -product: '{% data reusables.gated-features.packages %}' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-packages-usage - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/viewing-your-github-packages-usage - - /billing/managing-billing-for-github-packages/viewing-your-github-packages-usage -versions: - fpt: '*' - ghec: '*' -type: how_to -topics: - - Enterprise - - Packages - - Organizations - - User account -shortTitle: View your usage ---- - -## Viewing {% data variables.product.prodname_registry %} usage for your personal account - -Anyone can view {% data variables.product.prodname_registry %} usage for their own personal account. - -{% data reusables.user-settings.access_settings %} -{% data reusables.user-settings.billing_plans %} -{% data reusables.dotcom_billing.packages-view-usage %} -{% data reusables.dotcom_billing.packages-report-download %} - -## Viewing {% data variables.product.prodname_registry %} usage for your organization - -Organization owners and billing managers can view {% data variables.product.prodname_registry %} usage for an organization. For organizations managed by an enterprise account, only the organization owners can view {% data variables.product.prodname_registry %} usage in the organization billing page. - -{% data reusables.organizations.billing-settings %} - -{% data reusables.dotcom_billing.packages-view-usage %} -{% data reusables.dotcom_billing.packages-report-download-org-account %} - -{% ifversion ghec %} - -## Viewing {% data variables.product.prodname_registry %} usage for your enterprise account - -Enterprise owners and billing managers can view {% data variables.product.prodname_registry %} usage for an enterprise account. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.billing.enterprise-billing-menu %} -{% data reusables.dotcom_billing.packages-view-usage %} -{% data reusables.enterprise-accounts.packages-report-download-enterprise-accounts %} -{% endif %} diff --git a/content/billing/managing-billing-for-your-products/viewing-your-product-usage.md b/content/billing/managing-billing-for-your-products/viewing-your-product-usage.md new file mode 100644 index 000000000000..0598b7542471 --- /dev/null +++ b/content/billing/managing-billing-for-your-products/viewing-your-product-usage.md @@ -0,0 +1,95 @@ +--- +title: 'Viewing your usage of metered products' +intro: 'You can explore your use of different products that are billed by usage and see how each product contributes to your bill.' +allowTitleToDifferFromFilename: true +redirect_from: +# Git LFS redirects + - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-git-large-file-storage-usage + - /articles/viewing-storage-and-bandwidth-usage-for-a-personal-account + - /articles/viewing-storage-and-bandwidth-usage-for-an-organization + - /articles/viewing-your-git-large-file-storage-usage + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage + - /billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage + - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage +# Actions redirects + - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/viewing-your-github-actions-usage + - /billing/managing-billing-for-github-actions/viewing-your-github-actions-usage + - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage +# Advanced security redirects + - /billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage + - /admin/advanced-security/viewing-your-github-advanced-security-usage + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage + - /github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account + - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage + - /billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage + - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage +# Codespaces redirects + - /billing/managing-billing-for-github-codespaces/viewing-your-codespaces-usage + - /billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage + - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage +# Packages redirects + - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-packages-usage + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/viewing-your-github-packages-usage + - /billing/managing-billing-for-github-packages/viewing-your-github-packages-usage + - /billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage +versions: + fpt: '*' + ghec: '*' +type: how_to +topics: + - Billing +shortTitle: View product use +--- + +## Viewing a summary of usage for billed products + +Anyone can view usage for their own personal account. + +If you have an owner or billing manager role for an organization, an organization account, or enterprise account, you will also have access to usage data for that organization or account. + +### Personal accounts + +{% data reusables.user-settings.access_billing_settings_url %} +1. Scroll to the bottom of the page and use the tabbed view to see a summary of consumed use for each product that you use (in this example, the "{% data variables.product.prodname_AS %}" tab is shown). + + ![Screenshot of the tabbed view showing "{% data variables.product.prodname_AS %}" with the "View details" links outlined in dark orange.](/assets/images/help/billing/overview-product-summary.png) + +1. Optionally, click **View details** to show more detailed information. + +### Organization and enterprise accounts + +1. Display the settings for the organization or enterprise account you want to view data for. For example, using the context switcher shown on all personal and organization account settings pages. + + ![Screenshot of the "Public profile" settings for The Octocat. Next to "Your personal profile," a "Switch settings context" link is outlined in orange.](/assets/images/help/settings/context-switcher-button.png) + +1. Click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** to display the billing and licensing overview for the account: + * **Organization** accounts: under "Access" in the sidebar for settings. + * **Enterprise** accounts: a separate tab at the top of the page. + +## Exploring usage data in more detail + +You can also explore usage data in more detail in the **{% octicon "graph" aria-label="chart" aria-hidden="true" %} Usage** view. + +* **Filter data on the page**: click in the text box to see a list of available filters. +* **Group data**: options in the "Group" option vary based on the filters you define. +* **Choose a time period**: use the "Time Frame" option. + +The metered usage chart and usage break down table both show your current choice of data. + +![Screenshot of the metered usage chart showing "Actions grouped by SKU" with the three control fields outlined in dark orange.](/assets/images/help/billing/product-usage-chart.png) + +> [!TIP] +> For GitHub Actions, you can also view the billable job execution minutes for an individual workflow run. For more information, see [AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/viewing-job-execution-time). + +## Downloading the data displayed + +You can download the data plotted on the billing charts shown on the "Overview" or "Usage" page as a table or an image. Click the {% octicon "kebab-horizontal" aria-label="Chart options" aria-hidden="true" %} "Chart options" button and select your preferred format. + +![Screenshot of the metered usage chart on the "Overview" page with the "Chart options" outlined in dark orange.](/assets/images/help/billing/overview-chart-download-button.png) + +## Further reading + +* [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github) +* [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending) +* [AUTOTITLE](/billing/managing-your-billing/automating-usage-reporting) diff --git a/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md index 1700ee7bd149..e6bed7f3a80c 100644 --- a/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md +++ b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md @@ -31,18 +31,22 @@ If you use {% data variables.product.prodname_ghe_cloud %} through a Microsoft E {% ifversion fpt or ghec %} -## About usage-based billing on {% data variables.product.prodname_dotcom %} - -{% data variables.product.company_short %} provides usage-based billing for the following features and situations. You can learn more about billing and spending limits. - -| Billed feature or situation | Information about billing | Information about spending limits | -| :---------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------: | -| {% data variables.product.prodname_github_codespaces %} usage | [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces) | [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces) | -| {% data variables.product.prodname_actions %} usage beyond the amounts included with your plan | [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) | [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#about-spending-limits) | -| {% data variables.product.prodname_registry %} usage beyond the amounts included with your plan | [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages) | [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages#about-spending-limits) | -| {% data variables.copilot.copilot_business_short %} usage | [AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot#about-billing-for-github-copilot-business-and-github-copilot-enterprise) | N/A | -| {% data variables.product.prodname_AS %} usage (only available with a trial of {% data variables.product.prodname_ghe_cloud %}) | [AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#usage-based-billing-for-github-advanced-security) | N/A | -| {% data variables.product.prodname_enterprise %} usage | [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise) | N/A | +## About usage-based billing on {% data variables.product.github %} + +{% data variables.product.github %} provides usage-based billing for the following products. + +* {% data variables.product.prodname_actions %}, see [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) +* {% data variables.product.prodname_github_codespaces %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces) +* {% data variables.product.prodname_registry %}, see [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages) +* {% data variables.large_files.product_name_long %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage) + +In addition, usage-based billing is available for the following licenses + +* {% data variables.product.prodname_enterprise %}, see [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise) +* {% data variables.product.prodname_copilot %}, see [AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot) +* {% data variables.product.prodname_GHAS %}, see [AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security) + +For information about controlling spending, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). {% endif %} diff --git a/content/billing/managing-your-billing/about-billing-on-github.md b/content/billing/managing-your-billing/about-billing-on-github.md index e9c024af55c4..39ef355fe822 100644 --- a/content/billing/managing-your-billing/about-billing-on-github.md +++ b/content/billing/managing-your-billing/about-billing-on-github.md @@ -38,7 +38,7 @@ For more information about account types, see [AUTOTITLE](/get-started/learning- ## Included amounts by plan -The table below shows what's included with each plan. When you exceed these amounts, you'll be charged for additional usage unless you've set a spending limit. +The table below shows what's included with each plan. When you exceed these amounts, you'll be charged for additional usage unless you've set a budget with the setting "Stop usage when budget limit is reached" enabled. diff --git a/content/billing/managing-your-billing/charging-business-units.md b/content/billing/managing-your-billing/charging-business-units.md index 76565440efdd..c0f70cfd976e 100644 --- a/content/billing/managing-your-billing/charging-business-units.md +++ b/content/billing/managing-your-billing/charging-business-units.md @@ -60,7 +60,7 @@ To allocate spending to a cost center, you add repositories, organizations, or u ## Adding a budget to a cost center -After you create a cost center, you can add a monthly budget and receive alerts from the cost center to monitor your spending and usage. See [AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending). +After you create a cost center, you can add a monthly budget and receive alerts from the cost center to monitor your spending and usage. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). ## Viewing cost center usage diff --git a/content/billing/managing-your-billing/estimating-spending.md b/content/billing/managing-your-billing/estimating-spending.md index 5a25aece2b13..58b2568c8d13 100644 --- a/content/billing/managing-your-billing/estimating-spending.md +++ b/content/billing/managing-your-billing/estimating-spending.md @@ -100,4 +100,4 @@ If you have used all of your budget, a red banner appears at the top of the page ## Creating a budget -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). +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/managing-your-billing/using-budgets-control-spending#creating-a-budget). diff --git a/content/billing/managing-your-billing/index.md b/content/billing/managing-your-billing/index.md index d2e798a69e92..d13e9284c5b1 100644 --- a/content/billing/managing-your-billing/index.md +++ b/content/billing/managing-your-billing/index.md @@ -21,8 +21,8 @@ children: - /estimating-spending - /about-usage-reports - /gathering-insights-on-your-spending + - /using-budgets-control-spending - /charging-business-units - - /preventing-overspending - /managing-your-payment-and-billing-information - /automating-usage-reporting - /adding-a-sales-tax-certificate diff --git a/content/billing/managing-your-billing/preventing-overspending.md b/content/billing/managing-your-billing/preventing-overspending.md deleted file mode 100644 index 804e50037dc4..000000000000 --- a/content/billing/managing-your-billing/preventing-overspending.md +++ /dev/null @@ -1,155 +0,0 @@ ---- -title: Preventing overspending -intro: 'Learn how to set budgets and track when they are nearing or above a threshold to prevent overspending.' -versions: - feature: enhanced-billing-platform -redirect_from: - - /billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending - - /billing/using-the-new-billing-platform/preventing-overspending -type: how_to -topics: - - Enterprise - - Team -permissions: '{% data reusables.permissions.enhanced-billing-platform %}' -product: '{% data reusables.billing.enhanced-billing-platform-product %}' -shortTitle: Prevent overspending ---- - -Budgets and alerts allow you to track spending for your {% ifversion fpt %}organization or personal account{% elsif ghec %}enterprise, organizations, repositories, or cost centers{% endif %}. 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. - -The budget only applies to expenses incurred from the date of its creation onwards. Any expenses incurred prior to the creation of the budget will not be included in the calculations - -{% ifversion ghec %} -Budgets are not applicable to pre-paid volume licenses. -{% endif %} - -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. - -> [!NOTE] -> By default, paid usage will be limited to $0 for accounts that do not have a payment method on file. - -{% ifversion fpt %} - -## Managing budgets for your personal account - -You can set spending limits and receive alerts when your usage reaches 75%, 90%, or 100% of your defined budget. Budgets can be scoped at the repository or product level, depending on the product. - -{% data reusables.user-settings.access_settings %} -1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. -1. Click **Budgets and alerts**. -1. To create a new budget, click **New budget**. -1. Under "Budget Type" select either **Product-level budget** or **SKU-level budget**. - - * To create a Product-level budget, choose a metered product from the dropdown. - * To create a SKU-level budget, choose a SKU from the dropdown. This limits spending for an individual SKU. - -1. Under "Budget scope", set the scope of spending for this budget. -1. Under "Budget", set a budget amount. - - To stop any usage and further spending once the budget limit is reached, select **Stop usage when budget limit is reached**, if available. - - >[!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. - -1. To receive an alert if your budget has reached 75%, 90% and 100% thresholds, select **Receive budget threshold alerts** under "Alerts". When the budget has reached the specific threshold, you will be notified via email and a banner on {% data variables.product.github %}. You may opt out at any time. -1. Click **Create budget**. - -To edit or delete a budget, on the "Budget and alerts page", click **Edit** or **Delete** next to the budget you want to edit or delete. Follow the prompts. - -{% endif %} - -## Managing budgets for your {% data variables.enterprise.enterprise_or_org %} - -You can manage budgets for your {% data variables.enterprise.enterprise_or_org %} by setting a budget, viewing budgets, and editing or deleting budgets. - -{% ifversion ghec %} - -### Budget scopes - -You can create a budget for a given {% data variables.product.github %} product and specific scope: - -* `Enterprise` scoped budgets track spending for all organizations, repositories, and cost centers in the enterprise -* `Organization` scoped budgets track spending for a single organization, repositories, and cost centers in the organization -* `Repository` scoped budgets track spending for a single repository -* `Cost center` scoped budgets track spending for a single cost center - -Usage is applied towards all applicable budgets. If any applicable budget with "Stop usage when budget limit is reached" enabled becomes exhausted, additional usage will be stopped. - -{% endif %} - -### Viewing budgets - -If you are an {% data variables.enterprise.enterprise_or_org %} owner or billing manager, your {% data variables.enterprise.enterprise_or_org %}'s budget will be listed at the top of the "Budgets and alerts" page{% ifversion ghec %}, followed by the budgets for your organizations and cost centers. As an organization owner, you will be able to view the budgets for your organizations, repositories, and cost centers{% endif %}. - -{% ifversion fpt %} - -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -{% data reusables.billing.org-billing-menu %} - -{% elsif ghec %} - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.billing.enterprise-billing-menu %} - -{% endif %} - -1. Click **Budgets and alerts**. - -{% ifversion ghec %} -1. To filter by scope, select **Scope**, then choose a scope. -{% endif %} - -### Creating a budget - -As an {% data variables.enterprise.enterprise_or_org %} owner{% ifversion ghec %} or billing manager{% endif %}, you can set the budget for your {% data variables.enterprise.enterprise_or_org %}{% ifversion ghec %}, 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{% endif %}. - -{% ifversion fpt %} - -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -{% data reusables.billing.org-billing-menu %} - -{% elsif ghec %} - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.billing.enterprise-billing-menu %} - -{% endif %} - -{% data reusables.billing.create-product-or-sku-budget %} -1. Under "Budget", set a budget amount. - - 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. - - >[!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. - -1. To receive an alert if your budget has reached 75%, 90% and 100% thresholds, select **Receive budget threshold alerts** under "Alerts". When the budget has reached the specific threshold, you will be notified via email and a banner on {% data variables.product.github %}. You may opt out at any time. - - Under "Alert Recipients", select the people who will receive the alerts. - -1. Click **Create budget**. - -### Editing or deleting a budget - ->[!IMPORTANT] Deleting a budget may remove any limits on spending, depending on your other existing budgets. For example, deleting the default $0 budget for {% data variables.product.prodname_copilot_short %} premium requests allows for unlimited usage. - -{% ifversion fpt %} - -As an organization owner, you can edit or delete a budget at any time, but you cannot change the budget scope. - -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -{% data reusables.billing.org-billing-menu %} - -{% elsif ghec %} - -You can edit or delete a budget at any time, but you cannot change the budget scope. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.billing.enterprise-billing-menu %} - -{% endif %} - -1. Click **Budgets and alerts**. -1. To edit a budget, in the list of budgets, click {% octicon "kebab-horizontal" aria-label="View actions" %} next to the budget you want to edit, and click **{% octicon "pencil" aria-hidden="true" aria-label="pencil" %} Edit** or **{% octicon "trash" aria-hidden="true" aria-label="trash" %} Delete**. -1. Follow the prompts. diff --git a/content/billing/managing-your-billing/using-budgets-control-spending.md b/content/billing/managing-your-billing/using-budgets-control-spending.md new file mode 100644 index 000000000000..12a288c363b7 --- /dev/null +++ b/content/billing/managing-your-billing/using-budgets-control-spending.md @@ -0,0 +1,134 @@ +--- +title: Using budgets to control spending on metered products +intro: 'Learn how to set budgets and track when metered usage is nearing or above a budget threshold to prevent overspending.' +allowTitleToDifferFromFilename: true +versions: + feature: enhanced-billing-platform +redirect_from: + - /billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending + - /billing/using-the-new-billing-platform/preventing-overspending + - /billing/managing-your-billing/preventing-overspending + # Actions + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions + - /billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions + - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions + # Codespaces + - /billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces + - /billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces + - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces + # Packages + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages + - /billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages + - /billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages +type: how_to +topics: + - Enterprise + - Organizations + - Spending limits + - User account +permissions: '{% data reusables.permissions.enhanced-billing-platform %}' +shortTitle: Use budgets to control spending +--- + +Budgets and alerts allow you to track spending on metered products for your accounts, organizations, cost centers (enterprise only), and repositories. 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. + +{% data reusables.billing.default-over-quota-behavior %} + +## About budgets + +Each budget has a type and a scope that define which paid use contributes to spending against the budget. + +* **Type**: Defines which metered product or SKU is measured. +* **Scope**: Defines whether the budget applies to the whole account, or to a subset of repositories, organizations, or cost centers (enterprise only). + +### Your first billing cycle after creating a budget + +When you first create a budget, be aware that the budget applies only to metered usage from the date of its creation onwards. Any use made before you created the budget, is not included in the calculations. This means that you may exceed your budget in the first billing cycle after you create your budget, even if you select the option stop usage when the limit is reached. + +### Budget limitations + +For license-based products such as {% data variables.product.prodname_copilot %}, {% data variables.product.prodname_AS %}, {% data variables.product.prodname_team %}, and {% data variables.product.prodname_enterprise %}, setting a budget does not prevent usage over the limit but does provide alerts. +Budgets and alerts are not available for pre-paid volume licenses. + +## Deciding on the type and scope for a budget + +When deciding on the type and scope for a budget, remember that the use of metered products is applied towards **all applicable** budgets. If any applicable budget with "Stop usage when budget limit is reached" enabled is exhausted, additional usage is blocked. + +![Screenshot of budgets for "octo-org": "Actions" budget is $50 and "Actions Linux 96-core" budget is $100. All the "Actions" budget has been used.](/assets/images/help/billing/org-budget-example.png) + +In this example, the organization has set a budget of $50 for the "Actions" product and a budget of $100 for one of the SKUs within the "Actions" product. The organization has used all the included quota of actions minutes and an extra $50 of billed minutes. Some of the extra use was for Linux 96-core runners so it is applied to both budgets. Overall, the organization has used the full budget for the "Actions" product of $50. Members are now blocked from using all {% data variables.product.github %}-hosted runners until the next billing cycle or until the "Actions" product budget is increased. The SKU budget for Linux 96-core runners serves no purpose and is confusing, so should be deleted. + +We recommend that you avoid creating overlapping budgets for the use of a product and a SKU, or an organization and a repository, so that users are not unexpectedly blocked from using a feature that they rely on. Alternative, you may prefer to monitor use without blocking users by disabling the "Stop usage when budget limit is reached" option. + +## Managing budgets for your personal account + +You can set budgets and receive alerts when your usage reaches 75%, 90%, or 100% of your defined budget. Budgets can be scoped at the repository or product level, depending on the product. + +{% data reusables.user-settings.access_billing_settings_url %} +1. Click **Budgets and alerts**. +1. To create a new budget, click **New budget**. +1. Under "Budget Type" select either **Product-level budget** or **SKU-level budget**. + + * To create a Product-level budget, choose a metered product from the dropdown. + * To create a SKU-level budget, choose a SKU from the dropdown. This limits spending for an individual SKU. + +1. Under "Budget scope", set the scope of spending for this budget. +1. Under "Budget", set a budget amount. + + To stop any usage and further spending once the budget limit is reached, select **Stop usage when budget limit is reached**, if available. + + >[!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. + +1. To receive an alert if your budget has reached 75%, 90% and 100% thresholds, select **Receive budget threshold alerts** under "Alerts". When the budget has reached the specific threshold, you will be notified via email and a banner on {% data variables.product.github %}. You may opt out at any time. +1. Click **Create budget**. + +To edit or delete a budget, on the "Budget and alerts page", click **Edit** or **Delete** next to the budget you want to edit or delete. Follow the prompts. + +## Managing budgets for your organization or enterprise + +You can manage budgets for your organization or enterprise by setting a budget, viewing budgets, and editing or deleting budgets. + +### Viewing budgets + +If you are an organization owner, enterprise owner, or billing manager, your budget is listed at the top of the "Budgets and alerts" page, followed by budgets for smaller scopes. + +1. Display the settings for the organization or enterprise account you want to view data for. For example, using the context switcher shown on all personal and organization account settings pages. + + ![Screenshot of the "Public profile" settings for The Octocat. Next to "Your personal profile," a "Switch settings context" link is outlined in orange.](/assets/images/help/settings/context-switcher-button.png) + +1. Click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** to display the billing and licensing overview for the account: + * **Organization** accounts: under "Access" in the sidebar for settings. + * **Enterprise** accounts: a separate tab at the top of the page. + +1. Click **Budgets and alerts**. +1. Optionally, in the enterprise view only, to filter by scope, select **Scope**, then choose a scope. + +### Creating a budget + +As the onwer of an enterprise or organization account, or as a billing manager, you can set a budget at the account level, or at any level below this. + +1. In the "Budgets and alerts" view, click **New budget**. +1. Under "Budget", set a budget amount. + + 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. + + >[!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. + +1. To receive an alert if your budget has reached 75%, 90% and 100% thresholds, select **Receive budget threshold alerts** under "Alerts". When the budget has reached the specific threshold, you will be notified via email and a banner on {% data variables.product.github %}. You may opt out at any time. + + Under "Alert Recipients", select the people who will receive the alerts. + +1. Click **Create budget**. + +### Editing or deleting a budget + +>[!IMPORTANT] Deleting a budget may remove any limits on spending, depending on your other existing budgets. For example, deleting the default $0 budget for {% data variables.product.prodname_copilot_short %} premium requests allows for unlimited usage. + +You can edit or delete a budget at any time, but you cannot change the scope of a budget after creating it. + +1. In the "Budgets and alerts" view, click **New budget**. +1. Click **Budgets and alerts**. +1. To edit a budget, in the list of budgets, click {% octicon "kebab-horizontal" aria-label="View actions" %} next to the budget you want to edit, and click **{% octicon "pencil" aria-hidden="true" aria-label="pencil" %} Edit** or **{% octicon "trash" aria-hidden="true" aria-label="trash" %} Delete**. +1. Follow the prompts. diff --git a/content/codespaces/guides.md b/content/codespaces/guides.md index 56d0be0af9d3..6487e6bb2e5f 100644 --- a/content/codespaces/guides.md +++ b/content/codespaces/guides.md @@ -52,7 +52,7 @@ includeGuides: - /codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces - /codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports - /codespaces/managing-codespaces-for-your-organization/reviewing-your-organizations-audit-logs-for-github-codespaces - - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces + - /billing/managing-billing-for-your-products/about-billing-for-github-codespaces - /codespaces/reference/using-the-vs-code-command-palette-in-codespaces - /codespaces/reference/disaster-recovery-for-github-codespaces - /codespaces/reference/security-in-github-codespaces diff --git a/content/codespaces/index.md b/content/codespaces/index.md index a896679b76a7..f9fb9810463b 100644 --- a/content/codespaces/index.md +++ b/content/codespaces/index.md @@ -11,7 +11,7 @@ featuredLinks: - /codespaces/about-codespaces/understanding-the-codespace-lifecycle - /codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers - /codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces - - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces + - /billing/managing-billing-for-your-products/about-billing-for-github-codespaces guideCards: - /codespaces/about-codespaces/deep-dive - /codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository diff --git a/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans.md b/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans.md index c26feea7344f..582e90074b5e 100644 --- a/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans.md +++ b/content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments/about-billing-for-individual-copilot-plans.md @@ -60,7 +60,7 @@ If you use all of your premium requests, you can continue using {% data variable If you need more premium requests, you have two options: * Upgrade to a higher plan with a larger monthly premium request allowance. -* Set a spending limit for premium requests over your plan's allowance. Additional premium requests beyond the limit of your {% data variables.product.prodname_copilot_short %} plan are billed at {% data variables.copilot.additional_premium_requests %} per premium request. See [AUTOTITLE](/billing/managing-your-billing/preventing-overspending). +* Set a budget for premium requests over your plan's allowance. Additional premium requests beyond the limit of your {% data variables.product.prodname_copilot_short %} plan are billed at {% data variables.copilot.additional_premium_requests %} per premium request. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). {% data reusables.copilot.premium-requests-mobile %} diff --git a/content/copilot/managing-copilot/understanding-and-managing-copilot-usage/understanding-and-managing-requests-in-copilot.md b/content/copilot/managing-copilot/understanding-and-managing-copilot-usage/understanding-and-managing-requests-in-copilot.md index d67bcb36f5d8..90ef476df3ee 100644 --- a/content/copilot/managing-copilot/understanding-and-managing-copilot-usage/understanding-and-managing-requests-in-copilot.md +++ b/content/copilot/managing-copilot/understanding-and-managing-copilot-usage/understanding-and-managing-requests-in-copilot.md @@ -34,7 +34,7 @@ The following {% data variables.product.prodname_copilot_short %} features can u * [Agent mode in {% data variables.copilot.copilot_chat_short %}](/copilot/using-github-copilot/copilot-chat/asking-github-copilot-questions-in-your-ide#copilot-edits) [^2] * [{% data variables.product.prodname_copilot_short %} code review](/copilot/using-github-copilot/code-review/using-copilot-code-review) * [{% data variables.copilot.copilot_extensions_short %}](/copilot/building-copilot-extensions/about-building-copilot-extensions) -* [{% data variables.copilot.copilot_spaces_short %}](/copilot/using-github-copilot/copilot-spaces/creating-and-using-copilot-spaces) +* [{% data variables.copilot.copilot_spaces %}](/copilot/using-github-copilot/copilot-spaces/about-organizing-and-sharing-context-with-copilot-spaces) [^1]: {% data variables.copilot.copilot_coding_agent %} uses a fixed multiplier of 1 for the premium requests it uses, and may use multiple premium requests in response to one user prompt. [^2]: Agent mode uses one premium request per user prompt, multiplied by the model's rate. @@ -63,7 +63,7 @@ If you're on a **paid plan** and use all of your premium requests, you can still If you need more premium requests beyond your monthly allowance, you can: -* Set a spending limit for additional premium requests. See [AUTOTITLE](/billing/managing-your-billing/preventing-overspending). +* Set a spending limit for additional premium requests. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). * Upgrade to a higher plan. These actions can be taken by organization owners, billing managers, and personal account users. diff --git a/content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md b/content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md index f00410ffd079..881cd4cd29b0 100644 --- a/content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md +++ b/content/copilot/rolling-out-github-copilot-at-scale/assigning-licenses/managing-your-companys-spending-on-github-copilot.md @@ -34,7 +34,7 @@ For pricing details and a list of available models, see [AUTOTITLE](/copilot/abo ### Managing budgets -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). +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/managing-your-billing/using-budgets-control-spending). > [!WARNING] Deleting this budget without setting a new one will enable **unlimited {% data variables.product.prodname_copilot %} usage**. diff --git a/content/copilot/using-github-copilot/copilot-spaces/about-organizing-and-sharing-context-with-copilot-spaces.md b/content/copilot/using-github-copilot/copilot-spaces/about-organizing-and-sharing-context-with-copilot-spaces.md index 8c1205df352d..cff69c060083 100644 --- a/content/copilot/using-github-copilot/copilot-spaces/about-organizing-and-sharing-context-with-copilot-spaces.md +++ b/content/copilot/using-github-copilot/copilot-spaces/about-organizing-and-sharing-context-with-copilot-spaces.md @@ -48,10 +48,12 @@ During the {% data variables.release-phases.public_preview %}, if you're using a {% data variables.copilot.copilot_spaces_short %} can belong to a personal account or to an organization. Spaces owned by an organization can be shared with other organization members (read-only) or kept private to the person who created the space. +## How does using {% data variables.copilot.copilot_spaces_short %} affect my usage? + Questions you submit in a space count as {% data variables.copilot.copilot_chat_short %} requests. * If you're a {% data variables.copilot.copilot_free_short %} user, this usage counts toward your monthly chat limit. -* If you use {% data variables.copilot.copilot_spaces_short %} with a premium model, this usage counts toward your premium usage quota. +* If you use {% data variables.copilot.copilot_spaces_short %} with a premium model, this usage counts toward your premium usage quota. Every question you submit to a premium model counts as one premium request, multiplied by the model's multiplier. For information about the multipliers applied to each model, see [AUTOTITLE](/copilot/managing-copilot/understanding-and-managing-copilot-usage/understanding-and-managing-requests-in-copilot#model-multipliers). ## Next steps diff --git a/content/get-started/learning-about-github/about-github-advanced-security.md b/content/get-started/learning-about-github/about-github-advanced-security.md index 2ac805bed74f..cb09d2d34d15 100644 --- a/content/get-started/learning-about-github/about-github-advanced-security.md +++ b/content/get-started/learning-about-github/about-github-advanced-security.md @@ -150,7 +150,7 @@ A site administrator must enable {% data variables.product.prodname_AS %} for {% {% ifversion security-configurations %}{% else %}Once your system is set up, you can enable and disable these features at the organization or repository level. See [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization) and [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository).{% endif %} -If you are on a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan, license use for the entire team or enterprise is shown on your license page. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage). +If you are on a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan, license use for the entire team or enterprise is shown on your license page. {% ifversion fpt or ghec %}See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage).{% endif %} {% ifversion copilot-chat-ghas-alerts %} diff --git a/content/repositories/working-with-files/managing-large-files/about-git-large-file-storage.md b/content/repositories/working-with-files/managing-large-files/about-git-large-file-storage.md index e4fbbf85fa28..4c26db7e360e 100644 --- a/content/repositories/working-with-files/managing-large-files/about-git-large-file-storage.md +++ b/content/repositories/working-with-files/managing-large-files/about-git-large-file-storage.md @@ -55,4 +55,5 @@ It tracks the `version` of {% data variables.large_files.product_name_short %} y ## Further reading -* [AUTOTITLE](/repositories/working-with-files/managing-large-files/collaboration-with-git-large-file-storage) +* [AUTOTITLE](/repositories/working-with-files/managing-large-files/collaboration-with-git-large-file-storage) {% ifversion fpt or ghec %} +* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage) {% endif %} diff --git a/content/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage.md b/content/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage.md index 2408624d118c..9a572eb35891 100644 --- a/content/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage.md +++ b/content/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage.md @@ -27,17 +27,16 @@ If {% data variables.large_files.product_name_long %} ({% data variables.large_f > [!TIP] > * {% data reusables.large_files.owner_quota_only %} -> * {% data reusables.large_files.does_not_carry %} ## Storage quota -If you use more than {% data variables.large_files.initial_storage_quota %} of storage without purchasing a data pack, you can still clone repositories with large assets, but you will only retrieve the pointer files, and you will not be able to push new files back up. For more information about pointer files, see [AUTOTITLE](/repositories/working-with-files/managing-large-files/about-git-large-file-storage#pointer-file-format). +If you use more than {% data variables.large_files.initial_storage_quota %} of storage without a payment method on file, you can still clone repositories with large assets, but you will only retrieve the pointer files, and you will not be able to push new files back up. For more information about pointer files, see [AUTOTITLE](/repositories/working-with-files/managing-large-files/about-git-large-file-storage#pointer-file-format). ## Bandwidth quota -If you use more than {% data variables.large_files.initial_bandwidth_quota %} of bandwidth per month without purchasing a data pack, {% data variables.large_files.product_name_short %} support is disabled on your account until the next month. +If you use more than {% data variables.large_files.initial_bandwidth_quota %} of bandwidth per month without a payment method on file, {% data variables.large_files.product_name_short %} support is disabled on your account until the next month. ## Further reading -* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage) -* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage) +* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage) +* [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage) diff --git a/data/learning-tracks/actions.yml b/data/learning-tracks/actions.yml index 4a4d73f20940..624a2ad268b5 100644 --- a/data/learning-tracks/actions.yml +++ b/data/learning-tracks/actions.yml @@ -31,7 +31,7 @@ adopting_github_actions_for_your_enterprise_ghec: - >- /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions - >- - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions + /billing/managing-billing-for-your-products/about-billing-for-github-actions adopting_github_actions_for_your_enterprise_ghes: title: Adopt GitHub Actions for your enterprise description: >- @@ -56,7 +56,7 @@ adopting_github_actions_for_your_enterprise_ghes: - >- /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions - >- - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions + /billing/managing-billing-for-your-products/about-billing-for-github-actions hosting_your_own_runners: title: Host your own runners description: >- diff --git a/data/learning-tracks/admin.yml b/data/learning-tracks/admin.yml index 19a09223faba..8c393a19d61f 100644 --- a/data/learning-tracks/admin.yml +++ b/data/learning-tracks/admin.yml @@ -54,7 +54,7 @@ adopting_github_actions_for_your_enterprise_ghec: - >- /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions - >- - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions + /billing/managing-billing-for-your-products/about-billing-for-github-actions adopting_github_actions_for_your_enterprise_ghes: title: Adopt GitHub Actions for your enterprise description: >- @@ -79,7 +79,7 @@ adopting_github_actions_for_your_enterprise_ghes: - >- /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions - >- - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions + /billing/managing-billing-for-your-products/about-billing-for-github-actions increase_fault_tolerance: title: Increase the fault tolerance of your instance description: >- diff --git a/data/reusables/actions/actions-billing.md b/data/reusables/actions/actions-billing.md index 384523c5a247..a25bb9d1c19f 100644 --- a/data/reusables/actions/actions-billing.md +++ b/data/reusables/actions/actions-billing.md @@ -1 +1 @@ -{% data variables.product.prodname_actions %} usage is free for standard {% data variables.product.prodname_dotcom %}-hosted runners in public repositories, and for self-hosted runners. See [AUTOTITLE](/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job#standard-github-hosted-runners-for-public-repositories). For private repositories, each {% data variables.product.prodname_dotcom %} account receives a certain amount of free minutes and storage for use with {% data variables.product.prodname_dotcom %}-hosted runners, depending on the account's plan. Any usage beyond the included amounts is controlled by spending limits. +{% data variables.product.prodname_actions %} usage is free for standard {% data variables.product.prodname_dotcom %}-hosted runners in public repositories, and for self-hosted runners. See [AUTOTITLE](/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job#standard-github-hosted-runners-for-public-repositories). For private repositories, each {% data variables.product.prodname_dotcom %} account receives a quota of free minutes and storage for use with {% data variables.product.prodname_dotcom %}-hosted runners, depending on the account's plan. Any usage beyond the included amounts is billed to your account. diff --git a/data/reusables/actions/actions-spending-limit-brief.md b/data/reusables/actions/actions-spending-limit-brief.md index 3371718741ec..8005a32b08eb 100644 --- a/data/reusables/actions/actions-spending-limit-brief.md +++ b/data/reusables/actions/actions-spending-limit-brief.md @@ -1 +1,3 @@ -If you are a monthly-billed customer, your account will have a default spending limit of 0 US dollars (USD), which prevents additional usage of minutes or storage for private repositories beyond the amounts included with your account. If you pay your account by invoice, your account will have an unlimited default spending limit. +If you are a monthly-billed customer, your account will have a default budget of 0 US dollars (USD), which prevents additional usage of minutes or storage for private repositories beyond the quota included with your account. If you pay your account by invoice, your account will have an unlimited default spending limit. + + diff --git a/data/reusables/advanced-security/control-use-cost-links.md b/data/reusables/advanced-security/control-use-cost-links.md index 4c27c6aa7ecf..313c33f67d2f 100644 --- a/data/reusables/advanced-security/control-use-cost-links.md +++ b/data/reusables/advanced-security/control-use-cost-links.md @@ -1,3 +1,3 @@ -{% ifversion fpt or ghec %}[AUTOTITLE](/billing/managing-your-billing/preventing-overspending){% ifversion ghec %} and [AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise){% endif %} -{% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-billing/preventing-overspending) in the {% data variables.product.prodname_ghe_cloud %} docs +{% ifversion fpt or ghec %}[AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending){% ifversion ghec %} and [AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise){% endif %} +{% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-billing/using-budgets-control-spending) in the {% data variables.product.prodname_ghe_cloud %} docs {% endif %} diff --git a/data/reusables/billing/default-over-quota-behavior.md b/data/reusables/billing/default-over-quota-behavior.md new file mode 100644 index 000000000000..5b6dd38d52ee --- /dev/null +++ b/data/reusables/billing/default-over-quota-behavior.md @@ -0,0 +1,5 @@ +If your account does not have a valid payment method on file, usage is blocked once you use up your quota. + +By default, if you have a valid payment method on file, spending is limited to $0 USD until you set a budget. You can set and manage a budget to limit spending for a product or SKU. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). + + diff --git a/data/reusables/codespaces/exporting-changes.md b/data/reusables/codespaces/exporting-changes.md index 550a51c4db3c..e78fce0e6341 100644 --- a/data/reusables/codespaces/exporting-changes.md +++ b/data/reusables/codespaces/exporting-changes.md @@ -1 +1 @@ -If your personal, organization, or enterprise account reaches its spending limit, you will no longer be able to create or resume codespaces that are billable to that account. However, you can still export any work-in-progress changes to a new branch. For more information, see [AUTOTITLE](/codespaces/troubleshooting/exporting-changes-to-a-branch). +If your personal, organization, or enterprise account uses all of its quota or budget, you will no longer be able to create or resume codespaces that are billable to that account. However, you can still export any work-in-progress changes to a new branch. For more information, see [AUTOTITLE](/codespaces/troubleshooting/exporting-changes-to-a-branch). diff --git a/data/reusables/codespaces/when-an-org-pays.md b/data/reusables/codespaces/when-an-org-pays.md index e0981d15aabc..233d4d196c37 100644 --- a/data/reusables/codespaces/when-an-org-pays.md +++ b/data/reusables/codespaces/when-an-org-pays.md @@ -1,3 +1,3 @@ -* The organization has set a non-zero spending limit for {% data variables.product.prodname_github_codespaces %}. +* The organization has no budget defined for {% data variables.product.prodname_github_codespaces %} or has set a non-zero budget. * The codespace is created from one of the organization's repositories, or from a fork of one of the organization's repositories. This includes {% ifversion ghec %}public, private, and internal{% elsif fpt %}both public and private{% endif %} repositories. * The user creating the codespace is a member or collaborator of the organization, and the organization has enabled {% data variables.product.prodname_github_codespaces %} for this user. This can include all members and collaborators if the organization has chosen to enable {% data variables.product.prodname_codespaces %} for all users. If {% data variables.product.prodname_codespaces %} isn't enabled for a user, they can still create codespaces from public repositories in the organization, but the user will pay for these codespaces. diff --git a/data/reusables/large_files/owner_quota_only.md b/data/reusables/large_files/owner_quota_only.md index 463985208fd0..10adafcc7f44 100644 --- a/data/reusables/large_files/owner_quota_only.md +++ b/data/reusables/large_files/owner_quota_only.md @@ -1 +1 @@ -Bandwidth and storage usage only count against the repository owner's account. In forks, bandwidth and storage usage count against the root of the repository network. Anyone with write access to a repository can push files to {% data variables.large_files.product_name_short %} without affecting their personal bandwidth and storage{% ifversion enhanced-billing-platform %} usage{% else %} quotas or purchasing data packs{% endif %}. Forking and pulling a repository counts against the parent repository's bandwidth usage. +Bandwidth and storage usage count only against the repository owner's account. In forks, bandwidth and storage usage count against the root of the repository network. Anyone with write access to a repository can push files to {% data variables.large_files.product_name_short %} without affecting their personal bandwidth and storage. Forking and pulling a repository counts against the parent repository's bandwidth usage. diff --git a/data/reusables/package_registry/packages-billing.md b/data/reusables/package_registry/packages-billing.md index 3e4078659f0e..15b85adea968 100644 --- a/data/reusables/package_registry/packages-billing.md +++ b/data/reusables/package_registry/packages-billing.md @@ -1 +1 @@ -{% data variables.product.prodname_registry %} usage is free for public packages. For private packages, each account on {% data variables.product.github %} receives a certain amount of free storage and data transfer, depending on the account's plan. Any usage beyond the included amounts is controlled by spending limits. +{% data variables.product.prodname_registry %} usage is free for public packages. For private packages, each account on {% data variables.product.github %} receives a quota of free storage and data transfer, depending on the account's plan. Any usage beyond the included amounts is controlled by budgets. diff --git a/data/reusables/user-settings/access_billing_settings_url.md b/data/reusables/user-settings/access_billing_settings_url.md new file mode 100644 index 000000000000..9e050a1d2c00 --- /dev/null +++ b/data/reusables/user-settings/access_billing_settings_url.md @@ -0,0 +1 @@ +1. Open your billing overview page: https://github.com/settings/billing.