Skip to content

Commit 166a3b2

Browse files
authored
Merge pull request #39014 from github/repo-sync
Repo sync
2 parents fdc8efa + 5501c5e commit 166a3b2

File tree

24 files changed

+4128
-490
lines changed

24 files changed

+4128
-490
lines changed

content/billing/managing-your-billing/about-usage-reports.md

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,26 @@ permissions: '{% data reusables.permissions.enhanced-billing-platform %}'
1111
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
1212
---
1313

14-
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.
14+
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.
1515

1616
To generate a usage report, see [AUTOTITLE](/billing/managing-your-billing/gathering-insights-on-your-spending).
1717

18+
## Usage report types
19+
20+
### Summarized report
21+
22+
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.
23+
24+
Summarized reports can be requested for a maximum time frame of one year.
25+
26+
### Detailed report
27+
28+
The detailed usage report includes the same fields as the summarized report and adds `username` and `workflow_path`.
29+
30+
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`.
31+
32+
Detailed reports can be requested for a maximum time frame of 31 days.
33+
1834
## Usage report fields
1935

2036
The usage report contains the following fields.
@@ -30,10 +46,10 @@ The usage report contains the following fields.
3046
| `gross_amount` | The amount of the product SKU that was used. |
3147
| `discount_amount` | The amount of usage that was discounted. Usage that is discounted as part of your account’s included usage is reflected in this field. Also includes discounts for {% data variables.product.prodname_actions %} usage for standard {% data variables.product.github %}-hosted runners in public repositories and for self-hosted runners. |
3248
| `net_amount` | The billable amount of usage after applying the `discount_amount`. This is the amount that your account will be billed. `gross_amount - discount_amount = net_amount`. |
33-
| `username` | The user associated with the usage, if applicable. |
49+
| `username` | The user associated with the usage, if applicable. Only available in the detailed report. |
3450
| `organization` | The organization associated with the usage, if applicable. |
3551
| `repository` | The repository associated with the usage, if applicable. |
36-
| `workflow_path` | The path of the {% data variables.product.prodname_actions %} workflow that generated the usage, if applicable. |
52+
| `workflow_path` | The path of the {% data variables.product.prodname_actions %} workflow that generated the usage, if applicable. Only available in the detailed report. |
3753
| `cost_center_name` | The cost center associated with the usage, if applicable. |
3854

3955
### Deprecated report fields
@@ -45,10 +61,6 @@ The usage report contains the following fields.
4561
| `usage_at` | Refer to `date` instead. |
4662
| `workflow_name` | Refer to `workflow_path` instead. |
4763

48-
## How usage is summarized
49-
50-
To reduce the size of the report, similar usage entries are grouped and totaled. The report summarizes the `quantity`, `gross_amount`, `discount_amount`, and `net_amount` fields based on the combination of the following values: `date`, `sku`, `username`, `workflow_path`, `repository`, `cost_center_name`.
51-
5264
## Receiving the report
5365

5466
Usage reports are sent via email to the default email address associated with your {% data variables.product.github %} account.

content/copilot/managing-copilot/configuring-and-auditing-content-exclusion/excluding-content-from-github-copilot.md

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Excluding content from GitHub Copilot
33
shortTitle: Exclude content from Copilot
44
intro: 'You can prevent {% data variables.product.prodname_copilot_short %} from accessing certain content.'
5-
permissions: 'Repository administrators{% ifversion ghec%}, organization owners, and enterprise owners{% else %} and organization owners{% endif %} can manage content exclusion settings. People with the "Maintain" role for a repository can view, but not edit, content exclusion settings for that repository.'
5+
permissions: 'Repository administrators, organization owners, and enterprise owners can manage content exclusion settings. People with the "Maintain" role for a repository can view, but not edit, content exclusion settings for that repository.'
66
product: '{% data reusables.gated-features.copilot-business-and-enterprise %}'
77
layout: inline
88
versions:
@@ -22,9 +22,9 @@ topics:
2222
- Copilot
2323
---
2424

25-
## About content exclusions for {% data variables.product.prodname_copilot_short %}
25+
## About content exclusion for {% data variables.product.prodname_copilot_short %}
2626

27-
You can use content exclusions to configure {% data variables.product.prodname_copilot_short %} to ignore certain files. When you exclude content from {% data variables.product.prodname_copilot_short %}:
27+
You can use content exclusion to configure {% data variables.product.prodname_copilot_short %} to ignore certain files. When you exclude content from {% data variables.product.prodname_copilot_short %}:
2828

2929
* Code completion will not be available in the affected files.
3030
* The content in affected files will not inform code completion suggestions in other files.
@@ -33,11 +33,13 @@ You can use content exclusions to configure {% data variables.product.prodname_c
3333

3434
### Who can configure content exclusion
3535

36-
Repository administrators{% ifversion ghec %}, organization owners, and enterprise owners{% else %} and organization owners{% endif %} can configure content exclusion.
36+
Repository administrators, organization owners, and enterprise owners can configure content exclusion.
3737

3838
{% data reusables.copilot.content-exclusions-scope %}
3939

40-
### Availability of content exclusions
40+
### Availability of content exclusion
41+
42+
The {% data variables.copilot.copilot_business_short %} and {% data variables.copilot.copilot_enterprise_short %} plans provide the following level of support for content exclusion.
4143

4244
| Tool | Code completion support | {% data variables.copilot.copilot_chat_short %} support |
4345
|-------------------------------------------------|:---------------------------------------------:|:----------------------------------------------------------------:|
@@ -57,7 +59,7 @@ Content exclusions also apply to {% data variables.copilot.copilot_code-review_s
5759
> * Content exclusion is in {% data variables.release-phases.public_preview %} on the {% data variables.product.github %} website and in {% data variables.product.prodname_mobile %} and is subject to change.
5860
> * Content exclusion is currently not supported in Edit and Agent modes of {% data variables.copilot.copilot_chat_short %} in {% data variables.product.prodname_vscode %}.
5961
60-
### Limitations of content exclusions
62+
### Limitations of content exclusion
6163

6264
{% data reusables.copilot.content-exclusion-limitations %}
6365

@@ -67,16 +69,16 @@ Currently, content exclusions do not apply to symbolic links (symlinks).
6769

6870
After you configure content exclusion, the client (for example, the {% data variables.product.prodname_copilot_short %} extension for {% data variables.product.prodname_vscode_shortname %}) sends the current repository URL to the {% data variables.product.prodname_dotcom %} server so that the server can return the correct policy to the client. These URLs are not logged anywhere.
6971

70-
## Configuring content exclusions for your repository
72+
## Configuring content exclusion for your repository
7173

7274
You can use your repository settings to specify content in your repository that {% data variables.product.prodname_copilot %} should ignore.
7375

7476
{% data reusables.repositories.navigate-to-repo %}
7577
{% data reusables.repositories.sidebar-settings %}
7678

77-
1. In the "Code & automation" section of the sidebar, click **{% octicon "copilot" aria-hidden="true" aria-label="copilot" %} {% data variables.product.prodname_copilot_short %}**.
79+
1. In the "Code & automation" section of the sidebar, click **{% octicon "copilot" aria-hidden="true" aria-label="copilot" %} {% data variables.product.prodname_copilot_short %}** then click **Content exclusion**.
7880

79-
If your repository inherits any exclusions from {% ifversion fpt %}its parent organization{% else %} organizations in the same enterprise{% endif %}, you'll see {% ifversion ghec %}one or more{% else %} a{% endif %} gray box{% ifversion ghec %}es{% endif %} at the top of the page containing details of these exclusions. You cannot edit these settings.
81+
If your repository inherits any exclusions from its parent organization, or from organizations in the same enterprise, you'll see one or more gray boxes at the top of the page, containing details of these exclusions. You cannot edit these settings.
8082

8183
1. In the box following "Paths to exclude in this repository," enter the paths to files from which {% data variables.product.prodname_copilot_short %} should be excluded.
8284

@@ -103,7 +105,7 @@ You can use your repository settings to specify content in your repository that
103105
- "/scripts/**"
104106
```
105107
106-
## Configuring content exclusions for your organization
108+
## Configuring content exclusion for your organization
107109
108110
You can use your organization settings to specify files that {% data variables.product.prodname_copilot %} should ignore. The files can be within a Git repository or anywhere on the file system that is not under Git control.
109111
@@ -186,23 +188,19 @@ [email protected]:gitlab-org/gitlab-runner.git:
186188
- "**/security/**"
187189
```
188190
189-
{% ifversion ghec %}
190-
191-
## Configuring content exclusions for your enterprise
191+
## Configuring content exclusion for your enterprise
192192
193193
As an enterprise owner, you can use the enterprise settings to specify files that {% data variables.product.prodname_copilot %} should ignore. The files can be within a Git repository or anywhere on the file system that is not under Git control.
194194
195195
{% data reusables.enterprise-accounts.access-enterprise %}
196196
{% data reusables.enterprise-accounts.policies-tab %}
197197
{% data reusables.enterprise-accounts.copilot-tab %}
198198
1. Click the **Content exclusion** tab.
199-
1. Use paths to specify which content to exclude. See the previous section, [Configuring content exclusions for your organization](#configuring-content-exclusions-for-your-organization).
199+
1. Use paths to specify which content to exclude. See the previous section, [Configuring content exclusion for your organization](#configuring-content-exclusion-for-your-organization).
200200
201201
> [!NOTE]
202202
> The key difference between setting content exclusion at the enterprise level and the organization level is that rules set at the enterprise level apply to all {% data variables.product.prodname_copilot_short %} users in the enterprise, whereas the rules set by organization owners only apply to users who are assigned a {% data variables.product.prodname_copilot_short %} seat by that organization.
203203
204-
{% endif %}
205-
206204
## Testing changes to content exclusions
207205
208206
You can use your IDE to confirm that your changes to content exclusions are working as expected.
@@ -220,13 +218,19 @@ After you add or change content exclusions, it can take up to 30 minutes to take
220218

221219
### Test your content exclusions
222220

223-
There are a few different ways to test your content exclusions, depending on which IDE you're using.
221+
You can verify that content exclusions you have configured are working as expected.
222+
223+
1. First confirm that content exclusion is working in files that are not subject to content exclusion. To do this:
224+
* In your IDE, open a file that is not subject to content exclusion.
225+
* Make an edit that would normally generate a code completion suggestion. A suggestion should be offered
226+
1. Open a file that should be excluded and make the same edit. No suggestion should be offered.
227+
1. To test content exclusion for {% data variables.copilot.copilot_chat_short %}:
228+
* In your IDE, open the {% data variables.copilot.copilot_chat_short %} panel.
229+
* Open a file that should be excluded and close any other files that are open in the editor.
230+
* Make sure that the open file is attached to the prompt as the context file.
231+
* Enter the prompt `explain this file`.
224232

225-
1. Open a file that you expect to be affected by your content exclusions.
226-
1. Use one or more of the following techniques to test if content is being excluded:
227-
* **In JetBrains IDEs, {% data variables.product.prodname_vs %}, and {% data variables.product.prodname_vscode %}**, check the {% data variables.product.prodname_copilot_short %} icon in the status bar. If a {% data variables.product.prodname_copilot_short %} content exclusion applies to the file, the {% data variables.product.prodname_copilot_short %} icon will have a diagonal line through it. Hover over the icon to see whether an organization or the parent repository disabled {% data variables.product.prodname_copilot_short %} for the file.
228-
* **In Vim/Neovim**, begin typing in the file. If {% data variables.product.prodname_copilot %} no longer provides inline suggestions as you type, the file is excluded.
229-
* You can also test content exclusions in {% data variables.copilot.copilot_chat_short %}. Open the {% data variables.copilot.copilot_chat_short %} window, and ask {% data variables.copilot.copilot_chat_short %} a question about the excluded file. If your content is excluded successfully, {% data variables.product.prodname_copilot_short %} will be unable to answer your question, and will explain that some files were excluded from the conversation due to content exclusion rules.
233+
If the file is excluded, {% data variables.copilot.copilot_chat_short %} will not be able to use the file to generate a response. The file will not be listed as a reference in {% data variables.product.prodname_copilot_short %}'s response.
230234

231235
## Further reading
232236

content/copilot/managing-copilot/managing-github-copilot-in-your-organization/configuring-your-proxy-server-or-firewall-for-copilot.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@ shortTitle: Allow Copilot traffic
1111

1212
If your company employs security measures like a firewall or proxy server, you should add the following URLs, ports, and protocols to an allowlist to ensure {% data variables.product.prodname_copilot_short %} works as expected:
1313

14-
## GitHub Enterprise Related URLs
14+
## {% data variables.product.prodname_enterprise %} related URLs
15+
1516
| Domain and/or URL | Purpose |
1617
| :------------------------------------- | :--------------------------------- |
1718
| `https://github.com/YOUR-ENTERPRISE/*` | Enterprise URL |
1819
| `https://github.com/YOUR-ENTERPRISE?*` | Enterprise URL |
1920
| `https://github.com/enterprises/YOUR-ENTERPRISE/*` | Authentication for {% data variables.enterprise.prodname_managed_users %}, only required with {% data variables.product.prodname_emus %} |
2021

