Skip to content

Commit 5cd18c1

Browse files
authored
Merge branch 'main' into omnibox-docs
2 parents 6c8e25b + b0ba550 commit 5cd18c1

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

docs/admin/config/webhooks/incoming.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ To retain webhook logs for one day:
291291
```json
292292
{
293293
"webhook.logging": {
294-
"enabled": false,
294+
"enabled": true,
295295
"retention": "24h"
296296
}
297297
}

docs/admin/deploy/machine-images/aws-ami.mdx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ Following these docs will provision the following resources:
88
- A root EBS volume with 50GB of storage
99
- An additional EBS volume with 500GB of storage for storing code and search indices
1010

11+
### Sourcegraph AMI account ID
12+
13+
All Sourcegraph AMIs are published from one of the following AWS accounts:
14+
15+
- Account ID: `840044800169`
16+
- Account ID: `870751268155`
17+
18+
1119
### Instance size chart
1220

1321
Select an AMI according and instance type to the number of users and repositories you have using this table. If you fall between two sizes, choose the larger of the two.
@@ -26,7 +34,7 @@ Click [here](https://github.com/sourcegraph/deploy#amazon-ec2-amis) to see the c
2634

2735
**The default AMI username is `ec2-user`.**
2836

29-
<Callout type="note">AMIs are optimized for the specific set of resources provided by the instance type, please ensure you use the correct AMI for the associated EC2 instance type. You can [resize your EC2 instance anytime](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-resize.html), but your Sourcegraph AMI must match accordingly. If needed, follow the [upgrade steps](#upgrade) to switch to the correct AMI image that is optimized for your EC2 instance type.</Callout>
37+
<Callout type="note">While we recommend certain image types in our sizing chart, AMIs will dynamically use the resources available on the EC2 instance type they are deployed to, provided the minimum amount of resources needed is available. If you would like to resize your EC2 instance, follow the [upgrade steps](#upgrade) to switch to the correct AMI image that is optimized for your EC2 instance type.</Callout>
3038

3139
---
3240

@@ -35,7 +43,7 @@ Click [here](https://github.com/sourcegraph/deploy#amazon-ec2-amis) to see the c
3543
1. In the [instance size chart](#instance-size-chart), click the link for the AMI that matches your deployment size.
3644
2. Choose **Launch instance from AMI**.
3745
3. Name your instance.
38-
4. Select an **instance type** according to [the sizing chart](#instance-size-chart).
46+
4. Select an **instance type** according to [the sizing chart](#instance-size-chart) or your needs.
3947
5. **Key pair (login)**: Select or create a new Key Pair for connecting to your instance securely (this may be required in the event you need support).
4048
6. **Network settings**:
4149
- Under "Auto-assign public IP" select "Enable".

src/components/mdx/Tabs.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use client';
22

3-
import React, {ReactNode, useMemo} from 'react';
43
import {Tab as HeadlessTab} from '@headlessui/react';
54
import clsx from 'clsx';
5+
import React, {ReactNode, useMemo} from 'react';
66

77
interface TabData {
88
title: string;
@@ -31,10 +31,10 @@ export function Tabs({children}: TabsProps) {
3131

3232
return (
3333
<>
34-
<div className="w-full rounded-lg border border-light-border-2 dark:border-dark-border ">
34+
<div className="w-full rounded-lg">
3535
<HeadlessTab.Group>
3636
<HeadlessTab.List
37-
className="flex flex-wrap space-x-6 rounded-t-md border-b border-light-border-2 bg-light-bg-2/70 px-4 text-center text-sm font-medium dark:border-dark-border dark:bg-dark-bg-2"
37+
className="flex flex-wrap space-x-6 rounded-md border-light-border-2 bg-light-bg-2/70 px-4 text-center text-sm font-medium dark:border-dark-border dark:bg-dark-bg-2"
3838
id="defaultTab"
3939
data-tabs-toggle="#defaultTabContent"
4040
>

0 commit comments

Comments
 (0)