Skip to content

Commit 4a132e2

Browse files
authored
Merge pull request #43470 from github/repo-sync
Repo sync
2 parents 815e0a5 + e260fd7 commit 4a132e2

File tree

13 files changed

+50
-23
lines changed

13 files changed

+50
-23
lines changed

config/kubernetes/default/deployments/webapp.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,18 @@ spec:
6565
preStop:
6666
exec:
6767
command: ['sleep', '5']
68-
readinessProbe:
68+
startupProbe:
69+
httpGet:
70+
path: /healthcheck
71+
port: http
6972
initialDelaySeconds: 5
73+
periodSeconds: 5
74+
failureThreshold: 12
75+
timeoutSeconds: 5
76+
readinessProbe:
77+
timeoutSeconds: 5
78+
periodSeconds: 10
79+
failureThreshold: 3
7080
httpGet:
71-
# WARNING: This should be updated to a meaningful endpoint for your application which will return a 200 once the app is fully started.
72-
# See: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes
7381
path: /healthcheck
7482
port: http

config/kubernetes/production/deployments/webapp.yaml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ spec:
3232
# Node is single-threaded but we want more CPUs
3333
# for OS and image resizing, and other binary executions
3434
# Better to increase replicas or memory than CPU
35-
memory: 8.0Gi
35+
memory: 16.0Gi
3636
# Absolute minimum to start app is 4500Mi
3737
# Would increase with more pages, versions, or languages supported
3838
# The additional memory helps during traffic surges
3939
limits:
4040
cpu: 16000m
41-
memory: 8.0Gi
41+
memory: 16.0Gi
4242
ports:
4343
- name: http
4444
containerPort: 4000
@@ -68,10 +68,18 @@ spec:
6868
preStop:
6969
exec:
7070
command: ['sleep', '5']
71-
readinessProbe:
71+
startupProbe:
72+
httpGet:
73+
path: /healthcheck
74+
port: http
7275
initialDelaySeconds: 5
76+
periodSeconds: 5
77+
failureThreshold: 12
78+
timeoutSeconds: 5
79+
readinessProbe:
80+
timeoutSeconds: 5
81+
periodSeconds: 10
82+
failureThreshold: 3
7383
httpGet:
74-
# WARNING: This should be updated to a meaningful endpoint for your application which will return a 200 once the app is fully started.
75-
# See: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes
7684
path: /healthcheck
7785
port: http

content/billing/how-tos/products/use-cost-centers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ redirect_from:
99
- /billing/using-the-new-billing-platform/charging-business-units
1010
- /billing/managing-your-billing/charging-business-units
1111
- /billing/tutorials/use-cost-centers
12-
product: '{% data variables.product.prodname_ghe_cloud %}'
12+
permissions: 'Enterprise owners and billing managers'
1313
shortTitle: Use cost centers
1414
contentType: how-tos
1515
category:

content/billing/how-tos/set-up-payment/connect-azure-sub.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ versions:
1313
ghec: '*'
1414
ghes: '*'
1515
shortTitle: Connect Azure sub
16-
permissions: 'Billing managers or owners'
16+
permissions: 'Enterprise owners and organization owners'
1717
contentType: how-tos
1818
category:
1919
- Set up payment

content/billing/how-tos/set-up-payment/redeem-coupon.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ redirect_from:
1515
versions:
1616
fpt: '*'
1717
ghec: '*'
18-
product: 'Personal, organization, and enterprise account owners<br>Organization and enterprise billing managers'
18+
permissions: 'Personal account users, organization owners and billing managers, and enterprise owners and billing managers'
1919
shortTitle: Redeem coupon
2020
contentType: how-tos
2121
category:

content/billing/tutorials/automate-usage-reporting.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ versions:
99
fpt: '*'
1010
ghec: '*'
1111
permissions: 'Enterprise owners, organization owners, and billing managers'
12-
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
1312
contentType: tutorials
1413
category:
1514
- Track spending and control costs

content/billing/tutorials/gather-insights.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ title: Gathering insights on your spending
33
intro: 'Get insights into the usage of your {% data variables.enterprise.enterprise_or_org %} members.'
44
versions:
55
feature: enhanced-billing-platform
6+
permissions: '{% data reusables.permissions.enhanced-billing-platform %}'
67
redirect_from:
78
- /billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending
89
- /billing/using-the-new-billing-platform/gathering-insights-on-your-spending
910
- /billing/managing-your-billing/gathering-insights-on-your-spending
10-
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
1111
shortTitle: Gather insights
1212
contentType: tutorials
1313
category:
1414
- Track spending and control costs
1515
---
1616

17-
The new billing platform provides you with the tools to:
17+
The billing platform provides you with the tools to:
1818

1919
* **Get insights** into usage trends to understand how your resources are being used.
2020
* **Search and filter usage** by repository, product, or SKU, and group data accordingly.

content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,16 @@ This version of this article is for using repository custom instructions on the
4343

4444
* **Agent instructions** are used by AI agents.
4545

