diff --git a/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md b/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md index cbe2195744..9fe60b8fe8 100644 --- a/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md +++ b/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md @@ -35,7 +35,7 @@ The trial lasts for **{% data reusables.enterprise.ghec-trial-length %} days** a * Access to **most** {% data variables.product.prodname_ghe_cloud %} features.{% ifversion metered-ghe-ghas %} * {% data variables.product.prodname_copilot_for_business %} * {% data variables.product.prodname_GH_advanced_security %} -* Access to the **new billing platform**. See [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises).{% endif %} +* Access to the **new billing platform**.{% ifversion enhanced-billing-platform %} See [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises).{% endif %}{% endif %} * An **enterprise account**, which allows you to manage multiple organizations. See [AUTOTITLE](/enterprise-cloud@latest/get-started/learning-about-github/types-of-github-accounts). * Up to **50 licenses** to grant access to users. 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 6af833477a..2ef9358ca1 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 @@ -24,19 +24,20 @@ shortTitle: Advanced Security billing ## Metered billing for {% data variables.product.prodname_GH_advanced_security %} -If you started a trial of {% data variables.product.prodname_GH_advanced_security %} during your {% data variables.product.prodname_ghe_cloud %} trial on or after August 1, 2024, or if your account is onboarded into metered billing outside of the trial, your billing will be usage-based. This means: +If you started a trial of {% data variables.product.prodname_GH_advanced_security %} (GHAS) during your {% data variables.product.prodname_ghe_cloud %} trial on or after August 1, 2024, or if your account is onboarded into metered billing outside of the trial, your billing will be usage-based. This means: * You pay for the number of licenses used each month. * This applies to both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_GH_advanced_security %}. There are a few key differences between metered and volume billing for {% data variables.product.prodname_GH_advanced_security %}. -* **GHE Metered billing** +* **GHAS Metered billing** * Billed per active committer, with no pre-defined license limit. * No overage state, pay only for what you use. + * Server-only users will be added to metered billing. These users are de-duplicated with email matching to avoid double billing. -* **GHE Volume/Subscription billing** +* **GHAS Volume/Subscription billing** * Purchase a defined number of licenses (for example, 100 licenses). * If usage exceeds purchased licenses, you will need to purchase additional licenses to cover this overage usage. diff --git a/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md index 3e8f5fb413..ace00d9851 100644 --- a/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md +++ b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md @@ -110,7 +110,7 @@ If you'd like additional users to have access to your {% data variables.product. ## Adding seats to your enterprise account -If you have access to the enhanced billing platform, you can add seats to your enterprise account through the "Licensing" page. See, [AUTOTITLE](/billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account). +If you have access to the new billing platform, you can add seats to your enterprise account through the "Licensing" page. See, [AUTOTITLE](/billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account). {% data reusables.enterprise-accounts.billing-perms %} diff --git a/content/billing/using-the-new-billing-platform/about-billing-for-git-large-file-storage.md b/content/billing/using-the-new-billing-platform/about-billing-for-git-large-file-storage.md index dfdf9cda8d..029c9fb20c 100644 --- a/content/billing/using-the-new-billing-platform/about-billing-for-git-large-file-storage.md +++ b/content/billing/using-the-new-billing-platform/about-billing-for-git-large-file-storage.md @@ -1,6 +1,6 @@ --- title: About billing for Git Large File Storage -intro: 'Learn about billing for {% data variables.large_files.product_name_long %} using the enhanced billing platform.' +intro: 'Learn about billing for {% data variables.large_files.product_name_long %} using the new billing platform.' versions: feature: enhanced-billing-platform redirect_from: diff --git a/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md b/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md index 5642aa31be..2d76284e80 100644 --- a/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md +++ b/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md @@ -1,6 +1,6 @@ --- title: About the billing cycle -intro: Learn about the billing cycle for the enhanced billing platform. +intro: Learn about the billing cycle for the new billing platform. versions: feature: enhanced-billing-platform redirect_from: @@ -12,12 +12,12 @@ topics: product: '{% data reusables.billing.enhanced-billing-platform-product %}' --- ->[!IMPORTANT] {% ifversion fpt %}If you signed up for a personal user account before February 13, 2025, this article does not apply to you. However, if you created a new personal account (on {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}) after this date, the information in this article applies.{% elsif ghec %}If you have not migrated to the enhanced billing platform, this article does not apply to you.{% endif %} +>[!IMPORTANT] {% ifversion fpt %}If you signed up for a personal user account before February 13, 2025, this article does not apply to you. However, if you created a new personal account (on {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}) after this date, the information in this article applies.{% elsif ghec %}If you have not migrated to the new billing platform, this article does not apply to you.{% endif %} > -> To check if you are on the enhanced billing platform, see [How do I know if I can access the enhanced billing platform?](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform). +> To check if you are on the new billing platform, see [How do I know if I can access the new billing platform?](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform). -If your {% data variables.enterprise.enterprise_or_org %} {% ifversion fpt %}or personal account{% endif %} uses the enhanced billing platform, you have a fixed billing period for metered usage which runs from the first day of the month to the last day of the month. When the month ends, the usage is scheduled to be billed on your bill cycle day. Your bill cycle day {% ifversion fpt %}is the day you created your organization. For example, if you created the account{% elsif ghec %}is dictated by the moment you converted from a trial to a paid enterprise account. For example, if you converted{% endif %} on the fifteenth of the month, you will be billed on the fifteenth of each subsequent month. +If your {% data variables.enterprise.enterprise_or_org %} {% ifversion fpt %}or personal account{% endif %} uses the new billing platform, you have a fixed billing period for metered usage which runs from the first day of the month to the last day of the month. When the month ends, the usage is scheduled to be billed on your bill cycle day. Your bill cycle day {% ifversion fpt %}is the day you created your organization. For example, if you created the account{% elsif ghec %}is dictated by the moment you converted from a trial to a paid enterprise account. For example, if you converted{% endif %} on the fifteenth of the month, you will be billed on the fifteenth of each subsequent month. -This applies to all products available through the enhanced billing platform. +This applies to all products available through the new billing platform. -If still use the previous billing platform, for more information about the billing cycle for your account, see [AUTOTITLE](/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle). +If you still use the previous billing platform, for more information about the billing cycle for your account, see [AUTOTITLE](/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle). diff --git a/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md b/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md index 4b47f19af9..af2cd06181 100644 --- a/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md +++ b/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md @@ -14,11 +14,11 @@ product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: About the new billing platform --- -The enhanced billing platform provides better spending control and detailed usage insights with granular controls. +The new billing platform provides better spending control and detailed usage insights with granular controls. ## Available products -The products shown in the enhanced billing platform are determined by your {% data variables.product.github %} plan and subscriptions. +The products shown in the new billing platform are determined by your {% data variables.product.github %} plan and subscriptions. {% ifversion fpt %} @@ -93,7 +93,7 @@ With the new billing platform, you can: {% endif %} -If you have access, there will be a **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing** option in the sidebar. If you do **not** have access to the new, enhanced billing platform, to find out more about your billing platform, see [AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github). +If you have access, there will be a **{% octicon "credit-card" aria-hidden="true" %} Billing & Licensing** option in the sidebar. If you do **not** have access to the new billing platform, to find out more about your billing platform, see [AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github). ## Next steps diff --git a/content/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses.md b/content/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses.md index 4b1cfc3089..8a17eb56f4 100644 --- a/content/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses.md +++ b/content/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses.md @@ -1,6 +1,6 @@ --- title: About usage-based billing for licenses -intro: Learn about usage-based billing for your licenses with the enhanced billing platform, whether you pay through {% data variables.product.company_short %} or Azure. +intro: Learn about usage-based billing for your licenses with the new billing platform, whether you pay through {% data variables.product.company_short %} or Azure. redirect_from: - /early-access/billing/managing-usage-based-billing-for-github-licenses-through-github - /early-access/billing/managing-usage-based-billing-for-github-licenses-through-azure @@ -10,6 +10,7 @@ redirect_from: - /billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses versions: ghec: '*' + ghes: '>= 3.13' type: overview topics: - Enterprise @@ -20,17 +21,17 @@ shortTitle: Usage-based billing for licenses ## About usage-based billing -With the enhanced billing platform, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %} licenses you use. You will not need to buy a predefined number of licenses in advance. Usage-based billing provides flexibility and cost savings compared to more traditional licensing models, such as volume or subscription models. +With the new billing platform, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %} licenses you use. You will not need to buy a predefined number of licenses in advance. Usage-based billing provides flexibility and cost savings compared to more traditional licensing models, such as volume or subscription models. {% data reusables.billing.license-type-overview %} {% data reusables.billing.license-models %} -If a user starts consuming a {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %} during the month, you will pay pro rata for the user's license usage that month. If a user stops consuming a {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %} during the month, your bill for the following month will reflect the change. - -Pending invitations to join an organization that belongs to your enterprise on {% data variables.product.github %} do not consume a license. - {% data variables.visual_studio.prodname_vss_ghe %} is currently not supported for usage-based billing. +## How are metered licenses measured? + +{% data reusables.billing.metered-license-measures %} + ## Which payment methods can I use? You can use the following payment methods for usage-based billing for licenses: diff --git a/content/billing/using-the-new-billing-platform/automating-usage-reporting.md b/content/billing/using-the-new-billing-platform/automating-usage-reporting.md index 2ae1a49af5..8cf3e4f82a 100644 --- a/content/billing/using-the-new-billing-platform/automating-usage-reporting.md +++ b/content/billing/using-the-new-billing-platform/automating-usage-reporting.md @@ -18,7 +18,7 @@ You can automatically pull data from {% data variables.product.github %} to popu ## Using the billing platform `/usage` endpoint to retrieve metered usage details for an enterprise or organization -The enhanced billing platform provides REST API `/usage` endpoints that you can use to report on the use of all metered products in an enterprise or an organization. The usage data provided by the enterprise endpoint is available to enterprise owners and enterprise billing managers, and the data provided by the organization endpoint is available to organization owners within an enterprise and organization owners within an organization account. You will need to authenticate with {% data variables.product.github %}. +The new billing platform provides REST API `/usage` endpoints that you can use to report on the use of all metered products in an enterprise or an organization. The usage data provided by the enterprise endpoint is available to enterprise owners and enterprise billing managers, and the data provided by the organization endpoint is available to organization owners within an enterprise and organization owners within an organization account. You will need to authenticate with {% data variables.product.github %}. * If you use the GitHub CLI, use the `gh auth login` command to authenticate. * Otherwise, you will need to create a {% data variables.product.pat_v1 %}, see [Creating a {% data variables.product.pat_v1 %}](/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic). @@ -39,7 +39,7 @@ The previous billing platform provided three different endpoints for usage data: * [Get GitHub Packages billing for an enterprise](/rest/enterprise-admin/billing?apiVersion=2022-11-28#get-github-packages-billing-for-an-enterprise) * [Get shared storage billing for an enterprise](/rest/enterprise-admin/billing?apiVersion=2022-11-28#get-shared-storage-billing-for-an-enterprise) -When you transition to the enhanced billing platform, these endpoints will no longer return accurate usage information. You should upgrade any automation that uses these endpoints to use the new endpoint [GET /enterprises/{enterprise}/settings/billing/usage](/rest/enterprise-admin/billing?apiVersion=2022-11-28#get-billing-usage-report-for-an-enterprise). The tables below provide a detailed explanation how to use the billing platform to retrieve equivalent information. +When you transition to the new billing platform, these endpoints will no longer return accurate usage information. You should upgrade any automation that uses these endpoints to use the new endpoint [GET /enterprises/{enterprise}/settings/billing/usage](/rest/enterprise-admin/billing?apiVersion=2022-11-28#get-billing-usage-report-for-an-enterprise). The tables below provide a detailed explanation how to use the billing platform to retrieve equivalent information. ### Changes in call definition diff --git a/content/billing/using-the-new-billing-platform/estimating-spending.md b/content/billing/using-the-new-billing-platform/estimating-spending.md index ad4ef496cb..dea38d24ac 100644 --- a/content/billing/using-the-new-billing-platform/estimating-spending.md +++ b/content/billing/using-the-new-billing-platform/estimating-spending.md @@ -1,6 +1,6 @@ --- title: Estimating spending -intro: 'Use the enhanced billing platform to understand where your spending is trending based on the usage across products.' +intro: 'Use the new billing platform to understand where your spending is trending based on the usage across products.' versions: feature: enhanced-billing-platform redirect_from: @@ -15,7 +15,7 @@ product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: Estimate spending --- -The enhanced billing platform provides a high-level view of your spending trends based on the usage across products. You can use this information to estimate your spending and make informed decisions about your budget. +The new billing platform provides a high-level view of your spending trends based on the usage across products. You can use this information to estimate your spending and make informed decisions about your budget. {% ifversion fpt %} diff --git a/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md b/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md index b10854a3f8..d304502212 100644 --- a/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md +++ b/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md @@ -1,6 +1,6 @@ --- title: Getting started with the new billing platform -intro: 'Learn how to start using the enhanced billing platform for your {% data variables.enterprise.enterprise_or_org %} account.' +intro: 'Learn how to start using the new billing platform for your {% data variables.enterprise.enterprise_or_org %} account.' versions: feature: enhanced-billing-platform redirect_from: @@ -13,7 +13,7 @@ product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: Get started --- -If you don't already have access to the enhanced billing platform, you may be able to get started. +If you don't already have access to the new billing platform, you may be able to get started. {% ifversion fpt %} * If you are **new** to {% data variables.product.github %}, create a personal account on a {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %} plan or an organization on a {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %} plan. diff --git a/content/billing/using-the-new-billing-platform/index.md b/content/billing/using-the-new-billing-platform/index.md index 83f2fc6357..082719581f 100644 --- a/content/billing/using-the-new-billing-platform/index.md +++ b/content/billing/using-the-new-billing-platform/index.md @@ -1,7 +1,7 @@ --- title: Using the new billing platform shortTitle: New billing platform -intro: 'The enhanced billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls.' +intro: 'The new, enhanced billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls.' redirect_from: - /early-access/billing/billing-private-beta - /billing/using-the-enhanced-billing-platform-for-enterprises diff --git a/content/billing/using-the-new-billing-platform/managing-licenses-and-plans-for-your-account.md b/content/billing/using-the-new-billing-platform/managing-licenses-and-plans-for-your-account.md index 02d4ea25e5..05da7db715 100644 --- a/content/billing/using-the-new-billing-platform/managing-licenses-and-plans-for-your-account.md +++ b/content/billing/using-the-new-billing-platform/managing-licenses-and-plans-for-your-account.md @@ -1,6 +1,6 @@ --- title: Managing licenses {% ifversion fpt %}and plans{% endif %} for your account -intro: Learn how to add {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %} to your {% ifversion fpt %} personal or organization{% elsif ghec %}enterprise{% endif %} account using the enhanced billing platform. +intro: Learn how to add {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %} to your {% ifversion fpt %} personal or organization{% elsif ghec %}enterprise{% endif %} account using the new billing platform. versions: feature: enhanced-billing-platform redirect_from: diff --git a/content/billing/using-the-new-billing-platform/managing-your-payment-and-billing-information.md b/content/billing/using-the-new-billing-platform/managing-your-payment-and-billing-information.md index 1364a729ea..87046c1a50 100644 --- a/content/billing/using-the-new-billing-platform/managing-your-payment-and-billing-information.md +++ b/content/billing/using-the-new-billing-platform/managing-your-payment-and-billing-information.md @@ -1,6 +1,6 @@ --- title: Managing your payment and billing information -intro: 'Learn how to manage your payment information and history, and update your billing contacts using the enhanced billing platform.' +intro: 'Learn how to manage your payment information and history, and update your billing contacts using the new billing platform.' versions: feature: enhanced-billing-platform redirect_from: diff --git a/content/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform.md b/content/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform.md index 13424202e3..cceaed9fc4 100644 --- a/content/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform.md +++ b/content/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform.md @@ -1,6 +1,6 @@ --- title: Roles for the new billing platform -intro: 'Learn about the different roles that can use the enhanced billing platform.' +intro: 'Learn about the different roles that can use the new billing platform.' versions: feature: enhanced-billing-platform redirect_from: diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md index 383f9df27e..15a5b88567 100644 --- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md @@ -48,9 +48,9 @@ Billing managers **are not** able to: {% ifversion enhanced-billing-platform %} ->[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the enhanced billing platform. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform. +>[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the new billing platform. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the new billing platform. > -> If you are on the enhanced billing platform, the process for adding a billing manager is different. See [AUTOTITLE](/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform#inviting-a-billing-manager). +> If you are on the new billing platform, the process for adding a billing manager is different. See [AUTOTITLE](/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform#inviting-a-billing-manager). {% endif %} diff --git a/data/features/enhanced-billing-platform.yml b/data/features/enhanced-billing-platform.yml index c50a13574f..063d47713e 100644 --- a/data/features/enhanced-billing-platform.yml +++ b/data/features/enhanced-billing-platform.yml @@ -1,4 +1,4 @@ -# Versions for which the enhanced billing platform is available (GitHub Enterprise plan from June 2024 and GitHub Team plan from Nov 2024) +# Versions for which the new billing platform (FKA enhanced billing platform) is available (GitHub Enterprise plan from June 2024 and GitHub Team plan from Nov 2024) versions: ghec: '*' fpt: '*' diff --git a/data/features/metered-ghe-ghas.yml b/data/features/metered-ghe-ghas.yml index f20f8f00e5..e41354a4a0 100644 --- a/data/features/metered-ghe-ghas.yml +++ b/data/features/metered-ghe-ghas.yml @@ -3,3 +3,4 @@ versions: ghec: '*' + ghes: '>= 3.13' diff --git a/data/reusables/billing/enhanced-billing-platform-product.md b/data/reusables/billing/enhanced-billing-platform-product.md index 7fdb4f139c..d11de33bbf 100644 --- a/data/reusables/billing/enhanced-billing-platform-product.md +++ b/data/reusables/billing/enhanced-billing-platform-product.md @@ -1,6 +1,6 @@ {% ifversion fpt %} -Outside of {% data variables.product.prodname_ghe_cloud %}, the enhanced billing platform is **only** available to: +Outside of {% data variables.product.prodname_ghe_cloud %}, the new billing platform is **only** available to: * Organization accounts on a {% data variables.product.prodname_team %} plan created after November 13, 2024. * Organization accounts on a {% data variables.product.prodname_free_team %} plan created after February 4, 2025. @@ -16,7 +16,7 @@ For existing personal accounts created before February 13, 2025, {% data variabl {% elsif ghec %} -The enhanced billing platform is available to: +The new billing platform is available to: * All enterprise accounts, and their organizations, created after June 2, 2024 * Enterprises that participated in the {% data variables.release-phases.public_preview %} program diff --git a/data/reusables/billing/license-type-overview.md b/data/reusables/billing/license-type-overview.md index fe97063853..23ef3fd5f5 100644 --- a/data/reusables/billing/license-type-overview.md +++ b/data/reusables/billing/license-type-overview.md @@ -6,6 +6,7 @@ There are two types of {% data variables.product.prodname_enterprise %} (GHE) li * All Cloud users automatically receive a use right for {% data variables.product.prodname_ghe_server %}. * Billing is based on the number of active users each month. * Users can generate their own Server license, which covers the number of assigned Cloud seats at the time of generation and is valid for one year. + * Server-only users will be added to GHE (Metered) billing. These users are de-duplicated with email matching to avoid double billing. * **GHE (Volume/Subscription, also called GHE Unified)**: A bundled license for both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. * One license covers both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, allowing users to work in either or both. diff --git a/data/reusables/billing/metered-license-measures.md b/data/reusables/billing/metered-license-measures.md new file mode 100644 index 0000000000..f729e4f969 --- /dev/null +++ b/data/reusables/billing/metered-license-measures.md @@ -0,0 +1,21 @@ + +With metered billing, the cost of a license is calculated by measuring **consumed licenses** and **billable licenses**. + +* **Consumed licenses**: The number of licenses currently in use. +* **Billable licenses**: The unique licenses billed in a billing cycle. If a user stops consuming a license within the month, the adjustment is reflected in your next month's bill. + +If a user starts consuming a {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %} in the middle of the billing cycle, you will pay pro rata for the user's license usage that month. + +**For example:** The billing cycle begins on the first day of the month, and the account starts with 0 licenses. + +* Day 1: The administrator adds 10 licensed users. +* Day 2: The administrator adds 20 licensed users. +* Day 3: The administrator removes 5 licensed users. +* Day 4: No change. + +At the end of day 4, there will be: + +* 25 consumed licenses `(10 + 20 - 5)`. This is the number of users actively consuming licenses. +* 30 billable licenses `(10 + 20)`. This is the number of distinct users that consumed a license at some point during the month. + +Pending invitations to join an organization that belongs to your enterprise on {% data variables.product.github %} do not consume a license. diff --git a/data/reusables/billing/usage-based-billing.md b/data/reusables/billing/usage-based-billing.md index 714714ac52..809d4aca4f 100644 --- a/data/reusables/billing/usage-based-billing.md +++ b/data/reusables/billing/usage-based-billing.md @@ -1,3 +1,7 @@ +{% ifversion enhanced-billing-platform %} + If you created a trial of {% data variables.product.prodname_ghe_cloud %} on or after August 1, 2024, you use usage-based billing to pay for your licenses. With usage-based billing, you pay for the number of licenses you use each month. You do not need to buy a predefined number of licenses in advance. See, [AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses). > [!IMPORTANT] If you currently pay for your {% data variables.product.prodname_enterprise %} licenses through a volume, subscription, or prepaid agreement, you will continue to be billed in this way until your agreement expires. At renewal, you have the option to switch to the metered billing model. See [AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/getting-started-with-the-enhanced-billing-platform). + +{% endif %} diff --git a/data/reusables/copilot-business-for-non-ghe/manage-your-enterprise.md b/data/reusables/copilot-business-for-non-ghe/manage-your-enterprise.md index d75d6bd5c4..26f022cb8d 100644 --- a/data/reusables/copilot-business-for-non-ghe/manage-your-enterprise.md +++ b/data/reusables/copilot-business-for-non-ghe/manage-your-enterprise.md @@ -10,9 +10,9 @@ To do this in your enterprise, you can use the [List all {% data variables.produ ### Manage billing -Your enterprise has access to the enhanced billing platform, which allows you to estimate upcoming spending, control overspending with budgets, and track spending changes over time. +Your enterprise has access to the new billing platform, which allows you to estimate upcoming spending, control overspending with budgets, and track spending changes over time. -See [AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises). +See [AUTOTITLE](/billing/using-the-new-billing-platform). ### Configure content exclusions diff --git a/data/reusables/dotcom_billing/payment-methods.md b/data/reusables/dotcom_billing/payment-methods.md index 01b5243ef1..08b7c0dee6 100644 --- a/data/reusables/dotcom_billing/payment-methods.md +++ b/data/reusables/dotcom_billing/payment-methods.md @@ -2,10 +2,14 @@ If your {% data variables.product.prodname_ghe_cloud %} account uses metered billing, you can pay for your licenses with a credit card, PayPal, or through an Azure subscription. For purchase orders, contact your account manager in {% data variables.contact.contact_enterprise_sales %}. +{% ifversion enhanced-billing-platform %} + > [!IMPORTANT] If you currently pay for your {% data variables.product.prodname_enterprise %} licenses through a volume, subscription, or prepaid agreement, you will continue to be billed in this way until your agreement expires. At renewal, you have the option to switch to the metered billing model. See, [AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/getting-started-with-the-enhanced-billing-platform). > > If you do not have an account manager and pay for {% data variables.product.prodname_enterprise %} via credit card or PayPal, the transition to usage-based billing will be prompted by the product in the future, but this is not currently supported. +{% endif %} + {% else %} You can pay for {% data variables.product.company_short %} with a credit card or with a PayPal account. diff --git a/data/reusables/enterprise-accounts/license-tab.md b/data/reusables/enterprise-accounts/license-tab.md index 549a457492..4bf0f5a077 100644 --- a/data/reusables/enterprise-accounts/license-tab.md +++ b/data/reusables/enterprise-accounts/license-tab.md @@ -1,3 +1,3 @@ 1. Under **{% octicon "gear" aria-hidden="true" %} Settings**, click **{% ifversion ghec %}Licensing{% elsif ghes %}License{% endif %}**. {% ifversion enhanced-billing-platform %} - >[!NOTE] If you are on the enhanced billing platform, the licensing page has been relocated. See [AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending#viewing-license-usage).{% endif %} + >[!NOTE] If you are on the new billing platform, the licensing page has been relocated. See [AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending#viewing-license-usage).{% endif %}