Skip to content

Commit c493e67

Browse files
authored
Merge pull request #43501 from github/repo-sync
Repo sync
2 parents 7cbca58 + 37db57c commit c493e67

File tree

75 files changed

+3617
-1960
lines changed

Some content is hidden

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

75 files changed

+3617
-1960
lines changed

config/moda/configuration/default/env.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ data:
99
RATE_LIMIT_MAX: '21'
1010
# Moda uses a non-default port for sending datadog metrics
1111
DD_DOGSTATSD_PORT: '28125'
12+
# OTel distributed tracing — sends spans to OTel Collector via OTLP/HTTP (proto).
13+
# Uses stamp address (not mesh) since docs-internal is not on the service mesh.
14+
# See https://thehub.github.com/epd/engineering/dev-practicals/observability/distributed-tracing/instrumentation/
15+
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: 'https://otelcol.service.%stamp%.github.net/v1/traces'

config/moda/configuration/production/env.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ data:
1212
# Identifies the service deployment environment as production
1313
# Equivalent to HEAVEN_DEPLOYED_ENV === 'production'
1414
MODA_PROD_SERVICE_ENV: 'true'
15+
# OTel distributed tracing — sends spans to OTel Collector via OTLP/HTTP (proto).
16+
# Uses stamp address (not mesh) since docs-internal is not on the service mesh.
17+
# See https://thehub.github.com/epd/engineering/dev-practicals/observability/distributed-tracing/instrumentation/
18+
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: 'https://otelcol.service.%stamp%.github.net/v1/traces'

config/moda/secrets/production/secrets.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,8 @@ secrets:
6464
type: hydro_api_key
6565
owner: '@github/docs-engineering'
6666
externally_usable: true
67+
OTEL_EXPORTER_OTLP_TRACES_HEADERS:
68+
kind: latest_at_deployment_start
69+
type: salt
70+
owner: '@github/docs-engineering'
71+
externally_usable: true

content/billing/reference/billing-roles.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ The following roles have access to the billing platform:
1717

1818
* **Enterprise owners and enterprise billing managers**: Can manage billing for an enterprise account.
1919
* **Organization owners and organization billing managers**: Can manage billing for an organization on {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %}.
20+
21+
> [!NOTE]
22+
> If your organization is owned by an enterprise account, you cannot add billing managers at the organization level. Billing for enterprise-owned organizations is managed at the enterprise level.
23+
2024
* **Personal accounts (non-managed)**: Can access the billing platform for their personal usage.
2125

2226
To add a billing manager, see:
@@ -38,9 +42,7 @@ You have full administrative access to your organization. You can:
3842

3943
You can:
4044

41-
* View all metered usage for your organization its repositories.
42-
* View organization-level budgets.
43-
* Download CSV usage reports.
45+
{% data reusables.billing.org-billing-manager-permissions %}
4446

4547
## Enterprise owners and enterprise billing managers
4648

@@ -51,6 +53,8 @@ You can:
5153
* Download CSV usage reports for products your enterprise is using.
5254
* Set budgets for your enterprise.
5355
* Create cost centers for all organizations within your enterprise.
56+
* View and manage user licenses.
57+
* Manage other billing settings, such as payment methods and billing contacts.
5458

5559
## Further reading
5660

content/code-security/how-tos/secure-your-secrets/customize-leak-detection/enabling-extended-metadata-checks-for-your-repository.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@ redirect_from:
1717

1818
This article shows how you can enable extended metadata checks for individual repositories through repository settings. Alternatively, you can enable them at scale using **security configurations** at the organization or enterprise level. See [AUTOTITLE](/code-security/how-tos/secure-at-scale/configure-organization-security/establish-complete-coverage/creating-a-custom-security-configuration) or [AUTOTITLE](/code-security/how-tos/secure-at-scale/configure-enterprise-security/establish-complete-coverage/creating-a-custom-security-configuration-for-your-enterprise).
1919

20+
{% ifversion secret-scanning-validity-check-partner-patterns %}
21+
2022
## Prerequisites
2123

