diff --git a/assets/images/help/enterprises/ghas-orgs-list-click-org.png b/assets/images/help/billing/ghas-orgs-list-enterprise-click-org.png similarity index 100% rename from assets/images/help/enterprises/ghas-orgs-list-click-org.png rename to assets/images/help/billing/ghas-orgs-list-enterprise-click-org.png diff --git a/assets/images/help/enterprises/ghas-orgs-list.png b/assets/images/help/billing/ghas-orgs-list-enterprise.png similarity index 100% rename from assets/images/help/enterprises/ghas-orgs-list.png rename to assets/images/help/billing/ghas-orgs-list-enterprise.png diff --git a/assets/images/help/billing/ghas-seats-org.png b/assets/images/help/billing/ghas-seats-org.png new file mode 100644 index 000000000000..14b78d9e4f9c Binary files /dev/null and b/assets/images/help/billing/ghas-seats-org.png differ diff --git a/assets/images/help/billing/settings_organization_billing_planning_tab.png b/assets/images/help/billing/settings_organization_billing_planning_tab.png new file mode 100644 index 000000000000..12fc9942160f Binary files /dev/null and b/assets/images/help/billing/settings_organization_billing_planning_tab.png differ diff --git a/assets/images/help/enterprises/enterprise-licensing-tab-ghas-no-seats.png b/assets/images/help/enterprises/enterprise-licensing-tab-ghas-no-seats.png new file mode 100644 index 000000000000..0c962fc6a12f Binary files /dev/null and b/assets/images/help/enterprises/enterprise-licensing-tab-ghas-no-seats.png differ diff --git a/assets/images/help/enterprises/enterprise-licensing-tab-ghas.png b/assets/images/help/enterprises/enterprise-licensing-tab-ghas.png new file mode 100644 index 000000000000..c8b408911321 Binary files /dev/null and b/assets/images/help/enterprises/enterprise-licensing-tab-ghas.png differ diff --git a/assets/images/help/enterprises/settings-security-analysis-ghas-repos-list.png b/assets/images/help/enterprises/settings-security-analysis-ghas-repos-list.png new file mode 100644 index 000000000000..519b42620a13 Binary files /dev/null and b/assets/images/help/enterprises/settings-security-analysis-ghas-repos-list.png differ diff --git a/assets/images/help/organizations/ghas-repos-list.png b/assets/images/help/organizations/ghas-repos-list.png deleted file mode 100644 index daa5230cf9ed..000000000000 Binary files a/assets/images/help/organizations/ghas-repos-list.png and /dev/null differ diff --git a/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png b/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png new file mode 100644 index 000000000000..c9121bc5b95f Binary files /dev/null and b/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png differ diff --git a/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md b/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md index 1b768465bb93..f652543a23b1 100644 --- a/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md +++ b/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md @@ -35,14 +35,13 @@ You can manage the security and analysis features for your {% if currentVersion {% data reusables.repositories.sidebar-settings %} {% data reusables.repositories.navigate-to-security-and-analysis %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %} -4. Under "Configure security and analysis features", to the right of the feature, click **Disable** or **Enable**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If the control for "{% data variables.product.prodname_secret_scanning_caps %}" is not active, you need to enable {% data variables.product.prodname_GH_advanced_security %} first. +4. Under "Configure security and analysis features", to the right of the feature, click **Disable** or **Enable**.{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}The control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled if you have no available seats in your {% data variables.product.prodname_GH_advanced_security %} license. !["Enable" or "Disable" button for "Configure security and analysis" features](/assets/images/help/repository/security-and-analysis-disable-or-enable-dotcom-private.png) {% note %} - **Note:** If you disable {% data variables.product.prodname_GH_advanced_security %}, both {% data variables.product.prodname_secret_scanning %} and {% data variables.product.prodname_code_scanning %} are disabled. Any workflows, SARIF uploads, or API calls for {% data variables.product.prodname_code_scanning %} will fail. + **Note:** If you disable {% data variables.product.prodname_GH_advanced_security %}, {% if currentVersion == "free-pro-team@latest" %}dependency review, {% endif %}{% data variables.product.prodname_secret_scanning %} and {% data variables.product.prodname_code_scanning %} are disabled. Any workflows, SARIF uploads, or API calls for {% data variables.product.prodname_code_scanning %} will fail. {% endnote %} {% endif %} - {% endif %} {% if currentVersion == "enterprise-server@3.0" %} !["Enable" or "Disable" button for "Configure security and analysis" features](/assets/images/help/repository/security-and-analysis-disable-or-enable-ghe.png) {% endif %} @@ -51,7 +50,6 @@ You can manage the security and analysis features for your {% if currentVersion ![Enable or disable {% data variables.product.prodname_GH_advanced_security %} or {% data variables.product.prodname_secret_scanning %} for your repository](/assets/images/enterprise/github-ae/repository/enable-ghas-secret-scanning-ghae.png) {% endif %} - ### Granting access to security alerts After you enable {% if currentVersion != "github-ae@latest" %}{% data variables.product.prodname_dependabot %} or {% endif %}{% data variables.product.prodname_secret_scanning %} alerts for a repository in an organization, organization owners and repository administrators can view the alerts by default. You can give additional teams and people access to the alerts for a repository. diff --git a/content/github/administering-a-repository/setting-repository-visibility.md b/content/github/administering-a-repository/setting-repository-visibility.md index 1a36f2f0660e..aacaffa8b605 100644 --- a/content/github/administering-a-repository/setting-repository-visibility.md +++ b/content/github/administering-a-repository/setting-repository-visibility.md @@ -25,7 +25,7 @@ We recommend reviewing the following caveats before you change the visibility of * If you're using {% data variables.product.prodname_free_user %} for user accounts or organizations, some features won't be available in the repository after you change the visibility to private. {% data reusables.gated-features.more-info %}{% endif %} * Any published {% data variables.product.prodname_pages %} site will be automatically unpublished.{% if currentVersion == "free-pro-team@latest" %} If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)."{% endif %}{% if currentVersion == "free-pro-team@latest" %} * {% data variables.product.prodname_dotcom %} will no longer include the repository in the {% data variables.product.prodname_archive %}. For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)."{% endif %}{% if currentVersion == "free-pro-team@latest" %} -* {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working unless the repository is owned by an organization that has a license for {% data variables.product.prodname_advanced_security %}. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% if enterpriseServerVersions contains currentVersion %} +* {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working unless the repository is owned by an organization that has a license for {% data variables.product.prodname_advanced_security %} with sufficient spare seats. {% data reusables.advanced-security.more-info-ghas %}{% endif %}{% if enterpriseServerVersions contains currentVersion %} * Anonymous Git read access is no longer available. For more information, see "[Enabling anonymous Git read access for a repository](/enterprise/{{ currentVersion }}/user/articles/enabling-anonymous-git-read-access-for-a-repository)."{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %} diff --git a/content/github/getting-started-with-github/about-github-advanced-security.md b/content/github/getting-started-with-github/about-github-advanced-security.md index bd50369cfae7..f4e1f7ed5365 100644 --- a/content/github/getting-started-with-github/about-github-advanced-security.md +++ b/content/github/getting-started-with-github/about-github-advanced-security.md @@ -9,9 +9,9 @@ versions: ### About {% data variables.product.prodname_GH_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, for example: dependency graph and {% data variables.product.prodname_dependabot_alerts %}. 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 %}. (That is, private and internal repositories on {% data variables.product.prodname_dotcom_the_website %}, and all repositories on {% data variables.product.prodname_ghe_server %}.) +{% 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{% if currentVersion != "github-ae@latest" %}, 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 %}. -For an overview of all security features, see "[About securing your repository](/github/administering-a-repository/about-securing-your-repository#setting-up-your-repository-securely)." For information about permission requirements for actions related to security features, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization#permission-requirements-for-security-features)." +{% if currentVersion == "free-pro-team@latest" %}For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security)."{% elsif currentVersion ver_gt "enterprise-server@2.22" %}For information about purchasing a license for {% data variables.product.prodname_GH_advanced_security %}, contact {% data variables.contact.contact_enterprise_sales %}.{% elsif currentVersion == "github-ae@latest" %}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 @@ -25,17 +25,7 @@ A {% data variables.product.prodname_GH_advanced_security %} license provides th - **Dependency review** - Show the full impact of changes to dependencies and see details of any vulnerable versions before you merge a pull request. For more information, see "[Reviewing dependency changes in a pull request](/github/collaborating-with-issues-and-pull-requests/reviewing-dependency-changes-in-a-pull-request)." {% endif %} -For information about {% data variables.product.prodname_advanced_security %} features that are in development, see "[{% data variables.product.prodname_dotcom %} public roadmap](https://github.com/github/roadmap)." - -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} - -### About {% data variables.product.prodname_advanced_security %} licensing - -{% data reusables.advanced-security.license-overview %} - -{% data reusables.advanced-security.enable-disable-committer-info %} - -{% endif %} +For information about {% data variables.product.prodname_advanced_security %} features that are in development, see "[{% data variables.product.prodname_dotcom %} public roadmap](https://github.com/github/roadmap)." For an overview of all security features, see "[About securing your repository](/github/administering-a-repository/about-securing-your-repository#setting-up-your-repository-securely)." {% if currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} ### Enabling {% data variables.product.prodname_advanced_security %} features on {% data variables.product.product_name %} @@ -46,24 +36,18 @@ The site administrator must enable {% data variables.product.prodname_advanced_s Once your system is set up, you can enable and disable these features at the organization or repository level. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." -{% if currentVersion ver_gt "enterprise-server@2.22" %} -For information about purchasing a license for {% data variables.product.prodname_GH_advanced_security %}, contact {% data variables.contact.contact_enterprise_sales %}. -{% endif %} {% endif %} {% if currentVersion != "github-ae@latest" %} ### Enabling {% data variables.product.prodname_advanced_security %} features on {% data variables.product.prodname_dotcom_the_website %} -For public repositories on {% data variables.product.prodname_dotcom_the_website %}, these features are permanently on and are only disabled if you change the visibility of the project so that the code is no longer public. - -For other repositories, once you have a license for your organization or enterprise, you can enable and disable these features at the organization or repository level. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." - -{% if currentVersion == "free-pro-team@latest" %} +For public repositories on {% data variables.product.prodname_dotcom_the_website %}, these features are permanently on and can only be disabled if you change the visibility of the project so that the code is no longer public. -If you have an enterprise account, license use for the enterprise is shown on your billing page. For more information, see "[Managing use of Advanced Security for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account)." +For other repositories, once you have a license for your organization or enterprise, you can enable and disable these features at the organization or repository level. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} {% endif %} -For information about purchasing a license for {% data variables.product.prodname_GH_advanced_security %}, contact {% data variables.contact.contact_enterprise_sales %}. -{% endif %} +{% if currentVersion == "free-pro-team@latest" %} +If you have an enterprise account, license use for the entire enterprise is shown on your enterprise license page. For more information, see "[Viewing your {% data variables.product.prodname_GH_advanced_security %} usage](/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage)." + {% endif %} diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security.md new file mode 100644 index 000000000000..e60a2c91ffb5 --- /dev/null +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security.md @@ -0,0 +1,50 @@ +--- +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.' +versions: + free-pro-team: '*' +--- + +### 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 %} + +You can buy a license for an organization that is owned by a user account or for your enterprise account. If you want to use {% data variables.product.prodname_GH_advanced_security %} features for a private, user-owned repository, you must transfer the repository to an organization with a license. + +To discuss licensing for {% data variables.product.prodname_GH_advanced_security %}, contact {% data variables.contact.contact_enterprise_sales %}. + +### About committer numbers for {% data variables.product.prodname_GH_advanced_security %} + +We record and display two numbers of committers for {% data variables.product.prodname_GH_advanced_security %} on {% data variables.product.prodname_dotcom_the_website %}: + +- **Committers** is the number of committers who contributed to at least one private repository in an organization and who use a seat in your license. That is, they are also an organization member, an external collaborator, or have a pending invitation to join your organization or enterprise account. +- **Unique to this repository/organization** is the number of committers who contributed only to this repository, or to repositories in this organization. This number shows how many license seats you can free up by disabling {% data variables.product.prodname_GH_advanced_security %} for that repository or organization. + +If there are no unique committers, this means that all active committers also contribute to other repositories or organizations that use {% data variables.product.prodname_GH_advanced_security %}. Disabling the feature for that repository or organization would not free any seats on your license. + +{% note %} + +**Note:** The total number of seats used in your license is not the sum of either the committers or the unique committers to each repository or organization. This is because there are people who contribute to multiple repositories or organizations. The number of seats used is measured across the whole enterprise or organization account to ensure that each person is counted only once regardless of how many repositories or organizations they contribute to. + +{% endnote %} + +### Managing your license usage for {% data variables.product.prodname_GH_advanced_security %} + +When you enable {% data variables.product.prodname_GH_advanced_security %} for a single repository, or for all repositories in an organization, {% data variables.product.company_short %} shows how many extra seats this will use and prompts you for confirmation. If you disable access to {% data variables.product.prodname_GH_advanced_security %}, any seats used by "unique" committers are freed up. This makes it easy to understand the impact of your changes on the use of your license. + +If you are over your license limit, {% data variables.product.prodname_GH_advanced_security %} continues to work on all repositories where it is already enabled. However, in organizations where {% data variables.product.prodname_GH_advanced_security %} is enabled for new repositories, repositories will be created with the feature disabled. In addition, the option to enable {% data variables.product.prodname_GH_advanced_security %} for existing repositories will not be available. If you change the visibility of a public repository to private then {% data variables.product.prodname_GH_advanced_security %} will be disabled for that repository. + +As soon as you free up some seats, by disabling {% data variables.product.prodname_GH_advanced_security %} for some repositories or by increasing your license size, the options for enabling {% data variables.product.prodname_GH_advanced_security %} will work again as normal. + +For information on viewing usage, see "[Viewing your GitHub Advanced Security usage](/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage)." + +### Getting the most out of your {% data variables.product.prodname_GH_advanced_security %} license + +When you decide which repositories and organizations to prioritize for {% data variables.product.prodname_GH_advanced_security %}, you should review them and identify: + +- 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 code bases. If you want to increase the number of seats in your license, contact {% data variables.contact.contact_enterprise_sales %}. diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/index.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/index.md index 1ec07412e38b..d96469992f48 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/index.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/index.md @@ -44,6 +44,9 @@ versions: {% link_in_list /viewing-your-git-large-file-storage-usage %} {% link_in_list /upgrading-git-large-file-storage %} {% link_in_list /downgrading-git-large-file-storage %} +{% topic_link_in_list /managing-licensing-for-github-advanced-security %} + {% link_in_list /about-licensing-for-github-advanced-security %} + {% link_in_list /viewing-your-github-advanced-security-usage %} {% topic_link_in_list /managing-billing-for-github-sponsors %} {% link_in_list /about-billing-for-github-sponsors %} {% link_in_list /upgrading-a-sponsorship %} diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security.md new file mode 100644 index 000000000000..6af70a3655a1 --- /dev/null +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security.md @@ -0,0 +1,7 @@ +--- +title: Managing licensing for GitHub Advanced Security +intro: 'You can view and manage your use of seats on a license for {% data variables.product.prodname_advanced_security %}.' +mapTopic: true +versions: + free-pro-team: '*' +--- diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md new file mode 100644 index 000000000000..6b3107ffe5fc --- /dev/null +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md @@ -0,0 +1,45 @@ +--- +title: Viewing your GitHub Advanced Security usage +intro: 'You can view and manage usage of your {% data variables.product.prodname_GH_advanced_security %} license.' +permissions: Organization and enterprise owners can manage access to {% data variables.product.prodname_GH_advanced_security %} for their organization or enterprise organizations. +redirect_from: /github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account +versions: + free-pro-team: '*' +--- + +Each license for {% data variables.product.prodname_GH_advanced_security %} specifies a maximum number of accounts, or seats, that can use these features. Periodically you should check that your use is within your license capacity. For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %} enterprise license](/github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security)." + +### Viewing and managing {% data variables.product.prodname_GH_advanced_security %} license usage for your organization + +You can check how many seats your license includes and how many of them are currently used on the "Billing & plans" page for your organization. + +{% data reusables.profile.access_profile %} +{% data reusables.profile.access_org %} +{% data reusables.organizations.org_settings %} +{% data reusables.organizations.billing_planning %} +5. Optionally, in the "{% data variables.product.prodname_GH_advanced_security %}" section, click **Manage repositories** to see the usage for each repository that has the feature enabled. + ![Details of usage of seats](/assets/images/help/billing/ghas-seats-org.png) +6. Scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section to see a detailed breakdown of usage by repository for your organization. + ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/organizations/settings-security-analysis-ghas-repos-list.png) + For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." + +### Viewing and managing {% 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 on the "Enterprise licensing" page. + +{% 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 %} enterprise license](/github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security#getting-the-most-out-of-your-github-advanced-security-enterprise-license)." + ![{% 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) + In the "{% data variables.product.prodname_GH_advanced_security %}" section you can see the number of committers and unique committers for each organization. + ![{% data variables.product.prodname_GH_advanced_security %} in enterprise billing settings](/assets/images/help/billing/ghas-orgs-list-enterprise.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](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md index 4c91d7d56748..35b5b20eb774 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md +++ b/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md @@ -45,7 +45,7 @@ You can enable or disable features for all repositories. {% if currentVersion == {% data reusables.advanced-security.note-org-enable-uses-seats %} 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)." -2. Under "Configure security and analysis features", to the right of the feature, click **Disable all** or **Enable all**. +2. Under "Configure security and analysis features", to the right of the feature, click **Disable all** or **Enable all**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}The control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled if you have no available seats in your {% data variables.product.prodname_GH_advanced_security %} license.{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} !["Enable all" or "Disable all" button for "Configure security and analysis" features](/assets/images/help/organizations/security-and-analysis-disable-or-enable-all-ghas-dotcom.png) {% endif %} @@ -90,8 +90,6 @@ You can enable or disable features for all repositories. {% if currentVersion == ![Checkbox for enabling or disabling a feature for new repositories](/assets/images/enterprise/github-ae/organizations/security-and-analysis-enable-or-disable-secret-scanning-checkbox-ghae.png) {% endif %} - {% data reusables.advanced-security.note-org-enable-uses-seats %} - {% if currentVersion == "free-pro-team@latest" %} ### Allowing Dependabot to access private repositories @@ -117,18 +115,18 @@ By default, {% data variables.product.prodname_dependabot %} can't update depend ### Removing access to {% data variables.product.prodname_GH_advanced_security %} from individual repositories in an organization -You can manage the use of {% data variables.product.prodname_GH_advanced_security %} for a repository using the "Security & analysis" page, on the "Settings" tab. You can also disable the use of {% data variables.product.prodname_GH_advanced_security %} for any repository in an organization from the "Security & analysis" page of the organization. +You can manage access to {% data variables.product.prodname_GH_advanced_security %} features for a repository from its "Settings" tab. For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." However, you can also disable {% data variables.product.prodname_GH_advanced_security %} features for a repository from the "Settings" tab for the organization. 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/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 %}. -1. To remove access to {% data variables.product.prodname_GH_advanced_security %} from a repository, click the adjacent {% octicon "x" aria-label="X symbol" %}. + ![{% 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 %}. The size of your license is shown for organization-level licenses. For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-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 %}. {% note %} -**Note:** If you remove access to {% data variables.product.prodname_GH_advanced_security %} for a repository, you should communicate with the affected development team so that they know that the change was intended. Otherwise they may assume that the change was a mistake and re-enable access. +**Note:** If you remove access to {% data variables.product.prodname_GH_advanced_security %} for a repository, you should communicate with the affected development team so that they know that the change was intended. This ensures that they don't waste time debugging failed runs of code scanning. {% endnote %} diff --git a/content/github/setting-up-and-managing-your-enterprise/index.md b/content/github/setting-up-and-managing-your-enterprise/index.md index b2a9848b9203..a0f04ad09c7a 100644 --- a/content/github/setting-up-and-managing-your-enterprise/index.md +++ b/content/github/setting-up-and-managing-your-enterprise/index.md @@ -29,7 +29,6 @@ versions: {% link_in_list /managing-unowned-organizations-in-your-enterprise-account %} {% link_in_list /viewing-the-audit-logs-for-organizations-in-your-enterprise-account %} {% link_in_list /configuring-webhooks-for-organization-events-in-your-enterprise-account %} - {% link_in_list /managing-use-of-advanced-security-for-organizations-in-your-enterprise-account %} {% topic_link_in_list /configuring-identity-and-access-management-for-your-enterprise-account %} {% link_in_list /about-identity-and-access-management-for-your-enterprise-account %} {% link_in_list /enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account %} diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account.md deleted file mode 100644 index 7463c8055f84..000000000000 --- a/content/github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -title: Managing use of Advanced Security for organizations in your enterprise account -intro: 'You can review and manage the use of {% data variables.product.prodname_GH_advanced_security %} for organizations owned by an enterprise account.' -shortTitle: Managing use of Advanced Security -product: '{% data reusables.gated-features.enterprise-accounts %}' -permissions: Enterprise owners can manage access to {% data variables.product.prodname_GH_advanced_security %} for organizations and repositories in an enterprise account. -versions: - free-pro-team: '*' ---- - -### About {% data variables.product.prodname_GH_advanced_security %} for enterprise accounts - -{% data variables.product.prodname_dotcom %} makes additional security features available to private repositories owned by enterprise accounts with a license for {% data variables.product.prodname_GH_advanced_security %}. {% data reusables.advanced-security.more-info-ghas %} - -{% data reusables.advanced-security.license-overview %} - -You can see a summary of your current license usage for each organization on the billing page for the enterprise account (see below). - -### About committer numbers for enterprise accounts - -The {% data variables.product.prodname_GH_advanced_security %} summary for an enterprise account reports two numbers of committers for each organization: - -- **Committers** is the number of committers who contributed to at least one private repository in the organization and who use a seat in your enterprise license. That is, they are an organization member, external collaborator to a repository, or have a pending invitation to join your enterprise account. -- **Unique to this organization** is the number of committers who contributed only to repositories in that organization. This number shows how many license seats you can free up by disabling {% data variables.product.prodname_GH_advanced_security %} for that organization. - -{% data reusables.advanced-security.enable-disable-committer-info %} - -### Managing the use of {% data variables.product.prodname_GH_advanced_security %} for an enterprise account - -If you have a license for {% data variables.product.prodname_GH_advanced_security %}, the enterprise billing page includes a "{% data variables.product.prodname_GH_advanced_security %}" section that lists the organizations that use the feature. - -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.billing-tab %} -1. In the "{% data variables.product.prodname_GH_advanced_security %}" section you can see the number of committers and unique committers for each organization. - ![{% data variables.product.prodname_GH_advanced_security %} in enterprise billing settings](/assets/images/help/enterprises/ghas-orgs-list.png) -1. If you are an organization owner, you can click the name to display the billings and plans for the organization. - ![Owned organization in {% data variables.product.prodname_GH_advanced_security %} section of enterprise billing settings](/assets/images/help/enterprises/ghas-orgs-list-click-org.png) - -For detailed information of which repositories in an organization use {% data variables.product.prodname_GH_advanced_security %}, view the "Security & analysis" page for an organization. - -For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." diff --git a/content/github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account.md index 94a279cfb91a..d24531780060 100644 --- a/content/github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account.md +++ b/content/github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account.md @@ -37,6 +37,6 @@ For more information about managing billing managers, see "[Inviting people to m - "[About billing for GitHub Actions](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions#about-billing-for-github-actions)" - "[About billing for Git Large File Storage](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-git-large-file-storage)" -- "[Managing use of Advanced Security for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account)" +- "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security)" {% endif %} diff --git a/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md b/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md index 75069e955c3f..91c7975d75de 100644 --- a/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md +++ b/content/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository.md @@ -14,8 +14,6 @@ When you enable data use for your private repository, you'll be able to access t ### Enabling or disabling data use features -{% data reusables.security.some-security-and-analysis-features-are-enabled-by-default %} - {% data reusables.security.security-and-analysis-features-enable-read-only %} {% data reusables.repositories.navigate-to-repo %} diff --git a/data/release-notes/3-0/0.yml b/data/release-notes/3-0/0.yml index e9c29178ca1a..1d49e9bd0183 100644 --- a/data/release-notes/3-0/0.yml +++ b/data/release-notes/3-0/0.yml @@ -121,6 +121,7 @@ sections: - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results. - When maintenance mode is enabled, some services continue to be listed as "active processes". The services identified are expected to run during maintenance mode. If you experience this issue and are unsure, contact {% data variables.contact.contact_ent_support %}. - When GitHub Actions is enabled, use '`ghe-maintenance -u`' to unset maintenance mode. + - Users can dismiss a mandatory message without checking all checkboxes. deprecations: - heading: Deprecation of GitHub Enterprise Server 2.19 diff --git a/data/release-notes/3-0/1.yml b/data/release-notes/3-0/1.yml index a83d79f35004..b1574f568c7e 100644 --- a/data/release-notes/3-0/1.yml +++ b/data/release-notes/3-0/1.yml @@ -23,7 +23,6 @@ sections: - 'Fixes users being shown the option to set up the Code Scanning CodeQL Action even if Actions was not enabled for their repository.' - 'The "Prevent repository admins from changing anonymous Git read access" checkbox available in the enterprise account settings could not be successfully enabled or disabled.' - 'The modal used to display a mandatory message contained no vertical scrollbar, meaning longer messages could not be viewed in full.' - - 'Users could dismiss a mandatory message without checking all checkboxes.' - 'Redis would sometimes fail to start after a hard reboot or application crash.' changes: - 'Satisfy requests concurrently when multiple users are downloading the same archive, resulting in improved performance.' @@ -34,3 +33,4 @@ sections: - 'Issues cannot be closed if they contain a permalink to a blob in the same repository where the file path is longer than 255 characters.' - 'When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.' - 'When maintenance mode is enabled, some services continue to be listed as "active processes". The services identified are expected to run during maintenance mode. If you experience this issue and are unsure, contact [GitHub Enterprise Support](https://enterprise.githubsupport.com/hc/en-us) or [GitHub Premium Support](https://premium.githubsupport.com/).' + - 'Users can dismiss a mandatory message without checking all checkboxes.' diff --git a/data/reusables/advanced-security/enable-disable-committer-info.md b/data/reusables/advanced-security/enable-disable-committer-info.md deleted file mode 100644 index 87a49d2dbf74..000000000000 --- a/data/reusables/advanced-security/enable-disable-committer-info.md +++ /dev/null @@ -1 +0,0 @@ -When you enable {% data variables.product.prodname_GH_advanced_security %}, {% data variables.product.prodname_dotcom %} shows how many extra committers this will add and prompts for confirmation. If you disable access to {% data variables.product.prodname_GH_advanced_security %}, you can see how many seats this will free before you confirm the change. This makes it easy to see the impact of your changes on the use of your license. diff --git a/data/reusables/advanced-security/license-overview.md b/data/reusables/advanced-security/license-overview.md index 525f4d0aeb93..0cf5f16b9673 100644 --- a/data/reusables/advanced-security/license-overview.md +++ b/data/reusables/advanced-security/license-overview.md @@ -1 +1 @@ -Each license for {% data variables.product.prodname_GH_advanced_security %} specifies a maximum number of committers whose work can use these features. A committer is someone who authored at least one commit that was pushed to the repository in the last 90 days. Each committer is counted once, no matter how many repositories they contribute to. \ No newline at end of file +Each license for {% data variables.product.prodname_GH_advanced_security %} specifies a maximum number of accounts, or seats, that can use these features. Each active committer to at least one repository with the feature enabled uses one seat. An active committer is someone who authored at least one commit that was pushed to the repository in the last 90 days. 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 733e8e8a970f..f93772d5b744 100644 --- a/data/reusables/advanced-security/note-org-enable-uses-seats.md +++ b/data/reusables/advanced-security/note-org-enable-uses-seats.md @@ -1,7 +1,6 @@ {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@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 controls access to all {% data variables.product.prodname_advanced_security %} features including {% if currentVersion == "free-pro-team@latest" %}dependency review,{% endif %} {% data variables.product.prodname_code_scanning %}, and {% data variables.product.prodname_secret_scanning %}. - +**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. For more information, see "[About licensing for {% data variables.product.prodname_GH_advanced_security %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security)." {% endnote %} {% endif %} \ No newline at end of file diff --git a/data/reusables/organizations/billing_planning.md b/data/reusables/organizations/billing_planning.md new file mode 100644 index 000000000000..bc12e659ae5e --- /dev/null +++ b/data/reusables/organizations/billing_planning.md @@ -0,0 +1,2 @@ +1. In your organization's Settings sidebar, click **Billing & planning**. +![Billing settings](/assets/images/help/billing/settings_organization_billing_planning_tab.png)