diff --git a/assets/images/help/business-accounts/enterprise-account-settings-tab.png b/assets/images/help/business-accounts/enterprise-account-settings-tab.png index 6490bf534a3b..a3171b28780c 100644 Binary files a/assets/images/help/business-accounts/enterprise-account-settings-tab.png and b/assets/images/help/business-accounts/enterprise-account-settings-tab.png differ diff --git a/assets/images/help/enterprises/enterprise-licensing-tab.png b/assets/images/help/enterprises/enterprise-licensing-tab.png index ae9167d80677..f66c98c88d20 100644 Binary files a/assets/images/help/enterprises/enterprise-licensing-tab.png and b/assets/images/help/enterprises/enterprise-licensing-tab.png differ diff --git a/assets/images/help/enterprises/ghas-add-committers.png b/assets/images/help/enterprises/ghas-add-committers.png new file mode 100644 index 000000000000..1719ae183033 Binary files /dev/null and b/assets/images/help/enterprises/ghas-add-committers.png differ diff --git a/assets/images/help/enterprises/ghas-buy-advanced-security-button.png b/assets/images/help/enterprises/ghas-buy-advanced-security-button.png new file mode 100644 index 000000000000..5fc76ef610f2 Binary files /dev/null and b/assets/images/help/enterprises/ghas-buy-advanced-security-button.png differ diff --git a/assets/images/help/enterprises/ghas-cancel-subscription.png b/assets/images/help/enterprises/ghas-cancel-subscription.png new file mode 100644 index 000000000000..c97e3198cafe Binary files /dev/null and b/assets/images/help/enterprises/ghas-cancel-subscription.png differ diff --git a/assets/images/help/enterprises/ghas-committers-dropdown.png b/assets/images/help/enterprises/ghas-committers-dropdown.png new file mode 100644 index 000000000000..a3420e93ff02 Binary files /dev/null and b/assets/images/help/enterprises/ghas-committers-dropdown.png differ diff --git a/assets/images/help/enterprises/ghas-download-report.png b/assets/images/help/enterprises/ghas-download-report.png new file mode 100644 index 000000000000..bc4206d05182 Binary files /dev/null and b/assets/images/help/enterprises/ghas-download-report.png differ diff --git a/assets/images/help/enterprises/ghas-manage-committers.png b/assets/images/help/enterprises/ghas-manage-committers.png new file mode 100644 index 000000000000..c527bece0923 Binary files /dev/null and b/assets/images/help/enterprises/ghas-manage-committers.png differ diff --git a/assets/images/help/enterprises/your-enterprises-list.png b/assets/images/help/enterprises/your-enterprises-list.png index 4ee76d47caf1..82acc707423b 100644 Binary files a/assets/images/help/enterprises/your-enterprises-list.png and b/assets/images/help/enterprises/your-enterprises-list.png differ diff --git a/assets/images/help/enterprises/your-enterprises.png b/assets/images/help/enterprises/your-enterprises.png index 195e966caee3..cd7b8e46aa5c 100644 Binary files a/assets/images/help/enterprises/your-enterprises.png and b/assets/images/help/enterprises/your-enterprises.png differ diff --git a/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md b/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md index dc479cec8f74..ec2ae0012e07 100644 --- a/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md +++ b/content/admin/code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md @@ -20,7 +20,7 @@ You can use {% data variables.product.prodname_advanced_security %} features to {% ifversion secret-scanning-enterprise-level-api %}{% data reusables.secret-scanning.secret-scanning-enterprise-level-api %}{% endif %} -{% ifversion ghes or ghec %}For information about buying a license for {% 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 %} +{% ifversion ghes %}For information about buying a license for {% 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 ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[Signing up for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/signing-up-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 %} If you have disallowed {% data variables.product.prodname_GH_advanced_security %} for an organization, that organization will not be affected by enabling a feature for all existing repositories or for all new repositories. For more information about disallowing {% data variables.product.prodname_GH_advanced_security %} for an organization, see "[Enforcing policies for Advanced Security in your enterprise](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise)." 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 index ef31fcb9f3df..08e5973b1dbe 100644 --- 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 @@ -55,7 +55,9 @@ Each license for {% data variables.product.prodname_GH_advanced_security %} spec You can determine how many licenses you'll need for {% data variables.product.prodname_GH_advanced_security %} by generating a count of your instance's active committers in the site admin dashboard. For more information, see "[Site admin dashboard](/admin/configuration/configuring-your-enterprise/site-admin-dashboard#advanced-security-committers)." {% endif %} -To discuss licensing {% data variables.product.prodname_GH_advanced_security %} for your enterprise, contact {% data variables.contact.contact_enterprise_sales %}. +{% ifversion ghec %} +Enterprise account customers on GitHub Enterprise Cloud who pay with a credit card can purchase a GitHub Advanced Security license from their enterprise account settings. For more information, see "[Signing up for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)." For customers who pay by invoice, contact {% data variables.contact.contact_enterprise_sales %} to discuss licensing {% data variables.product.prodname_GH_advanced_security %} for your enterprise. +{% endif %} ## About committer numbers for {% data variables.product.prodname_GH_advanced_security %} @@ -86,9 +88,11 @@ As soon as you free up some {% ifversion ghas-billing-UI-update %}licenses{% els 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]({% ifversion fpt %}/enterprise-cloud@latest/{% endif %}/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %} {% ifversion fpt or ghes or ghec %} +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 %} -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)." - +{% ifversion ghec %} +For more information on managing the number of committers, see "[Managing your {% data variables.product.prodname_GH_advanced_security %} licensing](/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing)." {% endif %} ## Understanding active committer usage diff --git a/content/billing/managing-billing-for-github-advanced-security/index.md b/content/billing/managing-billing-for-github-advanced-security/index.md index 966f8b55618a..d15bfede68be 100644 --- a/content/billing/managing-billing-for-github-advanced-security/index.md +++ b/content/billing/managing-billing-for-github-advanced-security/index.md @@ -12,6 +12,9 @@ versions: ghec: '*' children: - /about-billing-for-github-advanced-security + - /signing-up-for-github-advanced-security - /viewing-your-github-advanced-security-usage + - /managing-your-github-advanced-security-licensing + --- diff --git a/content/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md b/content/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md new file mode 100644 index 000000000000..3062ca48b3a7 --- /dev/null +++ b/content/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md @@ -0,0 +1,36 @@ +--- +title: Managing your GitHub Advanced Security licensing +intro: 'You can add or remove {% data variables.product.prodname_GH_advanced_security %} licenses for your enterprise.' +permissions: 'Enterprise owners can manage licensing for {% data variables.product.prodname_GH_advanced_security %}.' +product: '{% data reusables.gated-features.ghas-ghec %}' +versions: + ghec: '*' +miniTocMaxHeadingLevel: 3 +type: how_to +topics: + - Advanced Security + - Enterprise +shortTitle: Manage Advanced Security licensing +--- +## About licensing for GitHub Advanced Security +Each license for {% data variables.product.prodname_GH_advanced_security %} specifies a maximum number of accounts that can use these features. Each active committer to at least one repository with the feature enabled uses one {% ifversion ghas-billing-UI-update %}license{% else %}seat{% endif %}. A committer is considered active if one of their commits has been pushed to the repository within the last 90 days, regardless of when it was originally authored. For more information about committer numbers, see "[About billing for GitHub Advanced Security](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." For information about purchasing a license, see "[Signing up for GitHub Advanced Security](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)." + +## Managing the number of GitHub Advanced Security committers +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.license-tab %} +1. Under "GitHub Advanced Security", click **Committers**. + ![Screenshot showing committer dropdown in the Advanced Security licensing section](/assets/images/help/enterprises/ghas-committers-dropdown.png) +2. Under "Committers", click **Manage committers**. + ![Screenshot showing "Manage committers" button in the Advanced Security licensing screen](/assets/images/help/enterprises/ghas-manage-committers.png) +3. Under "Total committers", click the plus or minus buttons to add or remove committers. + ![Screenshot showing "Manage committers" button in the Advanced Security licensing screen](/assets/images/help/enterprises/ghas-add-committers.png) +1. Click **Update committers**. + +## Canceling your {% data variables.product.prodname_GH_advanced_security %} subscription +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.license-tab %} +1. To the right of "GitHub Advanced Security", click **Manage**, then click **Cancel Supscription**. + ![Manage drop down in the GitHub Advanced Security licensing screen](/assets/images/help/enterprises/ghas-cancel-subscription.png) +2. To confirm your cancellation, click **I understand, cancel Advanced Security**. \ No newline at end of file diff --git a/content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md b/content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md new file mode 100644 index 000000000000..6bafe9869675 --- /dev/null +++ b/content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md @@ -0,0 +1,27 @@ +--- +title: Signing up for GitHub Advanced Security +intro: "You can sign up for {% data variables.product.prodname_GH_advanced_security %} from your enterprise account's settings to take advantage of extra security features that {% data variables.product.prodname_dotcom %} makes available to customers under a {% data variables.product.prodname_GH_advanced_security %} license." +permissions: 'Enterprise owners can sign up for {% data variables.product.prodname_GH_advanced_security %}.' +product: '{% data reusables.gated-features.ghas-ghec %}' +versions: + ghec: '*' +miniTocMaxHeadingLevel: 3 +type: how_to +topics: + - Advanced Security + - Enterprise +shortTitle: Sign up for Advanced Security +--- +## Purchasing {% data variables.product.prodname_GH_advanced_security %} +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.enterprise-accounts.settings-tab %} +{% data reusables.enterprise-accounts.license-tab %} +1. To the right of "GitHub Advanced Security", click **Buy Advanced Security**. + ![Buy Advanced Security button](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png) +2. Under "How many committers do you want to include?", enter the number of committers for which you want to purchase licenses. For more information about committer numbers, see "[About billing for GitHub Advanced Security](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." +3. Confirm your billing information and payment method. +4. Click **Purchase Advanced Security**. + +## Further reading +* [Introduction to adopting {% data variables.product.prodname_GH_advanced_security %} at scale](/code-security/adopting-github-advanced-security-at-scale/introduction-to-adopting-github-advanced-security-at-scale) +* [Securing your organization](/code-security/getting-started/securing-your-organization) \ No newline at end of file diff --git a/content/billing/managing-billing-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 index 0f881c1adc30..ecaebfff749d 100644 --- a/content/billing/managing-billing-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 @@ -39,7 +39,7 @@ You can view the enterprise account's current {% ifversion ghas-billing-UI-updat {% 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-licenses.png) - If you run out of licenses, the section will be red and show "Limit exceeded." You should either reduce your use of {% data variables.product.prodname_GH_advanced_security %} or purchase more licenses. 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)." + If you run out of licenses, the section will be red and show "Limit exceeded." You should either reduce your use of {% data variables.product.prodname_GH_advanced_security %} or purchase more licenses. 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)" and "[Managing your {% data variables.product.prodname_GH_advanced_security %} licensing](/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing)." ![{% data variables.product.prodname_GH_advanced_security %} in enterprise licensing settings showing "Limit exceeded"](/assets/images/help/enterprises/enterprise-licensing-tab-ghas-no-licenses.png) {% elsif ghes %} @@ -111,8 +111,8 @@ You can download the {% data variables.product.prodname_advanced_security %} lic {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.license-tab %} -1. Under "{% data variables.product.prodname_GH_advanced_security %}," click **{% octicon "download" aria-label="The download icon" %} CSV report** next to "Committers." - ![Download button for enterprise-level data](/assets/images/help/billing/download-enterprise-GHAS-usage-data.png) +1. Under "{% data variables.product.prodname_GH_advanced_security %}," click the **Manage** dropdown and then click **Download report**. + ![Download button for enterprise-level data](/assets/images/help/enterprises/ghas-download-report.png) ### Downloading {% data variables.product.prodname_advanced_security %} license usage information through the REST API 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 9ad42c156479..9e50914e40d5 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 @@ -18,7 +18,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 {% data variables.product.prodname_GH_advanced_security %}{% ifversion fpt or ghec %} license to run on repositories apart from public repositories on {% data variables.product.prodname_dotcom_the_website %}{% endif %}. -{% ifversion ghes or ghec %}For information about buying a license for {% 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.{% elsif fpt %}To purchase a {% data variables.product.prodname_GH_advanced_security %} license, you must be using {% data variables.product.prodname_enterprise %}. For information about upgrading to {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %}, see "[GitHub's products](/get-started/learning-about-github/githubs-products)" and "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %} +{% ifversion ghes %}For information about buying a license for {% 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 ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[Signing up for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/signing-up-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.{% elsif fpt %}To purchase a {% data variables.product.prodname_GH_advanced_security %} license, you must be using {% data variables.product.prodname_enterprise %}. For information about upgrading to {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %}, see "[GitHub's products](/get-started/learning-about-github/githubs-products)" and "[About billing for {% data variables.product.prodname_GH_advanced_security %}](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %} ## About {% data variables.product.prodname_advanced_security %} features diff --git a/data/reusables/gated-features/ghas-ghec.md b/data/reusables/gated-features/ghas-ghec.md new file mode 100644 index 000000000000..dbd6b6ab7ed8 --- /dev/null +++ b/data/reusables/gated-features/ghas-ghec.md @@ -0,0 +1 @@ +{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[About GitHub's products](/github/getting-started-with-github/githubs-products)."{% endif %}