21-
## GitHub Public URLs
22+
## {% data variables.product.github %} public URLs
23+
2224
| Domain and/or URL | Purpose |
2325
| :------------------------------------- | :--------------------------------- |
2426
| `https://github.com/login/*` | Authentication, only required with Personal Users |
@@ -44,7 +46,8 @@ If your company employs security measures like a firewall or proxy server, you s
4446
| `https://github.com/switch_account?*` | Switch Account |
4547
| `https://github.com/switch_account/*` | Switch Account |
4648

47-
## GitHub Copilot Related URLs
49+
## {% data variables.product.prodname_copilot_short %} related URLs
50+
4851
| Domain and/or URL | Purpose |
4952
| :------------------------------------- | :--------------------------------- |
5053
| `https://api.github.com/copilot_internal/*` | User Management |
@@ -57,13 +60,11 @@ If your company employs security measures like a firewall or proxy server, you s
5760
| `https://*.business.githubcopilot.com/*`[^3] | API service for {% data variables.product.prodname_copilot_short %} suggestions |
5861
| `https://*.enterprise.githubcopilot.com/*`[^4] | API service for {% data variables.product.prodname_copilot_short %} suggestions |
5962

60-
61-
If your organization is using Microsoft Extra ID, you also need to add the following URLs to the allowlist:
62-
- `https://login.microsoftonline.com/*`
63-
- `https://aadcdn.msauth.net/*`
64-
- `https://login.live.com/*`
65-
- `https://*.activedirectory.windowsazure.com/*`
66-
63+
If your organization is using Microsoft Entra ID, you also need to add the following URLs to the allowlist:
64+
* `https://login.microsoftonline.com/*`
65+
* `https://aadcdn.msauth.net/*`
66+
* `https://login.live.com/*`
67+
* `https://*.activedirectory.windowsazure.com/*`
6768

