Skip to content

Commit 53aac26

Browse files
authored
Merge pull request #46335 from github/repo-sync
Repo sync
2 parents 688c35b + cbb88a6 commit 53aac26

163 files changed

Lines changed: 1376 additions & 1084 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎content/admin/backing-up-and-restoring-your-instance/configuring-elasticsearch-snapshots.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This feature is opt-in. If you don't configure a snapshot repository, {% data va
3333

3434
Configure the following settings using `ghe-config` over SSH. For more information, see [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/accessing-the-administrative-shell-ssh).
3535

36-
You'll apply the configuration to register the snapshot repository with Elasticsearch. The repository is named `search_index_snapshots-VERSION`, where `VERSION` is the current {% data variables.product.prodname_ghe_server %} release version.
36+
You'll apply the configuration to register the snapshot repository with Elasticsearch. The repository is named `search_index_snapshots-vVERSION`, where `VERSION` is the current {% data variables.product.prodname_ghe_server %} release version.
3737

3838
### Azure Blob storage
3939

@@ -106,7 +106,7 @@ You'll apply the configuration to register the snapshot repository with Elastics
106106
After configuration apply completes, confirm the snapshot repository was registered.
107107

108108
```shell
109-
curl -k "http://127.0.0.1:9200/_snapshot/search_index_snapshots-$(ghe-version -v)/_status"
109+
curl -k "http://127.0.0.1:9200/_snapshot/search_index_snapshots-v$(ghe-version -v)/_status"
110110
```
111111

112112
If a required secret is missing, configuration apply fails while registering the repository. Update the secrets and rerun `ghe-config-apply` to retry.
@@ -137,9 +137,9 @@ You can manage Elasticsearch snapshots directly using the following commands. Ru
137137

138138
| Command | Description |
139139
| --- | --- |
140-
| `ghe-es-create-snapshot` | Creates a new snapshot in the configured repository. |
141-
| `ghe-es-list-snapshots` | Lists snapshot repositories, or snapshots within a repository. |
142-
| `ghe-es-restore-snapshot` | Restores search indices from a snapshot. |
140+
| `/usr/local/share/enterprise/ghe-es-create-snapshot` | Creates a new snapshot in the configured repository. |
141+
| `/usr/local/share/enterprise/ghe-es-list-snapshots` | Lists snapshot repositories, or snapshots within a repository. |
142+
| `/usr/local/share/enterprise/ghe-es-restore-snapshot` | Restores search indices from a snapshot. |
143143

