diff --git a/content/admin/managing-code-security/securing-your-enterprise/about-security-configurations.md b/content/admin/managing-code-security/securing-your-enterprise/about-security-configurations.md index cd54ad6ee007..5e2269fe1e97 100644 --- a/content/admin/managing-code-security/securing-your-enterprise/about-security-configurations.md +++ b/content/admin/managing-code-security/securing-your-enterprise/about-security-configurations.md @@ -18,7 +18,7 @@ topics: {% ifversion ghec %} -When you create a security configuration with {% data variables.product.prodname_AS %} features enabled, your enterprise will incur usage costs when you apply the configuration to repositories if your enterprise account has metered billing. If you have bought volume/subscription licenses for {% data variables.product.prodname_GHAS %}, {% data variables.product.prodname_GH_code_security %}, or {% data variables.product.prodname_GH_secret_protection %}, you will need enough licenses to cover any additional unique committers. +When you create a security configuration with {% data variables.product.prodname_AS %} features enabled, your enterprise will incur usage costs when you apply the configuration to repositories if your enterprise account has metered billing. If you have bought volume/subscription licenses for {% data variables.product.prodname_GHAS %}, {% data variables.product.prodname_GH_code_security %}, or {% data variables.product.prodname_GH_secret_protection %}, you will need enough licenses to cover any additional unique committers. See [AUTOTITLE](/billing/how-tos/products/add-advanced-security). {% endif %} diff --git a/content/billing/concepts/product-billing/git-lfs.md b/content/billing/concepts/product-billing/git-lfs.md index 07c2c9a5528c..f270f2f87ac4 100644 --- a/content/billing/concepts/product-billing/git-lfs.md +++ b/content/billing/concepts/product-billing/git-lfs.md @@ -11,6 +11,24 @@ redirect_from: - /github/managing-large-files/about-storage-and-bandwidth-usage - /github/managing-large-files/versioning-large-files/about-storage-and-bandwidth-usage - /repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage +# Redirects from upgrading Git LFS storage + - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-git-large-file-storage + - /articles/purchasing-additional-storage-and-bandwidth-for-a-personal-account + - /articles/purchasing-additional-storage-and-bandwidth-for-an-organization + - /articles/upgrading-git-large-file-storage + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage + - /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage + - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage + - /billing/how-tos/products/upgrade-git-lfs-storage +# Redirects from downgrading Git LFS storage + - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-git-large-file-storage + - /articles/downgrading-storage-and-bandwidth-for-a-personal-account + - /articles/downgrading-storage-and-bandwidth-for-an-organization + - /articles/downgrading-git-large-file-storage + - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage + - /billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage + - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage + - /billing/how-tos/products/downgrade-git-lfs-storage # Original redirects - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-git-large-file-storage - /articles/about-billing-for-git-large-file-storage diff --git a/content/billing/concepts/product-billing/github-advanced-security.md b/content/billing/concepts/product-billing/github-advanced-security.md index 58085c295e88..f4e3f8752093 100644 --- a/content/billing/concepts/product-billing/github-advanced-security.md +++ b/content/billing/concepts/product-billing/github-advanced-security.md @@ -3,6 +3,10 @@ title: '{% data variables.product.prodname_GHAS %} license billing' intro: 'Learn how usage of {% data variables.product.prodname_AS %} features is measured and how to pay for additional licenses.' product: '{% data reusables.gated-features.ghas-billing %}' redirect_from: +# Article on migrating to two separate SKUs + - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp + - /billing/how-tos/products/migrate-from-ghas +# This article - /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 @@ -89,11 +93,9 @@ There are two different ways to pay for licenses. * **Volume/subscription billing** available for {% data variables.product.prodname_enterprise %} plans only - * Purchase a specific number of {% data variables.product.prodname_GHAS_cs_or_sp %} licenses that last for a defined period, typically at least a year. + * Purchase a specific number of {% data variables.product.prodname_GHAS_cs_or_sp %} licenses that last for a defined period, typically at least a year, see {% ifversion fpt or ghec %}[AUTOTITLE](/billing/how-tos/products/add-advanced-security){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/billing/how-tos/products/add-advanced-security) in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. * If the usage of {% data variables.product.prodname_AS %} by active committers exceeds the number of licenses purchased, you need to purchase additional licenses to cover this overage usage. - If you want to purchase volume/subscription-based licenses, contact your account manager in {% data variables.contact.contact_enterprise_sales %} or contact {% data variables.contact.contact_support_page %}. - {% ifversion fpt or ghec %}To view your current license usage, see [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage).{% endif %} @@ -146,7 +148,9 @@ You can enforce policies to allow or disallow the use of {% data variables.produ ## Further reading -{% ifversion fpt or ghec or ghes > 3.14 %} +{%- ifversion fpt or ghec or ghes > 3.15 %} +* [AUTOTITLE](/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas){% endif %} +{%- ifversion fpt or ghec or ghes > 3.14 %} * [AUTOTITLE](/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale){% endif %} {%- ifversion fpt or ghec or ghes > 3.15 %} * [AUTOTITLE](/admin/managing-code-security/securing-your-enterprise/about-security-configurations){% else %} diff --git a/content/billing/how-tos/manage-plan-and-licenses/index.md b/content/billing/how-tos/manage-plan-and-licenses/index.md index 2304474081bb..ddfe73e6bc7d 100644 --- a/content/billing/how-tos/manage-plan-and-licenses/index.md +++ b/content/billing/how-tos/manage-plan-and-licenses/index.md @@ -29,4 +29,3 @@ children: - /manage-user-licenses contentType: how-tos --- - diff --git a/content/billing/how-tos/products/add-advanced-security.md b/content/billing/how-tos/products/add-advanced-security.md index ca94b1f68ee4..938d97ee5c15 100644 --- a/content/billing/how-tos/products/add-advanced-security.md +++ b/content/billing/how-tos/products/add-advanced-security.md @@ -1,7 +1,7 @@ --- -title: Adding GitHub Advanced Security to your organization or enterprise -intro: 'You can sign up for GitHub Advanced Security products from the settings for your organization or enterprise account to prevent data leaks and keep vulnerabilities out of your codebase.' -permissions: '{% ifversion fpt %}Organization{% else %}Enterprise{% endif %} owners can sign up for {% data variables.product.prodname_GH_cs_or_sp %}' +title: Buying Advanced Security for your organization or enterprise +intro: 'How to buy licenses for {% data variables.product.prodname_GHAS %} whether you have usage-based or volume/subscription billing.' +permissions: 'Organization or enterprise owners can sign up for {% data variables.product.prodname_GH_cs_or_sp %}' product: '{% data reusables.gated-features.ghas-billing %}' versions: fpt: '*' @@ -13,59 +13,60 @@ topics: - Billing - Advanced Security - Enterprise -shortTitle: Add Advanced Security +shortTitle: Buy Advanced Security +allowTitleToDifferFromFilename: true contentType: how-tos --- ## Checking your current plan -Your organization must use a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan before you can enable {% data variables.product.prodname_GH_cs_or_sp %} on private repositories. +You must use a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan before you can enable {% data variables.product.prodname_GH_cs_or_sp %} on private repositories. -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -{% data reusables.organizations.billing_plans_or_licensing %} +1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. + +1. Select the account you want to view and then access the "Billing & Licensing" pages: + + * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. + + * **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. + +1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. Your current plan is shown with any options to upgrade to a different plan. -## Starting to use {% data variables.product.prodname_AS %} +## Metered billing users -{% ifversion fpt %} -If your organization uses a {% data variables.product.prodname_team %} plan, you are ready to start enabling {% data variables.product.prodname_GH_cs_and_sp %} at the organization and repository level. Whenever you enable a feature or apply a configuration, a modal dialog shows detailed information with estimated billing changes. You can confirm your change or return to the page without making changes. +If your organization or enterprise uses metered billing, then you are ready to start enabling {% data variables.product.prodname_GH_cs_and_sp %}. Whenever you enable a feature or apply a configuration, a modal dialog shows detailed information with estimated billing changes. You can confirm your change or return to the page without making changes. The most effective way to control and enable these features is using security configurations, see [AUTOTITLE](/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/choosing-a-security-configuration-for-your-repositories). -{% elsif ghec %} -If you use volume/subscription billing, then you will need to purchase licenses before you can start using {% data variables.product.prodname_GH_cs_or_sp %} on private or internal repositories. - -If your enterprise uses metered billing, then you are ready to start enabling {% data variables.product.prodname_GH_cs_and_sp %} at the enterprise, organization, and repository level. Whenever you enable a feature or apply a configuration, a modal dialog shows detailed information with estimated billing changes. You can confirm your change or return to the page without making changes. +## Volume/subscription users -{% endif %} +If you use volume/subscription billing, then you will need to purchase licenses before you can start using {% data variables.product.prodname_GH_cs_or_sp %} on private or internal repositories. -## Purchasing licenses for organizations +1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -{% data reusables.organizations.billing_plans_or_licensing %} -1. To the right of "{% data variables.product.prodname_GHAS %}", click **Buy {% data variables.product.prodname_AS %}**. +1. Select the account you want to view and then access the "Billing & Licensing" pages: - ![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png) + * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. -{% ifversion ghec %} + * **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. -## Purchasing licenses for enterprises +1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} -{% data reusables.enterprise-accounts.licensing-tab-both-platforms %} 1. To the right of "{% data variables.product.prodname_GHAS %}", click **Buy {% data variables.product.prodname_AS %}**. - ![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png) + ![Screenshot of the {% data variables.product.prodname_AS %} section of the licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png) -{% data reusables.advanced-security.purchase-ghas %} +1. Confirm your billing information and payment method. +1. Under "How many committers do you want to include?", enter the number of committers you want to purchase licenses for. +1. Click **Purchase Advanced Security**. -{% endif %} +> [!TIP] +> To see how license use by committers is measured, see [AUTOTITLE](/billing/concepts/product-billing/github-advanced-security). ## Further reading +* [AUTOTITLE](/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas) * [AUTOTITLE](/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale){% ifversion ghec %} * [AUTOTITLE](/code-security/adopting-github-advanced-security-at-scale/introduction-to-adopting-github-advanced-security-at-scale){% endif %} diff --git a/content/billing/how-tos/products/downgrade-git-lfs-storage.md b/content/billing/how-tos/products/downgrade-git-lfs-storage.md deleted file mode 100644 index 28a64b79145e..000000000000 --- a/content/billing/how-tos/products/downgrade-git-lfs-storage.md +++ /dev/null @@ -1,40 +0,0 @@ ---- -title: Downgrading Git Large File Storage -intro: '{% data variables.large_files.product_name_short %} has moved to metered billing so that you pay only for the amount of bandwidth and storage you use.' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-git-large-file-storage - - /articles/downgrading-storage-and-bandwidth-for-a-personal-account - - /articles/downgrading-storage-and-bandwidth-for-an-organization - - /articles/downgrading-git-large-file-storage - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage - - /billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage - - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage -versions: - fpt: '*' - ghec: '*' -topics: - - Billing - - LFS - - Organizations - - User account -shortTitle: Downgrade Git LFS storage -contentType: how-tos ---- - - - - - - -## Billing has changed to metered billing - -There is no need to edit data packs to reduce your allowance, you can pay as you go. - -This change to metered billing brings additional benefits: - -* **Visualize your usage**: use new views to see your usage and export data to other systems, see [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage) -* **Budget setting**: use budgets to control spending, see [AUTOTITLE](/billing/managing-your-billing/preventing-overspending) - -For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage). - - diff --git a/content/billing/how-tos/products/download-ghas-license-use.md b/content/billing/how-tos/products/download-ghas-license-use.md index ae096d434f53..615ca33bc13f 100644 --- a/content/billing/how-tos/products/download-ghas-license-use.md +++ b/content/billing/how-tos/products/download-ghas-license-use.md @@ -1,97 +1,62 @@ --- -title: 'Downloading licensed use of Advanced Security' -intro: 'You can download consumption of {% data variables.product.prodname_GHAS %} licenses by your {% data variables.enterprise.enterprise_or_org %}: volume/subscription licenses or metered usage.' -permissions: '{% ifversion fpt %}Organization{% else %}Enterprise{% endif %} owners with {% data variables.product.prodname_AS %}' -product: '{% data reusables.gated-features.ghas-billing %}' +title: 'Downloading license use for your enterprise or organization' +intro: 'Get data on consumption of {% data variables.product.github %}, {% data variables.product.prodname_copilot_short %}, and {% data variables.product.prodname_AS %} licenses.' +permissions: '{% data reusables.permissions.enhanced-billing-enterprise %}' versions: fpt: '*' - ghes: '*' ghec: '*' + ghes: '*' topics: - Billing - Advanced Security - Enterprise -shortTitle: Download GHAS license use +shortTitle: Download license use +allowTitleToDifferFromFilename: true redirect_from: - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/downloading-your-github-advanced-security-usage contentType: how-tos --- -## Downloading {% data variables.product.prodname_AS %} license usage information - -You can download a CSV file with details of paid use of {% data variables.product.prodname_GHAS %} products at both the {% data variables.enterprise.enterprise_and_org %} level. The CSV file contains information about each {% data variables.product.prodname_AS %} license that is in use, including: - -* The username of the person using the {% data variables.product.prodname_GHAS_cs_or_sp %} license -* The {% data variables.product.prodname_GH_cs_and_sp %}-enabled repositories where commits were made -* The organizations{% ifversion secret-scanning-user-owned-repos %}{% ifversion ghec %} and user namespaces for {% data variables.product.prodname_emus %}{% endif %}{% endif %} that people using licenses belong to -* The most recent commit dates and associated email addresses - -You can use this information for insights into your paid use of {% data variables.product.prodname_AS %}, such as which members of your enterprise are using a license or how licenses are being consumed across your organizations. +You can download CSV files with details of paid license use through the {% data variables.product.github %} user interface or the REST API. -You can download a CSV report of license usage through the {% data variables.product.github %} user interface or the REST API. +For more detailed reports on usage of all paid products, see [AUTOTITLE](/billing/how-tos/products/view-product-use). -## Using the UI to download license and metered usage +## On {% data variables.product.prodname_ghe_cloud %} -You can download a CSV report for a repository, an organization, or an enterprise. +1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. -{% ifversion fpt or ghec %} +1. Select the account you want to view and then access the "Billing & Licensing" pages: -### For a repository + * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -1. In the "Security" section of the sidebar, select the {% data variables.product.UI_advanced_security %} dropdown menu, then click **{% data variables.product.prodname_global_settings_caps %}**. -1. In the "{% data variables.product.prodname_GH_cs_or_sp %} repositories" section, next to the repository you want usage information for, select {% octicon "kebab-horizontal" aria-label="GHAS repository actions" %}, then click **Download CSV report**. + * **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. - ![Screenshot of the table for {% data variables.product.prodname_GH_secret_protection %} usage. The horizontal kebab icon and "Download CSV report" button are outlined in orange.](/assets/images/help/billing/ghas-billing-table-repository-csv.png) +1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. -### For an organization +1. In the license area of interest, click **Download CSV report**. If offered a choice, choose your preferred report. -{% data reusables.profile.access_org %} -{% data reusables.profile.org_settings %} -1. In the "Access" section of the sidebar click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing** to display an overview. -1. For metered usage, in the sidebar click **Usage**. - 1. To display only {% data variables.product.prodname_AS %} usage within the graph, click the search bar, then click **Product**. Within the list of products displayed, click **GHAS**. - 1. To further filter the usage graph, use the dropdown menus: - * To view usage by SKU, select the **Group** dropdown, then click **SKU**. This will allow you to view usage for both {% data variables.product.prodname_GH_cs_and_sp %}. - * To filter by time, select **Time Frame**, then click a time period. - * Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, gross amount (the amount actually used), and billed amount (the amount you are charged). - 1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**. -1. For license consumption, in the sidebar click **{% octicon "law" aria-hidden="true" aria-label="law" %} Licensing**. - 1. Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**. +The report will be emailed to the default email address associated with your {% data variables.product.github %} account. For information about the fields, see [AUTOTITLE](/billing/reference/license-reports). -### For an enterprise - -{% data reusables.enterprise-accounts.access-enterprise %} -1. Click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & licensing** to display an overview. -1. For metered usage, click {% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} **Usage**. - 1. To display only {% data variables.product.prodname_AS %} usage within the graph, click the search bar, then click **Product**. Within the list of products displayed, click **GHAS**. - 1. To further filter the usage graph, use the dropdown menus: - * To view usage by SKU, select the **Group** dropdown, then click **SKU**. This will allow you to view usage for both {% data variables.product.prodname_GH_cs_and_sp %}. - * To filter by time, select **Time Frame**, then click a time period. - * Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, gross amount (the amount actually used), and billed amount (the amount you are charged). - 1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**. -1. For license consumption, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing**. - * Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**. - -{% elsif ghes %} +## On {% data variables.product.prodname_ghe_server %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.license-tab-ghes %} -1. Under "{% data variables.product.prodname_GHAS %}," click **{% octicon "download" aria-hidden="true" aria-label="download" %} CSV report**. - ![Screenshot of the licensing screen. The "CSV Report" button is highlighted with an orange outline.](/assets/images/enterprise/ghas/download-csv-report-ghes-3.9.png) +The page shows a summary of the licenses your enterprise is using for {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GHAS %}. Use links on the page to view more detailed information. -{% endif %} +To download a license usage report for {% data variables.product.prodname_GHAS %}: -## Using the REST API to download license and metered usage + * **Enterprise**: In "{% data variables.product.prodname_GHAS %}", click {% octicon "download" aria-hidden="true" aria-label="download" %} **CSV report**. + * **Organization**: In the "ORGANIZATION" table, click {% octicon "download" aria-label="Download CSV report" %} associated with the organization that you want to download a CSV report for. + * **User namespace**: In the "USER NAMESPACED" table, click {% octicon "download" aria-label="Download CSV report" %} associated with the user that you want to download a CSV report for. + * **Repository**: In the "ORGANIZATION" table, click the name of an organization to show a settings page for the organization. In the {% data variables.product.prodname_GHAS %} repositories table, click {% octicon "kebab-horizontal" aria-label="GHAS repository actions" %} and select **Download CSV report**. -You can retrieve information on paid use of {% data variables.product.prodname_AS %} with the billing API. +For details of the fields included in the report, see [AUTOTITLE](/billing/reference/license-reports). -{% ifversion fpt or ghec %} +## Using the REST API -For organization-level data, use the `/organizations/{org}/settings/billing/usage` endpoint. For more information, see [AUTOTITLE](/rest/billing/enhanced-billing?apiVersion=2022-11-28). +You can retrieve information on paid use of {% data variables.product.prodname_AS %} with the billing API. -{% endif %} +* Organization-level data (cloud only), use the `/organizations/{org}/settings/billing/usage` endpoint.{% ifversion fpt or ghec %} For more information, see [AUTOTITLE](/rest/billing/enhanced-billing?apiVersion=2022-11-28).{% endif %} -For enterprise-level data, use the `/enterprises/{enterprise}/settings/billing/usage` endpoint. For more information, see [AUTOTITLE](/enterprise-cloud@latest/rest/enterprise-admin/billing?apiVersion=2022-11-28#get-billing-usage-report-for-an-enterprise) in the {% data variables.product.prodname_ghe_cloud %} documentation. +* Enterprise-level data, use the `/enterprises/{enterprise}/settings/billing/usage` endpoint. For more information, see [AUTOTITLE](/enterprise-cloud@latest/rest/enterprise-admin/billing?apiVersion=2022-11-28#get-billing-usage-report-for-an-enterprise) in the {% data variables.product.prodname_ghe_cloud %} documentation. diff --git a/content/billing/how-tos/products/index.md b/content/billing/how-tos/products/index.md index 990783ed5e77..4595a1aa06c9 100644 --- a/content/billing/how-tos/products/index.md +++ b/content/billing/how-tos/products/index.md @@ -23,15 +23,10 @@ versions: topics: - Billing children: - - view-product-use - - download-ghas-license-use - - trial-advanced-security - - add-advanced-security - - manage-ghas-license - - migrate-from-ghas - - view-ghas-committers - - upgrade-git-lfs-storage - - downgrade-git-lfs-storage + - /view-product-use + - /download-ghas-license-use + - /add-advanced-security + - /manage-ghas-license + - /view-ghas-committers contentType: how-tos --- - diff --git a/content/billing/how-tos/products/manage-ghas-license.md b/content/billing/how-tos/products/manage-ghas-license.md index c95eb706c448..fa0f18a55804 100644 --- a/content/billing/how-tos/products/manage-ghas-license.md +++ b/content/billing/how-tos/products/manage-ghas-license.md @@ -1,8 +1,9 @@ --- title: 'Managing volume licenses for GitHub Advanced Security' intro: 'You can monitor and control the availability and consumption of licenses for {% data variables.product.prodname_AS %} in repositories in your enterprise.' -permissions: 'Enterprise owners with **volume/subscription licenses** for {% data variables.product.prodname_AS %}.
For metered usage on the new platform, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).' +permissions: 'Enterprise owners with **volume/subscription licenses** for {% data variables.product.prodname_AS %}.
For metered usage, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).' versions: + fpt: '*' ghec: '*' redirect_from: - /billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing @@ -11,7 +12,8 @@ topics: - Billing - Advanced Security - Enterprise -shortTitle: Manage GHAS license +shortTitle: Manage GHAS licenses +allowTitleToDifferFromFilename: true contentType: how-tos --- @@ -21,9 +23,15 @@ For information about using policies to control use of licenses in your enterpri ## Changing the size of your license -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.licensing-tab-both-platforms %} -1. Under "{% data variables.product.prodname_AS %}" you will see the consumption of licenses for {% data variables.product.prodname_GH_cs_and_sp %}. +1. In the upper-right corner of any page on {% data variables.product.github %}, click your profile picture. + +1. Select the account you want to view and then access the "Billing & Licensing" pages: + + * **Organizations**: Click **Your organizations**, then next to the organization, click **Settings**. In the organization sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**. + + * **Enterprises**: Click **Your enterprises**, then click the enterprise name. Click the **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** tab at the top of the page. + +1. From the list of "Billing & licensing" pages, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. ![Screenshot of the {% data variables.product.prodname_AS %} licensing screen. The "Manage licenses" button is outlined in orange.](/assets/images/help/enterprises/ghas-licenses-dropdown.png) @@ -36,7 +44,7 @@ For information about using policies to control use of licenses in your enterpri ## Canceling your {% data variables.product.prodname_AS %} subscription -{% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.licensing-tab-both-platforms %} +1. Navigate to the "Billing & licensing" pages for your enterprise or organization. +1. Click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** to display the licensing page. 1. To the right of "{% data variables.product.prodname_AS %}", select {% octicon "kebab-horizontal" aria-label="Open menu" %}, then click **Cancel subscription**. 1. To confirm your cancellation, click **I understand, cancel {% data variables.product.prodname_AS %}**. diff --git a/content/billing/how-tos/products/migrate-from-ghas.md b/content/billing/how-tos/products/migrate-from-ghas.md deleted file mode 100644 index e0b5c5b91907..000000000000 --- a/content/billing/how-tos/products/migrate-from-ghas.md +++ /dev/null @@ -1,83 +0,0 @@ ---- -title: 'Migrating from GHAS to Code Security and Secret Protection' -intro: 'Learn how you can migrate from a combined license for {% data variables.product.prodname_AS %} features to one of the new SKUs.' -product: '{% data reusables.gated-features.ghas-billing %}' -versions: - ghec: '*' - ghes: '> 3.16' -topics: - - Billing - - Advanced Security - - Enterprise - - Licensing - - Code Security - - Secret Protection -shortTitle: Migrate from GHAS -redirect_from: - - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp -contentType: how-tos ---- - -## New SKUs for {% data variables.product.prodname_AS %} features - - - -{% data variables.product.prodname_AS %} features are also available under two separate stock keeping units (SKUs) for {% data variables.product.prodname_team %} and {% data variables.product.prodname_ghe_cloud %} users. {% data variables.product.prodname_ghe_server %} users can use the two new SKUs when upgrading to version 3.17. - - - -{% data reusables.advanced-security.ghas-products-bullets %} - -For detailed information about the separate SKUs, see [feature summary and pricing information](https://github.com/enterprise/advanced-security#pricing) and [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security). - -## New users of {% data variables.product.prodname_AS %} - -{% ifversion ghec %} - -{% data variables.product.prodname_ghe_cloud %} users who don't already use {% data variables.product.prodname_GHAS %}, and {% data variables.product.prodname_team %} users, can start using {% data variables.product.prodname_cs_and_sp %} with metered billing immediately. - -To get started, apply the GitHub-recommended security configuration or a custom configuration to one or more repositories. Applying a configuration with {% data variables.product.prodname_cs_or_sp %} enabled to internal or private repositories will be tracked and billed by active, unique committer. - -For more information, see: - -* [Metered billing](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security#metered-billing) -* [AUTOTITLE](/code-security/securing-your-organization/enabling-security-features-in-your-organization/applying-the-github-recommended-security-configuration-in-your-organization) -* [AUTOTITLE](/code-security/securing-your-organization/enabling-security-features-in-your-organization/applying-a-custom-security-configuration) -* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage) - -In addition, enterprise customers can talk to their existing account team or [request a demo](https://github.com/security/advanced-security/secret-protection). - -{% elsif ghes %} - -If you use {% data variables.product.prodname_ghe_server %} with a volume/subscription license purchased through [{% data variables.product.github %}'s Sales team](https://enterprise.github.com/contact), you should talk to your contact about adding {% data variables.product.prodname_GHAS_cs_or_sp %} to your license. - -If you use {% data variables.product.prodname_ghe_server %} with a license downloaded from a linked instance of {% data variables.product.prodname_ghe_cloud %} with metered billing, you should be able to download a new license that allows metered use of {% data variables.product.prodname_cs_and_sp %}. This requires {% data variables.product.prodname_github_connect %}. See [AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise) and [AUTOTITLE](/enterprise-server@latest/admin/configuring-settings/configuring-github-connect/enabling-automatic-user-license-sync-for-your-enterprise). - -{% endif %} - -## Existing {% data variables.product.prodname_AS %} users - -If you already pay to use {% data variables.product.prodname_AS %} features, the migration options available to you depend on your existing billing model. - -### Metered billing users - -{% ifversion ghec %} - -If you are an existing self-serve customer and wish to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %}, contact [GitHub Support](mailto:support@github.com). - -{% elsif ghes %} - -On {% data variables.product.prodname_ghe_server %}, metered use of {% data variables.product.prodname_AS %} products is billed through the linked enterprise account on {% data variables.product.prodname_ghe_cloud %} to ensure that committers are counted and billed accurately across the two platforms. - -{% endif %} - -If you have a hybrid {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} system with metered billing, instructions on how to transition to the new SKUs will be sent to the email address associated with the enterprise account on {% data variables.product.prodname_ghe_cloud %}. Transitioning to the two separate products is self-serve and optional. - -### Volume/subscription billing users - -* **Invoiced**: When your license is due for renewal, you can choose to continue with licenses for {% data variables.product.prodname_GHAS %}, migrate to {% data variables.product.prodname_cs_or_sp %} subscription licenses, or migrate to metered billing. -* **Self-serve**: If you are an existing self-serve customer and wish to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %}, contact [GitHub Support](mailto:support@github.com). - -### Questions? - -If you have any questions, contact [{% data variables.product.github %}'s Sales team](https://enterprise.github.com/contact). diff --git a/content/billing/how-tos/products/upgrade-git-lfs-storage.md b/content/billing/how-tos/products/upgrade-git-lfs-storage.md deleted file mode 100644 index 35cceeac39da..000000000000 --- a/content/billing/how-tos/products/upgrade-git-lfs-storage.md +++ /dev/null @@ -1,40 +0,0 @@ ---- -title: Upgrading Git Large File Storage -intro: '{% data variables.large_files.product_name_short %} has moved to metered billing so that you pay only for the amount of bandwidth and storage you use. You no longer need to buy data packs to increase your quota and storage capacity.' -redirect_from: - - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-git-large-file-storage - - /articles/purchasing-additional-storage-and-bandwidth-for-a-personal-account - - /articles/purchasing-additional-storage-and-bandwidth-for-an-organization - - /articles/upgrading-git-large-file-storage - - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage - - /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage - - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage -versions: - fpt: '*' - ghec: '*' -topics: - - Billing - - LFS - - Organizations - - User account -shortTitle: Upgrade Git LFS storage -contentType: how-tos ---- - - - - - - -## Billing has changed to metered billing - -There is no need to purchase data packs to expand your allowance, you can pay as you go. - -This change to metered billing brings additional benefits: - -* **Visualize your usage**: use new views to see your usage and export data to other systems, see [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage) -* **Budget setting**: use budgets to control spending, see [AUTOTITLE](/billing/managing-your-billing/preventing-overspending) - -For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage). - - diff --git a/content/billing/how-tos/products/view-product-use.md b/content/billing/how-tos/products/view-product-use.md index 284536686d8e..ed16b14c836a 100644 --- a/content/billing/how-tos/products/view-product-use.md +++ b/content/billing/how-tos/products/view-product-use.md @@ -1,6 +1,6 @@ --- -title: Viewing your usage of metered products -intro: You can explore your use of different products that are billed by usage and see how each product contributes to your bill. +title: Viewing your usage of metered products and licenses +intro: Explore your use of features that are billed by usage and see how they contribute to your bill. redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-git-large-file-storage-usage - /articles/viewing-storage-and-bandwidth-usage-for-a-personal-account @@ -31,17 +31,29 @@ redirect_from: versions: fpt: '*' ghec: '*' + ghes: '*' topics: - Billing -shortTitle: View product use +shortTitle: View product/license use +allowTitleToDifferFromFilename: true +permissions: '{% data reusables.permissions.enhanced-billing-cloud-all %}' +product: 'Cloud only' contentType: how-tos --- -## Viewing a summary of usage for billed products +> [!TIP] +> **{% data variables.product.prodname_ghe_server %}** administrators should instead see [AUTOTITLE](/billing/how-tos/products/download-ghas-license-use). + +## Viewing a summary of usage -Anyone can view usage for their own personal account. +The options available to you vary according to your role and {% data variables.product.github %} plan. -If you are an owner or billing manager of an organization or enterprise, you will also have access to usage data for that organization or account. +{% data variables.product.github %} cloud: +* Anyone can view usage data for their own personal account unless their account is managed by their enterprise (EMU). +* If you are an **owner** or **billing manager** of an enterprise, or an organization on {% data variables.product.prodname_team %}, you will also have access to usage data for that organization or enterprise account. + +{% data variables.product.prodname_ghe_server %}: +* Enterprise owners can access and download usage data for licenses, see [AUTOTITLE](/billing/how-tos/products/download-ghas-license-use). ### Personal accounts @@ -74,17 +86,30 @@ The metered usage chart and usage break down table both show your current choice ![Screenshot of the metered usage chart showing "Actions grouped by SKU" with the three control fields outlined in dark orange.](/assets/images/help/billing/product-usage-chart.png) +{% ifversion fpt or ghec %} > [!TIP] > For GitHub Actions, you can also view the billable job execution minutes for an individual workflow run. For more information, see [AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/viewing-job-execution-time). +{% endif %} + +## Downloading usage reports + +You can download two different types of usage report from the "Usage" page. + +### General usage reports + +1. At the top of the "Usage" page, click **Get usage report**. +1. Choose the report that you want to download. + +For details of the fields included in the report, see [AUTOTITLE](/billing/reference/usage-reports). -## Downloading the data displayed +### Downloading the data plotted in the usage chart -You can download the data plotted on the billing charts shown on the "Overview" or "Usage" page as a table or an image. Click the {% octicon "kebab-horizontal" aria-label="Chart options" aria-hidden="true" %} "Chart options" button and select your preferred format. +When the chart on the "Usage" page shows the data you want to download, click the {% octicon "kebab-horizontal" aria-label="Chart options" aria-hidden="true" %} "Chart options" button and select your preferred format. -![Screenshot of the metered usage chart on the "Overview" page with the "Chart options" outlined in dark orange.](/assets/images/help/billing/overview-chart-download-button.png) +![Screenshot of the metered usage chart on the "Usage" page with the "Chart options" outlined in dark orange.](/assets/images/help/billing/overview-chart-download-button.png) -## Further reading +## Next steps -* [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github) +* [AUTOTITLE](/billing/reference/usage-reports){% ifversion fpt or ghec %} * [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending) -* [AUTOTITLE](/billing/managing-your-billing/automating-usage-reporting) +* [AUTOTITLE](/billing/managing-your-billing/automating-usage-reporting){% endif %} diff --git a/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md b/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md index 93d9d98ec3bf..ca12dda94c40 100644 --- a/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md +++ b/content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md @@ -9,7 +9,7 @@ versions: fpt: '*' ghec: '*' ghes: '*' -product: 'US-based organization and enterprise accounts that use the {% data variables.product.github %} Customer Agreement, see {% ifversion fpt or ghec %}[AUTOTITLE](/organizations/managing-organization-settings/upgrading-to-the-github-customer-agreement){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-organization-settings/upgrading-to-the-github-customer-agreement) in the {% data variables.product.prodname_ghe_cloud %} docs{% endif %}' +product: 'US-based organization and enterprise accounts that use the {% data variables.product.github %} Customer Agreement, see {% ifversion fpt or ghec %}[AUTOTITLE](/organizations/managing-organization-settings/upgrading-to-the-github-customer-agreement){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-organization-settings/upgrading-to-the-github-customer-agreement) in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}' topics: - Billing - Organizations diff --git a/content/billing/reference/enterprise-license-troubleshooting.md b/content/billing/reference/enterprise-license-troubleshooting.md index 0f09636e530e..94184ce3727f 100644 --- a/content/billing/reference/enterprise-license-troubleshooting.md +++ b/content/billing/reference/enterprise-license-troubleshooting.md @@ -54,49 +54,7 @@ If there is no match with a SAML or SCIM attribute, or if SAML authentication or The {% data variables.product.prodname_ghe_cloud %} license usage report and {% data variables.product.prodname_ghe_server %} exported license usage file include a variety of fields to help you troubleshoot license usage for your enterprise. -### {% data variables.product.prodname_ghe_cloud %} license usage report (CSV file) - -The license usage report for your enterprise is a CSV file that contains the following information about members of your enterprise. Some fields are specific to your {% data variables.product.prodname_ghe_cloud %} (GHEC) deployment, {% data variables.product.prodname_ghe_server %} (GHES) connected environments, or your {% data variables.product.prodname_vs %} subscriptions (VSS) with GitHub Enterprise. - -| Field | Description -| ----- | ----------- -| github_com_login | The username for the user's GHEC account -| github_com_name | The display name for the user's GHEC account -| github_com_profile | The URL for the user's profile page on GHEC -| github_com_user | Whether or not the user has an account on GHEC | -| github_com_member_roles | For each of the organizations the user belongs to on GHEC, the organization name and the user's role in that organization (`Owner` or `Member`) separated by a colon

Organizations delimited by commas | -| github_com_enterprise_role | Can be one of: `Owner`, `Member`, `Outside collaborator` (for an enterprise with personal accounts on {% data variables.product.prodname_dotcom_the_website %}), or `Repository collaborator` (for an enterprise that uses {% data variables.enterprise.prodname_managed_users %}) -| github_com_verified_domain_emails | All email addresses associated with the user's GHEC account that match your enterprise's verified domains | -| github_com_saml_name_id | The SAML username | -| github_com_orgs_with_pending_invites | All pending invitations for the user's GHEC account to join organizations within your enterprise | -| {% ifversion ghas-in-license-sync %} | -| github_com_advanced_security_license_user | Whether or not the user consumes a {% data variables.product.prodname_GHAS_cs_or_sp %} license on GHEC | -| {% endif %} | -| license_type | Can be one of: `Visual Studio subscription` or `Enterprise` -| enterprise_server_user| Whether or not the user has at least one account on GHES | -| enterprise_server_primary_emails | The primary email addresses associated with each of the user's GHES accounts | -| enterprise_server_user_ids | For each of the user's GHES accounts, the account's user ID -| {% ifversion ghas-in-license-sync %} | -| enterprise_server_advanced_security_user_ids | The GHES instances where the user is using {% data variables.product.prodname_GHAS_cs_or_sp %} {% ifversion ghec %}(only present if you are using GHES version 3.12 or later, and have enabled license sync){% endif %} | -| {% endif %} | -| total_user_accounts | The total number of accounts the person has across both GHEC and GHES -| visual_studio_subscription_user | Whether or not the user is a {% data variables.visual_studio.prodname_vs_subscriber %} | -| visual_studio_subscription_email | The email address associated with the user's VSS | -| visual_studio_license_status | Whether the Visual Studio license has been matched to a {% data variables.product.company_short %} user | - -### {% data variables.product.prodname_ghe_server %} exported license usage (JSON file) - -Your {% data variables.product.prodname_ghe_server %} license usage is a JSON file that is typically used when performing a manual sync of user licenses between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} deployments. The file contains the following information specific to your {% data variables.product.prodname_ghe_server %} environment. - -| Field | Description -| ----- | ----------- -| Features | The {% data variables.product.prodname_github_connect %} features that are enabled on your {% data variables.product.prodname_ghe_server %} instance, and the date and time of enablement. -| Host name | The hostname of your {% data variables.product.prodname_ghe_server %} instance. -| HTTP only | Whether Transport Layer Security (TLS) is enabled and configured on your {% data variables.product.prodname_ghe_server %} instance. Can be one of: `True` or `False`. -| License | A hash of your {% data variables.product.prodname_ghe_server %} license. -| Public key | The public key portion of your {% data variables.product.prodname_ghe_server %} license. -| Server ID | UUID generated for your {% data variables.product.prodname_ghe_server %} instance. -| Version | The version of your {% data variables.product.prodname_ghe_server %} instance. +For details of each field, see [AUTOTITLE](/billing/reference/license-reports#github-enterprise-cloud-license-report). ## Troubleshooting steps diff --git a/content/billing/reference/index.md b/content/billing/reference/index.md index b773107ebf59..69a4579dc580 100644 --- a/content/billing/reference/index.md +++ b/content/billing/reference/index.md @@ -18,6 +18,7 @@ children: - /cost-center-allocation - /roles-for-visual-studio - /license-consumption + - /license-reports - /models-multipliers-and-costs - /enterprise-license-troubleshooting contentType: reference diff --git a/content/billing/reference/license-consumption.md b/content/billing/reference/license-consumption.md index b9d2be6b7cb5..5ee886572f0d 100644 --- a/content/billing/reference/license-consumption.md +++ b/content/billing/reference/license-consumption.md @@ -1,7 +1,8 @@ --- title: People who consume a license in an organization intro: 'Learn how consumption of {% data variables.product.github %} licenses is determined for paid organizations and enterprises.' -shortTitle: License consumption +shortTitle: GitHub license users +allowTitleToDifferFromFilename: true redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/about-per-user-pricing - /articles/about-per-user-pricing diff --git a/content/billing/reference/license-reports.md b/content/billing/reference/license-reports.md new file mode 100644 index 000000000000..48deeeb43d36 --- /dev/null +++ b/content/billing/reference/license-reports.md @@ -0,0 +1,107 @@ +--- +title: License reports reference +shortTitle: License reports +intro: 'License reports show details of the users consuming licenses that you pay for.' +allowTitleToDifferFromFilename: true +versions: + fpt: '*' + ghec: '*' + ghes: '*' +topics: + - Billing + - Enterprise + - Team +permissions: '{% data reusables.permissions.enhanced-billing-enterprise %}' +contentType: reference +--- + +Each license report shows information about license users in your enterprise account, for {% data variables.product.prodname_copilot_short %}, or for {% data variables.product.prodname_AS %}. + +**Cloud users** can download license reports from the {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing** page under {% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} **Billing & licensing** or using the REST API. + +{% ifversion fpt or ghec %} + +* Enterprise and {% data variables.product.prodname_AS %} license users, see [AUTOTITLE](/billing/how-tos/products/download-ghas-license-use) +* {% data variables.product.prodname_copilot %} license users, see [AUTOTITLE](/copilot/how-tos/administer-copilot/download-activity-report) +* Report using the REST API, see [AUTOTITLE](/billing/tutorials/automate-usage-reporting) + +If you want to generate a more detailed usage report, see [AUTOTITLE](/billing/tutorials/gather-insights). + +{% endif %} + +**{% data variables.product.prodname_ghe_server %} users** can download license reports for {% data variables.product.prodname_AS %} from the **License** page under enterprise settings, see [AUTOTITLE](/billing/how-tos/products/download-ghas-license-use). + +## {% data variables.product.prodname_AS %} license report + +The CSV file contains information about each user who is currently consuming a license. The most recent commit by each of these users to repositories with paid security features enabled is reported. + +| Field | Description | +|---------------------------|----------------------------| +| User login | The {% data variables.product.github %} handle of the user. | +| Organization / repository | A repository with paid security features that the user contributed to within the last 90 days. | +| Last pushed date | The most recent author date of a commit pushed by the user to the repository. | +| Last pushed email | The email address associated with that commit. | + +Data in the "Organization / repository" field will also include `USERNAME/REPOSITORY` data in some situations: + +* Your {% data variables.product.prodname_ghe_cloud %} has {% data variables.product.prodname_emus %} +* Your report is for {% data variables.product.prodname_ghe_server %} + +{% ifversion copilot %} + +## {% data variables.product.prodname_copilot_short %} license report + +See [AUTOTITLE](/copilot/reference/metrics-data) + +{% endif %} + +## {% data variables.product.prodname_ghe_cloud %} license report + +The license usage report for your enterprise is a CSV file that contains the following information about members of your enterprise. Some fields are specific to your {% data variables.product.prodname_ghe_cloud %} (GHEC) deployment, {% data variables.product.prodname_ghe_server %} (GHES) connected environments, or your {% data variables.product.prodname_vs %} subscriptions (VSS) with GitHub Enterprise. + +Reports generated on instances of {% data variables.enterprise.data_residency %} will see `GitHub` in place of `GitHub com`. The `Ghe license active` field will be marked true. + +| Field | Description | +|-------|-------------| +| GitHub com login | The username for the user's GHEC account | +| GitHub com name | The display name for the user's GHEC account | +| Enterprise server user ids | For each of the user's GHES accounts, the account's user ID | +| GitHub com user | Whether or not the user has an account on GHEC | +| Enterprise server user | Whether or not the user has at least one account on GHES | +| Visual studio subscription user | Whether or not the user is a {% data variables.visual_studio.prodname_vs_subscriber %} | +| License type | Can be one of: `Visual Studio subscription` or `Enterprise` | +| GitHub com profile | The URL for the user's profile page on GHEC | +| GitHub com member roles | For each of the organizations the user belongs to on GHEC, the organization name and the user's role in that organization (`Owner` or `Member`) separated by a colon

Organizations delimited by commas | +| GitHub com enterprise roles | Can be one of: `Owner`, `Member`, `Outside collaborator` (for an enterprise with personal accounts on {% data variables.product.prodname_dotcom_the_website %}), or `Repository collaborator` (for an enterprise that uses {% data variables.enterprise.prodname_managed_users %}) | +| GitHub com verified domain emails | All email addresses associated with the user's GHEC account that match your enterprise's verified domains | +| GitHub com saml name | The SAML username | +| GitHub com orgs with pending invites | All pending invitations for the user's GHEC account to join organizations within your enterprise | +| GitHub com two factor auth | Whether the user has two-factor authentication enabled (true/false) | +| GitHub com two factor auth required by date | The date by which the user is required to enable two-factor authentication | +| GitHub com cost center | The cost center associated with the user for billing purposes | +| GitHub com code security license user | Whether the user consumes a code security license (true/false) | +| GitHub com secret protection license user | Whether the user consumes a secret protection license (true/false) | +| Ghe license active | Whether the user has an active license on {% data variables.enterprise.data_residency_site %} (true/false) | +| Ghe license start date | The start date of the user's license on {% data variables.enterprise.data_residency_site %} | +| Ghe license end date | The end date of the user's license on {% data variables.enterprise.data_residency_site %} | +| Enterprise server primary emails | The primary email addresses associated with each of the user's GHES accounts | +| Enterprise server advanced security user ids | User identifiers for advanced security features on {% data variables.product.prodname_ghe_server %} | +| Enterprise server code security user ids | User identifiers for code security features on {% data variables.product.prodname_ghe_server %} | +| Enterprise server secret protection user ids | User identifiers for secret protection features on {% data variables.product.prodname_ghe_server %} | +| Visual studio license status | Whether the Visual Studio license has been matched to a {% data variables.product.company_short %} user | +| Visual studio subscription email | The email address associated with the user's VSS | +| Total user accounts | The total number of accounts the person has across both GHEC and GHES | + +## {% data variables.product.prodname_ghe_server %} exported license usage (JSON file) + +Your {% data variables.product.prodname_ghe_server %} license usage is a JSON file that is typically used when performing a manual sync of user licenses between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} deployments. The file contains the following information specific to your {% data variables.product.prodname_ghe_server %} environment. + +| Field | Description +| ----- | ----------- +| Features | The {% data variables.product.prodname_github_connect %} features that are enabled on your {% data variables.product.prodname_ghe_server %} instance, and the date and time of enablement. +| Host name | The hostname of your {% data variables.product.prodname_ghe_server %} instance. +| HTTP only | Whether Transport Layer Security (TLS) is enabled and configured on your {% data variables.product.prodname_ghe_server %} instance. Can be one of: `True` or `False`. +| License | A hash of your {% data variables.product.prodname_ghe_server %} license. +| Public key | The public key portion of your {% data variables.product.prodname_ghe_server %} license. +| Server ID | UUID generated for your {% data variables.product.prodname_ghe_server %} instance. +| Version | The version of your {% data variables.product.prodname_ghe_server %} instance. diff --git a/content/billing/reference/usage-reports.md b/content/billing/reference/usage-reports.md index af20ab18c21b..d8b20393b964 100644 --- a/content/billing/reference/usage-reports.md +++ b/content/billing/reference/usage-reports.md @@ -1,41 +1,43 @@ --- title: Usage reports reference shortTitle: Usage reports -intro: 'Learn how to request and understand a report that shows detailed {% data variables.product.github %} usage and billing information for your account.' +intro: 'Usage reports show detailed {% data variables.product.github %} usage and billing information for your account.' allowTitleToDifferFromFilename: true versions: - feature: enhanced-billing-platform + fpt: '*' + ghec: '*' + ghes: '*' topics: - Billing - Enterprise - Team -permissions: '{% data reusables.permissions.enhanced-billing-platform %}' -product: '{% data reusables.billing.enhanced-billing-platform-product %}' +permissions: '{% data reusables.permissions.enhanced-billing-enterprise %}' redirect_from: - /billing/managing-your-billing/about-usage-reports contentType: reference --- -The usage report shows detailed information about your account’s {% data variables.product.github %} usage, including how much of each SKU was used and the resulting billable amount. +The usage report shows detailed information about your account’s {% data variables.product.github %} usage, including how much of each SKU was used and the resulting billable amount. -To generate a usage report, see [AUTOTITLE](/billing/managing-your-billing/gathering-insights-on-your-spending). +To generate a usage report, see {% ifversion fpt or ghec %}[AUTOTITLE](/billing/managing-your-billing/gathering-insights-on-your-spending){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-billing/gathering-insights-on-your-spending) in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. ## Usage report types +There are two different types of report. + +* Summarized reports can be requested for a maximum time frame of one year. +* Detailed reports can be requested for a maximum time frame of 31 days. + ### Summarized report The summarized usage report sums the `quantity`, `gross_amount`, `discount_amount`, and `net_amount` fields based on the combination of the following values: `date`, `sku`, `repository`, `cost_center_name`. If the usage report is for an enterprise with organizations, the amounts will be summarized by the organization value as well. -Summarized reports can be requested for a maximum time frame of one year. - ### Detailed report The detailed usage report includes the same fields as the summarized report and adds `username` and `workflow_path`. The detailed usage report sums the `quantity`, `gross_amount`, `discount_amount`, and `net_amount` fields based on the combination of the following values: `date`, `sku`, `organization`, `repository`, `cost_center_name`, `username`, `workflow_path`. -Detailed reports can be requested for a maximum time frame of 31 days. - ## Usage report fields The usage report contains the following fields. @@ -57,11 +59,11 @@ The usage report contains the following fields. | `workflow_path` | The path of the {% data variables.product.prodname_actions %} workflow that generated the usage, if applicable. Only available in the detailed report. | | `cost_center_name` | The cost center associated with the usage, if applicable. | -### Deprecated report fields +### Report fields closing down {% data variables.product.github %} aims to minimize changes to the usage report structure, however at times the report structure or fields may change. -| Deprecated field | Replacement | +| Closing down | Replacement | |--------------------|---------------------| | `usage_at` | Refer to `date` instead. | | `workflow_name` | Refer to `workflow_path` instead. | diff --git a/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale.md b/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale.md index 9690fe99c63b..68f9dcd188e3 100644 --- a/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale.md +++ b/content/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale.md @@ -27,7 +27,7 @@ topics: You can easily enable and manage {% data variables.product.github %}'s security features throughout your organization with {% data variables.product.prodname_security_configurations %}, which control repository-level security features, and {% data variables.product.prodname_global_settings %}, which control security features at the organization level. We recommend applying {% data variables.product.prodname_security_configurations %} _and_ customizing your {% data variables.product.prodname_global_settings %} to create a system that best meets the security needs of your organization. -For more information on purchasing {% data variables.product.prodname_GH_cs_or_sp %}, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security). +For more information on purchasing {% data variables.product.prodname_GH_cs_or_sp %}, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security) and [AUTOTITLE](/enterprise-cloud@latest/billing/how-tos/products/add-advanced-security){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. ## About {% data variables.product.prodname_security_configurations %} diff --git a/content/code-security/trialing-github-advanced-security/enable-security-features-trial.md b/content/code-security/trialing-github-advanced-security/enable-security-features-trial.md index 27733150dfdc..171c0da1581a 100644 --- a/content/code-security/trialing-github-advanced-security/enable-security-features-trial.md +++ b/content/code-security/trialing-github-advanced-security/enable-security-features-trial.md @@ -11,6 +11,7 @@ topics: versions: fpt: '*' ghec: '*' + ghes: '> 3.15' --- This article assumes that you have planned and then started a trial of {% data variables.product.prodname_GHAS %}. For more information, see [AUTOTITLE](/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas). diff --git a/content/code-security/trialing-github-advanced-security/explore-trial-code-scanning.md b/content/code-security/trialing-github-advanced-security/explore-trial-code-scanning.md index 010ebf756c57..066c203b6a6e 100644 --- a/content/code-security/trialing-github-advanced-security/explore-trial-code-scanning.md +++ b/content/code-security/trialing-github-advanced-security/explore-trial-code-scanning.md @@ -1,14 +1,15 @@ --- -title: 'Exploring your enterprise trial of {% data variables.product.prodname_GH_code_security %}' +title: 'Exploring your enterprise trial of {% data variables.product.prodname_GH_code_security_always %}' shortTitle: 'Trial {% data variables.product.prodname_code_security %}' allowTitleToDifferFromFilename: true -intro: 'Introduction to the features of code and dependency scanning available with {% data variables.product.prodname_GH_code_security %} in {% data variables.product.prodname_ghe_cloud %} so you can assess their fit to your business needs.' +intro: 'Introduction to the features of code and dependency scanning available with {% data variables.product.prodname_GH_code_security_always %} in {% data variables.product.prodname_ghe_cloud %} so you can assess their fit to your business needs.' type: quick_start topics: - Code Security versions: fpt: '*' ghec: '*' + ghes: '> 3.15' --- This guide assumes that you have planned and started a trial of {% data variables.product.prodname_GHAS %} for an existing or trial {% data variables.product.github %} enterprise account, see [AUTOTITLE](/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas). @@ -56,7 +57,7 @@ There are three different types of automated analysis of pull requests built int These automated reviews are a valuable extension to self-review and make it easier for developers to present a more complete and secure pull request for peer review. In addition, {% data variables.product.prodname_code_scanning %} and dependency reviews can be enforced to protect the security and compliance of your code. > [!NOTE] -> {% data variables.copilot.copilot_autofix %} is included in the license for {% data variables.product.prodname_GH_code_security %}. {% data variables.product.prodname_copilot_short %} code review requires a paid {% data variables.product.prodname_copilot_short %} plan. +> {% data variables.copilot.copilot_autofix %} is included in the license for {% data variables.product.prodname_GH_code_security_always %}. {% data variables.product.prodname_copilot_short %} code review requires a paid {% data variables.product.prodname_copilot_short %} plan. ### {% data variables.product.prodname_code_scanning_caps %} analysis @@ -86,11 +87,11 @@ This allows you to update the configuration in a single location, but use the wo > [!NOTE] > > {% data reusables.copilot.code-review.preview-note %} -> * If you get a {% data variables.product.prodname_copilot_short %} subscription from an organization, you will only be able to participate in the {% data variables.release-phases.public_preview %} on the {% data variables.product.github %} website if an owner of your organization {% ifversion ghec %}or enterprise{% endif %} has enabled **Copilot in GitHub.com > Opt in to preview features** in the **{% data variables.product.prodname_copilot %} policies** page of the organization {% ifversion ghec %}or enterprise{% endif %} settings. See [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-policies-for-copilot-in-your-organization#enabling-copilot-features-in-your-organization){% ifversion ghec %} and [AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise#copilot-in-githubcom){% endif %}. +> * If you get a {% data variables.product.prodname_copilot_short %} subscription from an organization, you will only be able to participate in the {% data variables.release-phases.public_preview %} on the {% data variables.product.github %} website if an owner of your organization or enterprise has enabled **Copilot in GitHub.com > Opt in to preview features** in the **{% data variables.product.prodname_copilot %} policies** page of the organization or enterprise settings. See [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-policies-for-copilot-in-your-organization#enabling-copilot-features-in-your-organization) and [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise#copilot-in-githubcom){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. -By default, users request a review from {% data variables.product.prodname_copilot_short %} in the same way as they do from human reviewers. However, you can update or create an organization-level branch ruleset to automatically add {% data variables.product.prodname_copilot_short %} as a reviewer to all pull requests made to selected branches in all or selected repositories. See [AUTOTITLE](/copilot/how-tos/agents/copilot-code-review/automatic-code-review). +By default, users request a review from {% data variables.product.prodname_copilot_short %} in the same way as they do from human reviewers. However, you can update or create an organization-level branch ruleset to automatically add {% data variables.product.prodname_copilot_short %} as a reviewer to all pull requests made to selected branches in all or selected repositories. See [AUTOTITLE](/enterprise-cloud@latest/copilot/how-tos/agents/copilot-code-review/automatic-code-review){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. -{% data variables.product.prodname_copilot_short %} leaves a review comment on each pull request it reviews, without approving the pull request or requesting changes. This ensures that its review is advisory and will not block development work. Similarly, you should not enforce the resolution of suggestions made by {% data variables.product.prodname_copilot_short %} because AI suggestions have known limitations, see [AUTOTITLE](/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-code-review#limitations-of-github-copilot-code-review). +{% data variables.product.prodname_copilot_short %} leaves a review comment on each pull request it reviews, without approving the pull request or requesting changes. This ensures that its review is advisory and will not block development work. Similarly, you should not enforce the resolution of suggestions made by {% data variables.product.prodname_copilot_short %} because AI suggestions have known limitations, see [AUTOTITLE](/enterprise-cloud@latest/copilot/responsible-use-of-github-copilot-features/responsible-use-of-github-copilot-code-review#limitations-of-github-copilot-code-review){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. ## Define where {% data variables.copilot.copilot_autofix_short %} is allowed and enabled @@ -103,7 +104,7 @@ There are two levels of control: ## Engage developers in security remediation -Security campaigns provide a way for security teams to engage with developers to remediate security technical debt. They also provide a practical way to combine education in secure coding with examples of vulnerable code in code that your developers are familiar with. For more information, see [AUTOTITLE](/code-security/securing-your-organization/fixing-security-alerts-at-scale/about-security-campaigns) and [AUTOTITLE](/code-security/securing-your-organization/fixing-security-alerts-at-scale/best-practice-fix-alerts-at-scale). +Security campaigns provide a way for security teams to engage with developers to remediate security technical debt. They also provide a practical way to combine education in secure coding with examples of vulnerable code in code that your developers are familiar with. For more information, see [AUTOTITLE](/enterprise-cloud@latest/code-security/securing-your-organization/fixing-security-alerts-at-scale/about-security-campaigns) and [AUTOTITLE](/enterprise-cloud@latest/code-security/securing-your-organization/fixing-security-alerts-at-scale/best-practice-fix-alerts-at-scale){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. ## Provide a secure development environment @@ -117,7 +118,7 @@ The development environment has many components. Some of the most useful feature * Workflow to enable {% data variables.product.prodname_dependabot_version_updates %} for package managers used by the company. * Workflow defining advanced setup for {% data variables.product.prodname_code_scanning %} for supported development languages where the default setup results are not enough. -In addition, when a developer creates a repository from a template they must define the value of any required custom properties. Custom properties are very useful for selecting a subset of repositories that you want to apply configurations, policies, or rulesets to, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/managing-custom-properties-for-repositories-in-your-enterprise). +In addition, when a developer creates a repository from a template they must define the value of any required custom properties. Custom properties are very useful for selecting a subset of repositories that you want to apply configurations, policies, or rulesets to, see [AUTOTITLE](/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/managing-custom-properties-for-repositories-in-your-enterprise){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. ## Next steps @@ -127,5 +128,5 @@ When you have finished exploring these options and {% data variables.product.pro * [AUTOTITLE](/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions) * [AUTOTITLE](/admin/enforcing-policies/enforcing-policies-for-your-enterprise) -* [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/governing-how-people-use-repositories-in-your-enterprise) +* [AUTOTITLE](/enterprise-cloud@latest/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/governing-how-people-use-repositories-in-your-enterprise){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %} * [Enforce {% data variables.product.prodname_GHAS %} at Scale](https://wellarchitected.github.com/library/application-security/recommendations/enforce-ghas-at-scale/) diff --git a/content/code-security/trialing-github-advanced-security/explore-trial-secret-scanning.md b/content/code-security/trialing-github-advanced-security/explore-trial-secret-scanning.md index 9817dde5cd5f..16369099702a 100644 --- a/content/code-security/trialing-github-advanced-security/explore-trial-secret-scanning.md +++ b/content/code-security/trialing-github-advanced-security/explore-trial-secret-scanning.md @@ -1,32 +1,33 @@ --- -title: 'Exploring your enterprise trial of {% data variables.product.prodname_GH_secret_protection %}' -shortTitle: 'Trial {% data variables.product.prodname_secret_protection %}' +title: 'Exploring your enterprise trial of {% data variables.product.prodname_GH_secret_protection_always %}' +shortTitle: 'Trial Secret Protection' allowTitleToDifferFromFilename: true -intro: 'Introduction to the features available with {% data variables.product.prodname_GH_secret_protection %} in {% data variables.product.prodname_ghe_cloud %} so you can assess their fit to your business needs.' +intro: 'Introduction to the features available with {% data variables.product.prodname_GH_secret_protection_always %} in {% data variables.product.prodname_ghe_cloud %} so you can assess their fit to your business needs.' type: quick_start topics: - Secret Protection versions: fpt: '*' ghec: '*' + ghes: '> 3.15' --- This guide assumes that you have planned and started a trial of {% data variables.product.prodname_GHAS %} for an existing or trial {% data variables.product.github %} enterprise account. See [AUTOTITLE](/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas). ## Introduction -{% data variables.product.prodname_GH_secret_protection %} features work the same way in private and internal repositories as they do in all public repositories. This article focuses on the additional functionality that you can use to protect your business from security leaks when you use {% data variables.product.prodname_GH_secret_protection %}, that is: +{% data variables.product.prodname_GH_secret_protection_always %} features work the same way in private and internal repositories as they do in all public repositories. This article focuses on the additional functionality that you can use to protect your business from security leaks when you use {% data variables.product.prodname_GH_secret_protection_always %}, that is: * Identify additional access tokens you use by defining custom patterns. * Detect potential passwords using AI. * Control and audit the bypass process for push protection and {% data variables.secret-scanning.alerts %}. * Enable validity checks for exposed tokens. -To find out how to run a free secret risk assessment, see [Generating an initial secret risk assessment](/code-security/securing-your-organization/understanding-your-organizations-exposure-to-leaked-secrets/viewing-the-secret-risk-assessment-report-for-your-organization#generating-an-initial-secret-risk-assessment). +To find out how to run a free secret risk assessment, see [Generating an initial secret risk assessment](/enterprise-cloud@latest/code-security/securing-your-organization/understanding-your-organizations-exposure-to-leaked-secrets/viewing-the-secret-risk-assessment-report-for-your-organization#generating-an-initial-secret-risk-assessment){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. If you have already scanned the code in your organization for leaked secrets using the free secret risk assessment, you will also want to explore that data more completely using the additional views on the **{% octicon "shield" aria-hidden="true" aria-label="shield" %} Security** tab for the organization. -For full details of the features available, see [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security#github-secret-protection). +For full details of the features available, see [{% data variables.product.prodname_GH_secret_protection_always %}](/get-started/learning-about-github/about-github-advanced-security#github-secret-protection). ### Security configuration for {% data variables.product.prodname_secret_protection %} @@ -56,15 +57,15 @@ Similar to custom patterns, if you enable AI detection both {% data variables.pr ## Control and audit the bypass process -When push protection blocks a push to {% data variables.product.github %} in a public repository without {% data variables.product.prodname_GH_secret_protection %}, the user has two simple options: bypass the control, or remove the highlighted content from the branch and its history. If they chose to bypass push protection, a {% data variables.product.prodname_secret_scanning %} alert is automatically created. This allows developers to rapidly unblock their work while still providing an audit trail for the content identified by {% data variables.product.prodname_secret_scanning %}. +When push protection blocks a push to {% data variables.product.github %} in a public repository without {% data variables.product.prodname_GH_secret_protection_always %}, the user has two simple options: bypass the control, or remove the highlighted content from the branch and its history. If they chose to bypass push protection, a {% data variables.product.prodname_secret_scanning %} alert is automatically created. This allows developers to rapidly unblock their work while still providing an audit trail for the content identified by {% data variables.product.prodname_secret_scanning %}. -Larger teams usually want to maintain tighter control over the potential publication of access tokens and other secrets. With {% data variables.product.prodname_GH_secret_protection %}, you can define a reviewers group to approve requests to bypass push protection, reducing the risk of a developer accidentally leaking a token that is still active. You can also define a reviewers group to approve requests to dismiss {% data variables.secret-scanning.alerts %}. +Larger teams usually want to maintain tighter control over the potential publication of access tokens and other secrets. With {% data variables.product.prodname_GH_secret_protection_always %}, you can define a reviewers group to approve requests to bypass push protection, reducing the risk of a developer accidentally leaking a token that is still active. You can also define a reviewers group to approve requests to dismiss {% data variables.secret-scanning.alerts %}. Reviewers are defined in an organization-level security configuration or in the settings for a repository. For more information, see [AUTOTITLE](/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/delegated-bypass-for-push-protection/about-delegated-bypass-for-push-protection). ## Enable validity checks -You can enable validity checks to check whether detected tokens are still active at the repository, organization, and enterprise level. Generally, it is worth enabling this feature across the whole enterprise using enterprise or organization-level security configurations. For more information, see [AUTOTITLE](/code-security/secret-scanning/enabling-secret-scanning-features/enabling-validity-checks-for-your-repository). +You can enable validity checks to check whether detected tokens are still active at the repository, organization, and enterprise level. Generally, it is worth enabling this feature across the whole enterprise using enterprise or organization-level security configurations. For more information, see [AUTOTITLE](/enterprise-cloud@latest/code-security/secret-scanning/enabling-secret-scanning-features/enabling-validity-checks-for-your-repository){% ifversion fpt or ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. ## Next steps diff --git a/content/code-security/trialing-github-advanced-security/index.md b/content/code-security/trialing-github-advanced-security/index.md index 3ac36aa0dff3..d5a3eefe4830 100644 --- a/content/code-security/trialing-github-advanced-security/index.md +++ b/content/code-security/trialing-github-advanced-security/index.md @@ -2,16 +2,19 @@ title: Trialing {% data variables.product.prodname_GHAS %} shortTitle: Trial {% data variables.product.prodname_GHAS %} intro: 'Determine how you can meet your security goals using {% data variables.product.prodname_GH_cs_and_sp %}.' -product: '{% data reusables.gated-features.ghas-ghec %}' +permissions: '{% data reusables.advanced-security.ghas-trial-permission %}' +product: '{% data reusables.gated-features.ghas-trial %}' versions: fpt: '*' ghec: '*' + ghes: '> 3.15' topics: - Enterprise - Code Security - Secret Protection children: - /planning-a-trial-of-ghas + - /trial-advanced-security - /enable-security-features-trial - /explore-trial-secret-scanning - /explore-trial-code-scanning diff --git a/content/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas.md b/content/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas.md index 1c8c2a4b30ad..143d26c6c86c 100644 --- a/content/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas.md +++ b/content/code-security/trialing-github-advanced-security/planning-a-trial-of-ghas.md @@ -10,37 +10,20 @@ topics: versions: fpt: '*' ghec: '*' + ghes: '> 3.15' --- ## About trialing {% data variables.product.prodname_GHAS %} You can trial {% data variables.product.prodname_GHAS %} independently, or working with an expert from {% data variables.product.github %} or a partner organization. The primary audience for these articles is people who will plan and run their trial independently, typically small and medium-sized organizations. -> [!NOTE] Although {% data variables.product.prodname_GHAS %} is free of charge during trials, you will be charged for any actions minutes that you use. That is, actions minutes used by the {% data variables.product.prodname_code_scanning %} default setup or by any other workflows you run. - -### Existing {% data variables.product.prodname_ghe_cloud %} users - -{% data reusables.advanced-security.ghas-trial-availability %} For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security#setting-up-your-trial-of-github-advanced-security). - -{% data reusables.advanced-security.ghas-trial-invoiced %} - -### Users on other GitHub plans - -You can trial {% data variables.product.prodname_GHAS %} as part of a trial of {% data variables.product.prodname_ghe_cloud %}. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud){% ifversion fpt %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}. +* Existing {% data variables.product.prodname_ghe_cloud %} users can set up a trial if you pay for {% data variables.product.prodname_ghe_cloud %} by credit card or PayPal, or if you are already taking part in a free trial of {% data variables.product.prodname_ghe_cloud %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security#setting-up-your-trial-of-github-advanced-security). -### When the trial ends + {% data reusables.advanced-security.ghas-trial-invoiced %} -{% ifversion fpt %} +* Users on other {% data variables.product.github %} plans can trial {% data variables.product.prodname_GHAS %} as part of a trial of {% data variables.product.prodname_ghe_cloud %}, see [AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud). -If you don't already use {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %}, you will need to upgrade your plan to continue using {% data variables.product.prodname_GH_cs_or_sp %} in private repositories when the trial ends. - -{% data variables.product.prodname_GH_cs_and_sp %} are billed by usage of unique committers to repositories with {% data variables.product.prodname_cs_or_sp %} enabled. For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security). - -{% elsif ghec %} - -You can end your trial at any time by purchasing {% data variables.product.prodname_GH_cs_or_sp %}. If you don't already use {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %}, you will need to upgrade your plan. Alternatively, you can cancel the trial at any time. - -{% endif %} +> [!NOTE] Although {% data variables.product.prodname_GHAS %} is free of charge during trials, you will be charged for any actions minutes that you use. That is, actions minutes used by the {% data variables.product.prodname_code_scanning %} default setup or by any other workflows you run. ## Define your company goals @@ -60,7 +43,7 @@ If your company already uses {% data variables.product.github %}, consider what {% endrowheaders %} -If your company doesn't use {% data variables.product.github %} yet, you are likely to have additional questions including how the platform handles data residency, secure account management, and repository migration. For more information, see [AUTOTITLE](/get-started/onboarding/getting-started-with-github-enterprise-cloud). +If your company doesn't use {% data variables.product.github %} yet, you are likely to have additional questions including how the platform handles data residency, secure account management, and repository migration. For more information, see [AUTOTITLE](/enterprise-cloud@latest/get-started/onboarding/getting-started-with-github-enterprise-cloud). ## Identify the members of your trial team @@ -90,7 +73,7 @@ For each company need or goal that you identify, determine what criteria you wil ## Next steps -1. [AUTOTITLE](/admin/overview/setting-up-a-trial-of-github-enterprise-cloud) +1. [AUTOTITLE](/code-security/trialing-github-advanced-security/trial-advanced-security) or [AUTOTITLE](/admin/overview/setting-up-a-trial-of-github-enterprise-cloud) with {% data variables.product.prodname_AS %} 1. [AUTOTITLE](/code-security/trialing-github-advanced-security/enable-security-features-trial) 1. [AUTOTITLE](/code-security/trialing-github-advanced-security/explore-trial-secret-scanning) 1. [AUTOTITLE](/code-security/trialing-github-advanced-security/explore-trial-code-scanning) diff --git a/content/billing/how-tos/products/trial-advanced-security.md b/content/code-security/trialing-github-advanced-security/trial-advanced-security.md similarity index 79% rename from content/billing/how-tos/products/trial-advanced-security.md rename to content/code-security/trialing-github-advanced-security/trial-advanced-security.md index 9b85aa02e7c3..94e62537fd29 100644 --- a/content/billing/how-tos/products/trial-advanced-security.md +++ b/content/code-security/trialing-github-advanced-security/trial-advanced-security.md @@ -1,13 +1,16 @@ --- title: Setting up a trial of GitHub Advanced Security intro: 'You can try the full set of {% data variables.product.prodname_GHAS %} features for free.' -product: 'Enterprise owners
Otherwise, you need a trial of {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_GHAS %}. See [AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud) in the {% data variables.product.prodname_ghe_cloud %} docs.' +permissions: '{% data reusables.advanced-security.ghas-trial-permission %}' +product: '{% data reusables.gated-features.ghas-trial %}' versions: fpt: '*' ghec: '*' + ghes: '> 3.15' redirect_from: - /billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security + - /billing/how-tos/products/trial-advanced-security topics: - Billing - Advanced Security @@ -23,7 +26,7 @@ To set up a trial of {% data variables.product.prodname_GHAS %} using this metho 1. Be an owner of an enterprise account. See [AUTOTITLE](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts). 1. Pay by credit card or PayPal. 1. Have not previously purchased or had a trial of {% data variables.product.prodname_GHAS %}. -1. You must not use metered billing for {% data variables.product.prodname_GHAS %}. +1. You are not already using metered billing for {% data variables.product.prodname_GHAS %}. > [!TIP] > * **No enterprise account?** Start a trial of {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_GHAS %}. See [AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud). @@ -50,8 +53,8 @@ If you pay for {% data variables.product.prodname_ghe_cloud %} with metered bill 1. To the right of "{% data variables.product.prodname_GHAS %} trial", select the **Manage** dropdown menu and click **Purchase**. {% data reusables.advanced-security.purchase-ghas %} -## Further reading +## Next steps -* [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security) -* [AUTOTITLE](/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale) -* [AUTOTITLE](/code-security/adopting-github-advanced-security-at-scale) +1. [AUTOTITLE](/code-security/trialing-github-advanced-security/enable-security-features-trial) +1. [AUTOTITLE](/code-security/trialing-github-advanced-security/explore-trial-secret-scanning) +1. [AUTOTITLE](/code-security/trialing-github-advanced-security/explore-trial-code-scanning) diff --git a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md index d79bb212cca4..13826cf903de 100644 --- a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md +++ b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md @@ -54,7 +54,7 @@ When you transfer a repository, its issues, pull requests, wiki, stars, and watc * If the transferred repository is a fork, then it remains associated with the upstream repository. * If the transferred repository has any forks, then those forks will remain associated with the repository after the transfer is complete. -* If the transferred repository uses {% data variables.large_files.product_name_long %}, all {% data variables.large_files.product_name_short %} objects are automatically moved. This transfer occurs in the background, so if you have a large number of {% data variables.large_files.product_name_short %} objects or if the {% data variables.large_files.product_name_short %} objects themselves are large, it may take some time for the transfer to occur.{% ifversion fpt or ghec %} Before you transfer a repository that uses {% data variables.large_files.product_name_short %}, make sure the receiving account has enough data packs to store the {% data variables.large_files.product_name_short %} objects you'll be moving over. For more information on adding storage for personal accounts, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage).{% endif %} +* If the transferred repository uses {% data variables.large_files.product_name_long %}, all {% data variables.large_files.product_name_short %} objects are automatically moved. This transfer occurs in the background, so if you have a large number of {% data variables.large_files.product_name_short %} objects or if the {% data variables.large_files.product_name_short %} objects themselves are large, it may take some time for the transfer to occur. * When a repository is transferred between two personal accounts, issue assignments are left intact. When you transfer a repository from a personal account to an organization, issues assigned to members in the organization remain intact, and all other issue assignees are cleared. Only owners in the organization are allowed to create new issue assignments. When you transfer a repository from an organization to a personal account, only issues assigned to the repository's owner are kept, and all other issue assignees are removed.{% ifversion issue-types %} * When you transfer a repository from an organization to another organization, issue types on issues are left intact if the new organization has a matching issue type, and all other issue types are removed from issues. * When you transfer a repository from an organization to a personal account, all issue types are removed from issues.{% endif %} diff --git a/data/reusables/advanced-security/ghas-trial-permission.md b/data/reusables/advanced-security/ghas-trial-permission.md new file mode 100644 index 000000000000..d4b5ea0d010b --- /dev/null +++ b/data/reusables/advanced-security/ghas-trial-permission.md @@ -0,0 +1 @@ +Enterprise owners
Otherwise, you need a trial of {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_GHAS %}. See [AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud) in the {% data variables.product.prodname_ghe_cloud %} documentation diff --git a/data/reusables/enterprise-accounts/access-enterprise-ghes.md b/data/reusables/enterprise-accounts/access-enterprise-ghes.md index 76fbb34af098..11a1aafeb0d8 100644 --- a/data/reusables/enterprise-accounts/access-enterprise-ghes.md +++ b/data/reusables/enterprise-accounts/access-enterprise-ghes.md @@ -1,3 +1 @@ 1. In the top-right corner of {% data variables.product.prodname_ghe_server %}, click your profile picture, then click **Enterprise settings**. - - ![Screenshot of the dropdown menu shown when you click your profile picture on GitHub Enterprise Server. The "Enterprise settings" option is outlined.](/assets/images/enterprise/settings/enterprise-settings.png) diff --git a/data/reusables/enterprise-accounts/license-tab-ghes.md b/data/reusables/enterprise-accounts/license-tab-ghes.md index 3c743804be02..c881726692b7 100644 --- a/data/reusables/enterprise-accounts/license-tab-ghes.md +++ b/data/reusables/enterprise-accounts/license-tab-ghes.md @@ -1 +1 @@ -1. Under **{% octicon "gear" aria-hidden="true" aria-label="gear" %} Settings**, click **{% ifversion ghec %}Licensing{% elsif ghes %}License{% endif %}**. +1. Under **{% octicon "gear" aria-hidden="true" aria-label="gear" %} Settings**, click **{% ifversion fpt or ghec %}Licensing{% elsif ghes %}License{% endif %}**. diff --git a/data/reusables/gated-features/ghas-trial.md b/data/reusables/gated-features/ghas-trial.md new file mode 100644 index 000000000000..234a13133c33 --- /dev/null +++ b/data/reusables/gated-features/ghas-trial.md @@ -0,0 +1 @@ +{% data variables.product.prodname_GHAS %} is available for accounts on {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %} diff --git a/data/reusables/permissions/enhanced-billing-cloud-all.md b/data/reusables/permissions/enhanced-billing-cloud-all.md new file mode 100644 index 000000000000..a8e3a5d805fa --- /dev/null +++ b/data/reusables/permissions/enhanced-billing-cloud-all.md @@ -0,0 +1 @@ +Enterprise owners, organization owners, billing managers, and personal account users diff --git a/data/reusables/permissions/enhanced-billing-enterprise.md b/data/reusables/permissions/enhanced-billing-enterprise.md new file mode 100644 index 000000000000..c195c9b64389 --- /dev/null +++ b/data/reusables/permissions/enhanced-billing-enterprise.md @@ -0,0 +1 @@ +Enterprise owners, organization owners, and billing managers (cloud)
Enterprise owners (server) diff --git a/data/variables/product.yml b/data/variables/product.yml index 4562b039fb46..e4f9ead6a7fd 100644 --- a/data/variables/product.yml +++ b/data/variables/product.yml @@ -187,6 +187,9 @@ prodname_matching_fund: 'GitHub Sponsors Matching Fund' prodname_GHAS: 'GitHub Advanced Security' prodname_GH_code_security: '{% ifversion ghas-products %}GitHub Code Security{% else %}GitHub Advanced Security{% endif %}' prodname_GH_secret_protection: '{% ifversion ghas-products %}GitHub Secret Protection{% else %}GitHub Advanced Security{% endif %}' +### Useful in unversioned docs +prodname_GH_code_security_always: 'GitHub Code Security' +prodname_GH_secret_protection_always: 'GitHub Secret Protection' ## GHAS or GHAS products prodname_GHAS_or_code_security: '{% ifversion ghas-products %}GitHub Code Security or {% endif %}GitHub Advanced Security'