2224
Before enabling metadata checks, you need to ensure that validity checks are enabled for the repository. See [AUTOTITLE](/code-security/secret-scanning/enabling-secret-scanning-features/enabling-validity-checks-for-your-repository#enabling-validity-checks).
2325

26+
{% endif %}
27+
2428
## Enabling extended metadata checks
2529

2630
{% ifversion fpt or ghec %}

content/copilot/concepts/agents/code-review.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Organizations in this situation can use self-hosted runners. For more informatio
109109

110110
Each time {% data variables.product.prodname_copilot_short %} reviews a pull request or reviews code in your IDE, your monthly quota of {% data variables.product.prodname_copilot_short %} premium requests is reduced by one.
111111

112-
If a repository is configured to automatically request a code review from {% data variables.product.prodname_copilot_short %} for all new pull requests, the premium request usage is applied to the pull request author's quota.
112+
If a repository is configured to automatically request a code review from {% data variables.product.prodname_copilot_short %} for all new pull requests, the premium request usage is applied to the pull request author's quota. If a review is manually requested by another user, the usage is applied to that user's quota instead.
113113

114114
If a pull request is created by {% data variables.product.prodname_actions %} or by a bot, the usage will apply to:
115115

@@ -120,11 +120,13 @@ If a pull request is created by {% data variables.product.prodname_actions %} or
120120

121121
When you reach your monthly quota, you will not be able to get a code review from {% data variables.product.prodname_copilot_short %} until your quota resets. To continue to use code reviews before your quota resets, you will need to upgrade your {% data variables.product.prodname_copilot_short %} plan or enable additional premium requests.
122122

123-
### Quota for users without a {% data variables.product.prodname_copilot_short %} license
123+
### Users without a {% data variables.product.prodname_copilot_short %} license or plan that includes {% data variables.copilot.copilot_code-review_short %}
124124

125-
Users without a {% data variables.product.prodname_copilot_short %} license do not have a monthly premium request quota. When {% data variables.copilot.copilot_code-review_short %} is enabled for these users, any premium requests they generate are billed directly to the organization or enterprise as paid overage usage. This applies to both manually requested reviews and automatic code reviews.
125+
Users without access to {% data variables.copilot.copilot_code-review_short %} do not have a monthly premium request quota. This includes users who have no {% data variables.product.prodname_copilot_short %} license and users on the {% data variables.copilot.copilot_free_short %} plan, which does not include {% data variables.copilot.copilot_code-review_short %}.
126126

127-
Premium requests generated by users without a license are not attributed to any {% data variables.product.prodname_copilot_short %} plan quota. They appear as overage usage in billing reports and premium request analytics. Users with a {% data variables.product.prodname_copilot_short %} license continue to consume premium requests from their assigned plan quota.
127+
When {% data variables.copilot.copilot_code-review_short %} is enabled for these users, any premium requests they generate are billed directly to the organization or enterprise as paid overage usage. This applies to both manually requested reviews and automatic code reviews.
128+
129+
Premium requests generated by these users are not attributed to any {% data variables.product.prodname_copilot_short %} plan quota. They appear as overage usage in billing reports and premium request analytics. Users with a {% data variables.product.prodname_copilot_short %} license that includes code review continue to consume premium requests from their assigned plan quota.
128130

129131
## Model usage
130132

content/copilot/concepts/billing/copilot-requests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ category:
2525
2626
## What is a request?
2727

28-
A request is any interaction where you ask {% data variables.product.prodname_copilot_short %} to do something for you—whether its generating code, answering a question, or helping you through an extension. Each time you send a prompt in a chat window or trigger a response from {% data variables.product.prodname_copilot_short %}, youre making a request.
28+
A request is any interaction where you ask {% data variables.product.prodname_copilot_short %} to do something for you—whether it's generating code, answering a question, or helping you through an extension. Each time you send a prompt in a chat window or trigger a response from {% data variables.product.prodname_copilot_short %}, you're making a request. For agentic features, only the prompts you send count as premium requests; actions {% data variables.product.prodname_copilot_short %} takes autonomously to complete your task, such as tool calls, do not. For example, using `/plan` in {% data variables.copilot.copilot_cli_short %} counts as one premium request, and any follow-up prompt you send counts as another.
2929

3030
## What are premium requests?
3131

content/integrations/concepts/github-developer-program.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ Building an application that integrates with {% data variables.product.github %}
2020

2121
Build your own tools that seamlessly integrate with {% data variables.product.github %} APIs. For more information, see [AUTOTITLE](/rest/about-the-rest-api/comparing-githubs-rest-api-and-graphql-api).
2222

23-
## Take on the enterprise
24-
25-
Email <a href="mailto:partnerships@github.com">partnerships@github.com</a> to request developer licenses to build and test your application against {% data variables.product.prodname_ghe_server %}.
26-
2723
## Have an integration that works with GitHub?
2824

2925
Awesome! Here’s how you can spread the word:

content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ Members of your organization's Owners team can give _billing manager_ permission
2121

2222
Billing managers can:
2323

24-
* Upgrade or downgrade between {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_team %} plans
25-
* Add, update, or remove payment methods
26-
* View payment history
27-
* Download receipts
28-
* View, invite, and remove billing managers
29-
* Start, modify, or cancel sponsorships
24+
{% data reusables.billing.org-billing-manager-permissions %}
3025

3126
In addition, all billing managers will receive billing receipts by email on the organization's billing date.
3227

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
* View all metered usage for your organization and its repositories.
2+
* View organization-level budgets.
3+
* Download CSV usage reports.
4+
* View payment history and download receipts.
5+
* Add, update, or remove payment methods.
6+
* Upgrade or downgrade between {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_team %} plans.
7+
* View, invite, and remove billing managers.
8+
* Start, modify, or cancel sponsorships.

0 commit comments

Comments
 (0)