diff --git a/assets/images/help/billing/code-security-and-analysis-tab.png b/assets/images/help/billing/code-security-and-analysis-tab.png new file mode 100644 index 0000000000..94edb4ff5c Binary files /dev/null and b/assets/images/help/billing/code-security-and-analysis-tab.png differ diff --git a/assets/images/help/billing/ghas-billing-table-repository-csv.png b/assets/images/help/billing/ghas-billing-table-repository-csv.png new file mode 100644 index 0000000000..65e34bb785 Binary files /dev/null and b/assets/images/help/billing/ghas-billing-table-repository-csv.png differ diff --git a/assets/images/help/billing/ghas-enterprise-billing-table-click-org.png b/assets/images/help/billing/ghas-enterprise-billing-table-click-org.png new file mode 100644 index 0000000000..de2c645340 Binary files /dev/null and b/assets/images/help/billing/ghas-enterprise-billing-table-click-org.png differ diff --git a/assets/images/help/billing/ghas-enterprise-billing-table.png b/assets/images/help/billing/ghas-enterprise-billing-table.png new file mode 100644 index 0000000000..2fedbee805 Binary files /dev/null and b/assets/images/help/billing/ghas-enterprise-billing-table.png differ diff --git a/assets/images/help/billing/ghas-org-billing-table.png b/assets/images/help/billing/ghas-org-billing-table.png new file mode 100644 index 0000000000..569e2943ce Binary files /dev/null and b/assets/images/help/billing/ghas-org-billing-table.png differ 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 5bdac882b6..e3ed9d6e96 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 @@ -41,15 +41,6 @@ You can view the enterprise account's current {% ifversion ghas-billing-UI-updat ![{% 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)." ![{% 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) -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-dotcom.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)." {% elsif ghes %} @@ -57,14 +48,29 @@ You can view the enterprise account's current {% ifversion ghas-billing-UI-updat {% 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 licenses used, as well as a table with the number of committers and unique committers for each organization. -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. + +{% endif %} +{%- ifversion ghas-billing-table-ui-update -%} +1. 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 a summary of your current license usage, as well as the number of committers and unique committers for each organization. The organizations in the billing table are sorted by the highest number of unique committers in descending order. + ![Screenshot of the {% data variables.product.prodname_GH_advanced_security %} billing table for an enterprise](/assets/images/help/billing/ghas-enterprise-billing-table.png) +{% endif %} +1. Optionally, click the name of an organization where you are an owner to display the security and analysis settings for the organization. + {%- ifversion ghas-billing-table-ui-update -%}![Screenshot of a row of an enterprise's {% data variables.product.prodname_GH_advanced_security %} billing table with emphasis on the organization link](/assets/images/help/billing/ghas-enterprise-billing-table-click-org.png) + {%- else -%}![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){%- endif -%} + +{% ifversion ghas-billing-table-ui-update %} +1. On the "Security & analysis" settings page, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section to see an overview of your organization's license usage, as well as a detailed breakdown of usage by repository for this organization. + ![Screenshot of the {% data variables.product.prodname_GH_advanced_security %} billing table for an organization](/assets/images/help/billing/ghas-org-billing-table.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)." + +{% else %} +1. 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 %} - {% ifversion ghec or ghes > 3.3 %} ## Downloading {% data variables.product.prodname_GH_advanced_security %} license usage information @@ -82,6 +88,17 @@ You can download the {% data variables.product.prodname_advanced_security %} lic ### Downloading {% data variables.product.prodname_advanced_security %} license usage information through the UI +{% ifversion ghas-billing-table-ui-update %} +#### At the repository-level + +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +1. In the "Security" section of the sidebar, click {% octicon "codescan" aria-label="The {% data variables.product.prodname_code_scanning %} icon" %} **Code security and analysis**. + ![Screenshot of the "Security" section of the sidebar with emphasis on the "Code security and analysis" tab](/assets/images/help/billing/code-security-and-analysis-tab.png) +1. In the "{% data variables.product.prodname_GH_advanced_security %} repositories" section, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} in a repository's row, then click **Download CSV report**. + ![Screenshot of the "{% data variables.product.prodname_GH_advanced_security %}" billing table for an organization with emphasis on the "Download CSV report" option](/assets/images/help/billing/ghas-billing-table-repository-csv.png) + +{% endif %} #### At the organization-level {% data reusables.profile.access_org %} diff --git a/data/features/ghas-billing-table-ui-update.yml b/data/features/ghas-billing-table-ui-update.yml new file mode 100644 index 0000000000..c65d530631 --- /dev/null +++ b/data/features/ghas-billing-table-ui-update.yml @@ -0,0 +1,4 @@ +versions: + ghec: '*' + ghes: '>3.8' + ghae: '>3.8'