Skip to content

Commit e739d0c

Browse files
authored
Merge pull request #43223 from github/repo-sync
Repo sync
2 parents 8756d31 + 73de74e commit e739d0c

File tree

10 files changed

+86
-7
lines changed

10 files changed

+86
-7
lines changed

content/billing/concepts/product-billing/github-advanced-security.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,21 @@ You can enforce policies to allow or disallow the use of {% data variables.produ
138138
> [!TIP]
139139
> 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.
140140
141+
{% ifversion disable-ghas-button %}
142+
143+
## Disabling {% data variables.product.prodname_GHAS %} in an enterprise
144+
145+
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.
146+
147+
The **Disable {% data variables.product.prodname_AS %}** option:
148+
* Disables {% data variables.product.prodname_GHAS %} in all private and internal repositories
149+
* Sets a policy to prevent future paid adoption
150+
* Stops billing for future usage (metered billing only)
151+
152+
See [AUTOTITLE](/billing/how-tos/products/disable-ghas-for-enterprise).
153+
154+
{% endif %}
155+
141156
## Further reading
142157

143158
{%- ifversion fpt or ghec or ghes > 3.15 %}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
title: Disabling GitHub Advanced Security for your enterprise
3+
intro: Disable {% data variables.product.prodname_GHAS %} and prevent accidental re-enablement across your enterprise.
4+
permissions: Enterprise owners
5+
versions:
6+
feature: disable-ghas-button
7+
topics:
8+
- Billing
9+
- Advanced Security
10+
- Enterprise
11+
shortTitle: Disable GHAS for enterprise
12+
contentType: how-tos
13+
---
14+
15+
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:
16+
17+
* **Canceling your subscription** stops future billing but does not disable {% data variables.product.prodname_GHAS %} in repositories or prevent re-enablement.
18+
* **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.
19+
20+
## Disabling {% data variables.product.prodname_GHAS %} across your enterprise
21+
22+
{% data reusables.enterprise-accounts.access-enterprise %}
23+
{% data reusables.billing.enterprise-billing-menu %}
24+
{% data reusables.billing.click-licensing %}
25+
1. To the right of "{% data variables.product.prodname_AS %}," click **Manage** and select the **Disable {% data variables.product.prodname_AS %}** option.
26+
1. In the modal dialog that is displayed, click **Disable {% data variables.product.prodname_AS %}** to confirm.
27+
28+
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.
29+
30+
## What happens to my bill?
31+
32+
Once you have disabled {% data variables.product.prodname_GHAS %}:
33+
34+
* 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.
35+
* 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.
36+
37+
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.

content/billing/how-tos/products/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ children:
2828
- /use-cost-centers
2929
- /manage-ghas-licenses
3030
- /view-ghas-committers
31+
- /disable-ghas-for-enterprise
3132
contentType: how-tos
3233
---
3334

content/billing/how-tos/products/manage-ghas-licenses.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,11 @@ For information about using policies to control use of licenses in your enterpri
3737
{% data reusables.billing.click-licensing %}
3838
1. To the right of "{% data variables.product.prodname_AS %}", select {% octicon "kebab-horizontal" aria-label="Open menu" %}, then click **Cancel subscription**.
3939
1. To confirm your cancellation, click **I understand, cancel {% data variables.product.prodname_AS %}**.
40+
41+
{% ifversion disable-ghas-button %}
42+
43+
## Disabling {% data variables.product.prodname_GHAS %} in an enterprise
44+
45+
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).
46+
47+
{% endif %}

content/copilot/concepts/auto-model-selection.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ When you select **Auto** in {% data variables.copilot.copilot_chat_short %}, {%
4646
* {% data variables.copilot.copilot_gpt_53_codex %}
4747
* {% data variables.copilot.copilot_claude_haiku_45 %}
4848
* {% data variables.copilot.copilot_claude_sonnet_45 %}
49+
* {% data variables.copilot.copilot_grok_code %}
50+
* {% data variables.copilot.copilot_raptor_mini %}
4951

5052
> [!TIP] To see which model was used for each response, hover over the response in {% data variables.copilot.copilot_chat_short %}.
5153

content/copilot/reference/copilot-usage-metrics/copilot-usage-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ These fields appear in the exported NDJSON reports and in the {% data variables.
9494

9595
### {% data variables.copilot.copilot_cli_short %} metrics fields (API only)
9696

97-
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.
97+
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.
9898

9999
| Field | Description |
100100
|:--|:--|

content/get-started/learning-about-github/about-github-advanced-security.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,16 @@ A site administrator must enable {% data variables.product.prodname_AS %} for {%
153153

154154
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 %}
155155

156+
{% ifversion disable-ghas-button %}
157+
158+
## Managing {% data variables.product.prodname_GHAS %}
159+
160+
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).
161+
162+
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).
163+
164+
{% endif %}
165+
156166
{% ifversion copilot-chat-ghas-alerts %}
157167

158168
## Leveraging {% data variables.copilot.copilot_chat %} to understand security alerts
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Reference: #21435
2+
# Disable GHAS button on the Enterprise licensing page [GA]
3+
versions:
4+
fpt: '*'
5+
ghec: '*'
6+
ghes: '>= 3.21'

src/secret-scanning/data/pattern-docs/fpt/public-docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
isPublic: false
115115
isPrivateWithGhas: true
116116
hasPushProtection: true
117-
hasValidityCheck: false
117+
hasValidityCheck: true
118118
hasExtendedMetadata: false
119119
base64Supported: false
120120
isduplicate: false
@@ -1718,7 +1718,7 @@
17181718
isPublic: false
17191719
isPrivateWithGhas: true
17201720
hasPushProtection: false
1721-
hasValidityCheck: false
1721+
hasValidityCheck: true
17221722
hasExtendedMetadata: false
17231723
base64Supported: false
17241724
isduplicate: false
@@ -3552,7 +3552,7 @@
35523552
isPublic: false
35533553
isPrivateWithGhas: true
35543554
hasPushProtection: true
3555-
hasValidityCheck: false
3555+
hasValidityCheck: true
35563556
hasExtendedMetadata: false
35573557
base64Supported: false
35583558
isduplicate: false

src/secret-scanning/data/pattern-docs/ghec/public-docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
isPublic: false
115115
isPrivateWithGhas: true
116116
hasPushProtection: true
117-
hasValidityCheck: false
117+
hasValidityCheck: true
118118
hasExtendedMetadata: false
119119
base64Supported: false
120120
isduplicate: false
@@ -1718,7 +1718,7 @@
17181718
isPublic: false
17191719
isPrivateWithGhas: true
17201720
hasPushProtection: false
1721-
hasValidityCheck: false
1721+
hasValidityCheck: true
17221722
hasExtendedMetadata: false
17231723
base64Supported: false
17241724
isduplicate: false
@@ -3552,7 +3552,7 @@
35523552
isPublic: false
35533553
isPrivateWithGhas: true
35543554
hasPushProtection: true
3555-
hasValidityCheck: false
3555+
hasValidityCheck: true
35563556
hasExtendedMetadata: false
35573557
base64Supported: false
35583558
isduplicate: false

0 commit comments

Comments
 (0)