resolve merge conflict

prisma · Oct 22, 2024 · 432eaf3 · 432eaf3
2 parents 8438781 + 0480f23
commit 432eaf3
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 21 deletions.
diff --git a/content/100-getting-started/01-quickstart-sqlite.mdx b/content/100-getting-started/01-quickstart-sqlite.mdx
@@ -421,6 +421,12 @@ If you want to move forward with Prisma ORM using your own PostgreSQL, MySQL, Mo
 - [Start with Prisma ORM from scratch](/getting-started/setup-prisma/start-from-scratch/relational-databases-typescript-postgresql)
 - [Add Prisma ORM to an existing project](/getting-started/setup-prisma/add-to-existing-project)
 
+### Get query insights and analytics with Prisma Optimize
+
+[Prisma Optimize](/optimize) helps you generate insights and provides recommendations that can help you make your database queries faster.
+
+Optimize aims to help developers of all skill levels write efficient database queries, reducing database load and making applications more responsive.
+
 ### Explore ready-to-run Prisma ORM examples
 
 Check out the [`prisma-examples`](https://github.com/prisma/prisma-examples/) repository on GitHub to see how Prisma ORM can be used with your favorite library. The repo contains examples with Express, NestJS, GraphQL as well as fullstack examples with Next.js and Vue.js, and a lot more.

diff --git a/...setup-prisma/100-start-from-scratch/110-relational-databases/300-next-steps.mdx b/...setup-prisma/100-start-from-scratch/110-relational-databases/300-next-steps.mdx
@@ -78,6 +78,12 @@ The Prisma blog features comprehensive tutorials about Prisma ORM, check out our
 
 Prisma Studio is a visual editor for the data in your database. Run `npx prisma studio` in your terminal.
 
+### Get query insights and analytics with Prisma Optimize
+
+[Prisma Optimize](/optimize) helps you generate insights and provides recommendations that can help you make your database queries faster. [Try it out now!](/optimize/getting-started)
+
+Optimize aims to help developers of all skill levels write efficient database queries, reducing database load and making applications more responsive.
+
 ### Try a Prisma ORM example
 
 The [`prisma-examples`](https://github.com/prisma/prisma-examples/) repository contains a number of ready-to-run examples:

diff --git a/...-prisma/200-add-to-existing-project/110-relational-databases/300-next-steps.mdx b/...-prisma/200-add-to-existing-project/110-relational-databases/300-next-steps.mdx
@@ -81,6 +81,12 @@ The Prisma blog features comprehensive tutorials about Prisma ORM, check out our
 
 Prisma Studio is a visual editor for the data in your database. Run `npx prisma studio` in your terminal.
 
+### Get query insights and analytics with Prisma Optimize
+
+[Prisma Optimize](/optimize) helps you generate insights and provides recommendations that can help you make your database queries faster. [Try it out now!](/optimize/getting-started)
+
+Optimize aims to help developers of all skill levels write efficient database queries, reducing database load and making applications more responsive.
+
 ### Change the database schema (e.g. add more tables)
 
 To evolve the app, you need to follow the same flow of the tutorial:

diff --git a/content/200-orm/200-prisma-client/600-observability-and-logging/index.mdx b/content/200-orm/200-prisma-client/600-observability-and-logging/index.mdx
@@ -7,4 +7,13 @@ hide_table_of_contents: true
 
 ## In this section
 
+:::tip Get query insights and analytics with Prisma Optimize
+
+[Prisma Optimize](/optimize) helps you generate insights and provides recommendations that can help you make your database queries faster:
+
+Optimize aims to help developers of all skill levels write efficient database queries, reducing database load and making applications more responsive.
+
+:::
+
+
 <Subsections depth="3" />
diff --git a/content/200-orm/200-prisma-client/700-debugging-and-troubleshooting/index.mdx b/content/200-orm/200-prisma-client/700-debugging-and-troubleshooting/index.mdx
@@ -5,11 +5,14 @@ metaDescription: 'Debugging & troubleshooting'
 hide_table_of_contents: true
 ---
 
-<TopBlock>
+:::tip Get query insights and analytics with Prisma Optimize
 
-Debugging & troubleshooting
+[Prisma Optimize](/optimize) helps you generate insights and provides recommendations that can help you make your database queries faster:
+
+Optimize aims to help developers of all skill levels write efficient database queries, reducing database load and making applications more responsive.
+
+:::
 
-</TopBlock>
 
 ## In this section
 

diff --git a/content/200-orm/800-more/400-comparisons/04-prisma-and-drizzle.mdx b/content/200-orm/800-more/400-comparisons/04-prisma-and-drizzle.mdx
@@ -442,6 +442,7 @@ In addition to Prisma Studio, Prisma offers commercial products via the Prisma D
 
 - [Prisma Accelerate](https://www.prisma.io/data-platform/accelerate?utm_source=docs&utm_medium=orm-docs): A connection pooler and global cache that integrates with Prisma ORM. Users can take advantage of connection pooling immediately and can control caching at an individual query level.
 - [Prisma Pulse](https://www.prisma.io/data-platform/pulse?utm_source=docs&utm_medium=orm-docs): A change data capture (CDC) service where Prisma Client can subscribe to database changes and receive them in real-time with little to no setup.
+- [Prisma Optimize](https://www.prisma.io/data-platform/optimize?utm_source=docs&utm_medium=orm-docs): A query analytics tool that provides deep insights, actionable recommendations, and allows you to interact with Prisma AI for further insights and optimizing your database queries.
 
 These products work hand-in-hand with Prisma ORM to offer comprehensive data tooling, making building data-driven applications easy by following [Data DX](https://datadx.io/) principles.
 

diff --git a/content/500-platform/40-limits.mdx b/content/500-platform/40-limits.mdx
diff --git a/content/500-platform/50-support.mdx b/content/500-platform/50-support.mdx
@@ -12,27 +12,28 @@ Your feedback is invaluable, and we encourage you to share your experiences with
 
 ## Support
 
+Your support options are based on your workspace's active plan. For more details, take a look at our [pricing page](https://prisma.io/pricing).
+
 ### Community support
 
 Reach out to us in our [Discord](https://pris.ly/discord).
 
 ### Standard support
 
-- Email support, <a href="mailto:[email protected]">[email protected]</a>
-- Mon-Fri, 9am-5pm CET
+- Email support, <a href="mailto:[email protected]">[email protected]</a>, or reach out via the Console
+- 2 business days, Mon-Fri, 9am-5pm CET
 
 ### Premium support
 
-- Email support, <a href="mailto:[email protected]">[email protected]</a>
-- 24/7
+- Email support, <a href="mailto:[email protected]">[email protected]</a>, or reach out via the Console
+- 1 business hour, Mon-Fri, 9am-5pm CET
 
 ### Dedicated support
 
 Dedicated contact person.
 
 ## Deleting your PDP account
 
-
 If you want to delete your PDP account, **email us at <a href="mailto:[email protected]">[email protected]</a>**. 
 
-To ensure that you're not accidentally disabling any infrastructure powering one of your applications, we require that you **disable Accelerate and Pulse in _all_ environments of _all_ your projects** that live in the account to be deleted.
+To ensure that you're not accidentally disabling any infrastructure powering one of your applications, we require that you **disable Accelerate and Pulse in _all_ environments of _all_ your projects** that live in the account to be deleted.
diff --git a/docusaurus.config.ts b/docusaurus.config.ts
@@ -74,8 +74,8 @@ const config: Config = {
     [
       "posthog-docusaurus",
       {
-        apiKey: "phc_cmc85avbWyuJ2JyKdGPdv7dxXli8xLdWDBPbvIXWJfs",
-        appUrl: "https://proxy.prisma.io",
+        apiKey: DOCUSAURUS_POST_HOG_KEY,
+        appUrl: "https://us.i.posthog.com",
         person_profiles: "identified_only",
         enableInDevelopment: false
       },