6869
Depending on the security policies and editors your organization uses, you may need to allowlist additional domains and URLs. For more information on specific editors, see [Further reading](#further-reading).
6970

content/copilot/rolling-out-github-copilot-at-scale/planning-your-rollout/choosing-your-enterprises-plan-for-github-copilot.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,4 @@ To summarize:
7474
## Further reading
7575

7676
* [AUTOTITLE](/enterprise-cloud@latest/copilot/customizing-copilot/managing-copilot-knowledge-bases)
77-
* [AUTOTITLE](/enterprise-cloud@latest/copilot/customizing-copilot/creating-a-custom-model-for-github-copilot)
7877
* [AUTOTITLE](/copilot/using-github-copilot/ai-models/choosing-the-right-ai-model-for-your-task)

content/copilot/setting-up-github-copilot/setting-up-github-copilot-for-your-organization.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,5 @@ Planning and implementing an effective enablement process is essential to drive
5050
Enhance the {% data variables.product.prodname_copilot_short %} experience for your organization by:
5151

5252
* **Setting up knowledge bases** for use with {% data variables.copilot.copilot_chat_short %} _({% data variables.copilot.copilot_enterprise_short %} only)_. See [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/managing-copilot-knowledge-bases).
53-
* **Fine tuning {% data variables.product.prodname_copilot_short %}** by creating a custom large language model. See [AUTOTITLE](/copilot/customizing-copilot/creating-a-custom-model-for-github-copilot).
5453
* **Installing {% data variables.copilot.copilot_extensions_short %}** to integrate other tools with {% data variables.copilot.copilot_chat_short %}. See [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/installing-github-copilot-extensions-for-your-organization).
5554
* **Adding {% data variables.copilot.copilot_coding_agent %}** as a team member to work asynchronously on issues. See [AUTOTITLE](/copilot/rolling-out-github-copilot-at-scale/enabling-developers/using-copilot-coding-agent-in-org).

0 commit comments

Comments
 (0)