From 690f4f3331526e36182fa9e8ee968f777f8bbca8 Mon Sep 17 00:00:00 2001 From: Kathleen <36471738+kathleenqin@users.noreply.github.com> Date: Wed, 4 Mar 2026 09:28:21 -0800 Subject: [PATCH 1/4] Update copilot-usage-metrics.md for user-level CLI telemetry (#59959) Co-authored-by: hubwriter --- .../reference/copilot-usage-metrics/copilot-usage-metrics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/copilot/reference/copilot-usage-metrics/copilot-usage-metrics.md b/content/copilot/reference/copilot-usage-metrics/copilot-usage-metrics.md index 5a6f1b69d23a..5c245f4c0d17 100644 --- a/content/copilot/reference/copilot-usage-metrics/copilot-usage-metrics.md +++ b/content/copilot/reference/copilot-usage-metrics/copilot-usage-metrics.md @@ -94,7 +94,7 @@ These fields appear in the exported NDJSON reports and in the {% data variables. ### {% data variables.copilot.copilot_cli_short %} metrics fields (API only) -The `totals_by_cli` object contains the following nested fields when CLI usage is present. These metrics are currently only available in the enterprise-level reports. +The `totals_by_cli` object contains the following nested fields when CLI usage is present. These metrics are currently only available in the enterprise-level and user-level reports. | Field | Description | |:--|:--| From bb4adb5fabd17b61ef10a1d6a52e189b572cf1c1 Mon Sep 17 00:00:00 2001 From: docs-bot <77750099+docs-bot@users.noreply.github.com> Date: Wed, 4 Mar 2026 09:59:34 -0800 Subject: [PATCH 2/4] Sync secret scanning data (#60035) Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com> --- src/secret-scanning/data/pattern-docs/fpt/public-docs.yml | 6 +++--- src/secret-scanning/data/pattern-docs/ghec/public-docs.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/secret-scanning/data/pattern-docs/fpt/public-docs.yml b/src/secret-scanning/data/pattern-docs/fpt/public-docs.yml index eacf6c16db71..9722847ff517 100644 --- a/src/secret-scanning/data/pattern-docs/fpt/public-docs.yml +++ b/src/secret-scanning/data/pattern-docs/fpt/public-docs.yml @@ -114,7 +114,7 @@ isPublic: false isPrivateWithGhas: true hasPushProtection: true - hasValidityCheck: false + hasValidityCheck: true hasExtendedMetadata: false base64Supported: false isduplicate: false @@ -1718,7 +1718,7 @@ isPublic: false isPrivateWithGhas: true hasPushProtection: false - hasValidityCheck: false + hasValidityCheck: true hasExtendedMetadata: false base64Supported: false isduplicate: false @@ -3552,7 +3552,7 @@ isPublic: false isPrivateWithGhas: true hasPushProtection: true - hasValidityCheck: false + hasValidityCheck: true hasExtendedMetadata: false base64Supported: false isduplicate: false diff --git a/src/secret-scanning/data/pattern-docs/ghec/public-docs.yml b/src/secret-scanning/data/pattern-docs/ghec/public-docs.yml index eacf6c16db71..9722847ff517 100644 --- a/src/secret-scanning/data/pattern-docs/ghec/public-docs.yml +++ b/src/secret-scanning/data/pattern-docs/ghec/public-docs.yml @@ -114,7 +114,7 @@ isPublic: false isPrivateWithGhas: true hasPushProtection: true - hasValidityCheck: false + hasValidityCheck: true hasExtendedMetadata: false base64Supported: false isduplicate: false @@ -1718,7 +1718,7 @@ isPublic: false isPrivateWithGhas: true hasPushProtection: false - hasValidityCheck: false + hasValidityCheck: true hasExtendedMetadata: false base64Supported: false isduplicate: false @@ -3552,7 +3552,7 @@ isPublic: false isPrivateWithGhas: true hasPushProtection: true - hasValidityCheck: false + hasValidityCheck: true hasExtendedMetadata: false base64Supported: false isduplicate: false From 54dc52196db0d5da0d680478c495785cd86d2f98 Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Wed, 4 Mar 2026 18:26:25 +0000 Subject: [PATCH 3/4] Disable GHAS button on the Enterprise licensing page [GA] (#59945) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Isaac Brown <101839405+isaacmbrown@users.noreply.github.com> Co-authored-by: isaacmbrown Co-authored-by: Melanie Yarbrough <11952755+myarb@users.noreply.github.com> --- .../github-advanced-security.md | 15 ++++++++ .../products/disable-ghas-for-enterprise.md | 37 +++++++++++++++++++ content/billing/how-tos/products/index.md | 1 + .../how-tos/products/manage-ghas-licenses.md | 8 ++++ .../about-github-advanced-security.md | 10 +++++ data/features/disable-ghas-button.yml | 6 +++ 6 files changed, 77 insertions(+) create mode 100644 content/billing/how-tos/products/disable-ghas-for-enterprise.md create mode 100644 data/features/disable-ghas-button.yml diff --git a/content/billing/concepts/product-billing/github-advanced-security.md b/content/billing/concepts/product-billing/github-advanced-security.md index 75db1bfaba64..07996217d17d 100644 --- a/content/billing/concepts/product-billing/github-advanced-security.md +++ b/content/billing/concepts/product-billing/github-advanced-security.md @@ -138,6 +138,21 @@ You can enforce policies to allow or disallow the use of {% data variables.produ > [!TIP] > All standalone instances of {% data variables.product.prodname_ghe_server %} use volume/subscription licenses. Contact [{% data variables.product.github %}'s Sales team](https://enterprise.github.com/contact) if you want to make changes to your license. +{% ifversion disable-ghas-button %} + +## Disabling {% data variables.product.prodname_GHAS %} in an enterprise + +To disable {% data variables.product.prodname_GHAS %} and prevent accidental re-enablement across your enterprise, enterprise owners can use the **Disable {% data variables.product.prodname_AS %}** option available in the enterprise licensing page. This is particularly useful for metered users who want to ensure {% data variables.product.prodname_GHAS %} is completely disabled and cannot be re-enabled without explicit approval. + +The **Disable {% data variables.product.prodname_AS %}** option: +* Disables {% data variables.product.prodname_GHAS %} in all private and internal repositories +* Sets a policy to prevent future paid adoption +* Stops billing for future usage (metered billing only) + +See [AUTOTITLE](/billing/how-tos/products/disable-ghas-for-enterprise). + +{% endif %} + ## Further reading {%- ifversion fpt or ghec or ghes > 3.15 %} diff --git a/content/billing/how-tos/products/disable-ghas-for-enterprise.md b/content/billing/how-tos/products/disable-ghas-for-enterprise.md new file mode 100644 index 000000000000..b0c691fa8b38 --- /dev/null +++ b/content/billing/how-tos/products/disable-ghas-for-enterprise.md @@ -0,0 +1,37 @@ +--- +title: Disabling GitHub Advanced Security for your enterprise +intro: Disable {% data variables.product.prodname_GHAS %} and prevent accidental re-enablement across your enterprise. +permissions: Enterprise owners +versions: + feature: disable-ghas-button +topics: + - Billing + - Advanced Security + - Enterprise +shortTitle: Disable GHAS for enterprise +contentType: how-tos +--- + +If you want to immediately disable {% data variables.product.prodname_GHAS %} in all repositories, prevent organizations from re-enabling it and avoid unexpected billing charges, you can use the **Disable {% data variables.product.prodname_AS %}** option available in the enterprise licensing page. This is different from canceling your {% data variables.product.prodname_AS %} subscription: + +* **Canceling your subscription** stops future billing but does not disable {% data variables.product.prodname_GHAS %} in repositories or prevent re-enablement. +* **Disabling {% data variables.product.prodname_AS %}** immediately disables {% data variables.product.prodname_GHAS %} in all private and internal repositories and sets a policy to prevent future paid adoption. + +## Disabling {% data variables.product.prodname_GHAS %} across your enterprise + +{% data reusables.enterprise-accounts.access-enterprise %} +{% data reusables.billing.enterprise-billing-menu %} +{% data reusables.billing.click-licensing %} +1. To the right of "{% data variables.product.prodname_AS %}," click **Manage** and select the **Disable {% data variables.product.prodname_AS %}** option. +1. In the modal dialog that is displayed, click **Disable {% data variables.product.prodname_AS %}** to confirm. + + To re-enable {% data variables.product.prodname_GHAS %}, you'll need to update the policies for this feature in the **Policies** tab of your enterprise. + +## What happens to my bill? + +Once you have disabled {% data variables.product.prodname_GHAS %}: + +* If you use **volume billing**, you agreed to a number of licenses and billing period upfront. You'll continue to pay for the rest of this period. +* If you use **metered billing**, you pay based on usage, and your billing will stop from next month. However, you _will_ continue paying for any licenses you've already consumed this month until the end of the month. + + For example, if you had 10 licenses in use and disabled GHAS on the second day of the month, you will still be billed for your 10 licenses for the full month instead of just for the two days. diff --git a/content/billing/how-tos/products/index.md b/content/billing/how-tos/products/index.md index d9fb0d36b525..2ff41ad923ef 100644 --- a/content/billing/how-tos/products/index.md +++ b/content/billing/how-tos/products/index.md @@ -28,6 +28,7 @@ children: - /use-cost-centers - /manage-ghas-licenses - /view-ghas-committers + - /disable-ghas-for-enterprise contentType: how-tos --- diff --git a/content/billing/how-tos/products/manage-ghas-licenses.md b/content/billing/how-tos/products/manage-ghas-licenses.md index 595ba56f8005..ad2fea06528c 100644 --- a/content/billing/how-tos/products/manage-ghas-licenses.md +++ b/content/billing/how-tos/products/manage-ghas-licenses.md @@ -37,3 +37,11 @@ For information about using policies to control use of licenses in your enterpri {% data reusables.billing.click-licensing %} 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 %}**. + +{% ifversion disable-ghas-button %} + +## Disabling {% data variables.product.prodname_GHAS %} in an enterprise + +Enterprise owners can disable {% data variables.product.prodname_GHAS %} completely and set a policy to prevent future re-enablement. See [AUTOTITLE](/billing/how-tos/products/disable-ghas-for-enterprise). + +{% endif %} diff --git a/content/get-started/learning-about-github/about-github-advanced-security.md b/content/get-started/learning-about-github/about-github-advanced-security.md index e7a8e391454c..fd17ecf89288 100644 --- a/content/get-started/learning-about-github/about-github-advanced-security.md +++ b/content/get-started/learning-about-github/about-github-advanced-security.md @@ -153,6 +153,16 @@ A site administrator must enable {% data variables.product.prodname_AS %} for {% If you are on a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan, license use for the entire team or enterprise is shown on your license page. {% ifversion fpt or ghec %}See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage).{% endif %} +{% ifversion disable-ghas-button %} + +## Managing {% data variables.product.prodname_GHAS %} + +Enterprise owners can manage {% data variables.product.prodname_GHAS %} licensing and access for their enterprise, including disabling {% data variables.product.prodname_GHAS %} across all repositories and preventing future re-enablement. See [AUTOTITLE](/billing/how-tos/products/manage-ghas-licenses#disabling-github-advanced-security-across-your-enterprise). + +For information about managing your {% data variables.product.prodname_GHAS %} license, see [AUTOTITLE](/code-security/how-tos/secure-at-scale/configure-organization-security/manage-usage-and-access/managing-your-github-advanced-security-license-usage). + +{% endif %} + {% ifversion copilot-chat-ghas-alerts %} ## Leveraging {% data variables.copilot.copilot_chat %} to understand security alerts diff --git a/data/features/disable-ghas-button.yml b/data/features/disable-ghas-button.yml new file mode 100644 index 000000000000..f1ba0ba79b37 --- /dev/null +++ b/data/features/disable-ghas-button.yml @@ -0,0 +1,6 @@ +# Reference: #21435 +# Disable GHAS button on the Enterprise licensing page [GA] +versions: + fpt: '*' + ghec: '*' + ghes: '>= 3.21' From 73de74e91cd6977494d109b5333cb879681630fe Mon Sep 17 00:00:00 2001 From: Nhu Do Date: Wed, 4 Mar 2026 13:46:50 -0500 Subject: [PATCH 4/4] Include Grok Code model in auto model selection (#59948) --- content/copilot/concepts/auto-model-selection.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/copilot/concepts/auto-model-selection.md b/content/copilot/concepts/auto-model-selection.md index 54baa852a4ed..e935c64f5b2a 100644 --- a/content/copilot/concepts/auto-model-selection.md +++ b/content/copilot/concepts/auto-model-selection.md @@ -46,6 +46,8 @@ When you select **Auto** in {% data variables.copilot.copilot_chat_short %}, {% * {% data variables.copilot.copilot_gpt_53_codex %} * {% data variables.copilot.copilot_claude_haiku_45 %} * {% data variables.copilot.copilot_claude_sonnet_45 %} + * {% data variables.copilot.copilot_grok_code %} + * {% data variables.copilot.copilot_raptor_mini %} > [!TIP] To see which model was used for each response, hover over the response in {% data variables.copilot.copilot_chat_short %}.