Skip to content

Commit 069ea82

Browse files
authored
Merge pull request #42809 from github/repo-sync
Repo sync
2 parents 748ec2a + fe270fc commit 069ea82

File tree

15 files changed

+150
-27
lines changed

15 files changed

+150
-27
lines changed

content/actions/concepts/security/openid-connect.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,20 @@ For more information, see [AUTOTITLE](/actions/reference/openid-connect-referenc
115115

116116
{% data variables.product.prodname_actions %} workflows can use OIDC tokens instead of secrets to authenticate with cloud providers. Many popular cloud providers offer official login actions that simplify the process of using OIDC in your workflows. For more information about updating your workflows with specific cloud providers, see [AUTOTITLE](/actions/how-tos/security-for-github-actions/security-hardening-your-deployments).
117117

118+
## OIDC support for {% data variables.product.prodname_dependabot %}
119+
120+
{% data variables.product.prodname_dependabot %} can use OIDC to authenticate with private registries, eliminating the need to store long-lived credentials as repository secrets. With OIDC-based authentication, {% data variables.product.prodname_dependabot %} update jobs can dynamically obtain short-lived credentials from your cloud identity provider.
121+
122+
{% data variables.product.prodname_dependabot %} supports OIDC authentication for any registry type that uses `username` and `password` authentication, when the registry is hosted on AWS CodeArtifact, Azure DevOps Artifacts, or JFrog Artifactory.
123+
124+
The benefits of OIDC authentication for {% data variables.product.prodname_dependabot %} are:
125+
126+
* **Enhanced security:** Eliminates static, long-lived credentials from your repositories.
127+
* **Simpler management:** Enables secure, policy-compliant access to private registries.
128+
* **Avoid rate limiting:** Dynamic credentials help you avoid hitting rate limits associated with static tokens.
129+
130+
For more information, see [AUTOTITLE](/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot#using-oidc-for-authentication).
131+
118132
## Next steps
119133

120134
For more information about configuring OIDC, see [AUTOTITLE](/actions/how-tos/security-for-github-actions/security-hardening-your-deployments).

content/code-security/how-tos/secure-at-scale/configure-organization-security/manage-usage-and-access/managing-your-github-advanced-security-license-usage.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Managing your paid use of {% data variables.product.prodname_AS %}
33
shortTitle: Manage paid GHAS use
4-
intro: You can understand and control the costs of using {% data variables.product.prodname_GH_cs_and_sp %} in repositories in your organization.
4+
intro: Control the costs of {% data variables.product.prodname_GH_cs_and_sp %} in your organization.
55
allowTitleToDifferFromFilename: true
66
permissions: '{% data reusables.permissions.security-org-enable %}'
77
product: '{% data reusables.gated-features.ghas-billing %}'
@@ -17,16 +17,9 @@ redirect_from:
1717
contentType: how-tos
1818
---
1919

20-
## Requirements for enabling {% data variables.product.prodname_AS %} products
20+
## Prerequisites
2121

22-
To use {% data variables.product.prodname_GHAS_cs_or_sp %} on private or internal repositories with unique active committers, you must have licenses available. The user-interface and options depend on how you pay for {% data variables.product.prodname_AS %}.
23-
24-
* **Metered billing:** by default, there is no limit on how many licenses you can consume. See {% data reusables.advanced-security.control-use-cost-links %}.
25-
* **Volume/subscription billing** ({% data variables.product.prodname_enterprise %} only)**:** once the licenses you have purchased are all in use, you cannot enable {% data variables.product.prodname_GHAS_cs_or_sp %} on additional repositories until you free up or buy additional licenses.
26-
27-
With {% data variables.product.prodname_security_configurations %}, you can easily understand the license usage of repositories in your organization, as well as the number of available {% data variables.product.prodname_GHAS_cs_or_sp %} licenses in your {% data variables.enterprise.enterprise_or_org %}. Additionally, if you need to make more licenses available to secure a high-impact repository, you can quickly disable {% data variables.product.prodname_GHAS_cs_or_sp %}{% ifversion fpt or ghec %} on private and internal repositories{% endif %} at scale.
28-
29-
To learn about licensing for {% data variables.product.prodname_GHAS_cs_and_sp %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security).
22+
Before you can effectively manage your paid use of {% data variables.product.prodname_AS %}, you should understand how {% data variables.product.prodname_AS %} is billed. See [AUTOTITLE](/billing/concepts/product-billing/github-advanced-security).
3023

3124
## Understanding your license usage
3225

content/code-security/how-tos/secure-your-supply-chain/manage-your-dependency-security/configuring-access-to-private-registries-for-dependabot.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,22 @@ If your private registry is configured with an IP allow list, you can find the I
124124

125125
{% endif %}
126126

127+
## Using OIDC for authentication
128+
129+
{% data variables.product.prodname_dependabot %} can use OpenID Connect (OIDC) to authenticate with private registries, eliminating the need to store long-lived credentials as repository secrets.
130+
131+
With OIDC-based authentication, {% data variables.product.prodname_dependabot %} update jobs can dynamically obtain short-lived credentials from your cloud identity provider, just like {% data variables.product.prodname_actions %} workflows using OIDC federation.
132+
133+
{% data variables.product.prodname_dependabot %} supports OIDC authentication for any registry type that uses `username` and `password` authentication, when the registry is hosted on one of the following cloud providers:
134+
135+
* AWS CodeArtifact
136+
* Azure DevOps Artifacts
137+
* JFrog Artifactory
138+
139+
To configure OIDC authentication, you need to specify `tenant-id` and `client-id` instead of `username` and `password` in your registry configuration.
140+
141+
For more information about how OIDC works, see [AUTOTITLE](/actions/concepts/security/openid-connect).
142+
127143
## Allowing external code execution
128144

129145
When you give {% data variables.product.prodname_dependabot %} access to one or more registries, external code execution is automatically disabled to protect your code from compromised packages. However, some version updates may fail.
@@ -363,6 +379,22 @@ registries:
363379

364380
{% endraw %}
365381

382+
You can also use OIDC authentication to access JFrog Artifactory. {% data reusables.dependabot.dependabot-oidc-credentials %}
383+
384+
{% raw %}
385+
386+
```yaml copy
387+
registries:
388+
maven-artifactory-oidc:
389+
type: maven-repository
390+
url: https://acme.jfrog.io/artifactory/my-maven-registry
391+
tenant-id: ${{secrets.ARTIFACTORY_TENANT_ID}}
392+
client-id: ${{secrets.ARTIFACTORY_CLIENT_ID}}
393+
replaces-base: true
394+
```
395+
396+
{% endraw %}
397+
366398
### `npm-registry`
367399

368400
The `npm-registry` type supports username and password, or token. {% data reusables.dependabot.password-definition %}
@@ -433,6 +465,23 @@ registries:
433465

434466
{% endraw %}
435467

468+
You can also use OIDC authentication to access Azure DevOps Artifacts. {% data reusables.dependabot.dependabot-oidc-credentials %}
469+
470+
{% raw %}
471+
472+
```yaml copy
473+
registries:
474+
nuget-azure-devops-oidc:
475+
type: nuget-feed
476+
url: https://pkgs.dev.azure.com/MyOrganization/MyProject/_packaging/MyArtifactFeedName/nuget/v3/index.json
477+
tenant-id: ${{secrets.AZURE_TENANT_ID}}
478+
client-id: ${{secrets.AZURE_CLIENT_ID}}
479+
```
480+
481+
{% endraw %}
482+
483+
The `AZURE_TENANT_ID` and `AZURE_CLIENT_ID` values can be obtained from the overview page of your Entra ID app registration.
484+
436485
### `pub-repository`
437486

438487
The `pub-repository` type supports a URL and a token.
@@ -490,6 +539,22 @@ registries:
490539

491540
{% endraw %}
492541

542+
You can also use OIDC authentication to access Azure DevOps Artifacts. {% data reusables.dependabot.dependabot-oidc-credentials %}
543+
544+
{% raw %}
545+
546+
```yaml copy
547+
registries:
548+
python-azure-oidc:
549+
type: python-index
550+
url: https://pkgs.dev.azure.com/octocat/_packaging/my-feed/pypi/example
551+
tenant-id: ${{secrets.AZURE_TENANT_ID}}
552+
client-id: ${{secrets.AZURE_CLIENT_ID}}
553+
replaces-base: true
554+
```
555+
556+
{% endraw %}
557+
493558
### `rubygems-server`
494559

495560
The `rubygems-server` type supports username and password, or token. {% data reusables.dependabot.password-definition %}

content/code-security/reference/supply-chain-security/dependabot-options-reference.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -932,24 +932,26 @@ The parameters used to provide authentication details for access to a private re
932932
| Registry `type` | Required authentication parameters |
933933
|--|--|
934934
| `cargo-registry` | `token` |
935-
| `composer-repository` | `username` and `password` |
936-
| `docker-registry` | `username` and `password` |
937-
| `git` | `username` and `password` |
935+
| `composer-repository` | `username` and `password`<br>or OIDC with `tenant-id` and `client-id` |
936+
| `docker-registry` | `username` and `password`<br>or OIDC with `tenant-id` and `client-id` |
937+
| `git` | `username` and `password`<br>or OIDC with `tenant-id` and `client-id` |
938938
| `hex-organization` | `organization` and `key` |
939939
| `hex-repository` | `repo` and `auth-key` optionally with the corresponding `public-key-fingerprint` |
940-
| `maven-repository` | `username` and `password` |
941-
| `npm-registry` | `username` and `password`<br>or `token` |
942-
| `nuget-feed` | `username` and `password`<br>or `token` |
940+
| `maven-repository` | `username` and `password`<br>or OIDC with `tenant-id` and `client-id` |
941+
| `npm-registry` | `username` and `password`<br>or `token`<br>or OIDC with `tenant-id` and `client-id` |
942+
| `nuget-feed` | `username` and `password`<br>or `token`<br>or OIDC with `tenant-id` and `client-id` |
943943
| `pub-registry` | `token` |
944-
| `python-index` | `username` and `password`<br>or `token` |
945-
| `rubygems-server` | `username` and `password`<br>or `token` |
944+
| `python-index` | `username` and `password`<br>or `token`<br>or OIDC with `tenant-id` and `client-id` |
945+
| `rubygems-server` | `username` and `password`<br>or `token`<br>or OIDC with `tenant-id` and `client-id` |
946946
| `terraform-registry` | `token` |
947947

948948
All sensitive data used for authentication should be stored securely and referenced from that secure location, see [AUTOTITLE](/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot).
949949

950950
> [!TIP]
951951
> {% data reusables.dependabot.password-definition %}
952952

953+
For more information about OIDC support for {% data variables.product.prodname_dependabot %}, see [AUTOTITLE](/actions/concepts/security/openid-connect#oidc-support-for-dependabot) and [AUTOTITLE](/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot#using-oidc-for-authentication).
954+
953955
### `url` and `replaces-base`
954956

955957
The `url` parameter defines where to access a registry. When the optional `replaces-base` parameter is enabled (`true`), {% data variables.product.prodname_dependabot %} resolves dependencies using the value of `url` rather than the base URL of that specific ecosystem.

content/copilot/concepts/copilot-metrics.md renamed to content/copilot/concepts/copilot-usage-metrics/copilot-metrics.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: GitHub Copilot usage metrics
33
shortTitle: Copilot usage metrics
4-
intro: 'Track how your teams are using and adopting {% data variables.product.prodname_copilot %} with detailed usage metrics.'
4+
intro: '{% data variables.product.prodname_copilot %} usage metrics provide visibility into how {% data variables.product.prodname_copilot %} is adopted and used across your organization, including engagement, activity, and code generation trends.'
55
versions:
66
feature: copilot
77
topics:
@@ -15,9 +15,12 @@ redirect_from:
1515
- /early-access/copilot-metrics/apis/about-the-copilot-metrics-apis
1616
- /early-access/copilot-metrics/dashboards/about-the-copilot-metrics-dashboard
1717
- /early-access/copilot-metrics/apis/rest-api-endpoints-for-copilot-enterprise-and-user-usage-metrics
18+
- /copilot/concepts/copilot-metrics
1819
category:
20+
- Copilot usage metrics
1921
- Learn about Copilot
2022
- Manage Copilot for a team
23+
- Get started with metrics
2124
---
2225

2326
{% data reusables.copilot.usage-metrics-preview %}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
title: GitHub Copilot usage metrics
3+
shortTitle: Copilot usage metrics
4+
intro: Track how your teams are using and adopting {% data variables.product.prodname_copilot %} with detailed usage metrics.
5+
versions:
6+
feature: copilot
7+
topics:
8+
- Copilot
9+
heroImage: /assets/images/banner-images/hero-4
10+
layout: bespoke-landing
11+
sidebarLink:
12+
text: All articles
13+
href: /copilot/concepts/copilot-usage-metrics
14+
children:
15+
- /copilot-metrics
16+
- /content/copilot/how-tos/administer-copilot/manage-for-enterprise/view-usage-and-adoption
17+
- /content/copilot/how-tos/administer-copilot/manage-for-enterprise/view-code-generation
18+
- /content/copilot/reference/copilot-usage-metrics/copilot-usage-metrics
19+
- /content/copilot/reference/copilot-usage-metrics/interpret-copilot-metrics
20+
- /content/copilot/reference/copilot-usage-metrics/reconciling-usage-metrics
21+
- /content/copilot/reference/copilot-usage-metrics/lines-of-code-metrics
22+
- /content/copilot/tutorials/roll-out-at-scale/measure-success
23+
includedCategories:
24+
- Get started with metrics
25+
- Understand metrics
26+
- Reconcile and validate metrics
27+
- Measure success
28+
- View metrics
29+
- Understand available data
30+
---

content/copilot/concepts/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ children:
1111
- /chat
1212
- /agents
1313
- /spark
14+
- /copilot-usage-metrics
1415
- /prompting
1516
- /context
1617
- /tools
@@ -21,6 +22,5 @@ children:
2122
- /policies
2223
- /mcp-management
2324
- /network-settings
24-
- /copilot-metrics
2525
contentType: concepts
2626
---

content/copilot/how-tos/administer-copilot/manage-for-enterprise/view-code-generation.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Viewing the code generation dashboard
33
shortTitle: View code generation
4-
intro: You can use the code generation dashboard to monitor how {% data variables.product.prodname_copilot_short %} generates code across your enterprise, including activity from both users and agents.
4+
intro: The code generation dashboard shows how {% data variables.product.prodname_copilot_short %} generates code across your enterprise, including activity from both users and agents.
55
permissions: '{% data reusables.copilot.usage-metrics-permissions %}'
66
versions:
77
feature: copilot
@@ -10,7 +10,9 @@ topics:
1010
contentType: how-tos
1111
allowTitleToDifferFromFilename: true
1212
category:
13+
- Copilot usage metrics
1314
- Manage Copilot for a team
15+
- View metrics
1416
---
1517

1618
{% data reusables.copilot.usage-metrics-preview %}

content/copilot/how-tos/administer-copilot/manage-for-enterprise/view-usage-and-adoption.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Viewing the Copilot usage metrics dashboard
33
shortTitle: View usage and adoption
4-
intro: You can use the {% data variables.product.prodname_copilot_short %} usage metrics dashboard to monitor how developers across your enterprise are adopting and using {% data variables.product.prodname_copilot_short %}.
4+
intro: '{% data variables.product.prodname_copilot_short %} usage metrics dashboards provide a centralized view of adoption and usage across your enterprise, based on IDE telemetry from developers using {% data variables.product.prodname_copilot_short %}.'
55
permissions: '{% data reusables.copilot.usage-metrics-permissions %}'
66
versions:
77
feature: copilot
@@ -10,7 +10,9 @@ topics:
1010
contentType: how-tos
1111
allowTitleToDifferFromFilename: true
1212
category:
13+
- Copilot usage metrics
1314
- Manage Copilot for a team
15+
- View metrics
1416
---
1517

1618
{% data reusables.copilot.usage-metrics-preview %}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Data available in Copilot usage metrics
33
allowTitleToDifferFromFilename: true
44
shortTitle: Copilot usage metrics data
5-
intro: 'You can display and export {% data variables.product.prodname_copilot_short %} usage metrics data in the dashboard and via APIs.'
5+
intro: '{% data variables.product.prodname_copilot_short %} usage metrics data is available through the dashboard and APIs, using a consistent set of fields to represent adoption, usage, and code generation activity.'
66
permissions: '{% data reusables.copilot.usage-metrics-permissions %}'
77
versions:
88
fpt: '*'
@@ -12,7 +12,9 @@ topics:
1212
- Copilot
1313
- Enterprise
1414
category:
15+
- Copilot usage metrics
1516
- Manage Copilot for a team
17+
- Understand available data
1618
---
1719

1820
{% data reusables.copilot.usage-metrics-preview %}

0 commit comments

Comments
 (0)