46-
You can create one or more `AGENTS.md` files, stored anywhere within the repository. When {% data variables.product.prodname_copilot_short %} is working, the nearest `AGENTS.md` file in the directory tree will take precedence over other agent instructions files. For more information, see the [openai/agents.md repository](https://github.com/openai/agents.md).
46+
{% data reusables.copilot.custom-instructions-agents %}
4747

4848
Alternatively, you can use a single `CLAUDE.md` or `GEMINI.md` file stored in the root of the repository.
4949

5050
## Creating repository-wide custom instructions
5151

5252
You can create your own custom instructions file from scratch. See [Writing your own copilot-instructions.md file](#writing-your-own-copilot-instructionsmd-file). Alternatively, you can ask {% data variables.copilot.copilot_coding_agent %} to generate one for you.
5353

54+
You can create your own custom instructions file from scratch. See [Writing your own copilot-instructions.md file](#writing-your-own-copilot-instructionsmd-file). Alternatively, you can ask {% data variables.copilot.copilot_coding_agent %} to generate one for you.
55+
5456
### Asking {% data variables.copilot.copilot_coding_agent %} to generate a `copilot-instructions.md` file
5557

5658
1. Navigate to the agents tab at [github.com/copilot/agents](https://github.com/copilot/agents?ref_product=copilot&ref_type=engagement&ref_style=text).

content/copilot/how-tos/copilot-cli/customize-copilot/add-custom-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Instructions in the `AGENTS.md` file in the root directory, if found, are treate
4343

4444
Instructions found in other `AGENTS.md` files are treated as additional instructions. Any primary instructions that are found are likely to have more effect on {% data variables.product.prodname_copilot_short %}'s responses than additional instructions.
4545

46-
For more information, see the [openai/agents.md repository](https://github.com/openai/agents.md).
46+
For more information, see the [agentsmd/agents.md repository](https://github.com/agentsmd/agents.md).
4747

4848
Alternatively, you can use `CLAUDE.md` and `GEMINI.md` files. These must be located at the root of the repository.
4949

content/copilot/how-tos/manage-and-track-spending/manage-request-allowances.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Premium request usage beyond the allowance is governed by two complementary cont
2424
* **Policy setting:** The **Premium request paid usage** policy determines whether users can surpass their included premium request allowance for each AI tool. This policy is enabled by default.
2525
* **Budget constraints:** If your enterprise or organization has a premium request SKU-level budget or a bundled premium requests budget, premium request usage will be blocked once the budget is fully consumed for the billing period.
2626

27-
2827
The **Premium request paid usage policy** must be enabled for any additional billing to occur. Budgets then control whether and when usage is stopped.
2928

3029
You can increase the allowance for users by ensuring the policy is enabled, editing your budgets, or upgrading users to {% data variables.copilot.copilot_enterprise_short %}.
@@ -35,7 +34,6 @@ You can increase the allowance for users by ensuring the policy is enabled, edit
3534
* If a user receives licenses from multiple enterprises or standalone organizations, the user must select a billing entity to use premium requests. See [Managing premium request billing with multiple {% data variables.product.prodname_copilot_short %} licenses](/copilot/managing-copilot/monitoring-usage-and-entitlements/monitoring-your-copilot-usage-and-entitlements#managing-premium-request-billing-with-multiple-copilot-licenses).
3635
* For enterprises only, review which organizations are able to assign and are actively assigning {% data variables.product.prodname_copilot_short %} access to users. See [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-access/grant-access#enabling-copilot-for-organizations).
3736

38-
3937
## Setting a policy for paid usage
4038

4139
By default, premium requests over the allowance are enabled for organizations and enterprises. This allows for uninterrupted use of premium requests, unless you have a budget that caps spending on the Premium Request SKU.
@@ -48,6 +46,9 @@ You can set the policy for an enterprise or a standalone organization.
4846

4947
## Updating budgets
5048

49+
> [!NOTE]
50+
> Enterprise billing managers can also edit and delete budgets.
51+
5152
1. Ensure the "Premium request paid usage" policy is enabled. See [Setting a policy for paid usage](#setting-a-policy-for-paid-usage).
5253
1. Check the budgets for your enterprise or organizations, and edit or delete any budgets that "stop usage when budget limit is reached" for the Premium Request SKU. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending#editing-or-deleting-a-budget).
5354
1. Premium request budget types:
@@ -58,7 +59,6 @@ Creating new budgets without deleting an existing budget does not override the e
5859

5960
Enterprise-level budgets act as a failsafe for the entire enterprise, including any spending originating from within cost centers. If the enterprise budget is exhausted before the cost center budget, usage will be blocked. See [AUTOTITLE](/billing/concepts/budgets-and-alerts) for details on different scopes of budgets and stopping usage.
6061

61-
6262
## Upgrading users to {% data variables.copilot.copilot_enterprise_short %}
6363

6464
An enterprise owner can upgrade certain users to increase their base allowance of premium requests.

0 commit comments

Comments
 (0)