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 036ee029b1..2d1cd3bd92 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 @@ -16,12 +16,8 @@ topics: shortTitle: About Git LFS billing --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## About billing for {% data variables.large_files.product_name_long %} {% data reusables.large_files.free-storage-bandwidth-amount %} {% data reusables.large_files.does_not_carry %} 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 86f16816ae..f245e2fc44 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 @@ -20,12 +20,8 @@ topics: shortTitle: Downgrade Git LFS storage --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - 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 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 05918a295b..6346785360 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 @@ -20,8 +20,4 @@ children: - /downgrading-git-large-file-storage --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} - -{% endif %} 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 af3ae01ec4..d13d3b8deb 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 @@ -20,12 +20,8 @@ topics: shortTitle: Upgrade Git LFS storage --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## Purchasing additional storage and bandwidth for a personal account {% data reusables.user-settings.access_settings %} 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 index 3094dd30b5..91fe64ccd1 100644 --- 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 @@ -19,12 +19,8 @@ topics: shortTitle: View Git LFS usage --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - {% data reusables.large_files.owner_quota_only %} {% data reusables.large_files.does_not_carry %} ## Viewing storage and bandwidth usage for a personal account 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/managing-billing-for-github-actions/about-billing-for-github-actions.md index 50fc70938c..456f6370e8 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/managing-billing-for-github-actions/about-billing-for-github-actions.md @@ -15,12 +15,8 @@ topics: shortTitle: Billing for GitHub Actions --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## About billing for {% data variables.product.prodname_actions %} {% ifversion billing-auth-and-capture %} 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 index 4315d5fb34..d6df0778ce 100644 --- 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 @@ -14,8 +14,4 @@ children: - /managing-your-spending-limit-for-github-actions --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} - -{% endif %} 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 index a450a8cfd4..a411bf93eb 100644 --- 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 @@ -18,12 +18,8 @@ topics: shortTitle: Spending limits for Actions --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## About spending limits for {% data variables.product.prodname_actions %} {% data reusables.actions.actions-billing %} 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 index c87b3fb399..0a0e8a36f0 100644 --- 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 @@ -17,12 +17,8 @@ topics: shortTitle: View your Actions usage --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - 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 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/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md index 6b5eb9c546..6298e194e2 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/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md @@ -19,12 +19,8 @@ redirect_from: - /billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## About {% data variables.product.prodname_github_codespaces %} pricing {% ifversion billing-auth-and-capture %} 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 index 238c8cc4bd..fdf733c0c8 100644 --- 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 @@ -13,8 +13,4 @@ children: - /managing-the-spending-limit-for-github-codespaces --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} - -{% endif %} 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 index b76632c17f..72c40cc2cf 100644 --- 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 @@ -18,12 +18,8 @@ redirect_from: - /billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## 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)." 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 index cb9cee9110..260a16c0ac 100644 --- 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 @@ -14,12 +14,8 @@ redirect_from: - /billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## Viewing {% data variables.product.prodname_github_codespaces %} usage for your personal account You can see how much of the usage included in your personal account you have used so far in the current monthly billing cycle. If you have set up a payment method, set a spending limit, and used all of your included usage, you can also check your bill for the current month. 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 index e6bf5965cb..9f41e33c7c 100644 --- 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 @@ -10,8 +10,4 @@ children: - /about-billing-for-github-copilot --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} - -{% endif %} 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/managing-billing-for-github-packages/about-billing-for-github-packages.md index 9e46beb5a5..22388b07aa 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/managing-billing-for-github-packages/about-billing-for-github-packages.md @@ -16,12 +16,8 @@ topics: shortTitle: About billing --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## About billing for {% data variables.product.prodname_registry %} {% ifversion billing-auth-and-capture %} 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 index a3098f8378..e7fb5adf8e 100644 --- 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 @@ -14,8 +14,4 @@ children: - /managing-your-spending-limit-for-github-packages --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} - -{% endif %} 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 index d610d05a6a..3e6bf66d31 100644 --- 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 @@ -19,12 +19,8 @@ topics: shortTitle: Your spending limit --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## About spending limits for {% data variables.product.prodname_registry %} {% data reusables.package_registry.packages-billing %} 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 index 714f063f6b..5e731a9d2d 100644 --- 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 @@ -18,12 +18,8 @@ topics: shortTitle: View your usage --- -{% ifversion enhanced-billing-platform %} - {% data reusables.billing.enhanced-billing-platform %} -{% endif %} - ## 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. diff --git a/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md b/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md index 86e664a483..94b1c1a4ec 100644 --- a/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md +++ b/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md @@ -61,7 +61,7 @@ Administrators for your enterprise account on {% data variables.product.prodname You have access to the new billing platform if you have an enterprise account, or if you are part of an organization owned by an enterprise account, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.private_preview %} also have access to the new billing platform. See "[AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises)." -{% data reusables.billing.new-billing-platform-permissions %} +{% data reusables.billing.enhanced-billing-platform-product %} To check if you have access: 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 39e9f8f0d0..8c379ceda2 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 %}.' +intro: 'Learn about billing for {% data variables.large_files.product_name_long %} using the enhanced billing platform.' versions: feature: enhanced-billing-platform redirect_from: @@ -10,8 +10,9 @@ topics: - Billing - LFS - Enterprise + - Team shortTitle: About Git LFS billing -permissions: '{% data reusables.billing.new-billing-platform-permissions %}' +product: '{% data reusables.billing.enhanced-billing-platform-product %}' --- ## About billing for {% data variables.large_files.product_name_long %} 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 87e0c4fedb..31055f7aef 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 @@ -8,11 +8,16 @@ redirect_from: type: overview topics: - Enterprise -permissions: '{% data reusables.billing.new-billing-platform-permissions %}' + - Team +product: '{% data reusables.billing.enhanced-billing-platform-product %}' --- ->[!IMPORTANT] If you are on not on the new billing platform, this article does not apply to you. To check if you are on the new 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)." For more information about the billing cycle for your enterprise account, see "[AUTOTITLE](/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle#changing-the-duration-of-your-enterprise-accounts-billing-cycle)." +>[!IMPORTANT] {% ifversion fpt %}If you have a {% data variables.product.prodname_free_user %} plan or a {% data variables.product.prodname_pro %} plan, this article does not apply to you.{% elsif ghec %}If you have not migrated to the enhanced 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)." -If your enterprise is on 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 is dictated by the moment you converted from a trial to a paid enterprise account. For example, if you converted 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 %} 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. -This applies to all products available through the new billing platform. +This applies to all products available through the enhanced 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)." diff --git a/content/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises.md b/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md similarity index 55% rename from content/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises.md rename to content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md index 0adc76a781..39fb88a385 100644 --- a/content/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises.md +++ b/content/billing/using-the-new-billing-platform/about-the-new-billing-platform.md @@ -1,22 +1,36 @@ --- -title: About the new billing platform for enterprises +title: About the new billing platform intro: Learn about the billing platform's key functionalities, and how it can help you manage your spending more effectively. versions: feature: enhanced-billing-platform redirect_from: - /billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises + - /billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises type: overview topics: - Enterprise -permissions: '{% data reusables.billing.new-billing-platform-permissions %}' + - Team +product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: About the new billing platform --- -The new billing platform provides better spending control and detailed usage insights with granular controls. +The enhanced billing platform provides better spending control and detailed usage insights with granular controls. ## Available products -The following products are available in the new billing platform: +The products shown in the enhanced billing platform are determined by your {% data variables.product.github %} plan and subscriptions. + +### {% data variables.product.prodname_team %} + +* {% data variables.product.prodname_actions %} +* {% data variables.product.prodname_github_codespaces %} +* {% data variables.product.prodname_copilot %} +* {% data variables.product.prodname_registry %} +* {% data variables.large_files.product_name_long %} + +{% ifversion ghec %} + +### {% data variables.product.prodname_ghe_cloud %} * {% data variables.product.prodname_actions %} * {% data variables.product.prodname_GH_advanced_security %} (only available with a trial of {% data variables.product.prodname_ghe_cloud %}) @@ -32,25 +46,38 @@ The following products are available in the new billing platform: {% endif %} +{% endif %} + ## Key functionalities With the new billing platform, you can: -* **Estimate spending:** Understand where your (annual, monthly, etc.) spending is trending based on the usage across costs centers and budgets. +* **Estimate spending:** Understand where your (annual, monthly, etc.) spending is trending based on the usage across {% ifversion ghec %}cost centers and {% endif %}budgets. * **Gather insights and data:** Generate usage reports to share with your team or stakeholders, and know if you're on track with your budget. +{%- ifversion ghec %} * **Charge business units:** Improve accountability by creating and assigning organizations, repositories, and members to cost centers. +{%- endif %} * **Prevent overspending:** Use budgets and alerts to track and control your spending. * **Observe and understand spending:** Understand how your spending changes over time and across which products. ## How do I know if I can access the new billing platform? -{% data reusables.billing.new-billing-platform-permissions %} +{% data reusables.billing.enhanced-billing-platform-product %} -To check if you have access: +{% data reusables.permissions.enhanced-billing-platform %} can check for access to the enhanced platform: + +{% ifversion fpt %} + +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} + +{% elsif ghec %} {% data reusables.enterprise-accounts.access-enterprise %} -If you have access, there will be a {% octicon "credit-card" aria-hidden="true" %} **Billing & Licensing** option in the enterprise account sidebar. +{% 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)." ## 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 305a0fab83..02a53f48d3 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 enterprise licenses, whether you pay through {% data variables.product.company_short %} or Azure. +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. 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 @@ -9,19 +9,20 @@ redirect_from: - /early-access/billing/managing-usage-based-billing-for-github-licenses - /billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses versions: - feature: enhanced-billing-platform + ghec: '*' type: overview topics: - Enterprise -permissions: Enterprise administrators +permissions: 'Enterprise administrators' +product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: Usage-based billing for licenses --- -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. +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. If a user starts consuming a license seat during the month, you will pay pro rata for the user's license usage that month. If a user stops consuming a license seat 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.prodname_dotcom_the_website %} do not consume a license. +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. @@ -31,5 +32,5 @@ You can use the following payment methods for usage-based billing for licenses: * Invoiced and self-serve {% data variables.product.prodname_enterprise %} customers can pay using a **credit card** or **PayPal** * Invoiced customers can also pay using **prepaid credits** (only available to customers who have a volume subscription with or without metered add-ons) -* You can connect an **Azure** subscription to your enterprise +* You can connect an **Azure** subscription to your enterprise account * For **purchase orders**, you can contact your account manager in {% data variables.contact.contact_enterprise_sales %} diff --git a/content/billing/using-the-new-billing-platform/adding-seats-to-your-account.md b/content/billing/using-the-new-billing-platform/adding-seats-to-your-account.md new file mode 100644 index 0000000000..bcd5a651f0 --- /dev/null +++ b/content/billing/using-the-new-billing-platform/adding-seats-to-your-account.md @@ -0,0 +1,44 @@ +--- +title: Adding seats to your account +intro: Learn how to add seats to your {% ifversion fpt %}organization{% elsif ghec %}enterprise{% endif %} account using the enhanced billing platform. +versions: + feature: enhanced-billing-platform +redirect_from: + - /billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account + - /billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account +type: overview +topics: + - Enterprise + - Team +permissions: '{% data reusables.permissions.enhanced-billing-platform %}' +shortTitle: Add seats to your account +--- + +{% ifversion ghec %} +>[!IMPORTANT] If you pay by invoice, you need to contact your account manager in {% data variables.contact.contact_enterprise_sales %} to add seats to your enterprise account. +{% endif %} + +If you have access to the new billing platform, you can add seats to your account through the "Licensing" page. To check if you have access, see "[AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-new-billing-platform)." + +{% ifversion fpt %} +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +{% data reusables.billing.org-billing-menu %} +1. Click **Licensing**. +1. In the {% data variables.product.prodname_team %} banner, click **Edit** and select **Add seats** to display the "Billing / Add seats" view. +1. Define the number of new seats you require. The details of the prorated cost for the remainder of the billing cycle and the total for your next bill are updated automatically. +1. When you have defined the number of additional seats to add, click **Add seats**. + +You can also use the **Edit** option to remove seats and see which users are using seats in your account. + +{% elsif ghec %} + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.billing.enterprise-billing-menu %} +1. Click **Licensing**. +1. Click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} and then click **Manage seats**. +1. Under "Total Seats", enter a number of seats. +1. Click **Update seats**. + +{% endif %} diff --git a/content/billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account.md b/content/billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account.md deleted file mode 100644 index f77dc9eed5..0000000000 --- a/content/billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -title: Adding seats to your enterprise account -intro: Learn how to add seats to your enterprise account using the new billing platform. -versions: - feature: enhanced-billing-platform -redirect_from: - - /billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account -type: overview -topics: - - Enterprise -permissions: '{% data reusables.billing.new-billing-platform-permissions %}' -shortTitle: Add seats to your enterprise ---- - ->[!IMPORTANT] If you pay by invoice, you need to contact your account manager in {% data variables.contact.contact_enterprise_sales %} to add 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. To check if you have access, see "[AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-new-billing-platform)." - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.billing.enterprise-billing-menu %} -1. Click **Licensing**. -1. Click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} and then click **Manage seats**. -1. Under "Total Seats", enter a number of seats. -1. Click **Update seats**. diff --git a/content/billing/using-the-new-billing-platform/charging-business-units.md b/content/billing/using-the-new-billing-platform/charging-business-units.md index dc5e1e869a..ea97e846a0 100644 --- a/content/billing/using-the-new-billing-platform/charging-business-units.md +++ b/content/billing/using-the-new-billing-platform/charging-business-units.md @@ -2,13 +2,13 @@ title: Charging business units intro: 'Learn how to create and use cost centers to manage business units at scale.' versions: - feature: enhanced-billing-platform + ghec: '*' redirect_from: - /billing/using-the-enhanced-billing-platform-for-enterprises/charging-business-units type: how_to topics: - Enterprise -permissions: '{% data reusables.billing.new-billing-platform-permissions %}' +product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: Charge business units --- diff --git a/content/billing/using-the-new-billing-platform/estimating-spending-for-your-enterprise.md b/content/billing/using-the-new-billing-platform/estimating-spending.md similarity index 53% rename from content/billing/using-the-new-billing-platform/estimating-spending-for-your-enterprise.md rename to content/billing/using-the-new-billing-platform/estimating-spending.md index 0054ec2926..3907637001 100644 --- a/content/billing/using-the-new-billing-platform/estimating-spending-for-your-enterprise.md +++ b/content/billing/using-the-new-billing-platform/estimating-spending.md @@ -1,35 +1,52 @@ --- -title: Estimating spending for your enterprise -intro: 'Understand where your spending is trending based on the usage across products.' +title: Estimating spending +intro: 'Use the enhanced billing platform to understand where your spending is trending based on the usage across products.' versions: feature: enhanced-billing-platform redirect_from: - /billing/using-the-enhanced-billing-platform-for-enterprises/estimating-spending-for-your-enterprise + - /billing/using-the-new-billing-platform/estimating-spending-for-your-enterprise type: how_to topics: - Enterprise -permissions: '{% data reusables.billing.new-billing-platform-permissions %}' + - Team +permissions: '{% data reusables.permissions.enhanced-billing-platform %}' +product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: Estimate spending --- -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. +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. ## Viewing your spending The "Overview" page provides a high-level view of your spending and budgets. +{% 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 %} + On this page, you can view your usage in the following categories: -* **Current metered usage:** The card on the top left shows the gross metered usage for your enterprise including all cost centers. Click **More details** to view a breakdown of the usage by cost center. -* **Metered usage:** The graph shows the gross metered usage for your enterprise including cost centers. +* **Current metered usage:** The card on the top left shows the gross metered usage for your {% data variables.enterprise.enterprise_or_org %}{% ifversion ghec %} including all cost centers. Click **More details** to view a breakdown of the usage by cost center{% endif %}. +* **Metered usage:** The graph shows the gross metered usage for your {% data variables.enterprise.enterprise_or_org %}{% ifversion ghec %} including cost centers{% endif %}. - To view a different time period, select **Time Frame**, then choose a time period. You can also download an image of the graph by clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} on the right. + To view a different time period, select **Time Frame**, then choose a time period. You can also download an image or CSV of the graph by clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} on the right. +{% ifversion fpt %} +* **By repository:** The card under the graph shows the top five repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage. +{% elsif ghec %} * **By organization** and **by repository:** The two cards under the graph show the top five organizations and repositories that generate the most usage. You can click {% octicon "kebab-horizontal" aria-label="Open column options" %} in the upper-right corner of each card to view all usage. -* **By products:** You can use the product tabs to view usage and discounts for different products. Only products with usage are shown. +{% endif %} +* **By products:** You can use the product tabs to view usage and discounts for different products. ![Screenshot of the product tabs section of the overview page.](/assets/images/help/billing/enhanced-billing-platform-products-tabs.png){% ifversion metered-ghe-ghas %} @@ -37,6 +54,8 @@ On this page, you can view your usage in the following categories: {% endif %} +{% ifversion ghec %} + ## Viewing prepaid credits Your prepaid credits are shown above the "Metered usage" graph. To add more prepaid credits, you can contact your account manager in {% data variables.contact.contact_enterprise_sales %}. @@ -47,8 +66,10 @@ If you don't currently use prepaid credits, but have a volume subscription and w In the "Current promotions and discounts" section in the top right, you can see the total amount of promotions and discounts applied to your account. Click **More details** to view a breakdown of the promotions and discounts. +{% endif %} + ## Tracking budgets -At the bottom of the page, under "Budgets", you can see budgets you have set, and how much you have spent against those budgets. By clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} to the right of a budget, you can edit or delete the budget. +At the bottom of the page, under "Budgets", you can see your current budgets, and how much you have spent against those budgets. If your role provides access, you can edit or delete a budget by clicking {% octicon "kebab-horizontal" aria-label="Open column options" %} to the right of a budget. See "[AUTOTITLE](/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform)." If you have used all of your budget, a red banner appears at the top of the page. You can click **Update your budget** to increase your budget. diff --git a/content/billing/using-the-new-billing-platform/gathering-insights-on-your-spending.md b/content/billing/using-the-new-billing-platform/gathering-insights-on-your-spending.md index 2537c9afe4..1e2b0e960d 100644 --- a/content/billing/using-the-new-billing-platform/gathering-insights-on-your-spending.md +++ b/content/billing/using-the-new-billing-platform/gathering-insights-on-your-spending.md @@ -1,6 +1,6 @@ --- title: Gathering insights on your spending -intro: 'Get insights into the usage of your enterprise members.' +intro: 'Get insights into the usage of your {% data variables.enterprise.enterprise_or_org %} members.' versions: feature: enhanced-billing-platform redirect_from: @@ -8,21 +8,34 @@ redirect_from: type: how_to topics: - Enterprise -permissions: The new billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.

