diff --git a/content/billing/concepts/azure-subscriptions.md b/content/billing/concepts/azure-subscriptions.md new file mode 100644 index 000000000000..4460832630d7 --- /dev/null +++ b/content/billing/concepts/azure-subscriptions.md @@ -0,0 +1,50 @@ +--- +title: Azure subscription payments +intro: 'Learn about paying for metered usage of {% data variables.product.github %} plans, licenses, and usage with an Azure subscription.' +shortTitle: Azure subscriptions +versions: + fpt: '*' + ghec: '*' + ghes: '*' +topics: + - Billing + - Enterprise + - Team + - Azure subscription +contentType: concepts +product: 'Organization and enterprise accounts can pay for any metered use of {% data variables.product.github %} using an Azure subscription. This option is not available for personal accounts.' +--- + +## Payment using an Azure subscription + +You can pay for {% data variables.product.github %} use through an Azure subscription by connecting the subscription to {% data variables.product.github %}. See [AUTOTITLE](/billing/how-tos/set-up-payment/connect-azure-sub). + +{% data variables.product.github %} installs a Subscription Permission Validation app (SPV app) on the Azure tenant, which it uses to get a list of available subscriptions from active directory. Installing the SPV app requires tenant-wide admin consent. You must sign into an Azure account that can provide tenant-wide admin consent, or work with an Azure administrator to configure the admin consent workflow. + +* [Grant tenant-wide admin consent to an application](https://learn.microsoft.com/azure/active-directory/manage-apps/grant-admin-consent) in Microsoft Docs +* [User and admin consent in Azure Active Directory](https://learn.microsoft.com/en-us/azure/active-directory/manage-apps/user-admin-consent-overview#admin-consent-workflow) in Microsoft Docs. + +>[!TIP] If your tenant provides user consent settings, users included in those settings might not require admin consent to install the {% data variables.product.company_short %} SPV app. See [User consent](https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/user-admin-consent-overview#user-consent) in Microsoft Docs. + +## Billing cycle for Azure + +If you link your {% data variables.product.github %} account to Azure, any usage-based costs starting from that point will be billed through Azure and charged on the 1st of each month. However, any remaining {% data variables.product.github %} charges, for example, charges for your {% data variables.product.prodname_dotcom %} plan, will still be billed on your usual billing date. + +Prepaid usage is not currently available for usage-based billing through Azure. + +### Calculation example + +You link your Azure subscription to your organization or enterprise account on **June 16th** and you also have a {% data variables.copilot.copilot_for_business %} subscription. + +* From that June 16th onwards, any usage costs for {% data variables.copilot.copilot_business_short %}, with any costs for metered use over the included amounts, is included in your Azure bill and charged on **July 1st** and on the first of every month. +* Any charges incurred before June 16th are billed separately through {% data variables.product.github %} on your account's usual billing date. + +## Use of {% data variables.product.prodname_ghe_cloud %} through a Microsoft Enterprise Agreement + +If you use {% data variables.product.prodname_ghe_cloud %} through a Microsoft Enterprise Agreement, connecting an Azure subscription is the only way to use {% data variables.product.prodname_GHAS %}, {% data variables.product.prodname_github_codespaces %}, or {% data variables.product.prodname_copilot %}, or to use {% data variables.product.prodname_actions %}, Git Large File Storage (LFS), or {% data variables.product.prodname_registry %} beyond your plan's included amounts. + +## Next steps + +For instructions on connecting your Azure subscription, see [AUTOTITLE](/billing/how-tos/set-up-payment/connect-azure-sub). + +For reference information, see [AUTOTITLE](/billing/reference/azure-subscription). diff --git a/content/billing/concepts/index.md b/content/billing/concepts/index.md index 2cfbe57fa036..e5448e7649df 100644 --- a/content/billing/concepts/index.md +++ b/content/billing/concepts/index.md @@ -11,6 +11,7 @@ topics: children: - /billing-cycles - /license-consumption + - /azure-subscriptions - /impact-of-plan-changes - /discounted-plans - /enterprise-billing @@ -18,4 +19,3 @@ children: - /third-party-payments contentType: concepts --- - diff --git a/content/billing/how-tos/set-up-payment/connect-azure-sub.md b/content/billing/how-tos/set-up-payment/connect-azure-sub.md index cfee56c80bdd..c201a2fd3623 100644 --- a/content/billing/how-tos/set-up-payment/connect-azure-sub.md +++ b/content/billing/how-tos/set-up-payment/connect-azure-sub.md @@ -1,6 +1,6 @@ --- title: Connecting an Azure subscription -intro: 'You can enable and pay for usage-based billing on {% data variables.location.product_location %} by connecting an Azure subscription.' +intro: 'You can enable and pay for usage-based billing on {% data variables.product.github %} by connecting an Azure subscription.' redirect_from: - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/connecting-an-azure-subscription-to-your-enterprise - /github/setting-up-and-managing-billing-and-payments-on-github/connecting-an-azure-subscription-to-your-enterprise @@ -13,113 +13,45 @@ versions: ghec: '*' ghes: '*' shortTitle: Connect Azure sub +permissions: 'Billing managers or owners' topics: - Billing contentType: how-tos --- +You can pay for metered usage of {% data variables.product.github %} features through Azure by connecting an Azure Subscription ID to your organization or enterprise account on {% data variables.product.github %}. See [AUTOTITLE](/billing/concepts/azure-subscriptions). {% data reusables.billing.usage-based-billing %} -## About connection of an Azure subscription - -You can pay for usage of {% data variables.product.github %} features through Azure by connecting an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif %} account on {% data variables.location.product_location %}. {% ifversion fpt %}For more information about organization accounts, see [AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/about-organizations).{% elsif ghec %} - -In this article, the instructions that you must follow to connect an Azure subscription depend on whether your company uses a single organization or an enterprise account on {% data variables.location.product_location %}. For more information about the differences between these two types of accounts, see [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts).{% endif %} - -{% ifversion ghec %} - -If you use {% data variables.product.prodname_ghe_cloud %} through a Microsoft Enterprise Agreement, connecting an Azure subscription is the only way to use {% data variables.product.prodname_GHAS %}, {% data variables.product.prodname_github_codespaces %}, or {% data variables.product.prodname_copilot %}, or to use {% data variables.product.prodname_actions %}, Git Large File Storage (LFS), or {% data variables.product.prodname_registry %} beyond your plan's included amounts. - -{% endif %} - -{% ifversion fpt or ghec %} - -## About usage-based billing on {% data variables.product.github %} - -{% data variables.product.github %} provides usage-based billing for the following products. - -* {% data variables.product.prodname_actions %}, see [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) -* {% data variables.product.prodname_github_codespaces %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces) -* {% data variables.product.prodname_registry %}, see [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages) -* {% data variables.large_files.product_name_long %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage) - -In addition, usage-based billing is available for the following licenses - -* {% data variables.product.prodname_enterprise %}, see [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise) -* {% data variables.product.prodname_copilot %}, see [AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot) -* {% data variables.product.prodname_GHAS %}, see [AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security) - -For information about controlling spending, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). - -{% endif %} - -## About billing through Azure - -If you link your {% data variables.product.company_short %} account to Azure, any usage-based costs starting from that point will be billed through Azure and charged on the 1st of each month. However, remaining {% data variables.product.company_short %} charges, for example charges for your {% data variables.product.prodname_dotcom %} plan, will still be billed on your usual billing date. - -For example, you link your Azure subscription to your organization {% ifversion ghec %}or enterprise{% endif %} account on June 16th and you also have a {% data variables.copilot.copilot_for_business %} subscription. From that date onwards, any usage costs for {% data variables.copilot.copilot_business_short %} will be included in your Azure bill and charged on July 1st. However, any charges incurred before June 16th for {% data variables.copilot.copilot_business_short %} will be billed separately through {% data variables.product.company_short %} on your account's usual billing date. - ## Prerequisites -* You must have {% ifversion ghec %}either {% endif %}an organization {% ifversion ghec %}or an enterprise {% endif %}account on {% data variables.location.product_location %}. For more information about the differences between these two types of accounts, see [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts). - - If the organization you want to connect an Azure subscription to belongs to an enterprise account, you must connect your Azure subscription to the enterprise account, not the organization. {% ifversion fpt %}See [the {% data variables.product.prodname_ghe_cloud %} version](/enterprise-cloud@latest/{{ currentArticle }}) of this article.{% endif %} +* You must be an owner of the {% data variables.product.github %} organization or enterprise account you want to connect to Azure. -* You must be an owner of the organization{% ifversion ghec %} or enterprise{% endif %} account. See {% ifversion fpt %}[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization).{% elsif ghec %}the following articles. +* You must know your Azure subscription ID. See [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. - * [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization) - * [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise) - {% endif %} - -* You must be logged into Azure as a user who is able to provide tenant-wide admin consent, which is required to install {% data variables.product.company_short %}'s Subscription Permission Validation app on the Azure AD tenant. The app requires read access to display a list of available subscriptions, and is only used during this one-time process of connecting the Azure subscription. See [Grant tenant-wide admin consent to an application](https://learn.microsoft.com/azure/active-directory/manage-apps/grant-admin-consent) in Microsoft Docs. - - * Alternatively, before following the instructions in this article, users who are not able to provide tenant-wide admin consent can work with an Azure AD global administrator to configure an admin consent workflow. See [User and admin consent in Azure Active Directory](https://learn.microsoft.com/en-us/azure/active-directory/manage-apps/user-admin-consent-overview#admin-consent-workflow) in Microsoft Docs. - - >[!NOTE] If your tenant provides user consent settings, users included in those settings might not require admin consent to install {% data variables.product.company_short %}'s Subscription Permission Validation app. See [User consent](https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/user-admin-consent-overview#user-consent) in Microsoft Docs. - -* To select an Azure subscription from the list of available subscriptions, the user must be an owner of the Azure subscription. See [Assign a user as an administrator of an Azure subscription](https://learn.microsoft.com/azure/role-based-access-control/role-assignments-portal-subscription-admin) in Microsoft docs. - -* You must know your Azure subscription ID. See [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 or [contact Azure support](https://azure.microsoft.com/support/). - -## Video demonstration of connecting a subscription - -To connect an Azure subscription, you'll need appropriate access permissions on both {% data variables.product.github %} and the Azure billing portal. This may require coordination between two different people. - -To see a demo of the process from beginning to end, see [Billing GitHub consumption through an Azure subscription](https://www.youtube.com/watch?v=Y-f7JKJ4_8Y) on {% data variables.product.company_short %}'s YouTube channel. This video demonstrates the process for an enterprise account. If you're connecting a subscription to an organization account, see [Connecting your Azure subscription to your organization account](/free-pro-team@latest/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-organization-account). - -{% ifversion fpt %} +* You must be logged into Azure as a user who is able to provide tenant-wide admin consent or arrange to work with an Azure AD global administrator to configure an admin consent workflow. See [AUTOTITLE](/billing/concepts/azure-subscriptions). ## Connecting your Azure subscription to your organization account -To connect your Azure subscription, you must have owner permissions to the Azure subscription and be an organization owner on {% data variables.product.prodname_dotcom %}. - -> [!NOTE] -> If your organization account on {% data variables.location.product_location %} belongs an enterprise account, you must connect your Azure subscription to the enterprise account instead of the organization account. See [Connecting your Azure subscription to your enterprise account](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-enterprise-account) in the {% data variables.product.prodname_ghe_cloud %} version of this article. - {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} 1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans**. 1. Under "Billing Management", to the right of "Metered billing via Azure", click **Add Azure Subscription**. -1. To sign in to your Microsoft account, follow the prompts. +1. Sign in to your Microsoft account. 1. Review the "Permissions requested" prompt. If you agree with the terms, click **Accept**. {% data reusables.enterprise-accounts.azure-admin-approval-required-message %} -1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your organization. {% data reusables.enterprise-accounts.tenant-app-permissions %} +1. Under "Select a subscription", select the Azure Subscription ID that you want to connect to your organization. {% data reusables.enterprise-accounts.connect-azure %} -{% endif %} - -{% ifversion ghec %} + {% data reusables.enterprise-accounts.tenant-app-permissions %} ## Connecting your Azure subscription to your enterprise account -To connect your Azure subscription, you must have owner permissions to the Azure subscription and be an enterprise owner on {% data variables.product.prodname_dotcom %}. - {% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.billing-tab-both-platforms %} +{% data reusables.billing.enterprise-billing-menu %} {% data reusables.enterprise-accounts.payment-information-tab-both-platforms %} 1. Under "Payment Information", click **Add Azure Subscription**. @@ -128,91 +60,29 @@ To connect your Azure subscription, you must have owner permissions to the Azure {% data reusables.enterprise-accounts.azure-admin-approval-required-message %} -1. Under "Select a subscription", select the Azure subscription ID that you want to connect to your enterprise. {% data reusables.enterprise-accounts.tenant-app-permissions %} - -{% data reusables.enterprise-accounts.connect-azure %} +1. Under "Select a subscription", select the Azure subscription ID that you want to connect to your enterprise. -{% endif %} - -{% ifversion fpt %} - -## Disconnecting your Azure subscription from your organization account - -After you disconnect your Azure subscription from your organization account, your usage can no longer exceed the amounts included with your plan. - -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} - -1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans**. -1. Under "Billing Management", then under "Metered billing via Azure", to the right of the subscription ID you want to disconnect, click **{% octicon "trash" aria-label="The trash icon" %}**. -1. Review the prompt, then click **Remove**. - -{% endif %} - -{% ifversion ghec %} - -## Disconnecting your Azure subscription from your enterprise account - -After you disconnect your Azure subscription from your enterprise account, your usage can no longer exceed the amounts included with your plan. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.billing-tab-both-platforms %} -{% data reusables.enterprise-accounts.payment-information-tab-both-platforms %} - -1. Under "Azure subscription", to the right of the subscription ID you want to disconnect, click **{% octicon "trash" aria-label="The trash icon" %}**. -1. Review the prompt, then click **Remove**. - {% endif %} - -## Troubleshooting connection of an Azure subscription - -You can troubleshoot some common issues with connection of an Azure subscription to your account on {% data variables.product.prodname_dotcom %}. - -### Message: "Need admin approval" - -If the user account you used to sign into Azure does not have adequate permissions to install the app that {% data variables.product.company_short %} uses to connect a subscription, you'll see a message with the following text. - -> **Need admin approval** -> -> GitHub Inc needs permission to access resources in your organization that only an admin can grant. Please ask an admin to grant permission to this app before you can use it. - -To avoid this message when you try again, you must either ensure that the Azure user can provide tenant-wide admin consent, or you must work with an Azure administrator to configure the admin consent workflow. For more information, review [Prerequisites](#prerequisites). - -{% ifversion ghec %} - -## Frequently asked questions about Azure subscriptions - -The following are answers to some common questions about connecting an Azure subscription to your account on {% data variables.product.prodname_dotcom %}. - -### Can I connect more than one enterprise or cost center to the same Azure subscription? - -Yes. There’s no limit to the number of enterprises or cost centers you can connect to a single Azure subscription. For details on how charges are applied to cost centers, see [AUTOTITLE](/billing/managing-your-billing/charging-business-units). - -### Can I connect multiple Azure subscriptions to one enterprise? - -Yes. You can connect multiple Azure subscriptions to a single enterprise account by creating **cost centers**. Cost centers let you allocate metered usage across different Azure subscriptions. - -### How are charges split in Azure for multiple enterprises? - -Azure usage is separated by **SKU** and either **enterprise ID** or **cost center ID**. The format used is `enterprise:sku` or `costcenter:sku`. + {% data reusables.enterprise-accounts.connect-azure %} -> [!NOTE] -> Azure currently shows internal IDs, which may make it difficult to identify the corresponding enterprise or cost center. + {% data reusables.enterprise-accounts.tenant-app-permissions %} -### What happens if I don’t assign an Azure subscription to a cost center? +## Editing or disconnecting your Azure subscription from an account -Charges will fall back to the **enterprise-level Azure subscription**. This also happens if a cost center becomes invalid or is deleted—any future usage from those resources is billed to the enterprise-level subscription. +If you disconnect your Azure subscription from your account, your usage can no longer exceed the amounts included with your plan. -### Can billing managers connect to Azure subscriptions? +1. Under "Billing Management", then under "Metered billing via Azure", to the right of the subscription ID you want change. -Yes. Billing managers for organizations or enterprises can connect Azure subscriptions. + * **Edit the subscription**: Click {% octicon "pencil" aria-label="Edit Azure Subscription" %} to edit your subscription. + * **Disconnect the subscription** Click {% octicon "trash" aria-label="Delete Azure Subscription" %} to remove the connection. -### Can I use metered products during an {% data variables.product.prodname_emu %} trial without connecting an Azure subscription? +## Video demonstration of connecting a subscription -Yes. During an **{% data variables.product.prodname_emu %} trial**, you can use metered products up to the included limits. To exceed the included limits, you’ll need to link an Azure subscription. +To connect an Azure subscription, you'll need appropriate access permissions on both {% data variables.product.github %} and the Azure billing portal. This may require coordination between two different people. -### What should I do if I see a banner saying my Azure ID is missing? +To see a demo of the process from beginning to end, see [Billing GitHub consumption through an Azure subscription](https://www.youtube.com/watch?v=Y-f7JKJ4_8Y) on {% data variables.product.company_short %}'s YouTube channel. This video demonstrates the process for an enterprise account. If you're connecting a subscription to an organization account, see [Connecting your Azure subscription to your organization account](/free-pro-team@latest/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-organization-account). -If you see this banner, it means your Azure payment method information is missing. To avoid service interruptions for your enterprise or organization, make sure to add this information before the date provided in the alert. +## Further reading -If you have questions or if you believe you are seeing this banner by mistake, contact {% data variables.contact.contact_support_page %}. -{% endif %} +* [AUTOTITLE](/billing/concepts/azure-subscriptions) +* [AUTOTITLE](/billing/reference/azure-subscription) +* [AUTOTITLE](/billing/how-tos/troubleshooting/azure-sub-connection) diff --git a/content/billing/how-tos/set-up-payment/manage-payment-info.md b/content/billing/how-tos/set-up-payment/manage-payment-info.md index 47826f2609a2..edecd82cbcee 100644 --- a/content/billing/how-tos/set-up-payment/manage-payment-info.md +++ b/content/billing/how-tos/set-up-payment/manage-payment-info.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 new billing platform.' +intro: 'Learn how to view and manage your payment information and billing contacts using the new billing platform.' versions: feature: enhanced-billing-platform redirect_from: @@ -21,135 +21,66 @@ topics: - Team - Receipts permissions: '{% data reusables.permissions.enhanced-billing-platform %}' -product: '{% data reusables.billing.enhanced-billing-platform-product %}' shortTitle: Manage payment info contentType: how-tos --- -You can view your payment information and history, and update your billing contacts. - -## Supported payment methods - -These are the supported payment methods for metered billing: - -* Invoice – Managed accounts only -* Credit card – Unmanaged accounts, or as a nonrecurring method for managed accounts -* PayPal – Unmanaged accounts, or as a nonrecurring method for managed accounts -* Azure Subscription ID – Not available for personal accounts -* Automated Clearing House (ACH) – Managed accounts only - -Accounts with volume licenses and metered billing can use multiple payment methods. - -* For unmanaged accounts, you might pay for volume licenses with a credit card or PayPal, and metered usage with an Azure Subscription ID. -* For managed accounts, you might pay for volume licenses via invoice, and metered usage via Azure Subscription ID. - -{% data variables.product.prodname_copilot_short %} standalone accounts, which traditionally used Azure Subscription IDs, can now also pay by credit card. Contact your {% data variables.product.github %} representative for details. - -{% 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.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/). - - * [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 - -## Connecting your Azure subscription - -After creation of your new enterprise on {% data variables.product.prodname_dotcom_the_website %}, to begin usage-based billing through Azure, you must connect your Azure subscription. - -> [!IMPORTANT] If you don't use {% data variables.product.prodname_emus %}, connection of an Azure subscription will immediately end your trial and begin paid usage. - -For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-enterprise-account). - -## 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_GHAS %}, usage and price excluding tax for each line item will appear as follows. - -| Product Family Usage Charges | Total (excluding Tax) | -| :- | :- | -| GH ENTERPRISE | AMOUNT | -| GH ADVANCED SECURITY | AMOUNT | - -For more information about your Azure invoice, see [Understand terms on your Microsoft Azure invoice](https://learn.microsoft.com/azure/cost-management-billing/understand/understand-invoice) in the Microsoft Docs. - -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 %} +The payment methods available depend on your account type. Enterprise and organization accounts have more payment options than personal accounts. Invoiced enterprise accounts make their payments using other methods. For more information, see [AUTOTITLE](/billing/reference/supported-payment-methods). ## Managing payment information -{% ifversion fpt %} - -You can view and edit your billing information and update your payment method. - 1. In the upper-right corner of any page on {% data variables.product.prodname_dotcom %}, click your profile picture. - * For **personal accounts**, click **Settings**, then in the **Access** section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. - * For **organizations**, click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. - -{% elsif ghec %} +1. Select the account you want to view and then access the "Billing & Licensing" pages: -You can view and edit your billing information, update your payment method, and view active coupons. + * **Personal accounts**: Click **Settings**, then in the **Access** section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. + * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. + * For **enterprises**, click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. ->[!NOTE] This does not apply to invoiced enterprise accounts. +1. From the list of "Billing & licensing" pages, click **Payment information** to display full details of your payment method. -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.billing.enterprise-billing-menu %} +1. To edit your payment method: -{% endif %} - -1. Click **Payment information**. -1. Click **Edit** to edit your payment information or **Remove** to delete your payment method. -1. Follow the prompts. + * **Bank card or PayPal**: In "Payment method", click **Edit** to update your payment information. + * **Azure subscription**: Under "Azure subscription", click {% octicon "pencil" aria-label="Edit Azure Subscription" %} to edit your subscription or {% octicon "trash" aria-label="Delete Azure Subscription" %} to remove your subscription. See [AUTOTITLE](/billing/how-tos/set-up-payment/connect-azure-sub). >[!NOTE] You may see an authorization hold on your provided payment method once its updated or after accruing significant usage of metered services. Authorization holds are temporary and are released as quickly as possible. -## Troubleshooting payment method issues +### Troubleshooting payment method issues -If you encounter issues when adding or updating your payment method, you can try the following: +If you encounter issues when adding or updating a payment method, you can try the following: 1. Retry adding your payment method. 1. Try adding a new payment method. -1. Reach out to {% data variables.contact.github_support %} or your customer representative for additional assistance. +1. Contact {% data variables.contact.github_support %} or your customer representative for additional assistance. ## Viewing payment history You can view your payment history, including the date, amount, and payment method. You can also download past payments. -1. Display the **Billing and Licensing** {% ifversion fpt %}section of the sidebar of the organization settings{% else %}page for the enterprise{% endif %}. -1. Click **Payment history**. +1. Display the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** pages. +1. Click **Payment history** to show details of payments. +1. To view the receipt for a payment, click {% octicon "eye" aria-label="View receipt" %}. +1. To download a receipt or invoice, click {% octicon "download" aria-label="Download" %} under "Receipt" or "Invoice". ## Managing billing contacts -You can add an email address to receive billing notifications regarding payments and budget threshold alerts. +Organizations and enterprises can add contacts to receive emails with billing notifications for payments and budget threshold alerts. One of the contacts is defined as the primary contact. -{% ifversion fpt %} +### Organization billing contacts -1. Display the **Billing and Licensing** section of the sidebar of the organization settings. +1. Display the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** page for the organization. 1. Click **Additional billing details**. 1. In the table of "Email recipients": - * Click **Add** and follow the prompt to add a new billing contact. - * Use the **Edit** drop-down for a contact to either remove the contact or make that contact the primary billing contact. + * Click **Add**, enter an email address, and click **Add** to add a new billing contact. + * Use the **Edit** drop-down for an existing contact to remove the contact or make that contact the primary billing contact. + * Click **Edit** to update the email address for the primary billing contact. -{% else %} +### Enterprise billing contacts -1. Display the **Billing and Licensing** page for the enterprise. +1. Display the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and Licensing** page for the enterprise. 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 a contact or make a contact the primary billing contact. - -{% endif %} +1. In the table of "Email recipients": + * Click **Add**, enter an email address, and click **Add** to add a new billing contact. + * Use the **{% octicon "kebab-horizontal" aria-label="Show options for ..." %}** drop-down for an existing contact to remove the contact or make that contact the primary billing contact. + * Click {% octicon "pencil" aria-label="Edit primary email address" %} to update the email address for the primary billing contact. diff --git a/content/billing/how-tos/troubleshooting/azure-sub-connection.md b/content/billing/how-tos/troubleshooting/azure-sub-connection.md new file mode 100644 index 000000000000..0ae9595d9008 --- /dev/null +++ b/content/billing/how-tos/troubleshooting/azure-sub-connection.md @@ -0,0 +1,32 @@ +--- +title: Troubleshooting Azure subscription connection problems +intro: 'Tips for resolving some common issues with connection of an Azure subscription to your account on {% data variables.product.github %}.' +versions: + fpt: '*' + ghec: '*' + ghes: '*' +topics: + - Billing + - Troubleshooting +shortTitle: Azure sub connection +contentType: how-tos +--- + +## Message: "Need admin approval" + +This message is displayed if the user account you used to sign into Azure does not have adequate permissions to install the {% data variables.product.github %} Subscription Permission Validation app (SPV app). {% data variables.product.github %} uses the SPV app during the connection process to get a list of available subscriptions from active directory. + +> **Need admin approval** +> +> GitHub Inc needs permission to access resources in your organization that only an admin can grant. Please ask an admin to grant permission to this app before you can use it. + + Installing the SPV app requires tenant-wide admin consent. You must sign into an Azure account that can provide tenant-wide admin consent, or work with an Azure administrator to configure the admin consent workflow. + +* [Grant tenant-wide admin consent to an application](https://learn.microsoft.com/azure/active-directory/manage-apps/grant-admin-consent) in Microsoft Docs +* [User and admin consent in Azure Active Directory](https://learn.microsoft.com/en-us/azure/active-directory/manage-apps/user-admin-consent-overview#admin-consent-workflow) in Microsoft Docs. + +>[!TIP] If your tenant provides user consent settings, users included in those settings might not require admin consent to install the {% data variables.product.company_short %} SVP app. See [User consent](https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/user-admin-consent-overview#user-consent) in Microsoft Docs. + +## Banner saying my Azure ID is missing + +If you see this banner, it means your Azure payment method information is missing. To avoid service interruptions for your enterprise or organization, update your Azure subscription connection as soon as possible. See [AUTOTITLE](/billing/how-tos/set-up-payment/connect-azure-sub). diff --git a/content/billing/how-tos/troubleshooting/index.md b/content/billing/how-tos/troubleshooting/index.md index ac2ac1370eae..8fe421e70c51 100644 --- a/content/billing/how-tos/troubleshooting/index.md +++ b/content/billing/how-tos/troubleshooting/index.md @@ -11,7 +11,7 @@ topics: children: - /declined-card - /locked-account + - /azure-sub-connection - /enterprise-license-usage contentType: how-tos --- - diff --git a/content/billing/reference/azure-subscription.md b/content/billing/reference/azure-subscription.md new file mode 100644 index 000000000000..cfd70bd992b3 --- /dev/null +++ b/content/billing/reference/azure-subscription.md @@ -0,0 +1,50 @@ +--- +title: Azure subscription reference +shortTitle: Azure subscription +intro: 'Reference information for connecting an Azure subscription to pay for usage of {% data variables.product.github %}.' +versions: + fpt: '*' + ghec: '*' + ghes: '*' +topics: + - Billing + - Enterprise + - Team +contentType: reference +--- + +## Enterprises and cost centers + +There’s no limit to the number of enterprises or cost centers you can connect to a single Azure subscription. + +If you want to use multiple Azure subscriptions to pay for usage in one enterprise account, you need to create **cost centers**. You can connect each cost center to a different Azure subscription. If a cost center is not connected to an Azure subscription, the usage is charged to Azure subscription of the enterprise account. This also happens if a cost center becomes invalid or is deleted—any future usage from those resources is billed to the enterprise subscription. + +For details on how charges are applied to cost centers, see {% ifversion fpt or ghec %}[AUTOTITLE](/billing/managing-your-billing/charging-business-units){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-billing/charging-business-units) in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. + +## Azure invoices + +After you connect your Azure subscription, usage for {% data variables.product.github %}'s products are included on your Azure invoice, summarized by product family. Azure usage is separated by **SKU** and either **enterprise ID** or **cost center ID**. The format used is `enterprise:sku` or `costcenter:sku`. + +> [!NOTE] +> Azure currently shows internal IDs, which may make it difficult to identify the corresponding enterprise or cost center. + +### Invoice example + +For example, if you use Azure to pay for {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_GHAS %}, usage and price excluding tax for each line item will appear as follows. + +| Product Family Usage Charges | Total (excluding Tax) | +| :- | :- | +| GH ENTERPRISE | AMOUNT | +| GH ADVANCED SECURITY | AMOUNT | + +For more information about your Azure invoice, see [Understand terms on your Microsoft Azure invoice](https://learn.microsoft.com/azure/cost-management-billing/understand/understand-invoice) in the Microsoft Docs. + +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. + +## {% data variables.product.prodname_emu %} trials + +During an **{% data variables.product.prodname_emu %} trial**, you can use metered products up to the included limits. To exceed the included limits, you’ll need to link an Azure subscription. + +> [!IMPORTANT] If you don't use {% data variables.product.prodname_emus %} in your trial of {% data variables.product.prodname_ghe_cloud %}, connecting an Azure subscription will immediately end your trial and begin paid usage. + +For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-enterprise-account). diff --git a/content/billing/reference/index.md b/content/billing/reference/index.md index 1897962cfd74..0e45eaff63c1 100644 --- a/content/billing/reference/index.md +++ b/content/billing/reference/index.md @@ -11,8 +11,9 @@ topics: children: - /product-usage-included - /usage-reports + - /supported-payment-methods + - /azure-subscription - /billing-roles - /license-usage-calculation contentType: reference --- - diff --git a/content/billing/reference/supported-payment-methods.md b/content/billing/reference/supported-payment-methods.md new file mode 100644 index 000000000000..c8410899f011 --- /dev/null +++ b/content/billing/reference/supported-payment-methods.md @@ -0,0 +1,53 @@ +--- +title: Supported payment methods for GitHub +intro: 'Reference information detailing the supported payment methods for {% data variables.product.github %}.' +versions: + fpt: '*' + ghec: '*' + ghes: '*' +topics: + - Billing +shortTitle: Supported payment methods +contentType: reference +--- + +## Metered or usage-based billing options + +The supported payment methods for metered billing: + +* Invoice – Managed accounts only +* Credit card – Unmanaged accounts, or as a nonrecurring method for managed accounts +* PayPal – Unmanaged accounts, or as a nonrecurring method for managed accounts +* Azure Subscription ID – Not available for personal accounts +* Automated Clearing House (ACH) – Managed accounts only + +Accounts with volume licenses and metered billing can use multiple payment methods. + +* For unmanaged accounts, you might pay for volume licenses with a credit card or PayPal, and metered usage with an Azure Subscription ID. +* For managed accounts, you might pay for volume licenses via invoice, and metered usage via Azure Subscription ID. + +{% data variables.product.prodname_copilot_short %} standalone accounts, which traditionally used Azure Subscription IDs, can now also pay by credit card. Contact your {% data variables.product.github %} representative for details. + +{% ifversion fpt or ghec %} + +## Usage-based billing availability + +{% data variables.product.github %} provides usage-based billing for the following products. + +* {% data variables.product.prodname_actions %}, see [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) +* {% data variables.product.prodname_github_codespaces %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces) +* {% data variables.product.prodname_registry %}, see [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages) +* {% data variables.large_files.product_name_long %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage) + +In addition, usage-based billing is available for the following licenses: + +* {% data variables.product.prodname_enterprise %}, see [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise) +* {% data variables.product.prodname_copilot %}, see [AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot) +* {% data variables.product.prodname_GHAS %}, see [AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security) + +For information about controlling spending, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). + +> [!NOTE] +> Prepaid usage is not currently available for usage-based billing through Azure. + +{% endif %} diff --git a/data/allowed-topics.js b/data/allowed-topics.js index 3542ffb8d018..39362c977d5f 100644 --- a/data/allowed-topics.js +++ b/data/allowed-topics.js @@ -32,6 +32,7 @@ export default [ 'Azure Kubernetes Service', 'Azure Pipelines', 'Azure Static Web Apps', + 'Azure subscription', 'Azure Virtual Network', 'Backups', 'Billing', diff --git a/data/reusables/billing/usage-based-billing.md b/data/reusables/billing/usage-based-billing.md index ea3110f0dc1e..7e4abc044f2a 100644 --- a/data/reusables/billing/usage-based-billing.md +++ b/data/reusables/billing/usage-based-billing.md @@ -1,7 +1,5 @@ {% 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. - -> [!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. +> [!NOTE] 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. {% endif %} diff --git a/data/reusables/enterprise-accounts/azure-admin-approval-required-message.md b/data/reusables/enterprise-accounts/azure-admin-approval-required-message.md index 208448283142..30491ef7038a 100644 --- a/data/reusables/enterprise-accounts/azure-admin-approval-required-message.md +++ b/data/reusables/enterprise-accounts/azure-admin-approval-required-message.md @@ -1 +1 @@ -If you don't see a "Permissions requested" prompt, and instead see a message indicating that you need admin approval, see [Message: "Need admin approval"](#message-need-admin-approval). +If you don't see a "Permissions requested" prompt, and instead see a message indicating that you need admin approval, see [AUTOTITLE](/billing/how-tos/troubleshooting/azure-sub-connection). diff --git a/data/reusables/enterprise-accounts/payment-information-tab-both-platforms.md b/data/reusables/enterprise-accounts/payment-information-tab-both-platforms.md index 4123d2e2e5ac..07a27a91dd3e 100644 --- a/data/reusables/enterprise-accounts/payment-information-tab-both-platforms.md +++ b/data/reusables/enterprise-accounts/payment-information-tab-both-platforms.md @@ -1 +1 @@ -1. Under "Billing & Licensing" (new platform) or "Billing", click **Payment information**. +1. Under "Billing & Licensing", click **Payment information**. diff --git a/data/reusables/enterprise-accounts/tenant-app-permissions.md b/data/reusables/enterprise-accounts/tenant-app-permissions.md index 5924476e7d6c..2345edb8886d 100644 --- a/data/reusables/enterprise-accounts/tenant-app-permissions.md +++ b/data/reusables/enterprise-accounts/tenant-app-permissions.md @@ -1 +1 @@ -To select an Azure subscription, you must have owner permissions to the subscription. If the default tenant does not have the right permissions, you may need to specify a different tenant ID. For more information, see [Prerequisites](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#prerequisites) and [Microsoft identity platform and OAuth 2.0 authorization code flow](https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow#request-an-authorization-code) in Microsoft Docs. +To select an Azure subscription, you must have owner permissions to the subscription. If the default tenant does not have the right permissions, you may need to specify a different tenant ID. For more information, see [AUTOTITLE](/billing/concepts/azure-subscriptions) and [Microsoft identity platform and OAuth 2.0 authorization code flow](https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow#request-an-authorization-code) in Microsoft Docs.