diff --git a/assets/images/help/business-accounts/add-administrator-add-button.png b/assets/images/help/business-accounts/add-administrator-add-button.png new file mode 100644 index 0000000000..51fac369b7 Binary files /dev/null and b/assets/images/help/business-accounts/add-administrator-add-button.png differ diff --git a/assets/images/help/business-accounts/add-owner-button.png b/assets/images/help/business-accounts/add-owner-button.png new file mode 100644 index 0000000000..1177727ffc Binary files /dev/null and b/assets/images/help/business-accounts/add-owner-button.png differ diff --git a/assets/images/help/business-accounts/ghes-remove-owner.png b/assets/images/help/business-accounts/ghes-remove-owner.png new file mode 100644 index 0000000000..43f771f835 Binary files /dev/null and b/assets/images/help/business-accounts/ghes-remove-owner.png differ diff --git a/assets/images/help/business-accounts/invite-admins-modal-button.png b/assets/images/help/business-accounts/invite-admins-modal-button.png index b2a05dad90..ab085e522d 100644 Binary files a/assets/images/help/business-accounts/invite-admins-modal-button.png and b/assets/images/help/business-accounts/invite-admins-modal-button.png differ diff --git a/content/admin/advanced-security/about-licensing-for-github-advanced-security.md b/content/admin/advanced-security/about-licensing-for-github-advanced-security.md deleted file mode 100644 index 5439b12d30..0000000000 --- a/content/admin/advanced-security/about-licensing-for-github-advanced-security.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -title: About licensing for GitHub Advanced Security -intro: 'You need a license to use {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_secret_scanning %}.' -product: '{% data reusables.gated-features.ghas %}' -versions: - ghes: '>=3.1' -type: overview -topics: - - Advanced Security - - Enterprise - - Licensing - - Security -shortTitle: Licensing ---- - -## About licensing for {% data variables.product.prodname_GH_advanced_security %} - -You can make extra features for code security available to users by buying and uploading a license for {% data variables.product.prodname_GH_advanced_security %}. For more information about {% data variables.product.prodname_GH_advanced_security %}, see "[About {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)." - -{% data reusables.advanced-security.license-overview %} - -To discuss licensing {% data variables.product.prodname_GH_advanced_security %} for {% data variables.product.product_name %}, contact {% data variables.contact.contact_enterprise_sales %}. To enable {% data variables.product.prodname_GH_advanced_security %}, see "[Enabling {% data variables.product.prodname_GH_advanced_security %} for your appliance](/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise)." - -## About committer numbers for {% data variables.product.prodname_GH_advanced_security %} - -{% data reusables.advanced-security.about-committer-numbers-ghec-ghes %} - -## Managing your license usage for {% data variables.product.prodname_GH_advanced_security %} - -{% data reusables.advanced-security.managing-license-usage-ghec-ghes %} - -You can enforce policies to allow or disallow the use of {% data variables.product.prodname_advanced_security %} by organizations owned by your enterprise account. For more information, see "[Enforcing policies for {% data variables.product.prodname_advanced_security %} in your enterprise](/admin/policies/enforcing-policies-for-advanced-security-in-your-enterprise)." - -For more information on viewing license usage, see "[Viewing your {% data variables.product.prodname_GH_advanced_security %} usage](/admin/advanced-security/viewing-your-github-advanced-security-usage)." - -## Getting the most out of your {% data variables.product.prodname_GH_advanced_security %} license - -{% data reusables.advanced-security.getting-the-most-from-your-license %} diff --git a/content/admin/advanced-security/configuring-code-scanning-for-your-appliance.md b/content/admin/advanced-security/configuring-code-scanning-for-your-appliance.md index 9d415da2f5..3b6fa47753 100644 --- a/content/admin/advanced-security/configuring-code-scanning-for-your-appliance.md +++ b/content/admin/advanced-security/configuring-code-scanning-for-your-appliance.md @@ -29,7 +29,7 @@ You can configure {% data variables.product.prodname_code_scanning %} to run {% ## Prerequisites for {% data variables.product.prodname_code_scanning %} -- A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes > 3.0 %} (see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/admin/advanced-security/about-licensing-for-github-advanced-security)"){% endif %} +- A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes > 3.0 %} (see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %} - {% data variables.product.prodname_code_scanning_capc %} enabled in the management console (see "[Enabling {% data variables.product.prodname_GH_advanced_security %} for your enterprise](/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise)") diff --git a/content/admin/advanced-security/configuring-secret-scanning-for-your-appliance.md b/content/admin/advanced-security/configuring-secret-scanning-for-your-appliance.md index 96171027b3..573d651406 100644 --- a/content/admin/advanced-security/configuring-secret-scanning-for-your-appliance.md +++ b/content/admin/advanced-security/configuring-secret-scanning-for-your-appliance.md @@ -27,7 +27,7 @@ topics: - The [SSSE3](https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-optimization-manual.pdf#G3.1106470) (Supplemental Streaming SIMD Extensions 3) CPU flag needs to be enabled on the VM/KVM that runs {% data variables.product.product_location %}. -- A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes > 3.0 %} (see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/admin/advanced-security/about-licensing-for-github-advanced-security)"){% endif %} +- A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes > 3.0 %} (see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %} - {% data variables.product.prodname_secret_scanning_caps %} enabled in the management console (see "[Enabling {% data variables.product.prodname_GH_advanced_security %} for your enterprise](/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise)") diff --git a/content/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise.md b/content/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise.md index 9a418cc51b..e55022c792 100644 --- a/content/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise.md +++ b/content/admin/advanced-security/enabling-github-advanced-security-for-your-enterprise.md @@ -26,9 +26,10 @@ When you enable {% data variables.product.prodname_GH_advanced_security %} for y ## Prerequisites for enabling {% data variables.product.prodname_GH_advanced_security %} -1. Upgrade your license for {% data variables.product.product_name %} to include {% data variables.product.prodname_GH_advanced_security %}.{% ifversion ghes > 3.0 %} For information about licensing, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/admin/advanced-security/about-licensing-for-github-advanced-security)."{% endif %} -2. Upload the new license to {% data variables.product.product_location %}. For more information, see "[Managing your GitHub Enterprise license](/admin/overview/managing-your-github-enterprise-license#downloading-a-new-license-and-uploading-it-to-github-enterprise-server)."{% ifversion ghes > 2.22 %} -3. Review the prerequisites for the features you plan to enable. +1. Upgrade your license for {% data variables.product.product_name %} to include {% data variables.product.prodname_GH_advanced_security %}.{% ifversion ghes > 3.0 %} For information about licensing, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %} +2. Download the new license file. For more information, see "[Downloading your license for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise)." +3. Upload the new license file to {% data variables.product.product_location %}. For more information, see "[Uploading a new license to {% data variables.product.prodname_ghe_server %}](/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server)."{% ifversion ghes > 2.22 %} +4. Review the prerequisites for the features you plan to enable. - {% data variables.product.prodname_code_scanning_capc %}, see "[Configuring {% data variables.product.prodname_code_scanning %} for your appliance](/admin/advanced-security/configuring-code-scanning-for-your-appliance#prerequisites-for-code-scanning)." - {% data variables.product.prodname_secret_scanning_caps %}, see "[Configuring {% data variables.product.prodname_secret_scanning %} for your appliance](/admin/advanced-security/configuring-secret-scanning-for-your-appliance#prerequisites-for-secret-scanning)."{% endif %} diff --git a/content/admin/advanced-security/index.md b/content/admin/advanced-security/index.md index 0edc537021..7e8287a691 100644 --- a/content/admin/advanced-security/index.md +++ b/content/admin/advanced-security/index.md @@ -11,7 +11,6 @@ versions: topics: - Enterprise children: - - /about-licensing-for-github-advanced-security - /enabling-github-advanced-security-for-your-enterprise - /configuring-code-scanning-for-your-appliance - /configuring-secret-scanning-for-your-appliance diff --git a/content/admin/advanced-security/viewing-your-github-advanced-security-usage.md b/content/admin/advanced-security/viewing-your-github-advanced-security-usage.md index 0a1ad9ce38..baca2303db 100644 --- a/content/admin/advanced-security/viewing-your-github-advanced-security-usage.md +++ b/content/admin/advanced-security/viewing-your-github-advanced-security-usage.md @@ -10,7 +10,9 @@ topics: shortTitle: View Advanced Security usage --- -{% data reusables.advanced-security.about-ghas-license-seats %} For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/admin/advanced-security/about-licensing-for-github-advanced-security)." +## About licenses for {% data variables.product.prodname_GH_advanced_security %} + +{% data reusables.advanced-security.about-ghas-license-seats %} For more information, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." ## Viewing license usage for {% data variables.product.prodname_GH_advanced_security %} diff --git a/content/admin/configuration/configuring-your-enterprise/accessing-the-management-console.md b/content/admin/configuration/configuring-your-enterprise/accessing-the-management-console.md index eff92a3874..ffc53c7878 100644 --- a/content/admin/configuration/configuring-your-enterprise/accessing-the-management-console.md +++ b/content/admin/configuration/configuring-your-enterprise/accessing-the-management-console.md @@ -34,7 +34,7 @@ To access the {% data variables.enterprise.management_console %}, you must use t ## Accessing the {% data variables.enterprise.management_console %} as a site administrator -The first time that you access the {% data variables.enterprise.management_console %} as a site administrator, you must upload your {% data variables.product.prodname_enterprise %} license file to authenticate into the app. For more information, see "[Managing your {% data variables.product.prodname_enterprise %} license](/enterprise/{{ currentVersion }}/admin/guides/installation/managing-your-github-enterprise-license)." +The first time that you access the {% data variables.enterprise.management_console %} as a site administrator, you must upload your {% data variables.product.prodname_enterprise %} license file to authenticate into the app. For more information, see "[Managing your license for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise)." {% data reusables.enterprise_site_admin_settings.access-settings %} {% data reusables.enterprise_site_admin_settings.management-console %} diff --git a/content/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud.md b/content/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud.md index 3093bd7998..d6d43a957d 100644 --- a/content/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud.md +++ b/content/admin/configuration/managing-connections-between-github-enterprise-server-and-github-enterprise-cloud/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud.md @@ -17,7 +17,7 @@ shortTitle: Enable user license sync --- ## About license synchronization -After you enable license synchronization, you'll be able to view license usage for your entire enterprise account, across {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. {% data variables.product.prodname_github_connect %} syncs license between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} weekly. For more information, see "[Managing your {% data variables.product.prodname_enterprise %} license](/enterprise/{{currentVersion}}/admin/installation/managing-your-github-enterprise-license)." +After you enable license synchronization, you'll be able to view license usage for your entire enterprise account, across {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. {% data variables.product.prodname_github_connect %} syncs license between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} weekly. For more information, see "[Managing your license for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise)." You can also manually upload {% data variables.product.prodname_ghe_server %} user license information to {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Connecting {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{ currentVersion }}/admin/guides/installation/connecting-github-enterprise-server-to-github-enterprise-cloud)." diff --git a/content/admin/index.md b/content/admin/index.md index 68a9bc5f42..53be141c07 100644 --- a/content/admin/index.md +++ b/content/admin/index.md @@ -8,7 +8,7 @@ changelog: label: enterprise featuredLinks: guides: - - '{% ifversion ghae %}/admin/overview/managing-billing-for-your-enterprise{% endif %}' + - '{% ifversion ghae %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}' - '{% ifversion ghae %}/admin/user-management/auditing-users-across-your-enterprise{% endif %}' - '{% ifversion ghae %}/admin/configuration/restricting-network-traffic-to-your-enterprise{% endif %}' - '{% ifversion ghes %}/admin/configuration/configuring-backups-on-your-appliance{% endif %}' @@ -27,7 +27,7 @@ featuredLinks: - '{% ifversion ghes %}/admin/installation{% endif %}' - '{% ifversion ghae %}/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad{% endif %}' - '{% ifversion ghae %}/admin/overview/about-upgrades-to-new-releases{% endif %}' - - '{% ifversion ghes %}/admin/overview/managing-your-github-enterprise-license{% endif %}' + - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise{% endif %}' - '{% ifversion ghes %}/admin/configuration/command-line-utilities{% endif %}' - /admin/enterprise-support/about-github-enterprise-support layout: product-landing diff --git a/content/admin/overview/about-enterprise-accounts.md b/content/admin/overview/about-enterprise-accounts.md index accda8f3e7..7329d69801 100644 --- a/content/admin/overview/about-enterprise-accounts.md +++ b/content/admin/overview/about-enterprise-accounts.md @@ -1,6 +1,6 @@ --- title: About enterprise accounts -intro: 'With {% data variables.product.product_name %}, you can use an enterprise account to give administrators a single point of visibility and management{% ifversion ghes %} for billing and license usage{% endif %}.' +intro: 'With {% data variables.product.product_name %}, you can use an enterprise account to give administrators a single point of visibility and management.' redirect_from: - /enterprise/admin/installation/about-enterprise-accounts - /enterprise/admin/overview/about-enterprise-accounts @@ -14,27 +14,4 @@ topics: - Fundamentals --- -## About enterprise accounts on {% data variables.product.product_name %} - -An enterprise account allows you to manage multiple organizations{% ifversion ghes %} and {% data variables.product.prodname_ghe_server %} instances{% else %} on {% data variables.product.product_name %}{% endif %}. Your enterprise account must have a handle, like an organization or personal account on {% data variables.product.prodname_dotcom %}. Enterprise administrators can manage settings and preferences, like: - -- Member access and management (organization members, outside collaborators){% ifversion ghes %} -- Billing and usage ({% data variables.product.prodname_ghe_server %} instances, user licenses, {% data variables.large_files.product_name_short %} packs){% endif %} -- Security {% ifversion ghes %}(single sign-on, two factor authentication) -- Requests {% ifversion ghes %}and support bundle sharing {% endif %}with {% data variables.contact.enterprise_support %}{% endif %} - -{% ifversion ghes %}{% data reusables.enterprise-accounts.enterprise-accounts-billing %} For more information about the management of your {% data variables.product.prodname_ghe_cloud %} subscription, see "[Viewing the subscription and usage for your enterprise account](/articles/viewing-the-subscription-and-usage-for-your-enterprise-account)." {% endif %}For more information about managing your {% data variables.product.product_name %} billing settings, see "[Managing billing for your enterprise](/admin/overview/managing-billing-for-your-enterprise)." - -For more information about the management of users, organizations, data, and policies for {% data variables.product.product_location %}, see "[Managing users, organizations, and repositories](/admin/user-management)" and "[Setting policies for your enterprise](/admin/policies)." - -For more information about the management of enterprise accounts using the GraphQL API, see "[Enterprise accounts](/graphql/guides/managing-enterprise-accounts)." - -{% ifversion ghes %} - -For more information about the differences between {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, see "[{% data variables.product.prodname_dotcom %}'s products](/articles/githubs-products)." To upgrade to {% data variables.product.prodname_enterprise %} or to get started with an enterprise account, contact {% data variables.contact.contact_enterprise_sales %}. - -## Managing {% data variables.product.prodname_ghe_server %} licenses linked to your enterprise account - -{% data reusables.enterprise-accounts.admin-managing-licenses %} - -{% endif %} +{% data reusables.enterprise-accounts.about-enterprise-accounts %} diff --git a/content/admin/overview/index.md b/content/admin/overview/index.md index 149246e217..cd450137d9 100644 --- a/content/admin/overview/index.md +++ b/content/admin/overview/index.md @@ -11,8 +11,6 @@ children: - /about-upgrades-to-new-releases - /about-data-residency - /about-enterprise-accounts - - /managing-your-github-enterprise-license - - /managing-billing-for-your-enterprise - /system-overview - /about-the-github-enterprise-api --- diff --git a/content/admin/overview/managing-billing-for-your-enterprise.md b/content/admin/overview/managing-billing-for-your-enterprise.md deleted file mode 100644 index e159ccb7ee..0000000000 --- a/content/admin/overview/managing-billing-for-your-enterprise.md +++ /dev/null @@ -1,82 +0,0 @@ ---- -title: Managing billing for your enterprise -intro: You can view billing information for your enterprise. -product: '{% data reusables.gated-features.enterprise-accounts %}' -redirect_from: - - /enterprise/admin/installation/managing-billing-for-github-enterprise - - /enterprise/admin/overview/managing-billing-for-github-enterprise - - /admin/overview/managing-billing-for-github-enterprise -versions: - ghes: '*' - ghae: '*' -topics: - - Enterprise -shortTitle: Manage billing ---- - -{% ifversion ghae %} - -{% data reusables.github-ae.about-billing %} Once per day, {% data variables.product.prodname_dotcom %} will count the number of users with a license for your enterprise. {% data variables.product.company_short %} bills you for each licensed user regardless of whether the user logged into {% data variables.product.prodname_ghe_managed %} that day. - -For commercial regions, the price per user per day is $1.2580645161. For 31-day months, the monthly cost for each user is $39. For months with fewer days, the monthly cost is lower. Each billing month begins at a fixed time on the first day of the calendar month. - -If you add a licensed user mid-month, that user will only be included in the count for the days they have a license. When you remove a licensed user, that user will remain in the count until the end of that month. Therefore, if you add a user mid-month and later remove the user in the same month, the user will be included in the count from the day the user was added through the end of the month. There is no additional cost if you re-add a user during the same month the user was removed. - -For example, here are the costs for users with licenses on different dates. - -User | License dates | Counted days | Cost ----- | ------------ | ------- | ----- -@octocat | January 1 - January 31 | 31 | $39 -@robocat | February 1 - February 28 | 28 | $35.23 -@devtocat | January 15 - January 31 | 17 | $21.39 -@doctocat | January 1 - January 15 | 31 | $39 -@prodocat | January 7 - January 15 | 25 | $31.45 -@monalisa | January 1 - January 7,
January 15 - January 31 | 31 | $39 - -{% data variables.product.prodname_ghe_managed %} has a 500-user minimum per instance. {% data variables.product.company_short %} bills you for a minimum of 500 users per instance, even if there are fewer than 500 users with a license that day. - -You can see your current usage in your [Azure account portal](https://portal.azure.com). - -{% else %} - -## About billing for enterprise accounts - -Enterprise accounts are currently available to {% data variables.product.prodname_enterprise %} customers paying by invoice. Billing for all of the organizations and {% data variables.product.prodname_ghe_server %} instances connected to your enterprise account is aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services (including paid licenses in organizations, {% data variables.large_files.product_name_long %} data packs, and subscriptions for {% data variables.product.prodname_marketplace %} apps). - -Enterprise owners and billing managers can access and manage all billing settings for enterprise accounts. For more information about enterprise accounts, {% ifversion fpt or ghae %}"[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise#enterprise-members)" and {% endif %}"[Repository permission levels for an organization](/articles/repository-permission-levels-for-an-organization)."For more information about managing billing managers, see "[Inviting people to manage your enterprise](/github/setting-up-and-managing-your-enterprise/inviting-people-to-manage-your-enterprise)." - -## Viewing your current invoice - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -4. Under "Quick Actions", click **View invoice**. - ![View invoice link](/assets/images/help/business-accounts/view-invoice-link.png) - -## Paying your current invoice - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -4. Under "Quick Actions", click **Pay invoice**. - ![Pay invoice link](/assets/images/help/business-accounts/pay-invoice-link.png) -5. Under "Pay invoice", type your credit card information in the secure form, then click **Pay Invoice**. - ![Confirm and pay invoice](/assets/images/help/business-accounts/pay-invoice.png) - -## Downloading your current invoice - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -4. Under "Quick Actions", click **Download current invoice**. - ![Download current invoice link](/assets/images/help/business-accounts/download-current-invoice.png) - -## Viewing your payment history - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -4. Under "Billing", click the **Past Invoices** tab to see a summary of your past billing activity. - ![View payment history tab](/assets/images/help/business-accounts/view-payment-history.png) - -{% endif %} diff --git a/content/admin/overview/managing-your-github-enterprise-license.md b/content/admin/overview/managing-your-github-enterprise-license.md deleted file mode 100644 index 88fa71bd36..0000000000 --- a/content/admin/overview/managing-your-github-enterprise-license.md +++ /dev/null @@ -1,108 +0,0 @@ ---- -title: Managing your GitHub Enterprise license -intro: 'You can view, manage, and update your {% data variables.product.prodname_enterprise %} license.' -redirect_from: - - /enterprise/admin/installation/managing-your-github-enterprise-license - - /enterprise/admin/categories/licenses/ - - /enterprise/admin/articles/license-files/ - - /enterprise/admin/installation/about-license-files/ - - /enterprise/admin/articles/downloading-your-license/ - - /enterprise/admin/installation/downloading-your-license/ - - /enterprise/admin/articles/upgrading-your-license/ - - /enterprise/admin/installation/updating-your-license/ - - /enterprise/admin/installation/managing-your-github-enterprise-server-license - - /enterprise/admin/overview/managing-your-github-enterprise-license -versions: - ghes: '*' -topics: - - Enterprise -shortTitle: Manage your license ---- - -## About {% data variables.product.prodname_enterprise %} licenses - -When you purchase or renew {% data variables.product.prodname_enterprise %}, you receive a license file to validate your application. A license file has an expiration date and controls the number of user licenses you can add to {% data variables.product.prodname_enterprise %}. After you download and install {% data variables.product.prodname_enterprise %}, uploading the license file unlocks the application for you to use. For more information about downloading {% data variables.product.prodname_enterprise %}, see the [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website. For information about setting up {% data variables.product.product_location %}, see "[Setting up a {% data variables.product.prodname_enterprise %} instance](/admin/installation/setting-up-a-github-enterprise-server-instance)." - - -You can allocate the user licenses included in your {% data variables.product.prodname_enterprise %} license to users in {% data variables.product.product_location_enterprise %} and a {% data variables.product.prodname_ghe_cloud %} enterprise account. When you add a user to either environment, they will consume a license. If a user has accounts in both environments, to consume only one license, their primary {% data variables.product.prodname_enterprise %} email address must be the same as their verified {% data variables.product.prodname_ghe_cloud %} email address. You can sync license count and usage between the environments. - -If your {% data variables.product.prodname_ghe_server %} license expires, you won't be able to access {% data variables.product.product_location_enterprise %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)." If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}. - -You can download your {% data variables.product.prodname_ghe_server %} license from your [enterprise account](https://enterprise.github.com/download). For more information, see "[Managing your {% data variables.product.prodname_enterprise %} license](/admin/overview/managing-your-github-enterprise-license#downloading-a-new-license-and-uploading-it-to-github-enterprise-server)." - -## Downloading a new license and uploading it to {% data variables.product.prodname_ghe_server %} - - -After you purchase a new license or upgrade an existing license from {% data variables.contact.contact_enterprise_sales %}, you must download your new license file, then upload the file to {% data variables.product.prodname_ghe_server %} to unlock your new user licenses. - -If you'd like to renew or add user licenses to {% data variables.product.prodname_enterprise %}, contact {% data variables.contact.contact_enterprise_sales %}. Your new license file will be available for download immediately after you complete your order. - -{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} -{% data reusables.enterprise-accounts.settings-tab %} -3. In the left sidebar, click **Enterprise licensing**. - !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) -4. Under "Enterprise Server Instances", click {% octicon "download" aria-label="The download icon" %} to download your license file. - ![Download GitHub Enterprise Server license](/assets/images/help/business-accounts/download-ghes-license.png) -5. Log into your {% data variables.product.prodname_ghe_server %} instance as a site administrator. -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.license-tab %} -12. Under "Quick links", click **Update license**. - ![Update license link](/assets/images/enterprise/business-accounts/update-license-link.png) -13. To select your license, click **License file**, or drag your license file onto **License file**. - ![Upload license file](/assets/images/enterprise/management-console/upload-license.png) -14. Click **Upload**. - ![Begin upload](/assets/images/enterprise/management-console/begin-upload.png) - -{% ifversion ghes < 3.0 %}If the web UI for {% data variables.product.prodname_ghe_server %} doesn't reflect your updated license immediately, see "[Troubleshooting](#troubleshooting)."{% endif %} - -## Viewing license usage - -{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} -{% data reusables.enterprise-accounts.settings-tab %} -3. In the left sidebar, click **Enterprise licensing**. - !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) -4. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses. {% ifversion ghes > 3.0 %}If your license includes {% data variables.product.prodname_GH_advanced_security %}, you can review your total seat use as well as a per-organization breakdown of committers. For more information, see "[Managing {% data variables.product.prodname_GH_advanced_security %} for your enterprise](/admin/advanced-security)."{% endif %} - -## Automatically syncing user license usage with {% data variables.product.prodname_ghe_cloud %} - -You can use {% data variables.product.prodname_github_connect %} to automatically sync user license count and usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Enabling automatic user license sync between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/enterprise/{{currentVersion}}/admin/installation/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud)." - -## Manually syncing user license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} - -You can download a JSON file from {% data variables.product.prodname_ghe_server %} and upload the file to {% data variables.product.prodname_ghe_cloud %} to manually sync user license usage between the two deployments. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.license-tab %} -5. Under "Quick links", to download a file containing your current license usage on {% data variables.product.prodname_ghe_server %}, click **Export license usage**. - ![Export license usage link](/assets/images/enterprise/business-accounts/export-license-usage-link.png) -{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} -{% data reusables.enterprise-accounts.settings-tab %} -8. In the left sidebar, click **Enterprise licensing**. - !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) -{% data reusables.enterprise-accounts.license-tab %} -10. Under "Enterprise Server Instances", click **Add server usage**. - ![Upload GitHub Enterprise Servers usage link](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png) -11. Upload the JSON file you downloaded from {% data variables.product.prodname_ghe_server %}. - ![Drag and drop or select a file to upload](/assets/images/help/business-accounts/upload-ghe-server-usage-file.png) - -{% ifversion ghes < 3.0 %} - -## Troubleshooting - -In some scenarios, the web UI for {% data variables.product.prodname_ghe_server %} may not immediately reflect your new license. You can force the system to detect the license by restarting two system services. - -{% data reusables.enterprise_installation.ssh-into-instance %} -1. Restart the services for Git authentication and the HTTP server. - - {% warning %} - - **Warning**: Running the following command will result in a few minutes of user-facing downtime for {% data variables.product.prodname_ghe_server %}. Run the command with care. - - {% endwarning %} - - sudo systemctl restart github-gitauth github-unicorn -1. After {% data variables.product.prodname_ghe_server %} returns you to a prompt, try accessing {% data variables.product.prodname_ghe_server %} via the command line or web UI again. - -{% endif %} diff --git a/content/billing/index.md b/content/billing/index.md index 04369cbbdd..64e0f94bb5 100644 --- a/content/billing/index.md +++ b/content/billing/index.md @@ -1,18 +1,21 @@ --- -title: Billing and payments on GitHub +title: Billing and payments for GitHub shortTitle: Billing and payments -intro: 'Learn about paid products and subscriptions available from {% data variables.product.company_short %}, and manage your account''s billing and payment methods.' +intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade, downgrade, and view pending changes to your account''s subscription at any time.{% elsif ghes or ghae %}{% data variables.product.company_short %} bills for your enterprise members'' {% ifversion ghae %}usage of {% data variables.product.product_name %}{% elsif ghes %} licence seats for {% data variables.product.product_name %}{% ifversion ghes > 3.0 %} and any additional services that you purchase{% endif %}{% endif %}.{% endif %}' redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github - /categories/setting-up-and-managing-billing-and-payments-on-github versions: fpt: '*' + ghes: '*' + ghae: '*' children: - /managing-your-github-billing-settings - /managing-billing-for-your-github-account - /managing-billing-for-github-actions - /managing-billing-for-github-packages - - /managing-licensing-for-github-advanced-security + - /managing-your-license-for-github-enterprise + - /managing-billing-for-github-advanced-security - /managing-billing-for-github-sponsors - /managing-billing-for-github-marketplace-apps - /managing-billing-for-git-large-file-storage diff --git a/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md b/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md new file mode 100644 index 0000000000..8c77e1c28f --- /dev/null +++ b/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md @@ -0,0 +1,77 @@ +--- +title: About billing for GitHub Advanced Security +intro: 'If you want to use {% data variables.product.prodname_GH_advanced_security %} features{% ifversion fpt %} in a private or internal repository{% endif %}, you need a license.{% ifversion fpt %} These features are available free of charge for public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %}' +product: '{% data reusables.gated-features.ghas %}' +redirect_from: + - /admin/advanced-security/about-licensing-for-github-advanced-security + - /billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security + - /github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security +versions: + fpt: '*' + ghes: '>=3.1' +type: overview +topics: + - Advanced Security + - Enterprise + - Licensing +shortTitle: Advanced Security billing +--- + +## About billing for {% data variables.product.prodname_GH_advanced_security %} + +{% ifversion fpt %} + +If you want to use {% data variables.product.prodname_GH_advanced_security %} features on any repository apart from a public repository on {% data variables.product.prodname_dotcom_the_website %}, you will need a license. For more information about {% data variables.product.prodname_GH_advanced_security %}, see "[About {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)." + +{% elsif ghes %} + +You can make extra features for code security available to users by buying and uploading a license for {% data variables.product.prodname_GH_advanced_security %}. For more information about {% data variables.product.prodname_GH_advanced_security %}, see "[About {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)." + +{% endif %} + +{% ifversion fpt or ghes %} + +{% data reusables.advanced-security.license-overview %} + +{% endif %} + +To discuss licensing {% data variables.product.prodname_GH_advanced_security %} for your enterprise, contact {% data variables.contact.contact_enterprise_sales %}. + +## About committer numbers for {% data variables.product.prodname_GH_advanced_security %} + +{% data reusables.advanced-security.about-committer-numbers-ghec-ghes %} + +{% ifversion fpt or ghes %} + +{% data reusables.advanced-security.managing-license-usage-ghec-ghes %} + +{% endif %} + +You can enforce policies to allow or disallow the use of {% data variables.product.prodname_advanced_security %} by organizations owned by your enterprise account. For more information, see "{% ifversion ghes %}[Enforcing policies for {% data variables.product.prodname_advanced_security %} in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise){% elsif fpt or ghae %}[Enforcing policies for {% data variables.product.prodname_advanced_security %} in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise-account){% endif %}." + +{% ifversion fpt or ghes %} + +For more information on viewing license usage, see "[Viewing your {% data variables.product.prodname_GH_advanced_security %} usage](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)." + +{% endif %} + +## Calculating committer spending + +The following example timeline demonstrates the events during a month that affect billing for {% data variables.product.prodname_GH_advanced_security %} in an enterprise. For each month, you will find events, the total committer count, and the total number of committers that {% data variables.product.company_short %} would bill for. + +| Date | Events during the month | Total committer count | Committers billed for the month | +| :- | :- | -: | -: | +| August 1 | A member of your enterprise enables {% data variables.product.prodname_GH_advanced_security %} for repository **X**. Repository **X** has 50 committers over the past 90 days. | **50** | **50** | +| September 5 | Developer **A** leaves the team working on repository **X**. Developer **A**'s contributions continue to count for 90 days. | **50** | **50** | +| September 8 | Developer **B** pushes a commit to repository **X** for the first time. Developer **B**'s usage is pro-rated, because the developer began contributing to repository **X** partway through the month. | _50 + 1_
**51** | _50 + 0.8_
**50.8** | +| October and November | Developer **A**'s contributions to repository **X** continue to count because the contributions were within the past 90 days. {% data variables.product.company_short %} now bills for developer **B** for the entire month because developer **B** now has contributions within the past 90 days. | **51** | **51** | +| December 4 | 90 days have passed since developer **A**'s last contribution to repository _X. The 90 days lapsed after December started, so {% data variables.product.company_short %} bills for developer **A** for the entire month. | _51 - 1_
**50** |
**51** | +| December 11 | Developer **C** joins the company and pushes a commit to repository **X** for the first time. Developer **C**'s usage is pro-rated at 70% for 21 out of 30 days. | _50 + 1_
**51** | _51 + .07_
**51.7** | +| January | {% data variables.product.company_short %} no longer bills for developer **A**. {% data variables.product.company_short %} bills for developer **C** for the entire month. | **51** | **51** | +| February 15 | A member of your enterprise disables {% data variables.product.prodname_GH_advanced_security %} for repository **X**. The 51 contributors to repository **X** do not work in any other repositories with {% data variables.product.prodname_GH_advanced_security %}. {% data variables.product.company_short %} bills for the developers' usage in repository **X** for February. | _51 - 51_
**0** |
**51** | +| March | No repository owned by your enterprise has {% data variables.product.prodname_GH_advanced_security %} enabled. | **0** | **0** | + +## Getting the most out of {% data variables.product.prodname_GH_advanced_security %} + +{% data reusables.advanced-security.getting-the-most-from-your-license %} diff --git a/content/billing/managing-licensing-for-github-advanced-security/index.md b/content/billing/managing-billing-for-github-advanced-security/index.md similarity index 70% rename from content/billing/managing-licensing-for-github-advanced-security/index.md rename to content/billing/managing-billing-for-github-advanced-security/index.md index 69022577a3..5654a13c98 100644 --- a/content/billing/managing-licensing-for-github-advanced-security/index.md +++ b/content/billing/managing-billing-for-github-advanced-security/index.md @@ -1,14 +1,16 @@ --- -title: Managing licensing for GitHub Advanced Security +title: Managing billing for GitHub Advanced Security shortTitle: GitHub Advanced Security intro: 'You can view and manage your use of seats on a license for {% data variables.product.prodname_advanced_security %}.' product: '{% data reusables.gated-features.ghas %}' redirect_from: + - /billing/managing-licensing-for-github-advanced-security - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security versions: fpt: '*' + ghes: '>=3.1' children: - - /about-licensing-for-github-advanced-security + - /about-billing-for-github-advanced-security - /viewing-your-github-advanced-security-usage --- diff --git a/content/billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md b/content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md similarity index 55% rename from content/billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md rename to content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md index 890d1c1093..b97e93461d 100644 --- a/content/billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md +++ b/content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md @@ -1,33 +1,40 @@ --- title: Viewing your GitHub Advanced Security usage -intro: 'You can view usage of your {% data variables.product.prodname_GH_advanced_security %} license.' -permissions: 'Enterprise owners can manage access to {% data variables.product.prodname_GH_advanced_security %} for their organization or enterprise organizations.' +intro: 'You can view usage of {% data variables.product.prodname_GH_advanced_security %} for your enterprise.' +permissions: 'Enterprise owners can view usage for {% data variables.product.prodname_GH_advanced_security %}.' product: '{% data reusables.gated-features.ghas %}' redirect_from: + - /billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage + - /admin/advanced-security/viewing-your-github-advanced-security-usage - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage - /github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage versions: + ghes: '>=3.1' fpt: '*' type: how_to topics: - Advanced Security - Enterprise -shortTitle: View your usage +shortTitle: View Advanced Security usage --- -{% data reusables.advanced-security.about-ghas-license-seats %} For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security)." +## About licenses for {% data variables.product.prodname_GH_advanced_security %} + +{% data reusables.advanced-security.about-ghas-license-seats %} For more information, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." ## Viewing {% data variables.product.prodname_GH_advanced_security %} license usage for your enterprise account You can check how many seats your license includes and how many of them are currently used. +{% ifversion fpt %} + {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.license-tab %} The "{% data variables.product.prodname_GH_advanced_security %}" section shows details of the current usage. ![{% data variables.product.prodname_GH_advanced_security %} in enterprise licensing settings](/assets/images/help/enterprises/enterprise-licensing-tab-ghas.png) - If you run out of seats, the section will be red. You should either reduce your use of {% data variables.product.prodname_GH_advanced_security %} or purchase more seats. For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security#getting-the-most-out-of-your-github-advanced-security-enterprise-license)." + If you run out of seats, the section will be red. You should either reduce your use of {% data variables.product.prodname_GH_advanced_security %} or purchase more seats. For more information, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#getting-the-most-out-of-github-advanced-security)." ![{% data variables.product.prodname_GH_advanced_security %} in enterprise licensing settings](/assets/images/help/enterprises/enterprise-licensing-tab-ghas-no-seats.png) 4. Optionally, to see a detailed breakdown of usage per organization, in the left sidebar, click **Billing**. ![Billing tab in the enterprise account settings sidebar](/assets/images/help/business-accounts/settings-billing-tab.png) @@ -38,3 +45,18 @@ You can check how many seats your license includes and how many of them are curr 6. On the "Security & analysis" settings page, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section to see a detailed breakdown of usage by repository for this organization. ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/enterprises/settings-security-analysis-ghas-repos-list.png) For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." + +{% elsif ghes %} + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.license-tab %} + The "{% data variables.product.prodname_GH_advanced_security %}" section shows details of the current usage. You can see the total number of seats used, as well as a table with the number of committers and unique committers for each organization. + ![{% data variables.product.prodname_GH_advanced_security %} section of Enterprise license](/assets/images/help/billing/ghas-orgs-list-enterprise-ghes.png) +5. Optionally, click the name of an organization where you are an owner to display the security and analysis settings for the organization. + ![Owned organization in {% data variables.product.prodname_GH_advanced_security %} section of enterprise billing settings](/assets/images/help/billing/ghas-orgs-list-enterprise-click-org.png) +6. On the "Security & analysis" settings page, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section to see a detailed breakdown of usage by repository for this organization. + ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/enterprises/settings-security-analysis-ghas-repos-list.png) + For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." + +{% endif %} diff --git a/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md b/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md new file mode 100644 index 0000000000..6f0ef17f0e --- /dev/null +++ b/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md @@ -0,0 +1,85 @@ +--- +title: About billing for your enterprise +intro: You can view billing information for your enterprise. +product: '{% data reusables.gated-features.enterprise-accounts %}' +redirect_from: + - /admin/overview/managing-billing-for-your-enterprise + - /enterprise/admin/installation/managing-billing-for-github-enterprise + - /enterprise/admin/overview/managing-billing-for-github-enterprise + - /admin/overview/managing-billing-for-github-enterprise +versions: + fpt: '*' + ghes: '*' + ghae: '*' +topics: + - Enterprise +shortTitle: Billing for your enterprise +--- + +## About billing for your enterprise + +{% ifversion ghae %} + +{% data reusables.github-ae.about-billing %} Once per day, {% data variables.product.prodname_dotcom %} will count the number of users with a license for your enterprise. {% data variables.product.company_short %} bills you for each licensed user regardless of whether the user logged into {% data variables.product.prodname_ghe_managed %} that day. + +For commercial regions, the price per user per day is $1.2580645161. For 31-day months, the monthly cost for each user is $39. For months with fewer days, the monthly cost is lower. Each billing month begins at a fixed time on the first day of the calendar month. + +If you add a licensed user mid-month, that user will only be included in the count for the days they have a license. When you remove a licensed user, that user will remain in the count until the end of that month. Therefore, if you add a user mid-month and later remove the user in the same month, the user will be included in the count from the day the user was added through the end of the month. There is no additional cost if you re-add a user during the same month the user was removed. + +For example, here are the costs for users with licenses on different dates. + +User | License dates | Counted days | Cost +---- | ------------ | ------- | ----- +@octocat | January 1 - January 31 | 31 | $39 +@robocat | February 1 - February 28 | 28 | $35.23 +@devtocat | January 15 - January 31 | 17 | $21.39 +@doctocat | January 1 - January 15 | 31 | $39 +@prodocat | January 7 - January 15 | 25 | $31.45 +@monalisa | January 1 - January 7,
January 15 - January 31 | 31 | $39 + +{% data variables.product.prodname_ghe_managed %} has a 500-user minimum per instance. {% data variables.product.company_short %} bills you for a minimum of 500 users per instance, even if there are fewer than 500 users with a license that day. + +You can see your current usage in your [Azure account portal](https://portal.azure.com). + +{% elsif fpt or ghes %} + +{% ifversion fpt %} + +{% data variables.product.company_short %} bills monthly for the total number of members in your enterprise account, as well as any additional services you use with {% data variables.product.prodname_ghe_cloud %}. + +{% elsif ghes %} + +Each user on {% data variables.product.product_location %} consumes a seat on your license. {% data variables.product.company_short %} bills monthly for the total number of seats consumed on your license. + +{% endif %} + +{% data reusables.billing.about-invoices-for-enterprises %} For more information about usage and invoices, see "[Viewing the subscription and usage for your enterprise account](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and {% ifversion ghes %}"Managing invoices for your enterprise" in the {% data variables.product.prodname_dotcom_the_website %} documentation.{% elsif fpt %}"[Managing invoices for your enterprise](/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise)."{% endif %} + +Administrators for your enterprise account on {% data variables.product.prodname_dotcom_the_website %} can access and manage billing for the enterprise. + +{% ifversion fpt %} + +Each member of your enterprise account with a unique email address consumes a license. Billing managers do not consume a license. Each outside collaborator on a private repository that an organization in your enterprise owns consumes a license, unless the private repository is a fork. Each invitee to your enterprise account, including owners, members of organizations, and outside collaborators, consume a license. For more information about roles in an enterprise account, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/roles-in-an-enterprise)" and "[Inviting people to manage your enterprise](/github/setting-up-and-managing-your-enterprise/inviting-people-to-manage-your-enterprise)." + +{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)." + +{% endif %} + +{% ifversion ghes %} + +{% data reusables.billing.ghes-with-no-enterprise-account %} + +{% endif %} + +## About synchronization of license usage + +{% data reusables.enterprise.about-deployment-methods %} + +{% data reusables.enterprise-licensing.about-license-sync %} For more information, see {% ifversion fpt %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/enterprise-server/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."{% endif %} + +{% endif %} + +## Further reading + +- "[About enterprise accounts]({% ifversion fpt or ghes %}/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/about-enterprise-accounts#about-enterprise-accounts-on-githubcom{% elsif ghae %}/admin/overview/about-enterprise-accounts{% endif %})"{% ifversion fpt or ghes %} +- "[About licenses for GitHub Enterprise](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise)"{% endif %} diff --git a/content/billing/managing-billing-for-your-github-account/index.md b/content/billing/managing-billing-for-your-github-account/index.md index 215aebc45e..7f554e4afb 100644 --- a/content/billing/managing-billing-for-your-github-account/index.md +++ b/content/billing/managing-billing-for-your-github-account/index.md @@ -1,7 +1,7 @@ --- title: Managing billing for your GitHub account shortTitle: Your GitHub account -intro: '{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade, downgrade, and view pending changes to your account''s subscription at any time.' +intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade, downgrade, and view pending changes to your account''s subscription at any time.{% elsif ghes or ghae %}You can manage billing for {% data variables.product.product_name %}{% ifversion ghae %}.{% elsif ghes %} from your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.{% endif %}{% endif %}' redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account - /categories/97/articles/ @@ -15,13 +15,18 @@ redirect_from: - /articles/managing-billing-for-your-github-account versions: fpt: '*' + ghes: '*' + ghae: '*' children: - /about-billing-for-github-accounts - /about-per-user-pricing - - /how-does-upgrading-or-downgrading-affect-the-billing-process + - /about-billing-for-your-enterprise + - /viewing-the-subscription-and-usage-for-your-enterprise-account - /upgrading-your-github-subscription - /viewing-and-managing-pending-changes-to-your-subscription - /downgrading-your-github-subscription + - /managing-invoices-for-your-enterprise + - /how-does-upgrading-or-downgrading-affect-the-billing-process - /discounted-subscriptions-for-github-accounts --- diff --git a/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md b/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md new file mode 100644 index 0000000000..07b3fb392c --- /dev/null +++ b/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md @@ -0,0 +1,54 @@ +--- +title: Managing invoices for your enterprise +shortTitle: Manage invoices +intro: 'You can view, pay, or download a current invoice for your enterprise, and you can view your payment history.' +product: '{% data reusables.gated-features.enterprise-accounts %}' +versions: + fpt: '*' +type: how_to +topics: + - Enterprise + - Licensing +--- + +## About invoices for your enterprise + +{% data reusables.billing.about-invoices-for-enterprises %} For more information, see "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)." + +For more information about viewing the subscription and usage for your enterprise account, see "[Viewing the subscription and usage for your enterprise account](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)." + +{% data reusables.billing.ghes-with-no-enterprise-account %} + +## Viewing your current invoice + +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.billing-tab %} +4. Under "Current Invoice", click **View invoice**. + ![View invoice link](/assets/images/help/business-accounts/view-invoice-link.png) + +## Paying your current invoice + +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.billing-tab %} +4. Under "Payment Due", click **Pay invoice**. + ![Pay invoice link](/assets/images/help/business-accounts/pay-invoice-link.png) +5. Under "Pay invoice", type your credit card information in the secure form, then click **Pay Invoice**. + ![Confirm and pay invoice](/assets/images/help/business-accounts/pay-invoice.png) + +## Downloading your current invoice + +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.billing-tab %} +4. Under "Quick Actions", click **Download current invoice**. + ![Download current invoice link](/assets/images/help/business-accounts/download-current-invoice.png) + +## Viewing your payment history + +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.billing-tab %} +4. To see a summary of your past billing activity, under "Billing", click the **Past Invoices** tab. + ![View payment history tab](/assets/images/help/business-accounts/view-payment-history.png) diff --git a/content/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/content/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md new file mode 100644 index 0000000000..13f0d51f98 --- /dev/null +++ b/content/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md @@ -0,0 +1,51 @@ +--- +title: Viewing the subscription and usage for your enterprise account +intro: 'You can view the current {% ifversion fpt %}subscription, {% endif %}license usage{% ifversion fpt %}, invoices, payment history, and other billing information{% endif %} for {% ifversion fpt %}your enterprise account{% elsif ghes %}{% data variables.product.product_location_enterprise %}{% endif %}.' +product: '{% data reusables.gated-features.enterprise-accounts %}' +permissions: Enterprise owners {% ifversion fpt %}and billing managers {% endif %}can access and manage all billing settings for enterprise accounts. +redirect_from: + - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account + - /github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account + - /articles/viewing-the-subscription-and-usage-for-your-enterprise-account + - /github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account +versions: + fpt: '*' + ghes: '*' +topics: + - Enterprise +shortTitle: View subscription & usage +--- + +## About billing for enterprise accounts + +You can view an overview of {% ifversion fpt %}your subscription and paid{% elsif ghes %}the license{% endif %} usage for {% ifversion fpt %}your{% elsif ghes %}the{% endif %} enterprise account on {% ifversion fpt %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.product.product_location %}{% endif %}. + +For invoiced {% data variables.product.prodname_enterprise %} customers{% ifversion ghes %} who use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}{% endif %}, each invoice includes details about billed services for all products. For example, in addition to your usage for {% ifversion fpt %}{% data variables.product.prodname_ghe_cloud %}{% elsif ghes %}{% data variables.product.product_name %}{% endif %}, you may have usage for {% data variables.product.prodname_GH_advanced_security %}{% ifversion fpt %}, {% elsif ghes %}. You may also have usage on {% data variables.product.prodname_dotcom_the_website %}, like {% endif %}paid licenses in organizations outside of your enterprise account, data packs for {% data variables.large_files.product_name_long %}, or subscriptions to apps in {% data variables.product.prodname_marketplace %}. For more information about invoices, see "{% ifversion fpt %}[Managing invoices for your enterprise](/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise)."{% elsif ghes %}Viewing the subscription and usage for your enterprise account" in the {% data variables.product.prodname_dotcom_the_website %} documentation.{% endif %} + +{% ifversion fpt %} + +In addition to enterprise owners, billing managers can view the subscription and usage for your enterprise account. For more information, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/roles-in-an-enterprise#billing-manager)" and "[Inviting people to manage your enterprise](/github/setting-up-and-managing-your-enterprise/inviting-people-to-manage-your-enterprise)." + +{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)." + +{% endif %} + +{% ifversion ghes %} + +If you want to view an overview of your subscription and usage for {% data variables.product.prodname_enterprise %} and any related services on {% data variables.product.prodname_dotcom_the_website %}, see "[Viewing the subscription and usage for your enterprise account](/free-pro-team@latest/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" in the {% data variables.product.prodname_dotcom_the_website %} documentation. + +{% endif %} + +## Viewing the subscription and usage for your enterprise account + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.license-tab %} +1. Under "User licenses", view your total licenses, number of consumed licenses, and your subscription expiration date. + {% ifversion fpt %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %} + ![License and subscription information in enterprise billing settings](/assets/images/enterprise/enterprise-server/enterprise-server-billing-license-info.png){% endif %} +1. Optionally, to view details for license usage or download a {% ifversion fpt %}CSV{% elsif ghes %}JSON{% endif %} file with license details{% ifversion fpt %}, to the right of "User Licenses"{% endif %}, click **View {% ifversion fpt %}details{% elsif ghes %}users{% endif %}** or {% ifversion fpt %}{% octicon "download" aria-label="The download icon" %}{% elsif ghes %}**Export license usage**{% endif %}.{% ifversion fpt %} + !["View details" button and button with download icon to the right of "User Licenses"](/assets/images/help/business-accounts/billing-license-info-click-view-details-or-download.png){% endif %}{% ifversion fpt %} +1. Optionally, to view usage details for other features, in the left sidebar, click **Billing**. + ![Billing tab in the enterprise account settings sidebar](/assets/images/help/business-accounts/settings-billing-tab.png) +{% endif %} diff --git a/content/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security.md b/content/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security.md deleted file mode 100644 index 4b08772196..0000000000 --- a/content/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security.md +++ /dev/null @@ -1,39 +0,0 @@ ---- -title: About licensing for GitHub Advanced Security -intro: 'If you want to use {% data variables.product.prodname_GH_advanced_security %} features in a private or internal repository, you need a license. These features are available free of charge for public repositories.' -product: '{% data reusables.gated-features.ghas %}' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security -versions: - fpt: '*' -type: overview -topics: - - Advanced Security - - Enterprise - - Licensing -shortTitle: About licensing ---- -## About licensing for {% data variables.product.prodname_GH_advanced_security %} - -If you want to use {% data variables.product.prodname_GH_advanced_security %} features on any repository apart from a public repository on {% data variables.product.prodname_dotcom_the_website %}, you will need a license. For more information about {% data variables.product.prodname_GH_advanced_security %}, see "[About {% data variables.product.prodname_GH_advanced_security %}](/github/getting-started-with-github/about-github-advanced-security)." - -{% data reusables.advanced-security.license-overview %} - -To discuss licensing {% data variables.product.prodname_GH_advanced_security %} for your enterprise account, contact {% data variables.contact.contact_enterprise_sales %}. - -## About committer numbers for {% data variables.product.prodname_GH_advanced_security %} - -{% data reusables.advanced-security.about-committer-numbers-ghec-ghes %} - -## Managing your license usage for {% data variables.product.prodname_GH_advanced_security %} - -{% data reusables.advanced-security.managing-license-usage-ghec-ghes %} - -You can enforce policies to allow or disallow the use of {% data variables.product.prodname_advanced_security %} by organizations owned by your enterprise account. For more information, see "[Enforcing policies for {% data variables.product.prodname_advanced_security %} in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise-account)." - -For more information on viewing license usage, see "[Viewing your {% data variables.product.prodname_GH_advanced_security %} usage](/billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage)." - -## Getting the most out of your {% data variables.product.prodname_GH_advanced_security %} license - -{% data reusables.advanced-security.getting-the-most-from-your-license %} diff --git a/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md b/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md new file mode 100644 index 0000000000..053f1645c1 --- /dev/null +++ b/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md @@ -0,0 +1,42 @@ +--- +title: About licenses for GitHub Enterprise +intro: '{% ifversion fpt %}If you purchase {% data variables.product.prodname_enterprise %} and use {% data variables.product.prodname_ghe_server %}, each{% elsif ghes %}Each{% endif %} {% data variables.product.prodname_ghe_server %} instance requires a license file to validate and unlock the application.' +versions: + fpt: '*' + ghes: '*' +type: overview +topics: + - Enterprise + - Licensing +shortTitle: About licenses +--- + +## About license files for {% data variables.product.prodname_enterprise %} + +{% ifversion fpt %} + +{% data reusables.enterprise.about-deployment-methods %} + +{% endif %} + +When you purchase or renew {% data variables.product.prodname_enterprise %}, {% data variables.product.company_short %} provides a license file {% ifversion fpt %}for your deployments of {% data variables.product.prodname_ghe_server %}{% elsif ghes %}for {% data variables.product.product_location_enterprise %}{% endif %}. A license file has an expiration date and controls the number of people who can use {% data variables.product.product_location_enterprise %}. After you download and install {% data variables.product.prodname_ghe_server %}, you must upload the license file to unlock the application for you to use. + +For more information about downloading your license file, see "[Downloading your license for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise)." For more information about uploading your license file, see {% ifversion fpt %}"[Uploading a new license to {% data variables.product.prodname_ghe_server %}](/enterprise-server/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server)" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}"[Uploading a new license to {% data variables.product.prodname_ghe_server %}](/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server)."{% endif %} + +If your license expires, you won't be able to access {% data variables.product.prodname_ghe_server %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)." If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}. + +## About synchronization of license usage for {% data variables.product.prodname_enterprise %} + +{% ifversion ghes %} + +{% data reusables.enterprise.about-deployment-methods %} + +{% endif %} + +{% data reusables.enterprise-licensing.about-license-sync %} For more information, see {% ifversion fpt %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/enterprise-server/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."{% endif %} + +## Further reading + +- "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)" +- [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website +- "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/admin/installation/setting-up-a-github-enterprise-server-instance)" diff --git a/content/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise.md b/content/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise.md new file mode 100644 index 0000000000..5302908a3a --- /dev/null +++ b/content/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise.md @@ -0,0 +1,38 @@ +--- +title: Downloading your license for GitHub Enterprise +intro: 'You can download a copy of your license file for {% data variables.product.prodname_ghe_server %}.' +permissions: 'Enterprise owners can download license files for {% data variables.product.prodname_ghe_server %}.' +versions: + fpt: '*' + ghes: '*' +type: how_to +topics: + - Enterprise + - Licensing +shortTitle: Download your license +--- + +## About license files for {% data variables.product.prodname_enterprise %} + +After you purchase or upgrade a license for {% data variables.product.prodname_enterprise %} from {% data variables.contact.contact_enterprise_sales %}, you must download your new license file. For more information about licenses for {% data variables.product.prodname_enterprise %}, see "[About licenses for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise)." + +{% data reusables.enterprise-licensing.contact-sales-for-renewals-or-seats %} + +## Downloading your license from {% data variables.product.prodname_dotcom_the_website %} + +You must have an enterprise account on {% data variables.product.prodname_dotcom_the_website %} to download your license from {% data variables.product.prodname_dotcom_the_website %}. For more information about enterprise accounts, see "[About enterprise accounts](/admin/overview/about-enterprise-accounts)." + +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} +{% data reusables.enterprise-accounts.settings-tab %} +1. In the left sidebar, click **Enterprise licensing**. + !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) +1. Under "Enterprise Server Instances", click {% octicon "download" aria-label="The download icon" %} to download your license file. + ![Download GitHub Enterprise Server license](/assets/images/help/business-accounts/download-ghes-license.png) + +After you download your license file, you can upload the file to {% data variables.product.product_location_enterprise %} to validate your application. For more information, see {% ifversion fpt %}"[Uploading a new license to {% data variables.product.prodname_ghe_server %}](/enterprise-server/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server)" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}"[Uploading a new license to {% data variables.product.prodname_ghe_server %}](/enterprise-server/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server)."{% endif %} + +## Downloading your license if you don't have an enterprise account on {% data variables.product.prodname_dotcom_the_website %} + +If you do not have an enterprise account on {% data variables.product.prodname_dotcom_the_website %}, or if you're not sure, you may be able to download your {% data variables.product.prodname_ghe_server %} license from the [{% data variables.product.prodname_enterprise %} website](https://enterprise.github.com/download). + +If you have any questions about downloading your license, contact {% data variables.contact.contact_enterprise_sales %}. diff --git a/content/billing/managing-your-license-for-github-enterprise/index.md b/content/billing/managing-your-license-for-github-enterprise/index.md new file mode 100644 index 0000000000..97f03f42b6 --- /dev/null +++ b/content/billing/managing-your-license-for-github-enterprise/index.md @@ -0,0 +1,26 @@ +--- +title: Managing your license for GitHub Enterprise +shortTitle: GitHub Enterprise license +intro: 'You can view, manage, and update your license for {% data variables.product.prodname_enterprise %}, which unlocks the application on {% data variables.product.product_location_enterprise %}.' +redirect_from: + - /enterprise/admin/installation/managing-your-github-enterprise-license + - /enterprise/admin/categories/licenses/ + - /enterprise/admin/articles/license-files/ + - /enterprise/admin/installation/about-license-files/ + - /enterprise/admin/articles/downloading-your-license/ + - /enterprise/admin/installation/downloading-your-license/ + - /enterprise/admin/articles/upgrading-your-license/ + - /enterprise/admin/installation/updating-your-license/ + - /enterprise/admin/installation/managing-your-github-enterprise-server-license + - /enterprise/admin/overview/managing-your-github-enterprise-license +versions: + fpt: '*' + ghes: '*' +children: + - /about-licenses-for-github-enterprise + - /downloading-your-license-for-github-enterprise + - /uploading-a-new-license-to-github-enterprise-server + - /viewing-license-usage-for-github-enterprise + - /syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud +--- + diff --git a/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md b/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md new file mode 100644 index 0000000000..3f4e47d531 --- /dev/null +++ b/content/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud.md @@ -0,0 +1,43 @@ +--- +title: Syncing license usage between GitHub Enterprise Server and GitHub Enterprise Cloud +intro: 'You can sync license usage from {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %} to view all license usage across your enterprise in one place and ensure that people with accounts in both environments only consume one user license.' +permissions: 'Enterprise owners can sync license usage between enterprise accounts on {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}.' +versions: + ghes: '*' +type: how_to +topics: + - Enterprise + - Licensing +shortTitle: Sync license usage +--- + +## About synchronization of license usage + +{% data reusables.enterprise-licensing.about-license-sync %} + +If you allow {% data variables.product.product_location %} to connect to {% data variables.product.prodname_dotcom_the_website %}, you can sync license usage between your enterprise accounts automatically. Automatic synchronization ensures that you see up-to-date license details on {% data variables.product.prodname_dotcom_the_website %}. If you don't want to allow {% data variables.product.product_location %} to connect to {% data variables.product.prodname_dotcom_the_website %}, you can manually sync license usage by uploading a file from {% data variables.product.product_location %} to {% data variables.product.prodname_dotcom_the_website %}. + +For more information about licenses and usage for {% data variables.product.prodname_ghe_server %}, see "[About licenses for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise)." + +## Automatically syncing license usage + +You can use {% data variables.product.prodname_github_connect %} to automatically sync user license count and usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[Enabling automatic user license sync between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/admin/installation/enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud)." + +## Manually syncing license usage + +You can download a JSON file from {% data variables.product.prodname_ghe_server %} and upload the file to {% data variables.product.prodname_ghe_cloud %} to manually sync user license usage between the two deployments. + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.license-tab %} +5. Under "Quick links", to download a file containing your current license usage on {% data variables.product.prodname_ghe_server %}, click **Export license usage**. + ![Export license usage link](/assets/images/enterprise/business-accounts/export-license-usage-link.png) +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} +{% data reusables.enterprise-accounts.settings-tab %} +8. In the left sidebar, click **Enterprise licensing**. + !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) +{% data reusables.enterprise-accounts.license-tab %} +10. Under "Enterprise Server Instances", click **Add server usage**. + ![Upload GitHub Enterprise Servers usage link](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png) +11. Upload the JSON file you downloaded from {% data variables.product.prodname_ghe_server %}. + ![Drag and drop or select a file to upload](/assets/images/help/business-accounts/upload-ghe-server-usage-file.png) diff --git a/content/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server.md b/content/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server.md new file mode 100644 index 0000000000..b4bb95d1a1 --- /dev/null +++ b/content/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server.md @@ -0,0 +1,52 @@ +--- +title: Uploading a new license to GitHub Enterprise Server +intro: 'You can upload your license file for {% data variables.product.prodname_enterprise %} to {% data variables.product.product_location_enterprise %} to validate your application.' +versions: + ghes: '*' +type: how_to +topics: + - Enterprise + - Licensing +shortTitle: Upload a new license +--- + +## About license files for {% data variables.product.prodname_enterprise %} + +After you purchase or upgrade a license for {% data variables.product.prodname_enterprise %} from {% data variables.contact.contact_enterprise_sales %}, you must upload the new license file to {% data variables.product.product_location_enterprise %} to unlock your new user licenses. For more information about licenses for {% data variables.product.product_name %}, see "[About licenses for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise)" and "[Downloading your license for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise)." + +{% data reusables.enterprise-licensing.contact-sales-for-renewals-or-seats %} + +## Uploading your license to {% data variables.product.product_location_enterprise %} + +1. Sign into {% data variables.product.product_location_enterprise %} as a site administrator. +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.license-tab %} +1. Under "Quick links", click **Update license**. + ![Update license link](/assets/images/enterprise/business-accounts/update-license-link.png) +1. To select your license, click **License file**, or drag your license file onto **License file**. + ![Upload license file](/assets/images/enterprise/management-console/upload-license.png) +1. Click **Upload**. + ![Begin upload](/assets/images/enterprise/management-console/begin-upload.png) + +{% ifversion ghes < 3.0 %} + +If the web UI for {% data variables.product.prodname_ghe_server %} doesn't reflect your updated license immediately, see "[Troubleshooting](#troubleshooting)." + +## Troubleshooting + +In some scenarios, the web UI for {% data variables.product.prodname_ghe_server %} may not immediately reflect your new license. You can force the system to detect the license by restarting two system services. + +{% data reusables.enterprise_installation.ssh-into-instance %} +1. Restart the services for Git authentication and the HTTP server. + + {% warning %} + + **Warning**: Running the following command will result in a few minutes of user-facing downtime for {% data variables.product.prodname_ghe_server %}. Run the command with care. + + {% endwarning %} + + sudo systemctl restart github-gitauth github-unicorn +1. After {% data variables.product.prodname_ghe_server %} returns you to a prompt, try accessing {% data variables.product.prodname_ghe_server %} via the command line or web UI again. + +{% endif %} diff --git a/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md b/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md new file mode 100644 index 0000000000..cee607571e --- /dev/null +++ b/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md @@ -0,0 +1,50 @@ +--- +title: Viewing license usage for GitHub Enterprise +intro: 'You can view license usage for your enterprise on {% ifversion fpt %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.product.product_location %}{% endif %}.' +permissions: 'Enterprise owners can view license usage for {% data variables.product.prodname_enterprise %}.' +versions: + fpt: '*' + ghes: '*' +type: how_to +topics: + - Enterprise + - Licensing +shortTitle: View license usage +--- + +## About license usage for {% data variables.product.prodname_enterprise %} + +{% ifversion fpt %} + +You can view license usage for your enterprise account on {% data variables.product.prodname_ghe_cloud %} on {% data variables.product.prodname_dotcom_the_website %}. + +{% data reusables.enterprise-licensing.you-can-sync-for-a-combined-view %} + +{% elsif ghes %} + +You can view license usage for {% data variables.product.prodname_ghe_server %} on {% data variables.product.product_location %}. + +{% data reusables.enterprise-licensing.you-can-sync-for-a-combined-view %} For more information about the display of license usage on {% data variables.product.prodname_dotcom_the_website %}, see "Viewing license usage for {% data variables.product.prodname_enterprise %}" in the {% data variables.product.prodname_dotcom_the_website %} documentation. + +{% endif %} + +## Viewing license usage on {% ifversion fpt %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.product.product_location %}{% endif %} + +{% ifversion fpt %} + +{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %} +{% data reusables.enterprise-accounts.settings-tab %} +1. In the left sidebar, click **Enterprise licensing**. + !["Enterprise licensing" tab in the enterprise account settings sidebar](/assets/images/help/enterprises/enterprise-licensing-tab.png) +1. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses. + - If your license includes {% data variables.product.prodname_GH_advanced_security %}, you can review your total seat use. For more information, see "[Viewing your {% data variables.product.prodname_GH_advanced_security %} usage](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)." + +{% elsif ghes %} + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.license-tab %} +1. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses.{% ifversion ghes > 3.0 %} + - If your license includes {% data variables.product.prodname_GH_advanced_security %}, you can review your total seat use as well as a per-organization breakdown of committers. For more information, see "[Managing {% data variables.product.prodname_GH_advanced_security %} for your enterprise](/admin/advanced-security)."{% endif %} + +{% endif %} diff --git a/content/get-started/learning-about-github/about-github-advanced-security.md b/content/get-started/learning-about-github/about-github-advanced-security.md index 0a29b65b78..ff014d18ee 100644 --- a/content/get-started/learning-about-github/about-github-advanced-security.md +++ b/content/get-started/learning-about-github/about-github-advanced-security.md @@ -17,7 +17,7 @@ shortTitle: GitHub Advanced Security {% data variables.product.prodname_dotcom %} has many features that help you improve and maintain the quality of your code. Some of these are included in all plans{% ifversion not ghae %}, such as dependency graph and {% data variables.product.prodname_dependabot_alerts %}{% endif %}. Other security features require a license for {% data variables.product.prodname_GH_advanced_security %} to run on repositories apart from public repositories on {% data variables.product.prodname_dotcom_the_website %}. -{% ifversion fpt %}For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security)."{% elsif ghes > 2.22 %}For information about purchasing a license for {% data variables.product.prodname_GH_advanced_security %}, contact {% data variables.contact.contact_enterprise_sales %}.{% elsif ghae %}There is no charge for {% data variables.product.prodname_GH_advanced_security %} on {% data variables.product.prodname_ghe_managed %} during the beta release.{% endif %} +{% ifversion fpt or ghes > 3.0 %}For more information about purchasing {% data variables.product.prodname_GH_advanced_security %}, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% elsif ghae %}There is no charge for {% data variables.product.prodname_GH_advanced_security %} on {% data variables.product.prodname_ghe_managed %} during the beta release.{% endif %} ## About {% data variables.product.prodname_advanced_security %} features diff --git a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md index 7ed7e5d365..51f7b6ab51 100644 --- a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md +++ b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server.md @@ -27,7 +27,7 @@ Trials are also available for {% data variables.product.prodname_ghe_cloud %}. F {% data variables.product.prodname_ghe_server %} is installed as a virtual appliance. Determine the best person in your organization to set up a virtual machine, and ask that person to submit a [trial request](https://enterprise.github.com/trial). You can begin your trial immediately after submitting a request. -To set up an account for the {% data variables.product.prodname_enterprise %} Web portal, click the link in the email you received after submitting your trial request, and follow the prompts. Then, download your license file. For more information, see "[Managing your {% data variables.product.prodname_enterprise %} license](/enterprise/admin/installation/managing-your-github-enterprise-license)." +To set up an account for the {% data variables.product.prodname_enterprise %} Web portal, click the link in the email you received after submitting your trial request, and follow the prompts. Then, download your license file. For more information, see "[Managing your license for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise)." To install {% data variables.product.prodname_ghe_server %}, download the necessary components and upload your license file. For more information, see the instructions for your chosen visualization platform in "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise/admin/installation/setting-up-a-github-enterprise-server-instance)." diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md b/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md index d122dd6d66..79e9e8254c 100644 --- a/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md +++ b/content/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise.md @@ -1,7 +1,8 @@ --- title: Inviting people to manage your enterprise -intro: You can invite people to become enterprise owners or billing managers in your enterprise account. You can also remove enterprise owners or billing managers who no longer need access to the enterprise account. +intro: You can {% ifversion fpt %}invite people to become enterprise owners or billing managers for{% elsif ghes %}add enterprise owners to{% endif %} your enterprise account. You can also remove enterprise owners {% ifversion fpt %}or billing managers {% endif %}who no longer need access to the enterprise account. product: '{% data reusables.gated-features.enterprise-accounts %}' +permissions: 'Enterprise owners can {% ifversion fpt %}invite other people to become{% elsif ghes %}add{% endif %} additional enterprise administrators.' redirect_from: - /github/setting-up-and-managing-your-enterprise-account/inviting-people-to-manage-your-enterprise-account - /articles/inviting-people-to-collaborate-in-your-business-account/ @@ -11,12 +12,21 @@ versions: fpt: '*' ghes: '*' topics: + - Administrator - Enterprise + - User account shortTitle: Invite people to manage --- -## About inviting people to manage your enterprise account -{% data reusables.enterprise-accounts.enterprise-administrators %} For more information, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise). +## About users who can manage your enterprise account + +{% data reusables.enterprise-accounts.enterprise-administrators %} For more information, see "[Roles in an enterprise](/github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise)." + +{% ifversion ghes %} + +If you want to manage owners and billing managers for an enterprise account on {% data variables.product.prodname_dotcom_the_website %}, see "[Inviting people to manage your enterprise](/free-pro-team@latest/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise)" in the {% data variables.product.prodname_dotcom_the_website %} documentation. + +{% endif %} {% tip %} @@ -24,24 +34,28 @@ shortTitle: Invite people to manage {% endtip %} -## Inviting an enterprise administrator to your enterprise account +## {% ifversion fpt %}Inviting{% elsif ghes %}Adding{% endif %} an enterprise administrator to your enterprise account -Only enterprise owners can invite other people to become enterprise administrators. - -After you invite someone to join the enterprise account, they must accept the emailed invitation before they can access the enterprise account. +{% ifversion fpt %}After you invite someone to join the enterprise account, they must accept the emailed invitation before they can access the enterprise account.{% endif %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.people-tab %} -3. In the left sidebar, click **Administrators**. +1. In the left sidebar, click **Administrators**. ![Administrators tab in the left sidebar](/assets/images/help/business-accounts/administrators-tab.png) -4. Above the list of administrators, click **Invite admin**. - ![Invite admin button above the list of enterprise owners](/assets/images/help/business-accounts/invite-admin-button.png) -5. Type the username, full name, or email address of the person you want to invite to become an enterprise administrator, then select the appropriate person from the results. - ![Modal box with field to type a person's username, full name, or email address, and Invite button](/assets/images/help/business-accounts/invite-admins-modal-button.png) -6. Select **Owner** or **Billing Manager**. +1. Above the list of administrators, click {% ifversion fpt %}**Invite admin**{% elsif ghes %}**Add owner**{% endif %}. + {% ifversion fpt %} + !["Invite admin" button above the list of enterprise owners](/assets/images/help/business-accounts/invite-admin-button.png) + {% elsif ghes %} + !["Add owner" button above the list of enterprise owners](/assets/images/help/business-accounts/add-owner-button.png) + {% endif %} +1. Type the username, full name, or email address of the person you want to invite to become an enterprise administrator, then select the appropriate person from the results. + ![Modal box with field to type a person's username, full name, or email address, and Invite button](/assets/images/help/business-accounts/invite-admins-modal-button.png){% ifversion fpt %} +1. Select **Owner** or **Billing Manager**. ![Modal box with role choices](/assets/images/help/business-accounts/invite-admins-roles.png) -7. Click **Send Invitation**. - ![Send invitation button](/assets/images/help/business-accounts/invite-admins-send-invitation.png) +1. Click **Send Invitation**. + ![Send invitation button](/assets/images/help/business-accounts/invite-admins-send-invitation.png){% endif %}{% ifversion ghes %} +1. Click **Add**. + !["Add" button](/assets/images/help/business-accounts/add-administrator-add-button.png){% endif %} ## Removing an enterprise administrator from your enterprise account @@ -49,5 +63,10 @@ Only enterprise owners can remove other enterprise administrators from the enter {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.people-tab %} -3. Next to the username of the person you'd like to remove, click {% octicon "gear" aria-label="The Settings gear" %}, then click **Remove owner** or **Remove billing manager**. +1. Next to the username of the person you'd like to remove, click {% octicon "gear" aria-label="The Settings gear" %}, then click **Remove owner**{% ifversion fpt %} or **Remove billing manager**{% endif %}. + {% ifversion fpt %} ![Settings gear with menu option to remove an enterprise administrator](/assets/images/help/business-accounts/remove-admin.png) + {% elsif ghes %} + ![Settings gear with menu option to remove an enterprise administrator](/assets/images/help/business-accounts/ghes-remove-owner.png) + {% endif %} +1. Read the confirmation, then click **Remove owner**{% ifversion fpt %} or **Remove billing manager**{% endif %}. \ No newline at end of file diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/about-enterprise-accounts.md b/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/about-enterprise-accounts.md index 3f62f01476..47dbfe5976 100644 --- a/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/about-enterprise-accounts.md +++ b/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/about-enterprise-accounts.md @@ -1,6 +1,6 @@ --- title: About enterprise accounts -intro: 'With {% data variables.product.prodname_ghe_cloud %}, you can create an enterprise account to enable collaboration between your organizations, while giving administrators a single point of visibility and management.' +intro: 'With {% data variables.product.product_name %}, you can use an enterprise account to {% ifversion fpt %}enable collaboration between your organizations, while giving{% elsif ghes or ghae %}give{% endif %} administrators a single point of visibility and management.' product: '{% data reusables.gated-features.enterprise-accounts %}' redirect_from: - /articles/about-github-business-accounts/ @@ -11,37 +11,8 @@ versions: fpt: '*' ghes: '*' topics: + - Accounts - Enterprise --- -## About enterprise accounts -An enterprise account allows you to manage multiple {% data variables.product.prodname_dotcom %} organizations and {% data variables.product.prodname_ghe_server %} instances. Your enterprise account must have a handle, like an organization or personal account on {% data variables.product.prodname_dotcom %}. Enterprise administrators can manage settings and preferences, like: - -- Member access and management (organization members, outside collaborators) -- Billing and usage ({% data variables.product.prodname_ghe_server %} instances, user licenses, {% data variables.large_files.product_name_short %} packs{% ifversion fpt or ghes > 3.0 %}, {% data variables.product.prodname_GH_advanced_security %} usage{% endif %}) -- Security (single sign-on, two factor authentication) -- Requests and support bundle sharing with {% data variables.contact.enterprise_support %} - -{% data reusables.enterprise-accounts.enterprise-accounts-billing %} For more information about managing your {% data variables.product.prodname_ghe_cloud %} subscription, see "[Viewing the subscription and usage for your enterprise account](/articles/viewing-the-subscription-and-usage-for-your-enterprise-account)." For more information about managing your {% data variables.product.prodname_ghe_server %} billing settings, see "[Managing billing for your enterprise](/admin/overview/managing-billing-for-your-enterprise)." - -For more information about the differences between {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, see "[{% data variables.product.prodname_dotcom %}'s products](/articles/githubs-products)." To upgrade to {% data variables.product.prodname_enterprise %} or to get started with an enterprise account, contact {% data variables.contact.contact_enterprise_sales %}. - -For more information about member access and management, see "{% ifversion fpt %}[Managing users in your enterprise](/github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise){% elsif ghae or ghes %}[Managing users, organizations, and repositories](/admin/user-management){% endif %}." - -For more information about managing enterprise accounts using the GraphQL API, see "[Enterprise accounts](/graphql/guides/managing-enterprise-accounts)." - -{% ifversion fpt %} - -## Managing organizations linked to your enterprise account - -Organizations are shared accounts where groups of people can collaborate across many projects at once. Owners can manage member access to the organization's data and projects with sophisticated security and administrative features. For more information, see "[About organizations](/articles/about-organizations)." - -Enterprise owners can create organizations and link them to the enterprise. After you add organizations to your enterprise account, you can manage and enforce the organizations' policies. Specific enforcement options vary by setting; generally, you can choose to enforce a single policy for every organization in your enterprise account or allow owners to set policy on the organization level. - -For more information, see "[Managing organizations in your enterprise account](/articles/managing-organizations-in-your-enterprise-account)" and "[Setting policies for organizations in your enterprise account](/articles/setting-policies-for-organizations-in-your-enterprise-account)." - -{% endif %} - -## Managing {% data variables.product.prodname_ghe_server %} licenses linked to your enterprise account - -{% data reusables.enterprise-accounts.admin-managing-licenses %} +{% data reusables.enterprise-accounts.about-enterprise-accounts %} diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/index.md b/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/index.md index 3f5c1141e7..d727f29701 100644 --- a/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/index.md +++ b/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/index.md @@ -11,7 +11,6 @@ topics: children: - /about-enterprise-accounts - /verifying-or-approving-a-domain-for-your-enterprise-account - - /viewing-the-subscription-and-usage-for-your-enterprise-account - /managing-licenses-for-visual-studio-subscription-with-github-enterprise - /connecting-an-azure-subscription-to-your-enterprise shortTitle: Manage your enterprise diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md b/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md index 0078466d5e..64c8dc5698 100644 --- a/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md +++ b/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md @@ -44,7 +44,7 @@ For more information, see "[Inviting users to join your organization](/organizat ## Viewing {% data variables.product.prodname_enterprise %} licensing -After assigning a license for {% data variables.product.prodname_vss_ghe %} in {% data variables.product.prodname_vss_admin_portal_with_url %}, you can view the number of {% data variables.product.prodname_enterprise %} licenses available to your enterprise account. For more information, see "[Viewing the subscription and usage for your enterprise account](/github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account)." +After assigning a license for {% data variables.product.prodname_vss_ghe %} in {% data variables.product.prodname_vss_admin_portal_with_url %}, you can view the number of {% data variables.product.prodname_enterprise %} licenses available to your enterprise account. For more information, see "[Viewing the subscription and usage for your enterprise account](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)." You can also see pending {% data variables.product.prodname_enterprise %} invitations to subscribers in {% data variables.product.prodname_vss_admin_portal_with_url %}. The list of pending invitations includes subscribers who are not yet members of at least one organization in your enterprise account. For more information, see "[Viewing people in your enterprise](/github/setting-up-and-managing-your-enterprise/viewing-people-in-your-enterprise#viewing-members-and-outside-collaborators)." diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md deleted file mode 100644 index cafc75eab8..0000000000 --- a/content/github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -title: Viewing the subscription and usage for your enterprise account -intro: 'You can view the current subscription, license usage, invoices, payment history, and other billing information for your enterprise account.' -product: '{% data reusables.gated-features.enterprise-accounts %}' -permissions: Enterprise owners and billing managers can access and manage all billing settings for enterprise accounts. -redirect_from: - - /github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account - - /articles/viewing-the-subscription-and-usage-for-your-enterprise-account - - /github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account -versions: - fpt: '*' - ghes: '*' -topics: - - Enterprise -shortTitle: View subscription & usage ---- -## About billing for enterprise accounts - -Enterprise accounts are currently available to {% data variables.product.prodname_enterprise %} customers paying by invoice. Billing for all of the organizations and {% data variables.product.prodname_ghe_server %} instances connected to your enterprise account are aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services (including paid licenses in organizations, {% data variables.large_files.product_name_long %} data packs,{% ifversion fpt or ghes > 3.0 %} {% data variables.product.prodname_GH_advanced_security %} usage,{% endif %} and subscriptions for {% data variables.product.prodname_marketplace %} apps). - -{% ifversion fpt %}{% data reusables.enterprise-accounts.billing-microsoft-ea-overview %} For more information, see "[Connecting an Azure subscription to your enterprise](/github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise)."{% endif %} - -For more information about managing billing managers, see "[Inviting people to manage your enterprise](/github/setting-up-and-managing-your-enterprise/inviting-people-to-manage-your-enterprise)." - -## Viewing the subscription and usage for your enterprise account - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.license-tab %} -1. Under "User {% ifversion fpt %}Licenses{% else %}licenses{% endif %}", view your total licenses, number of consumed licenses, and your subscription expiration date. - {% ifversion fpt %}![License and subscription information in enterprise billing settings](/assets/images/help/business-accounts/billing-license-info.png){% else %} - ![License and subscription information in enterprise billing settings](/assets/images/enterprise/enterprise-server/enterprise-server-billing-license-info.png){% endif %} -1. Optionally, to view details for license usage or download a {% ifversion fpt %}CSV{% elsif ghes %}JSON{% endif %} file with license details{% ifversion fpt %}, to the right of "User Licenses"{% endif %}, click **View {% ifversion fpt %}details{% elsif ghes %}users{% endif %}** or {% ifversion fpt %}{% octicon "download" aria-label="The download icon" %}{% elsif ghes %}**Export license usage**{% endif %}.{% ifversion fpt %} - !["View details" button and button with download icon to the right of "User Licenses"](/assets/images/help/business-accounts/billing-license-info-click-view-details-or-download.png){% endif %} -{% ifversion fpt or ghes > 3.0 %} -1. Optionally, to view usage details for other features, in the left sidebar, click **Billing**. - ![Billing tab in the enterprise account settings sidebar](/assets/images/help/business-accounts/settings-billing-tab.png) -{% endif %} - -{% ifversion fpt %} -## Further reading - -- "[About billing for GitHub Actions](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#about-billing-for-github-actions)" -- "[About billing for Git Large File Storage](/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)" -- "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security)" - -{% endif %} diff --git a/content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md index e97f6a5b36..823f4bad3c 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md @@ -136,7 +136,7 @@ You can manage access to {% data variables.product.prodname_GH_advanced_security 1. Go to the security and analysis settings for your organization. For more information, see "[Displaying the security and analysis settings](#displaying-the-security-and-analysis-settings)." 1. To see a list of all the repositories in your organization with {% data variables.product.prodname_GH_advanced_security %} enabled, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section. ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png) - The table lists the number of unique committers for each repository. This is the number of seats you could free up on your license by removing access to {% data variables.product.prodname_GH_advanced_security %}. {% ifversion fpt %}For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security)."{% else %}For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/admin/advanced-security/about-licensing-for-github-advanced-security)."{% endif %} + The table lists the number of unique committers for each repository. This is the number of seats you could free up on your license by removing access to {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." 1. To remove access to {% data variables.product.prodname_GH_advanced_security %} from a repository and free up seats used by any committers that are unique to the repository, click the adjacent {% octicon "x" aria-label="X symbol" %}. 1. In the confirmation dialog, click **Remove repository** to remove access to the features of {% data variables.product.prodname_GH_advanced_security %}. diff --git a/data/reusables/advanced-security/getting-the-most-from-your-license.md b/data/reusables/advanced-security/getting-the-most-from-your-license.md index ff7d774004..58b7b80a0a 100644 --- a/data/reusables/advanced-security/getting-the-most-from-your-license.md +++ b/data/reusables/advanced-security/getting-the-most-from-your-license.md @@ -3,4 +3,4 @@ When you decide which repositories and organizations to prioritize for {% data v - Codebases that are the most critical to your company's success. These are the projects for which the introduction of vulnerable code, hard-coded secrets, or vulnerable dependencies would have the greatest impact on your company. - Codebases with the highest commit frequency. These are the most actively developed projects, consequently there is a higher risk that security problems could be introduced. -When you have enabled {% data variables.product.prodname_GH_advanced_security %} for these organizations or repositories, you should assess which other codebases you could add without adding any extra unique committers and using up more seats on your license. After this, review the next most important and busy codebases. If you want to increase the number of seats in your license, contact {% data variables.contact.contact_enterprise_sales %}. +When you have enabled {% data variables.product.prodname_GH_advanced_security %} for these organizations or repositories, assess which other codebases you could add without incurring billing for unique committers. Finally, review the remaining important and busy codebases. {% ifversion fpt or ghes %}If you want to increase the number of seats in your license, contact {% data variables.contact.contact_enterprise_sales %}.{% endif %} diff --git a/data/reusables/advanced-security/note-org-enable-uses-seats.md b/data/reusables/advanced-security/note-org-enable-uses-seats.md index 982daa9721..f49fc2eae1 100644 --- a/data/reusables/advanced-security/note-org-enable-uses-seats.md +++ b/data/reusables/advanced-security/note-org-enable-uses-seats.md @@ -1,6 +1,6 @@ {% ifversion fpt or ghes > 3.0 %} {% note %} -**Note:** If you enable {% data variables.product.prodname_GH_advanced_security %}, committers to these repositories will use seats on your {% data variables.product.prodname_GH_advanced_security %} license. This option is disabled if you have exceeded your license capacity. {% ifversion fpt %}For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security)."{% endif %} +**Note:** If you enable {% data variables.product.prodname_GH_advanced_security %}, committers to these repositories will use seats on your {% data variables.product.prodname_GH_advanced_security %} license. This option is disabled if you have exceeded your license capacity. {% ifversion fpt %}For more information, see "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %} {% endnote %} {% endif %} diff --git a/data/reusables/billing/about-invoices-for-enterprises.md b/data/reusables/billing/about-invoices-for-enterprises.md new file mode 100644 index 0000000000..87b56d3b14 --- /dev/null +++ b/data/reusables/billing/about-invoices-for-enterprises.md @@ -0,0 +1 @@ +For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. diff --git a/data/reusables/billing/ghes-with-no-enterprise-account.md b/data/reusables/billing/ghes-with-no-enterprise-account.md new file mode 100644 index 0000000000..ea5183e6af --- /dev/null +++ b/data/reusables/billing/ghes-with-no-enterprise-account.md @@ -0,0 +1 @@ +{% data variables.product.prodname_enterprise %} customers with no enterprise account on {% data variables.product.prodname_dotcom_the_website %} can view invoices and payment history on the [{% data variables.product.prodname_enterprise %} website](https://enterprise.github.com/login). {% data reusables.enterprise-accounts.to-upgrade-or-get-started %} diff --git a/data/reusables/enterprise-accounts/about-enterprise-accounts.md b/data/reusables/enterprise-accounts/about-enterprise-accounts.md new file mode 100644 index 0000000000..cafe2dbc0e --- /dev/null +++ b/data/reusables/enterprise-accounts/about-enterprise-accounts.md @@ -0,0 +1,87 @@ +## About enterprise accounts on {% ifversion fpt %}{% data variables.product.prodname_ghe_cloud %}{% else %}{% data variables.product.product_name %}{% endif %} + +{% ifversion fpt %} + +Your enterprise account on {% data variables.product.prodname_dotcom_the_website %} allows you to manage multiple organizations. Your enterprise account must have a handle, like an organization or personal account on {% data variables.product.prodname_dotcom %}. + +{% elsif ghes or ghae %} + +The enterprise account on {% ifversion ghes %}{% data variables.product.product_location_enterprise %}{% elsif ghae %}{% data variables.product.product_name %}{% endif %} allows you to manage the organizations{% ifversion ghes %} on{% elsif ghae %} owned by{% endif %} your {% ifversion ghes %}{% data variables.product.prodname_ghe_server %} instance{% elsif ghae %}enterprise{% endif %}. + +{% endif %} + +Organizations are shared accounts where enterprise members can collaborate across many projects at once. Organization owners can manage access to the organization's data and projects with sophisticated security and administrative features. For more information, see {% ifversion fpt %}"[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)."{% elsif ghes or ghae %}"[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)" and "[Managing users, organizations, and repositories](/admin/user-management)."{% endif %} + +{% ifversion fpt %} + +Enterprise owners can create organizations and link the organizations to the enterprise. After you add organizations to your enterprise account, you can manage and enforce policies for the organizations. Specific enforcement options vary by setting; generally, you can choose to enforce a single policy for every organization in your enterprise account or allow owners to set policy on the organization level. For more information, see "[Setting policies for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account)." + +{% elsif ghes or ghae %} + +For more information about the management of policies for your enterprise account, see "[Setting policies for your enterprise](/admin/policies)." + +{% endif %} + +## About administration of your enterprise account + +{% ifversion ghes or ghae %} + +From your enterprise account on {% ifversion ghae %}{% data variables.product.product_name %}{% elsif ghes %}a {% data variables.product.prodname_ghe_server %} instance{% endif %}, administrators can view enterprise membership and manage the following for the {% ifversion ghes %}{% data variables.product.prodname_ghe_server %} instance{% elsif ghae %}enterprise on {% data variables.product.prodname_ghe_managed %}{% endif %}. + +{% ifversion ghes %} +- License usage{% endif %} +- Security ({% ifversion ghae %}single sign-on, IP allow lists, {% endif %}SSH certificate authorities, two-factor authentication) +- Enterprise policies for organizations owned by the enterprise account + +{% endif %} + +{% ifversion ghes %} + +### About administration of your enterprise account on {% data variables.product.prodname_ghe_cloud %} + +{% endif %} + +{% ifversion fpt or ghes %}When you try or purchase {% data variables.product.prodname_enterprise %}, you can{% ifversion ghes %} also{% endif %} create an enterprise account for {% data variables.product.prodname_ghe_cloud %} on {% data variables.product.prodname_dotcom_the_website %}. Administrators for the enterprise account on {% data variables.product.prodname_dotcom_the_website %} can view membership and manage the following for the enterprise account{% ifversion ghes %} on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. + +- Billing and usage (services on {% data variables.product.prodname_dotcom_the_website %}, {% data variables.product.prodname_GH_advanced_security %}, user licenses) +- Security (single sign-on, IP allow lists, SSH certificate authorities, two-factor authentication) +- Enterprise policies for organizations owned by the enterprise account + +If you use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, you can also manage the following for {% data variables.product.prodname_ghe_server %} from your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. + +- Billing and usage for {% data variables.product.prodname_ghe_server %} instances +- Requests and support bundle sharing with {% data variables.contact.enterprise_support %} + +You can also connect the enterprise account on {% data variables.product.product_location_enterprise %} to your enterprise account on {% data variables.product.prodname_dotcom_the_website %} to see license usage details for your {% data variables.product.prodname_enterprise %} subscription from {% data variables.product.prodname_dotcom_the_website %}. For more information, see {% ifversion fpt %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/enterprise-server/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."{% endif %} + +For more information about the differences between {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, see "[{% data variables.product.prodname_dotcom %}'s products](/get-started/learning-about-github/githubs-products)." {% data reusables.enterprise-accounts.to-upgrade-or-get-started %} + +{% endif %} + +## About billing for your enterprise account + +The bill for your enterprise account includes the monthly cost for each member of your enterprise. The bill includes {% ifversion fpt %}any paid licenses in organizations outside of your enterprise account, subscriptions to apps in {% data variables.product.prodname_marketplace %}, {% endif %}{% ifversion fpt or ghae %}additional paid services for your enterprise{% ifversion fpt %} like data packs for {% data variables.large_files.product_name_long %},{% endif %} and{% endif %} usage for {% data variables.product.prodname_GH_advanced_security %}. + +{% ifversion fpt %} + +For more information about billing for your {% data variables.product.prodname_ghe_cloud %} subscription, see "[Viewing the subscription and usage for your enterprise account](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)." + +{% elsif ghes %} + +{% data reusables.enterprise-accounts.enterprise-accounts-billing %} + +For more information about billing for {% ifversion fpt %}{% data variables.product.prodname_ghe_cloud %}{% else %}{% data variables.product.product_name %}{% endif %}, see "[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)." + +{% endif %} + +{% ifversion fpt or ghes %} + +{% ifversion fpt %} + +{% data variables.product.prodname_enterprise %} offers two deployment options. In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or supported cloud provider. {% endif %}Enterprise owners on {% data variables.product.prodname_dotcom_the_website %} can use an enterprise account to manage payment and licensing for {% data variables.product.prodname_ghe_server %} instances. For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products#github-enterprise)" and "[Managing your license for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise)." + +{% endif %} + +## Further reading + +- "[Enterprise accounts](/graphql/guides/managing-enterprise-accounts)" in the GraphQL API documentation diff --git a/data/reusables/enterprise-accounts/admin-managing-licenses.md b/data/reusables/enterprise-accounts/admin-managing-licenses.md deleted file mode 100644 index 4574313a69..0000000000 --- a/data/reusables/enterprise-accounts/admin-managing-licenses.md +++ /dev/null @@ -1 +0,0 @@ -{% data variables.product.prodname_enterprise %} administrators can use an enterprise account to view and manage user licenses on their {% data variables.product.prodname_ghe_server %} instance. To get started with an enterprise account, contact {% data variables.contact.contact_enterprise_sales %}, and see "[Managing your {% data variables.product.prodname_enterprise %} license](/enterprise/admin/installation/managing-your-github-enterprise-license)." diff --git a/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md b/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md index cccbf3efa8..57ca31b009 100644 --- a/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md +++ b/data/reusables/enterprise-accounts/billing-microsoft-ea-overview.md @@ -1 +1 @@ -If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. +If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} usage beyond the amounts included with your account. diff --git a/data/reusables/enterprise-accounts/enterprise-administrators.md b/data/reusables/enterprise-accounts/enterprise-administrators.md index e15d603622..779c4a1333 100644 --- a/data/reusables/enterprise-accounts/enterprise-administrators.md +++ b/data/reusables/enterprise-accounts/enterprise-administrators.md @@ -1 +1 @@ -{% ifversion ghes or fpt %}Currently, there are two administrative roles available in enterprises: enterprise owners, who can access and manage all settings across the enterprise, and billing managers, who can access and manage only the enterprise's billing settings. {% endif %}Enterprise owners can {% ifversion ghes or fpt %}also {% endif %} see all of the members and outside collaborators for every organization owned by the enterprise. +{% ifversion fpt %}Currently, there are two administrative roles available in enterprises: enterprise owners, who can access and manage all settings across the enterprise, and billing managers, who can access and manage only the enterprise's billing settings. {% endif %}Enterprise owners can {% ifversion fpt %}also {% endif %} see all of the members and outside collaborators for every organization owned by the enterprise. diff --git a/data/reusables/enterprise-accounts/to-upgrade-or-get-started.md b/data/reusables/enterprise-accounts/to-upgrade-or-get-started.md new file mode 100644 index 0000000000..f6b206a9ce --- /dev/null +++ b/data/reusables/enterprise-accounts/to-upgrade-or-get-started.md @@ -0,0 +1 @@ +To upgrade to {% data variables.product.prodname_enterprise %} or to get started with an enterprise account, contact {% data variables.contact.contact_enterprise_sales %}. diff --git a/data/reusables/enterprise-licensing/about-license-sync.md b/data/reusables/enterprise-licensing/about-license-sync.md new file mode 100644 index 0000000000..01a45abcdc --- /dev/null +++ b/data/reusables/enterprise-licensing/about-license-sync.md @@ -0,0 +1 @@ +You can allocate the user count for your {% data variables.product.prodname_enterprise %} license to members of both {% data variables.product.product_location_enterprise %} and an enterprise account on {% data variables.product.prodname_ghe_cloud %}. When you add a user to either environment, the user will consume one license. If a user has accounts in both environments, to consume only one license, the user's primary email address on {% data variables.product.product_location_enterprise %} must be the same as the user's verified email address on {% data variables.product.prodname_dotcom_the_website %}. You can sync license count and usage between the environments. \ No newline at end of file diff --git a/data/reusables/enterprise-licensing/contact-sales-for-renewals-or-seats.md b/data/reusables/enterprise-licensing/contact-sales-for-renewals-or-seats.md new file mode 100644 index 0000000000..927dea3bdb --- /dev/null +++ b/data/reusables/enterprise-licensing/contact-sales-for-renewals-or-seats.md @@ -0,0 +1 @@ +If you'd like to renew or add user licenses to {% data variables.product.prodname_enterprise %}, or if you have questions about your license, contact {% data variables.contact.contact_enterprise_sales %}. Your new license file will be available for download immediately after you complete your order. diff --git a/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md b/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md new file mode 100644 index 0000000000..662c5f90b8 --- /dev/null +++ b/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md @@ -0,0 +1 @@ +If you use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} and sync license usage between the products, you can view license usage for both on {% data variables.product.prodname_dotcom_the_website %}. For more information, see {% ifversion fpt %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/enterprise-server/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}"[Syncing license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."{% endif %} diff --git a/data/reusables/enterprise/about-deployment-methods.md b/data/reusables/enterprise/about-deployment-methods.md new file mode 100644 index 0000000000..7b172e17c9 --- /dev/null +++ b/data/reusables/enterprise/about-deployment-methods.md @@ -0,0 +1 @@ +{% data variables.product.prodname_enterprise %} offers two deployment options. {% ifversion fpt %}In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or a supported cloud.{% elsif ghes %}In addition to {% data variables.product.product_name %}, you can use {% data variables.product.prodname_ghe_cloud %} to host development work for your enterprise on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[{% data variables.product.company_short %}'s products](/get-started/learning-about-github/githubs-products#github-enterprise)." diff --git a/data/reusables/enterprise_installation/software-license.md b/data/reusables/enterprise_installation/software-license.md index cd39127667..99674d6230 100644 --- a/data/reusables/enterprise_installation/software-license.md +++ b/data/reusables/enterprise_installation/software-license.md @@ -1 +1 @@ -You must have a {% data variables.product.prodname_enterprise %} license file. To download an existing license file or request a trial license, visit [enterprise.github.com](https://enterprise.github.com/download). For more information, see "[Managing your {% data variables.product.prodname_enterprise %} license](/enterprise/{{ currentVersion }}/admin/guides/installation/managing-your-github-enterprise-license/)." +You must have a {% data variables.product.prodname_enterprise %} license file. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_server %}](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server#setting-up-your-trial-of-github-enterprise-server)" and "[About licenses for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise)." \ No newline at end of file diff --git a/data/reusables/enterprise_installation/upload-a-license-file.md b/data/reusables/enterprise_installation/upload-a-license-file.md index 7812bad049..511af188a9 100644 --- a/data/reusables/enterprise_installation/upload-a-license-file.md +++ b/data/reusables/enterprise_installation/upload-a-license-file.md @@ -1 +1 @@ -2. At the prompt, upload your license file and set a management console password. For more information, see "[Managing your {% data variables.product.prodname_enterprise %} license](/enterprise/{{ currentVersion }}/admin/guides/installation/managing-your-github-enterprise-license/)." +2. At the prompt, upload your license file and set a management console password. For more information, see "[Managing your license for {% data variables.product.prodname_enterprise %}](/billing/managing-your-license-for-github-enterprise)." \ No newline at end of file diff --git a/data/reusables/gated-features/code-scanning.md b/data/reusables/gated-features/code-scanning.md index 607b5d21b6..f5156da965 100644 --- a/data/reusables/gated-features/code-scanning.md +++ b/data/reusables/gated-features/code-scanning.md @@ -1,5 +1,5 @@ {% ifversion fpt %}{% data variables.product.prodname_code_scanning_capc %} is available for all public repositories, and for private repositories owned by organizations where {% data variables.product.prodname_GH_advanced_security %} is enabled. -{%- elsif ghes > 3.0 or ghae-next %}{% data variables.product.prodname_code_scanning_capc %} is available for organization-owned repositories where {% data variables.product.prodname_GH_advanced_security %} is enabled. +{%- elsif ghes > 3.0 %}{% data variables.product.prodname_code_scanning_capc %} is available for organization-owned repositories where {% data variables.product.prodname_GH_advanced_security %} is enabled. {%- elsif ghae %} {% data variables.product.prodname_code_scanning_capc %} is available as part of {% data variables.product.prodname_GH_advanced_security %}, which is free during the beta release. {%- else %} diff --git a/data/reusables/gated-features/ghas.md b/data/reusables/gated-features/ghas.md index 94c19836e6..a8814b11e1 100644 --- a/data/reusables/gated-features/ghas.md +++ b/data/reusables/gated-features/ghas.md @@ -1 +1 @@ -{% data variables.product.prodname_GH_advanced_security %} licenses are available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt %} {% data variables.product.prodname_GH_advanced_security %} is also included in all public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)." +{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt %} {% data variables.product.prodname_GH_advanced_security %} is also included in all public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)." diff --git a/translations/de-DE/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md b/translations/de-DE/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md index 6b04a6d2ec..36db0b4825 100644 --- a/translations/de-DE/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md +++ b/translations/de-DE/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md @@ -42,6 +42,12 @@ env=~/.ssh/agent.env agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; } +agent_start () { + (umask 077; ssh-agent >| "$env") + . env=~/.ssh/agent.env + +agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; } + agent_start () { (umask 077; ssh-agent >| "$env") . "$env" >| /dev/null ; } @@ -58,6 +64,15 @@ elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then ssh-add fi +unset env + +if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then + agent_start + ssh-add +elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then + ssh-add +fi + unset env ``` diff --git a/translations/es-ES/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md b/translations/es-ES/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md index 126699527b..9bcf02c432 100644 --- a/translations/es-ES/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md +++ b/translations/es-ES/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md @@ -48,7 +48,7 @@ agent_start () { agent_load_env -# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running +# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?) if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then @@ -58,6 +58,15 @@ elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then ssh-add fi +unset env + +if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then + agent_start + ssh-add +elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then + ssh-add +fi + unset env ``` diff --git a/translations/es-XL/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md b/translations/es-XL/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md index af883b30cb..0ff15b1cfc 100644 --- a/translations/es-XL/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md +++ b/translations/es-XL/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md @@ -48,7 +48,7 @@ agent_start () { agent_load_env -# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running +# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?) if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then @@ -58,6 +58,15 @@ elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then ssh-add fi +unset env + +if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then + agent_start + ssh-add +elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then + ssh-add +fi + unset env ``` diff --git a/translations/ja-JP/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md b/translations/ja-JP/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md index 8923d56a9a..ba40f73ee0 100644 --- a/translations/ja-JP/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md +++ b/translations/ja-JP/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md @@ -44,21 +44,20 @@ agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; } agent_start () { (umask 077; ssh-agent >| "$env") - . "$env" >| /dev/null ; } + . env=~/.ssh/agent.env -agent_load_env +agent_load_env () { test -f "$env" && . -# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running -agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?) +"$env" >| /dev/null ; } -if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then +agent_start () { + (umask 077; ssh-agent >| "$env") + . "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then agent_start ssh-add elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then ssh-add fi - -unset env ``` 秘密鍵がデフォルトの場所 (`~/.ssh/id_rsa` など) に保存されていない場合は、SSH 認証エージェントにその場所を指定する必要があります。 キーを ssh-agent に追加するには、`ssh-add ~/path/to/my_key` と入力します。 詳細は「[新しい SSH キーを生成して ssh-agent に追加する](/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/)」を参照してください。 diff --git a/translations/ko-KR/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md b/translations/ko-KR/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md index 92b541facd..4924962052 100644 --- a/translations/ko-KR/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md +++ b/translations/ko-KR/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md @@ -48,7 +48,7 @@ agent_start () { agent_load_env -# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running +# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?) if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then diff --git a/translations/pt-BR/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md b/translations/pt-BR/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md index bf04734399..f29fd403be 100644 --- a/translations/pt-BR/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md +++ b/translations/pt-BR/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md @@ -48,9 +48,11 @@ agent_start () { agent_load_env -# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running +# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?) +if [ ! + if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then agent_start ssh-add diff --git a/translations/ru-RU/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md b/translations/ru-RU/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md index 0da2533220..4259b4df92 100644 --- a/translations/ru-RU/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md +++ b/translations/ru-RU/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md @@ -48,7 +48,7 @@ agent_start () { agent_load_env -# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running +# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?) if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then diff --git a/translations/zh-CN/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md b/translations/zh-CN/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md index 236a3be7c7..282de2efcb 100644 --- a/translations/zh-CN/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md +++ b/translations/zh-CN/content/github/authenticating-to-github/connecting-to-github-with-ssh/working-with-ssh-key-passphrases.md @@ -42,13 +42,19 @@ env=~/.ssh/agent.env agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; } +agent_start () { + (umask 077; ssh-agent >| "$env") + . env=~/.ssh/agent.env + +agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; } + agent_start () { (umask 077; ssh-agent >| "$env") . "$env" >| /dev/null ; } agent_load_env -# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2=agent not running +# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?) if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then @@ -58,6 +64,15 @@ elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then ssh-add fi +unset env + +if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then + agent_start + ssh-add +elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then + ssh-add +fi + unset env ```