As an enterprise owner or billing manager you can view and download your enterprise's usage. As an organization owner, you can view and download usage for the organizations you manage + - Team +permissions: '{% data reusables.permissions.enhanced-billing-platform %}' +product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: Gather insights --- The new billing platform provides you with the tools to: -* **Get insights** into the usage of your enterprise members to understand how your resources are being used. -* **Generate reports** on the usage of your enterprise members to import into your own tools for visualization and analysis. +* **Get insights** into the usage of your {% data variables.enterprise.enterprise_or_org %} members to understand how your resources are being used. +* **Generate reports** on the usage of your {% data variables.enterprise.enterprise_or_org %} members to import into your own tools for visualization and analysis. ## Viewing usage -You can view the usage of your enterprise members and download the usage data for further analysis. +You can view the usage of your {% data variables.enterprise.enterprise_or_org %} members and download the usage data for further analysis. + +{% 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 **Usage**. 1. To search or filter the graph, click the search bar. Then click the filter you want to use. 1. To further filter the graph, use the dropdown menus. @@ -39,7 +52,17 @@ You can view the usage of your enterprise members and download the usage data fo ## Viewing license usage -You can view the license usage of your enterprise members and download the usage data for further analysis. The following license types are available: +You can view the license usage of your {% data variables.enterprise.enterprise_or_org %} members and download the usage data for further analysis. + +{% ifversion fpt %} + +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +{% data reusables.billing.org-billing-menu %} + +{% elsif ghec %} + +The following license types are available: * User * {% data variables.product.prodname_GH_advanced_security %} @@ -49,9 +72,14 @@ You can also view your active {% data variables.product.prodname_enterprise %} i {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.billing.enterprise-billing-menu %} + +{% endif %} + 1. Click **Licensing**. 1. To download a CSV report of the license usage, click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} to the right of the usage you want to download, then click {% octicon "download" aria-hidden="true" %} **CSV report**. ## Further reading -* "[AUTOTITLE](/rest/enterprise-admin/billing)" +{% ifversion ghec %} +* "[AUTOTITLE](/rest/enterprise-admin/billing)"{% endif %} +* "[AUTOTITLE](/billing/using-the-new-billing-platform/adding-seats-to-your-account)" 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 441f64a416..885932c036 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 new billing platform for your enterprise account.' +intro: 'Learn how to start using the enhanced billing platform for your {% data variables.enterprise.enterprise_or_org %} account.' versions: feature: enhanced-billing-platform redirect_from: @@ -8,12 +8,22 @@ redirect_from: type: overview topics: - Enterprise -permissions: Enterprise administrators + - Team +product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: Get started --- -If you don't already have access to the new billing platform, there are three ways to get started. +If you don't already have access to the enhanced billing platform, you may be able to get started. +{% ifversion fpt %} +* If you are **new** to {% data variables.product.github %}, set up a {% data variables.product.prodname_team %} plan account. See [Team](https://github.com/pricing) on the {% data variables.product.github %} pricing page. +{% endif %} * If you are **new** to {% data variables.product.prodname_ghe_cloud %}, set up a trial of {% data variables.product.prodname_ghe_cloud %}. See "[AUTOTITLE](/admin/overview/setting-up-a-trial-of-github-enterprise-cloud)." +{% ifversion ghec %} * If you have an **existing** enterprise account and pay by **invoice**, contact your account manager in {% data variables.contact.contact_enterprise_sales %} to discuss switching when your contract renews. * If you have an **existing** enterprise account and pay via **credit card or PayPal**, wait for an in-product prompt to transition. +{% endif %} + +## Next steps + +* To **learn about billing cycles**, see "[AUTOTITLE](/billing/using-the-new-billing-platform/about-the-billing-cycle)." diff --git a/content/billing/using-the-new-billing-platform/index.md b/content/billing/using-the-new-billing-platform/index.md index 7290bb32dd..938b249258 100644 --- a/content/billing/using-the-new-billing-platform/index.md +++ b/content/billing/using-the-new-billing-platform/index.md @@ -1,21 +1,21 @@ --- title: Using the new billing platform shortTitle: New billing platform -intro: 'The new billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls.' +intro: 'The 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 -permissions: '{% data reusables.billing.new-billing-platform-permissions %}' +product: '{% data reusables.billing.enhanced-billing-platform-product %}' versions: feature: enhanced-billing-platform children: - - /about-the-new-billing-platform-for-enterprises + - /about-the-new-billing-platform - /getting-started-with-the-new-billing-platform - /about-the-billing-cycle - /about-usage-based-billing-for-licenses - - /adding-seats-to-your-enterprise-account + - /adding-seats-to-your-account - /roles-for-the-new-billing-platform - - /estimating-spending-for-your-enterprise + - /estimating-spending - /gathering-insights-on-your-spending - /charging-business-units - /preventing-overspending 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 647bb43113..ced580a3b4 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.' +intro: 'Learn how to manage your payment information and history, and update your billing contacts using the enhanced billing platform.' versions: feature: enhanced-billing-platform redirect_from: @@ -8,7 +8,9 @@ redirect_from: type: how_to topics: - Enterprise -permissions: '{% data reusables.billing.new-billing-platform-permissions %}' + - Team +permissions: '{% data reusables.permissions.enhanced-billing-platform %}' +product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: Manage your payment information --- @@ -18,9 +20,20 @@ You can view your payment information and history, and update your billing conta * PayPal * Azure Subscription ID +{% ifversion fpt %} + +## Connecting your Azure subscription + +You must know your Azure subscription ID. For more information, see the following documentation or [contact Azure support](https://azure.microsoft.com/support/). + +* "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)" +* [Get subscription and tenant IDs in the Azure portal](https://learn.microsoft.com/en-us/azure/azure-portal/get-subscription-tenant-id) in the Microsoft Docs + +{% elsif ghec %} + ## Prerequisites for paying through Azure -* You must be new to {% data variables.product.prodname_ghe_cloud %} to begin with usage-based billing through an Azure subscription. If your company already uses {% data variables.product.prodname_dotcom %}, you can use {% data variables.product.prodname_importer_proper_name %} to migrate your resources to a new subscription that bills through Azure. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/understanding-github-enterprise-importer/about-github-enterprise-importer)." +* You must be new to {% data variables.product.prodname_ghe_cloud %} to begin with usage-based billing through an Azure subscription. If your company already uses {% data variables.product.github %}, you can use {% data variables.product.prodname_importer_proper_name %} to migrate your resources to a new subscription that bills through Azure. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/understanding-github-enterprise-importer/about-github-enterprise-importer)." * Prepaid usage is not currently available for usage-based billing through Azure. * You must know your Azure subscription ID. For more information, see the following documentation or [contact Azure support](https://azure.microsoft.com/support/). @@ -37,7 +50,9 @@ For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-githu ## What does my Azure invoice look like? -After you connect your Azure subscription, usage for {% data variables.product.company_short %}'s products will appear on your Azure invoice, summarized by product family. For example, if you use this billing arrangement for {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_GH_advanced_security %}, usage and price excluding tax for each line item will appear as follows. +After you connect your Azure subscription, usage for {% data variables.product.company_short %}'s products will appear on your Azure invoice, summarized by product family. + +For example, if you use this billing arrangement for {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_GH_advanced_security %}, usage and price excluding tax for each line item will appear as follows. | Product Family Usage Charges | Total (excluding Tax) | | :- | :- | @@ -48,32 +63,49 @@ For more information about your Azure invoice, see [Understand terms on your Mic The {% data variables.product.company_short %} products on your Azure invoice are also MACC-eligible. For more information, see [Track your Microsoft Azure Consumption Commitment (MACC)](https://learn.microsoft.com/azure/cost-management-billing/manage/track-consumption-commitment) in the Microsoft Docs. +{% endif %} + ## Viewing payment information +{% ifversion fpt %} + +You can view and edit your billing information and update your payment method. + +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +{% data reusables.billing.org-billing-menu %} + +{% elsif ghec %} + You can view and edit your billing information, update your payment method, and view active coupons. >[!NOTE] This only applies to invoiced enterprise accounts. {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.billing.enterprise-billing-menu %} + +{% endif %} + 1. Click **Payment information**. -1. Click {% octicon "pencil" aria-label="The edit icon" %} to edit your payment information or {% octicon "trash" aria-label="The trash icon" %} to delete your payment method. +1. Click **Edit** to edit your payment information or **Remove** to delete your payment method. 1. Follow the prompts. ## Viewing payment history You can view your payment history, including the date, amount, and payment method. You can also download past payments. -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.billing.enterprise-billing-menu %} +1. Display the **Billing & Licensing** section of the sidebar of the {% data variables.enterprise.enterprise_or_org %} settings. 1. Click **Payment history**. +{% ifversion ghec %} + ## Managing billing contacts You can add an email address to receive billing notifications regarding payments and budget threshold alerts. -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.billing.enterprise-billing-menu %} +1. Display the **Billing & Licensing** section of the sidebar of the enterprise settings. 1. Click **Billing contacts**. 1. Click **Add** in the upper-right corner and follow the prompt. 1. Click {% octicon "pencil" aria-label="The edit icon" %} to edit the primary billing contact or {% octicon "kebab-horizontal" aria-label="Show options" %} to either remove or make a contact the primary billing contact. + +{% endif %} diff --git a/content/billing/using-the-new-billing-platform/preventing-overspending.md b/content/billing/using-the-new-billing-platform/preventing-overspending.md index 3707a45e57..5c8383b653 100644 --- a/content/billing/using-the-new-billing-platform/preventing-overspending.md +++ b/content/billing/using-the-new-billing-platform/preventing-overspending.md @@ -8,45 +8,72 @@ redirect_from: type: how_to topics: - Enterprise -permissions: '{% data reusables.billing.new-billing-platform-permissions %}' + - 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 enterprise, organizations, repositories, or cost centers. 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. +Budgets and alerts allow you to track spending for your {% ifversion fpt %}organization{% 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 Budgets are not applicable to: -* Seat-based products such as {% data variables.product.prodname_copilot %}, {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_enterprise %}. -* Pre-paid volume licenses. +* Seat-based products such as {% data variables.product.prodname_copilot %}{% ifversion fpt %} and {% data variables.product.prodname_team %}{% elsif ghec %}, {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_enterprise %}. +* Pre-paid volume licenses{% endif %}. ## Viewing budgets -If you are an enterprise owner or billing manager, your enterprise's budget will be listed at the top of the "Budgets and alerts" page, 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. +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 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. +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 %} + 1. Click **Budgets and alerts**. 1. Click **New budget**. 1. Under "Products", select the metered product to include in this budget. 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 your enterprise or organization reaches the budget limit, select **Stop usage when budget limit is reached**. This does not apply to {% data variables.product.prodname_copilot %} usage. + To stop any usage and further spending once your {% ifversion fpt %}organization{% elsif ghec %}enterprise or organization{% endif %} reaches the budget limit, select **Stop usage when budget limit is reached**. This does not apply to {% data variables.product.prodname_copilot %} usage. >[!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.prodname_dotcom %}. You may opt out at any time. +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. @@ -54,9 +81,23 @@ As an enterprise owner or billing manager, you can set the budget for your enter ## Editing or deleting a budget +{% 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" %} **Edit** or {% octicon "trash" aria-hidden="true" %} **Delete**. 1. Follow the prompts. 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 3daa3a7b49..88dc465f48 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 three different roles that have access to the new billing platform.' +intro: 'Learn about the different roles that can use the enhanced billing platform.' versions: feature: enhanced-billing-platform redirect_from: @@ -8,28 +8,46 @@ redirect_from: type: reference topics: - Enterprise -permissions: The new billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform. + - Team +product: '{% data reusables.billing.enhanced-billing-platform-product %}' --- -Three roles have access to the new billing platform: enterprise owners, billing managers, and organization owners. See "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise)." +The following roles have access to the new billing platform: {% ifversion ghec %}enterprise owners, {% endif %}billing managers, and organization owners. {% ifversion fpt %}See "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)."{% elsif ghec %}See "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise)."{% endif %} -## Enterprise owners and billing managers +{% ifversion ghec %} -As an enterprise owner or a billing manager, you can access the new billing platform for your enterprise account. You can: +## Enterprise owners and enterprise billing managers -* View all metered usage in your enterprise and set budgets for your enterprise and organizations. +You can: + +* View all metered usage for your account and set budgets for your {% data variables.enterprise.enterprise_and_org %}. * See enterprise usage, including costs for organizations and repositories. * Download CSV usage reports for products your enterprise is using. +* Set budgets for your {% data variables.enterprise.enterprise_and_org %}. * Create cost centers for all organizations within your enterprise. -* Set budgets for your enterprise and organizations. + +{% endif %} ## Organization owners -As an organization owner, you have administrative access to your organization. You can: +You have full administrative access to your organization. You can: -* View metered usage and budgets for the organizations and repositories you manage. +* View metered usage and budgets for your organization and its repositories. +* Set budgets for the organization and its repositories. +* Download CSV usage reports.{% ifversion ghec %} +* Create cost centers by grouping repositories you manage. * View promotions and discounts. * View spending for pre-purchased user licenses for {% data variables.product.prodname_enterprise %} or {% data variables.product.prodname_GH_advanced_security %} based on your usage. -* See organization usage and download CSV usage reports. -* Create cost centers by grouping repositories you manage. -* Set budgets for the repositories you manage. +{% endif %} + +{% ifversion fpt %} + +## Organization billing managers + +You can: + +* View all metered usage for your organization its repositories. +* View organization-level budgets. +* Download CSV usage reports. + +{% endif %} diff --git a/data/allowed-topics.js b/data/allowed-topics.js index ad1784a97c..96e08988b4 100644 --- a/data/allowed-topics.js +++ b/data/allowed-topics.js @@ -147,6 +147,7 @@ export default [ 'Storage', 'Support', 'Swift', + 'Team', 'Teams', 'Transcripts', 'Travis CI', diff --git a/data/features/enhanced-billing-platform.yml b/data/features/enhanced-billing-platform.yml index 2f0275b59d..c50a13574f 100644 --- a/data/features/enhanced-billing-platform.yml +++ b/data/features/enhanced-billing-platform.yml @@ -1,3 +1,4 @@ -# Versions for which the enhanced billing platform is available +# Versions for which the 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/reusables/billing/enhanced-billing-platform-product.md b/data/reusables/billing/enhanced-billing-platform-product.md new file mode 100644 index 0000000000..5daa30a475 --- /dev/null +++ b/data/reusables/billing/enhanced-billing-platform-product.md @@ -0,0 +1,18 @@ +{% ifversion fpt %} + +Outside of {% data variables.product.prodname_ghe_cloud %}, the enhanced billing platform is available only to organization accounts created after November 13, 2024 on a {% data variables.product.prodname_team %} plan. It is currently **not** available to: + +* {% data variables.product.prodname_free_user %} +* {% data variables.product.prodname_pro %} +* Organizations that upgrade from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_team %} + +{% elsif ghec %} + +The enhanced 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 + +Beginning in September 2024, {% data variables.product.company_short %} will migrate remaining enterprises to the new billing platform. Enterprises will receive a notice 30 days before their migration. See the [GitHub blog](https://github.blog/changelog/2024-09-24-enhanced-billing-platform-for-enterprises/). + +{% endif %} diff --git a/data/reusables/billing/enhanced-billing-platform.md b/data/reusables/billing/enhanced-billing-platform.md index 830c5fb92a..994d7fcd8a 100644 --- a/data/reusables/billing/enhanced-billing-platform.md +++ b/data/reusables/billing/enhanced-billing-platform.md @@ -1,3 +1,3 @@ ->[!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] {% ifversion fpt %}Organization accounts, created after November 13, 2024 on a {% data variables.product.prodname_team %} plan, have access to the enhanced billing platform.{% elsif ghec %}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.{% endif %} > > The enhanced billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls. See "[AUTOTITLE](/billing/using-the-new-billing-platform)." diff --git a/data/reusables/billing/new-billing-platform-permissions.md b/data/reusables/billing/new-billing-platform-permissions.md deleted file mode 100644 index fb1cf79c26..0000000000 --- a/data/reusables/billing/new-billing-platform-permissions.md +++ /dev/null @@ -1,3 +0,0 @@ -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 also have access to the new billing platform. - -Beginning in September 2024, {% data variables.product.company_short %} will migrate remaining enterprises to the new billing platform. Enterprises will receive a notice 30 days before their migration. See the [GitHub blog](https://github.blog/changelog/2024-09-24-enhanced-billing-platform-for-enterprises/). diff --git a/data/reusables/billing/org-billing-menu.md b/data/reusables/billing/org-billing-menu.md new file mode 100644 index 0000000000..94755de5b6 --- /dev/null +++ b/data/reusables/billing/org-billing-menu.md @@ -0,0 +1 @@ +1. On the left side of the page, in the organization sidebar, click {% octicon "credit-card" aria-hidden="true" %} **Billing & Licensing**. diff --git a/data/reusables/permissions/enhanced-billing-platform.md b/data/reusables/permissions/enhanced-billing-platform.md new file mode 100644 index 0000000000..2cd49306c9 --- /dev/null +++ b/data/reusables/permissions/enhanced-billing-platform.md @@ -0,0 +1 @@ +{% ifversion fpt %}Organization owners and billing managers {% elsif ghec %}Enterprise owners, organization owners, and billing managers {% endif %} diff --git a/data/variables/enterprise.yml b/data/variables/enterprise.yml index ed5cc3380a..0b88e47eae 100644 --- a/data/variables/enterprise.yml +++ b/data/variables/enterprise.yml @@ -29,3 +29,7 @@ ghes_azure_ad_app_link: '[GitHub Enterprise Server application](https://azuremar gh_enterprise: '{% ifversion ghec %}{% data variables.enterprise.data_residency %}{% elsif ghes %}{% data variables.product.prodname_ghe_server %}{% endif %}' gh_enterprise_domain: '{% ifversion ghec %}{% data variables.enterprise.data_residency_domain %}{% elsif ghes %}https://GHE_HOSTNAME{% endif %}' gh_enterprise_container_registry: '{% ifversion ghes %}https://containers.GHE_HOSTNAME/v2/{% elsif ghec %}https://containers.SUBDOMAIN.ghe.com{% endif %}' + +# For features that are available on more than one cloud account type +enterprise_or_org: '{% ifversion fpt %}organization{% elsif ghec %}enterprise{% endif %}' +enterprise_and_org: '{% ifversion fpt %}organization{% elsif ghec %}enterprise and organizations{% endif %}'