Merge branch 'main' into kelsey-brown-patch-2

MaedahBatool · web-flow · commit 31a623a0ab30 · 2025-05-07T15:03:28.000-07:00
diff --git a/docs/admin/deploy/machine-images/aws-ami.mdx b/docs/admin/deploy/machine-images/aws-ami.mdx
@@ -16,34 +16,24 @@ All Sourcegraph AMIs are published from one of the following AWS accounts:
 - Account ID: `870751268155`
 
 
-### Instance size chart
+### Instance sizing
 
-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.
-
-For example, if you have 8,000 users with 80,000 repositories, your instance size would be **L**. If you have 1,000 users with 80,000 repositories, you should still go with size **M**.
-
-|                      | **XS**                                                                                                              | **S**                                                                                                             | **M**                                                                                                             | **L**                                                                                                             | **XL**                                                                                                              |
-|----------------------|---------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|
-| **Users**            | greater than or equal to 500                                                                                        | greater than or equal to 1,000                                                                                    | greater than or equal to 5,000                                                                                    | greater than or equal to 10,000                                                                                   | greater than or equal to 20,000                                                                                     |
-| **Repositories**     | greater than or equal to 5,000                                                                                      | greater than or equal to 10,000                                                                                   | greater than or equal to 50,000                                                                                   | greater than or equal to 100,000                                                                                  | greater than or equal to 250,000                                                                                    |
-| **Recommended Type** | m6a.2xlarge                                                                                                         | m6a.4xlarge                                                                                                       | m6a.8xlarge                                                                                                       | m6a.12xlarge                                                                                                      | m6a.24xlarge                                                                                                        |
-| **Minimum Type**     | m6a.2xlarge                                                                                                         | m6a.2xlarge                                                                                                       | m6a.4xlarge                                                                                                       | m6a.8xlarge                                                                                                       | m6a.12xlarge                                                                                                        |
-| **AMIs List**        | [size-XS AMIs](https://console.aws.amazon.com/ec2/v2/home#Images:visibility=public-images;imageName=Sourcegraph-XS) | [size-S AMIs](https://console.aws.amazon.com/ec2/v2/home#Images:visibility=public-images;imageName=Sourcegraph-S) | [size-M AMIs](https://console.aws.amazon.com/ec2/v2/home#Images:visibility=public-images;imageName=Sourcegraph-M) | [size-L AMIs](https://console.aws.amazon.com/ec2/v2/home#Images:visibility=public-images;imageName=Sourcegraph-L) | [size-XL AMIs](https://console.aws.amazon.com/ec2/v2/home#Images:visibility=public-images;imageName=Sourcegraph-XL) |
+Refer to our [AWS Instance Sizing](/how-to/aws-instance-sizing) guide to determine the appropriate EC2 instance type for your Sourcegraph deployment based on the number of users and repositories.
 
 Click [here](https://github.com/sourcegraph/deploy#amazon-ec2-amis) to see the completed list of AMI IDs published in each region.
 
 **The default AMI username is `ec2-user`.**
 
-<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>
-
 ---
 
 ## Deploy Sourcegraph
 
-1. In the [instance size chart](#instance-size-chart), click the link for the AMI that matches your deployment size.
+<img width="1256" alt="Screenshot 2025-05-06 at 3 52 51 PM" src="https://github.com/user-attachments/assets/8e98792b-16d9-4c0c-a3a1-981246a811b8" />
+
+1. Search for Sourcegraph in the AWS Marketplace or AMI catalog (see screenshot in the introduction).
 2. Choose **Launch instance from AMI**.
 3. Name your instance.
-4. Select an **instance type** according to [the sizing chart](#instance-size-chart) or your needs.
+4. Select an **instance type** according to [our sizing guide](/how-to/aws-instance-sizing) or your specific requirements.
 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).
 6. **Network settings**:
    - Under "Auto-assign public IP" select "Enable".
diff --git a/docs/analytics/index.mdx b/docs/analytics/index.mdx
@@ -1,22 +1,25 @@
 # Sourcegraph Analytics
 
-Enterprise customers can use Sourcegraph Analytics to get a clear view of usage, engagement, performance, and impact.
+Enterprise customers can use Sourcegraph Analytics to get a clear view of usage, engagement, performance, and impact. 
 
 ## Sourcegraph Cloud Analytics
+This solution is available to: 
+- [Sourcegraph Cloud](/cloud) customers
+- Self-hosted customers that have fully enabled usage telemetry, and that are running a supported version of Sourcegraph (5.9+) 
 
 [Sourcegraph Cloud](/cloud) customers can use our managed [cloud analytics service](https://cody-analytics.sourcegraph.com) for Cody and Code Search usage data.
-Self-hosted customers can also use this service, but they must
-
-Upgrade to a supported version of Sourcegraph (5.9+)
-Have fully enabled usage telemetry.
-
+Self-hosted customers can also use this service, but they must:
+- Upgrade to a supported version of Sourcegraph (5.9+)
+- Have fully enabled usage telemetry
 - [Enablement instructions](/analytics/cloud#enablement)
 
+For more details on setting up Sourcegraph Analytics, see our [enablement instructions](/analytics/cloud#enablement)
+
 ![Sourcegraph-cloud-analytics](https://storage.googleapis.com/sourcegraph-assets/Docs/Sourcegraph-Analytics-2025-01-28.png)
 
-## Self-Hosted Analytics
+## Air-gapped Analytics
 
-Self-hosted customers will soon be able to use our self-hosted and locally deployed analytics service, built on Grafana, to see Sourcegraph usage data.
+Air-gapped customers will soon be able to use our self-hosted and locally deployed analytics service, built on Grafana, to see Sourcegraph usage data.
 
 This product is in development now. If you would like to learn more, please contact your Sourcegraph representative.
 
diff --git a/docs/analytics/pcw.mdx b/docs/analytics/pcw.mdx
@@ -34,3 +34,5 @@ It’s simple to identify which code is generated by Cody, but much more difficu
 -   We exclude disjoint insertions - insertions made in multiple places at once, which are likely to come from third party sources
 -   We exclude any insertions made in an inactive file/editor window
 -   We exclude any insertions into “stale” code - code the user hasn’t touched in the last 5 seconds
+
+This metric only includes data from users on Cody versions 1.42+.
diff --git a/docs/how-to/aws-instance-sizing.mdx b/docs/how-to/aws-instance-sizing.mdx
@@ -0,0 +1,16 @@
+# AWS Instance Sizing for Sourcegraph
+
+## Instance size chart
+
+Select an instance type according to the number of users and repositories you have using this table. If you fall between two sizes, choose the larger of the two.
+
+For example, if you have 8,000 users with 80,000 repositories, your instance size would be **L**. If you have 1,000 users with 80,000 repositories, you should still go with size **M**.
+
+|                      | **XS**                | **S**                 | **M**                 | **L**                 | **XL**                 |
+|----------------------|-----------------------|-----------------------|-----------------------|-----------------------|------------------------|
+| **Users**            | ≥ 500                 | ≥ 1,000               | ≥ 5,000               | ≥ 10,000              | ≥ 20,000               |
+| **Repositories**     | ≥ 5,000               | ≥ 10,000              | ≥ 50,000              | ≥ 100,000             | ≥ 250,000              |
+| **Recommended Type** | m6a.2xlarge           | m6a.4xlarge           | m6a.8xlarge           | m6a.12xlarge          | m6a.24xlarge           |
+| **Minimum Type**     | m6a.2xlarge           | m6a.2xlarge           | m6a.4xlarge           | m6a.8xlarge           | m6a.12xlarge           |
+
+<Callout type="note">While we recommend certain instance types in our sizing chart, the Sourcegraph AMI will dynamically use the resources available on the EC2 instance type it is deployed to, provided the minimum amount of resources needed is available. If you would like to resize your EC2 instance, follow the [upgrade steps](/admin/deploy/machine-images/aws-ami#upgrade) to switch to a more appropriate instance type.</Callout>
diff --git a/src/components/MdxComponents.tsx b/src/components/MdxComponents.tsx
@@ -53,6 +53,15 @@ const MdxComponents = (version?: string) => {
     h3: (props: any) => {
       return <Heading level="3" id={props.id} props={props} />;
     },
+    h4: (props: any) => {
+      return <Heading level="4" id={props.id} props={props} />;
+    },
+    h5: (props: any) => {
+      return <Heading level="5" id={props.id} props={props} />;
+    },
+    h6: (props: any) => {
+      return <Heading level="6" id={props.id} props={props} />;
+    },
     img: (props: any) => {
       return <img className="rounded-xl" {...props} />;
     },
diff --git a/src/components/mdx/Heading.tsx b/src/components/mdx/Heading.tsx
@@ -58,13 +58,13 @@ function Anchor({id, children}: {id: string; children: ReactNode}) {
 }
 
 interface HeadingProps {
-	level?: '2' | '3';
+	level?: '2' | '3' | '4' | '5' | '6';
 	id: string;
 	props: any;
 }
 
 export function Heading({level = '2', id, props}: HeadingProps) {
-	let Component = `h${level}` as 'h2' | 'h3';
+	let Component = `h${level}` as 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 	return (
 		<Component {...props}>
 			<Anchor id={id}>{props.children}</Anchor>

Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,13 @@ function Anchor({id, children}: {id: string; children: ReactNode}) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`interface HeadingProps {`
`61`		`- level?: '2' \| '3';`
	`61`	`+ level?: '2' \| '3' \| '4' \| '5' \| '6';`
`62`	`62`	`id: string;`
`63`	`63`	`props: any;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`export function Heading({level = '2', id, props}: HeadingProps) {`
`67`		- let Component = `h${level}` as 'h2' \| 'h3';
	`67`	+ let Component = `h${level}` as 'h2' \| 'h3' \| 'h4' \| 'h5' \| 'h6';
`68`	`68`	`return (`
`69`	`69`	`<Component {...props}>`
`70`	`70`	`<Anchor id={id}>{props.children}</Anchor>`