144144
> [!TIP]
145145
> For routine backups and restores, use {% data variables.product.prodname_enterprise_backup_utilities %} or {% data variables.product.prodname_enterprise_backup_service %} instead of these commands directly. The backup tooling coordinates Elasticsearch snapshots with the rest of your instance's data to ensure a consistent backup or restore. Use the manual commands only when you need to manage search index snapshots independently of a full instance backup or restore.
@@ -151,13 +151,13 @@ You can restore a snapshot created by an earlier {% data variables.product.prodn
151151
1. List available snapshots for the earlier version.
152152

153153
```shell
154-
ghe-es-list-snapshots -v 3.14.0
154+
/usr/local/share/enterprise/ghe-es-list-snapshots -v 3.14.0
155155
```
156156

157157
1. Restore the snapshot you want.
158158

159159
```shell
160-
ghe-es-restore-snapshot -v 3.14.0 -s SNAPSHOT-NAME
160+
/usr/local/share/enterprise/ghe-es-restore-snapshot -v 3.14.0 -s SNAPSHOT-NAME
161161
```
162162

163163
Elasticsearch automatically upgrades the restored indices to the current version's format.

‎content/admin/data-residency/feature-overview-for-github-enterprise-cloud-with-data-residency.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ The following features are currently unavailable on {% data variables.enterprise
2323
| Feature | Details | More information |
2424
| :- | :- | :- |
2525
| Dependency insights | Organization-level and enterprise-level dependency insights are unavailable and display no data. | [AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-dependencies-in-your-organization) |
26-
| License and package metadata in the dependency graph | License and package details are not currently populated in the dependency graph. This can result in empty license fields in software bill of materials (SBOM) exports and missing license information from the {% data variables.dependency-review.action_name %}. | [AUTOTITLE](/code-security/how-tos/secure-your-supply-chain/establish-provenance-and-integrity/export-dependencies-as-sbom)<br>[AUTOTITLE](/code-security/how-tos/secure-your-supply-chain/manage-your-dependency-security/configure-dependency-review-action) |
2726
| macOS runners for {% data variables.product.prodname_actions %} | Currently unavailable. | [AUTOTITLE](/actions/concepts/runners/github-hosted-runners) |
2827
| Maven and Gradle support for {% data variables.product.prodname_registry %} | Currently unavailable. | [AUTOTITLE](/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry) |
2928
| {% data variables.product.prodname_marketplace %} | {% data variables.product.prodname_marketplace %}, as a means of searching for, purchasing, and directly installing apps and actions, is unavailable. Ecosystem apps and actions can still be discovered and installed from their source, but they may require modification to work on {% data variables.enterprise.data_residency_site %}. | [{% data variables.product.prodname_actions %} workflows from {% data variables.product.prodname_marketplace %}](#github-actions-workflows-from-github-marketplace) |

‎content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise.md‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,6 @@ Across all of your enterprise's organizations, you can allow or disallow people
109109

110110
{% endif %}
111111

112-
{% ifversion secret-scanning-actions-logs %}
113-
114-
## Enforcing a policy for secret scanning in {% data variables.product.prodname_actions %} workflow logs
115-
116-
As an enterprise owner, you can choose whether {% data variables.product.github %} scans {% data variables.product.prodname_actions %} workflow logs for secrets. This policy is disabled by default.
117-
118-
When you enable the policy, {% data variables.product.github %} scans the logs of new workflow runs in all repositories in your enterprise where {% data variables.product.prodname_secret_scanning %} is enabled.
119-
120-
{% data reusables.enterprise-accounts.access-enterprise %}
121-
{% data reusables.enterprise-accounts.policies-tab %}
122-
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
123-
1. Under "Secret scanning for Actions workflow logs", select the **All repositories** dropdown menu, then click **Enabled** or **Disabled**.
124-
125-
{% endif %}
126-
127112
{% ifversion code-scanning-autofix %}
128113

129114
## Enforcing a policy to manage the use of {% data variables.copilot.copilot_autofix_short %} in your enterprise's repositories

‎content/admin/managing-accounts-and-repositories/managing-roles-in-your-enterprise/abilities-of-roles.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ category:
3030
| Enterprise owner | Can manage all enterprise settings, members, and policies. |
3131
| {% ifversion ghec %} |
3232
| Billing manager | Can manage enterprise billing settings. |
33+
| Enterprise open-source license manager | Can edit license compliance policy. Receives notifications for license alert closure requests. |
3334
| {% endif %} |
3435
| {% ifversion enterprise-app-manager %} |
3536
| App manager | Can manage {% data variables.product.prodname_github_app %} registrations that are owned by the enterprise. |

‎content/apps/using-github-apps/about-using-github-apps.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Before you install or authorize a {% data variables.product.prodname_github_app
4343
4444
{% data reusables.copilot.agent-apps-intro %} Powered by {% data variables.copilot.copilot_cloud_agent %}, you can trigger these agents from issues, pull requests, and the Agents UI.
4545

46-
When you install an {% data variables.copilot.agent_app %}, you will be asked if you want to enable agent features. For more information, see [AUTOTITLE](/copilot/concepts/agents/agent-apps).
46+
When you install an {% data variables.copilot.agent_app %}, you will be asked if you want to enable agent features. For more information, see [AUTOTITLE](/copilot/concepts/agent-capabilities/about-agents/agent-apps).
4747

4848
If the app is installed in an organization owned by an enterprise, an administrator must also enable the "{% data variables.copilot.agent_apps %}" {% data variables.product.prodname_copilot_short %} policy before the agent features become available.
4949

‎content/billing/concepts/budgets-and-alerts.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ For most license-based products such as {% data variables.product.prodname_copil
1919

2020
For metered products such as {% data variables.product.prodname_actions %}, {% data variables.product.prodname_copilot_short %} {% data variables.product.prodname_ai_credits_short %}, or cloud sandboxes, you can set budgets to prevent usage once the budget threshold is reached.
2121

22+
{% ifversion fpt or ghec %}
23+
24+
The bundled {% data variables.product.prodname_ai_credits_short %} budget controls metered spending across all AI-credit SKUs. You can also create a SKU-level budget for **Code Security AI Credits** to control spending on AI Scan and agentic autofix.
25+
26+
When no Code Security AI Credits quota remains because of a hard budget, AI Scan cannot produce findings and agentic autofix cannot start a session. Usage resumes when the limiting budget is increased or a new billing cycle begins.
27+
28+
Hard budgets for Code Security AI Credits limit AI feature usage, not enablement. Reaching a budget limit does not prevent administrators from enabling AI Scan or agentic autofix.
29+
30+
By contrast, a hard budget for active-committer licenses prevents enabling {% data variables.product.prodname_code_security %} or {% data variables.product.prodname_secret_protection %} on additional repositories. It does not disable these products in repositories where they are already enabled.
31+
32+
{% endif %}
33+
2234
## Types and scopes
2335

2436
Each budget has a type and a scope that define which paid use contributes to spending against the budget.

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: '{% data variables.product.prodname_GHAS %} license billing'
3-
intro: 'Learn how usage of {% data variables.product.prodname_AS %} features is measured and how to pay for additional licenses.'
3+
intro: 'Understand how {% data variables.product.prodname_AS %} licenses{% ifversion fpt or ghec %} and AI-credit usage{% endif %} are billed.'
44
product: '{% data reusables.gated-features.ghas-billing %}'
55
redirect_from:
66
# Article on migrating to two separate SKUs
@@ -60,6 +60,28 @@ For full details of available features, see [AUTOTITLE](/get-started/learning-ab
6060

6161
You need to **pay** to use {% data variables.product.prodname_AS %} features in **private repositories** on {% data variables.product.prodname_dotcom_the_website %}, and in all repositories hosted by {% data variables.enterprise.data_residency_site %} and {% data variables.product.prodname_ghe_server %}.
6262

63+
{% ifversion fpt or ghec %}
64+
65+
## How AI feature usage is billed
66+
67+
Some {% data variables.product.prodname_AS %} features consume {% data variables.product.prodname_ai_credits_short %} in addition to the active-committer licenses described in this article. AI Scan and agentic autofix consume the **Code Security AI Credits** SKU.
68+
69+
These features consume Code Security AI Credits even when the repository is public and does not require active-committer licenses.
70+
71+
If the account being billed has included {% data variables.product.prodname_ai_credits_short %} from a {% data variables.product.prodname_copilot %} entitlement, eligible usage draws from that allowance first. After the included allowance is exhausted, further usage is metered. If the account doesn't have included {% data variables.product.prodname_ai_credits_short %}, all usage is metered.
72+
73+
For an organization-owned repository, usage is attributed to the account that pays for the organization's usage. This is the standalone organization account or its enterprise account. The included {% data variables.product.prodname_ai_credits_short %} and budgets for that account apply, including for public repositories.
74+
75+
Repositories in the personal namespace of a {% data variables.enterprise.prodname_managed_user %} are not treated as ordinary personal-account repositories for Code Security AI Credits. AI Scan and agentic autofix are not currently available for these repositories and do not consume Code Security AI Credits there. Purchasing {% data variables.product.prodname_code_security %}, having included {% data variables.product.prodname_ai_credits_short %}, or configuring a Code Security AI Credits budget does not make these features available.
76+
77+
This limitation does not affect classic {% data variables.copilot.copilot_autofix_short %}, which is distinct from agentic autofix and does not consume {% data variables.product.prodname_ai_credits_short %}.
78+
79+
Before security administrators enable AI Scan or agentic autofix broadly, billing administrators should review the account's included {% data variables.product.prodname_ai_credits_short %} and set budgets for metered usage. After the included allowance is exhausted, a hard budget can prevent further metered usage. For more information, see [AUTOTITLE](/billing/concepts/budgets-and-alerts).
80+
81+
For information about features that consume Code Security AI Credits, see [AUTOTITLE](/code-security/concepts/code-scanning/ai-powered-security-detections) and [AUTOTITLE](/code-security/concepts/code-scanning/autofix-for-code-scanning).
82+
83+
{% endif %}
84+
6385
## Using more than your planned licenses
6486

6587
Your account may have a limit on the number of licenses you can use. For example, volume billing specifies a set number of licenses.

‎content/billing/how-tos/products/view-productlicense-use.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,20 @@ The metered usage chart and usage break down table both show your current choice
9494
> [!NOTE]
9595
> Enterprise owners and billing managers can filter AI usage data by user. Organization owners cannot view user-level data directly—to see per-user consumption, download a usage report instead. See [Downloading usage reports](#downloading-usage-reports).
9696
97-
If you use {% data variables.product.prodname_copilot_short %}, an additional **AI usage** view is listed under **Usage**. You can use this view to dig deeper into how your enterprise is consuming {% data variables.product.prodname_ai_credits_short %} and where additional spend is occurring. For example:
97+
If your account uses {% data variables.product.prodname_ai_credits_short %}, an additional **AI usage** view is listed under **Usage**. You can use this view to understand included and metered usage across products, including {% data variables.product.prodname_copilot_short %} and {% data variables.product.prodname_AS %}.
98+
99+
To review combined AI Scan and agentic autofix usage, open the **AI usage** view, under "Group by," select **Products**, then review **{% data variables.product.prodname_AS %}**. These features share the Code Security AI Credits SKU, so their usage is reported together within the product total, not as separate totals for each feature.
100+
101+
You can use the view to answer questions such as:
98102

99103
* What's our total {% data variables.product.prodname_ai_credits_short %} consumption across all users?
100104
* Which users are the heaviest consumers, and are they within their budget?
101105
* Which models are driving the most spend?
102106
* How widespread is adoption in the organizations where we rolled out {% data variables.product.prodname_copilot_short %}?
103107

104-
To understand how {% data variables.product.prodname_ai_credits_short %} are pooled across your enterprise and what the usage data represents, see [AUTOTITLE](/copilot/concepts/billing-and-usage/organizations-and-enterprises/billing).
108+
For information about {% data variables.product.prodname_copilot_short %} allowances and how {% data variables.product.prodname_ai_credits_short %} are pooled across your enterprise, see [AUTOTITLE](/copilot/concepts/billing-and-usage/organizations-and-enterprises/billing).
109+
110+
For information about {% data variables.product.prodname_AS %} AI-credit billing, see [AUTOTITLE](/billing/concepts/product-billing/github-advanced-security#how-ai-feature-usage-is-billed).
105111

106112
{% endif %}
107113

0 commit comments

Comments
 (0)