diff --git a/apps/docs/components/MetricsStackCards.data.ts b/apps/docs/components/MetricsStackCards.data.ts
index 1cbd0a4a15698..637af23172874 100644
--- a/apps/docs/components/MetricsStackCards.data.ts
+++ b/apps/docs/components/MetricsStackCards.data.ts
@@ -17,10 +17,7 @@ export const metricsStackOptions: MetricsStackOption[] = [
     iconKind: 'grafana',
     iconColor: '#F05A28',
     iconBg: 'rgba(240,90,40,0.1)',
-    badges: [
-      { label: 'Supabase guide', variant: 'default' },
-      { label: 'Community', variant: 'community' },
-    ],
+    badges: [{ label: 'Supabase guide', variant: 'default' }],
   },
   {
     title: 'Grafana + self-hosted Prometheus',
diff --git a/apps/docs/content/guides/telemetry/metrics/grafana-cloud.mdx b/apps/docs/content/guides/telemetry/metrics/grafana-cloud.mdx
index 39d96d066ba4d..42f894f2b8794 100644
--- a/apps/docs/content/guides/telemetry/metrics/grafana-cloud.mdx
+++ b/apps/docs/content/guides/telemetry/metrics/grafana-cloud.mdx
@@ -6,37 +6,55 @@ description: 'Use Grafana Cloud’s managed Prometheus to visualize Supabase met
 
 Grafana Cloud gives you a fully managed Prometheus endpoint plus hosted Grafana dashboards, which makes it the fastest way to explore the Supabase Metrics API without operating your own infrastructure.
 
-<Admonition type="note">
+## Installation
 
-Grafana maintains a [Supabase integration guide](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/integrations/integration-reference/integration-supabase/) for Grafana Cloud. It runs on the same Metrics API documented here, but is community-maintained by Grafana, so feature coverage might differ from what Supabase officially supports.
+The Grafana Cloud integration is available in the Supabase Dashboard. [Add the integration](/dashboard/project/_/integrations/grafana-cloud/overview?utm_source=metrics-api&utm_medium=docs&utm_campaign=supabase_grafana_cloud_one_click_integration) and select a project to get a fully-configured instance in one click: authentication, metric scraping, and a pre-built dashboard tracking 200+ metrics, set up automatically.
+
+By integrating Supabase with Grafana Cloud, users gain monitoring capabilities for Supabase performance and operations. The included dashboard offers a comprehensive overview of Supabase performance, supplemented with Postgres metrics.
+
+## Manual setup
+
+The [Grafana Cloud integration](/dashboard/project/_/integrations/grafana-cloud/overview?utm_source=metrics-api&utm_medium=docs&utm_campaign=supabase_grafana_cloud_one_click_integration) available in the Supabase Dashboard is the recommended path. You can still configure and run the setup manually by following the steps below.
+
+<Admonition type="caution">
+
+Use this guide only if you need full manual control (custom scrape topology, self-hosted
+Prometheus or non-standard auth).
 
 </Admonition>
 
-## Prerequisites
+### Prerequisites
 
 - A Supabase project with access to the Metrics API (Secret API key `sb_secret_...`).
 - A Grafana Cloud account with Prometheus metrics enabled (Free or Pro tier).
 - A Grafana API token with the `metrics:write` and `metrics:read` scopes if you plan to push data manually.
 
-<$Partial path="metrics_access.mdx" />
-
-## 1. Create a Grafana Cloud stack
+### 1. Create a Grafana Cloud stack
 
 1. Sign in to [Grafana Cloud](https://grafana.com/auth/sign-in).
-2. Create (or select) a stack that has **Prometheus Metrics** enabled (Free and Pro tiers both work for this guide).
+2. Create or select a stack that has **Prometheus Metrics** enabled.
+
+### 2. Install the Supabase integration for Grafana Cloud
+
+1. In your Grafana Cloud stack, click **Connections** in the left-hand menu.
+2. Select the **Supabase** integration and follow the steps outlined on the **Configuration** page:
+3. Give your scrape job a descriptive name like `production-eu-central-1`.
+4. Set your Project ID and enter the service account API key.
+5. Test the connection and save the scrape job.
+6. Once scrape jobs are configured, click Install to add the prebuilt dashboards to your Grafana Cloud instance.
 
-## 2. Configure the Supabase integration
+### 3. Configure the Supabase integration
 
 1. Navigate to **Connections → Add new connection → Supabase** inside Grafana Cloud.
 2. Provide:
    - Your Supabase project ref (e.g. `abcd1234`).
-   - The Metrics API endpoint: `https://<project-ref>.supabase.co/customer/v1/privileged/metrics`.
+   - The Metrics API endpoint (e.g. `https://<project-ref>.supabase.co/customer/v1/privileged/metrics`).
    - HTTP Basic Auth credentials (`sb_secret_...`).
-3. Choose the scrape interval (1 minute recommended) and test the connection. Grafana Cloud will deploy an agent in the background that scrapes the Metrics API and forwards the data to Prometheus.
+3. Choose the scrape interval. 1 minute is recommended, and test the connection. Grafana Cloud will deploy an agent in the background that scrapes the Metrics API and forwards the data to Prometheus.
 
 If you prefer to reuse an existing Grafana Agent deployment, configure an [integration pipeline](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/integrations/integration-reference/integration-supabase/) with the same URL and credentials.
 
-## 3. Import the Supabase dashboard
+### 4. Import the Supabase dashboard
 
 1. Open your Grafana Cloud dashboard list and click **New → Import**.
 2. Paste the raw contents of [`supabase-grafana/dashboard.json`](https://raw.githubusercontent.com/supabase/supabase-grafana/refs/heads/main/grafana/dashboard.json).
@@ -51,11 +69,11 @@ This dashboard includes 200+ charts grouped by CPU, IO, connections, replication
   height="1509"
 />
 
-## 4. Configure alerts (optional)
+### 5. Configure alerts (optional)
 
 The [`docs/example-alerts.md`](https://github.com/supabase/supabase-grafana/blob/main/docs/example-alerts.md) file contains suggested alert rules (disk saturation, long-running queries, replication lag, etc.). Import the alert rules into Grafana Cloud’s Alerting UI or translate them into Grafana Cloud’s managed alert rule format.
 
-## 5. Troubleshooting
+### 6. Troubleshooting
 
 - Metrics missing? Ensure the Grafana Cloud agent can reach `https://<project-ref>.supabase.co` and that the selected Secret API key is still valid.
 - 401 errors? Create/rotate a Secret API key in [Project Settings → API Keys](/dashboard/project/_/settings/api-keys) and update the Grafana Cloud credentials.
diff --git a/apps/docs/content/guides/telemetry/metrics/grafana-self-hosted.mdx b/apps/docs/content/guides/telemetry/metrics/grafana-self-hosted.mdx
index 917ecfbc9e89c..868e095ea6c83 100644
--- a/apps/docs/content/guides/telemetry/metrics/grafana-self-hosted.mdx
+++ b/apps/docs/content/guides/telemetry/metrics/grafana-self-hosted.mdx
@@ -6,11 +6,11 @@ description: 'Deploy Prometheus and Grafana yourself to monitor Supabase metrics
 
 Self-hosting [Prometheus](https://prometheus.io/docs/prometheus/latest/installation/) and Grafana gives you full control over retention, alert routing, and dashboards. The Supabase Metrics API slots into any standard Prometheus scrape job, so you can run everything locally, on a VM, or inside Kubernetes.
 
-<$Partial path="metrics_access.mdx" />
+<Admonition type="caution">
 
-<Admonition type="note">
+Use this guide only if you need full manual control (custom scrape topology, self-hosted Prometheus or non-standard auth).
 
-Grafana also documents a [Supabase integration reference](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/integrations/integration-reference/integration-supabase/). While it targets Grafana Cloud, the scrape and agent settings apply equally to self-hosted clusters and offer a community-maintained companion to this guide.
+Otherwise, use the [Grafana Cloud integration](/docs/guides/telemetry/metrics/grafana-cloud#installation) available in the Supabase Dashboard.
 
 </Admonition>
 
@@ -18,7 +18,7 @@ Grafana also documents a [Supabase integration reference](https://grafana.com/do
 
 1. **Prometheus** scrapes `https://<project-ref>.supabase.co/customer/v1/privileged/metrics` every minute using HTTP Basic Auth.
 2. **Grafana** reads from Prometheus and renders dashboards/alerts.
-3. (Optional) **Alertmanager** or your preferred system sends notifications when Prometheus rules fire.
+3. **Prometheus Alertmanager** or your preferred system sends notifications when Prometheus rules fire (optional) .
 
 ## 1. Deploy Prometheus
 
diff --git a/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx b/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx
index ea9a8a4df6060..28d2a728ee3ca 100644
--- a/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx
+++ b/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx
@@ -37,7 +37,7 @@ export const TOTPFactors = () => {
                       </p>
                       <div className="flex items-center gap-4">
                         <p className="text-sm text-foreground-light">
-                          Added on {dayjs(factor.updated_at).format(DATETIME_FORMAT)}
+                          Added on {dayjs(factor.created_at).format(DATETIME_FORMAT)}
                         </p>
                         <Button
                           size="tiny"
diff --git a/apps/studio/components/interfaces/Database/Migrations/Migrations.tsx b/apps/studio/components/interfaces/Database/Migrations/Migrations.tsx
index 24f4763fa216f..b893c62e324be 100644
--- a/apps/studio/components/interfaces/Database/Migrations/Migrations.tsx
+++ b/apps/studio/components/interfaces/Database/Migrations/Migrations.tsx
@@ -32,7 +32,7 @@ import { formatMigrationVersionLabel, parseMigrationVersion } from '@/lib/migrat
 import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
 import { useShortcut } from '@/state/shortcuts/useShortcut'
 
-const Migrations = () => {
+export const Migrations = () => {
   const [search, setSearch] = useState('')
   const [selectedMigration, setSelectedMigration] = useState<DatabaseMigration>()
   const searchInputRef = useRef<HTMLInputElement>(null)
@@ -116,7 +116,7 @@ const Migrations = () => {
                   placeholder="Search for a migration"
                   value={search}
                   className="w-full lg:w-52"
-                  onChange={(e: any) => setSearch(e.target.value)}
+                  onChange={(e) => setSearch(e.target.value)}
                   icon={<Search />}
                 />
                 <Card>
@@ -221,10 +221,14 @@ const Migrations = () => {
         <div className="h-full">
           <div className="relative h-full">
             <CodeEditor
+              // The CodeEditor does not react to content only changes,
+              // specifically when two projects have migrations with the same version but different content.
+              // Setting the key ensure it always update when the migration changes
+              key={`${project?.ref}-${selectedMigration?.version}`}
               isReadOnly
               id={selectedMigration?.version ?? ''}
               language="pgsql"
-              defaultValue={
+              value={
                 selectedMigration?.statements?.join(';\n') +
                 (selectedMigration?.statements?.length ? ';' : '')
               }
@@ -235,5 +239,3 @@ const Migrations = () => {
     </>
   )
 }
-
-export default Migrations
diff --git a/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx
index d25050b658d16..c806b61489f7b 100644
--- a/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx
+++ b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx
@@ -94,9 +94,9 @@ export const RealtimeSettings = () => {
         .max(maxConn?.maxConnections ?? 100)
         .optional(),
       max_concurrent_users: z.coerce.number().min(1).max(50000).optional(),
-      max_events_per_second: z.coerce.number().min(1).max(10000).optional(),
-      max_presence_events_per_second: z.coerce.number().min(1).max(10000).optional(),
-      max_payload_size_in_kb: z.coerce.number().min(1).max(3000).optional(),
+      max_events_per_second: z.coerce.number().min(1).max(50000).optional(),
+      max_presence_events_per_second: z.coerce.number().min(1).max(5000).optional(),
+      max_payload_size_in_kb: z.coerce.number().min(1).max(10000).optional(),
       // [Joshen] These fields are temporarily hidden from the UI
       // max_bytes_per_second: z.coerce.number().min(1).max(10000000).optional(),
       // max_channels_per_client: z.coerce.number().min(1).max(10000).optional(),
@@ -111,9 +111,9 @@ export const RealtimeSettings = () => {
         .min(1)
         .max(maxConn?.maxConnections ?? 100),
       max_concurrent_users: z.coerce.number().min(1).max(50000),
-      max_events_per_second: z.coerce.number().min(1).max(10000),
-      max_presence_events_per_second: z.coerce.number().min(1).max(10000),
-      max_payload_size_in_kb: z.coerce.number().min(1).max(3000),
+      max_events_per_second: z.coerce.number().min(1).max(50000),
+      max_presence_events_per_second: z.coerce.number().min(1).max(5000),
+      max_payload_size_in_kb: z.coerce.number().min(1).max(10000),
       // [Joshen] These fields are temporarily hidden from the UI
       // max_bytes_per_second: z.coerce.number().min(1).max(10000000),
       // max_channels_per_client: z.coerce.number().min(1).max(10000),
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts
index 15f713a34747f..a9b62e271bdc5 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.test.ts
@@ -282,14 +282,18 @@ describe('UnifiedLogs.queries (OTEL flat)', () => {
   })
 
   describe('user filter', () => {
-    it('restricts to auth_logs/postgres_logs and skips the default postgres+edge restriction', () => {
+    it('restricts to auth_logs/edge_logs and skips the default postgres+edge restriction', () => {
       const sql = getUnifiedLogsQuery(withUser('user-123'))
       const where = sql.split(/\bWHERE\b/)[1] ?? ''
-      expect(where).toContain(`log_attributes['auth_event.actor_id'] = 'user-123'`)
-      expect(where).toContain(`source = 'postgres_logs'`)
-      // The unfiltered default (postgres_logs OR edge_logs) would incorrectly exclude
+      expect(where).toContain(
+        `(source = 'auth_logs' AND log_attributes['auth_event.actor_id'] = 'user-123')`
+      )
+      expect(where).toContain(
+        `(source = 'edge_logs' AND log_attributes['request.sb.jwt.authorization.payload.subject'] = 'user-123')`
+      )
+      // The unfiltered default (edge_logs OR postgres_logs) would incorrectly exclude
       // auth_logs, the primary attributable source, so it must not appear here.
-      expect(where).not.toContain(`(source = 'postgres_logs') OR (source = 'edge_logs')`)
+      expect(where).not.toContain(`(source = 'edge_logs') OR (source = 'postgres_logs')`)
     })
 
     it('does not restrict sources when the user filter is inactive', () => {
@@ -321,8 +325,8 @@ describe('UnifiedLogs.queries (OTEL flat)', () => {
       expect(isUserFilterUnreachable(withUser('user-123', 'log_type:eq:auth'))).toBe(false)
     })
 
-    it('is false when the explicit log_type filter includes an attributable source (postgres)', () => {
-      expect(isUserFilterUnreachable(withUser('user-123', 'log_type:eq:postgres'))).toBe(false)
+    it('is false when the explicit log_type filter includes an attributable source (edge)', () => {
+      expect(isUserFilterUnreachable(withUser('user-123', 'log_type:eq:edge'))).toBe(false)
     })
 
     it('is false when at least one of several selected log types is attributable', () => {
@@ -332,12 +336,12 @@ describe('UnifiedLogs.queries (OTEL flat)', () => {
     })
 
     it('is true when the explicit log_type filter restricts to a single non-attributable source', () => {
-      expect(isUserFilterUnreachable(withUser('user-123', 'log_type:eq:edge'))).toBe(true)
+      expect(isUserFilterUnreachable(withUser('user-123', 'log_type:eq:storage'))).toBe(true)
     })
 
     it('is true when every selected log type is non-attributable', () => {
       expect(
-        isUserFilterUnreachable(withUser('user-123', 'log_type:eq:edge', 'log_type:eq:storage'))
+        isUserFilterUnreachable(withUser('user-123', 'log_type:eq:realtime', 'log_type:eq:storage'))
       ).toBe(true)
     })
 
@@ -347,7 +351,7 @@ describe('UnifiedLogs.queries (OTEL flat)', () => {
 
     it('(neq) is true only when both attributable sources are excluded', () => {
       expect(
-        isUserFilterUnreachable(withUser('user-123', 'log_type:neq:auth', 'log_type:neq:postgres'))
+        isUserFilterUnreachable(withUser('user-123', 'log_type:neq:auth', 'log_type:neq:edge'))
       ).toBe(true)
     })
   })
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts
index 1b56bae859e6d..619fd33ceefdf 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts
@@ -104,6 +104,13 @@ const LEVEL_EXPR: SafeLogSqlFragment = safeSql`CASE
       ELSE 'success'
     END`
 
+// The `auth_user` column is derived from the source-specific fields that can be attributed to a user.
+const AUTH_USER_EXPR: SafeLogSqlFragment = safeSql`nullIf(CASE
+      WHEN source = 'auth_logs' THEN log_attributes['auth_event.actor_id']
+      WHEN source = 'edge_logs' THEN log_attributes['request.sb.jwt.authorization.payload.subject']
+      ELSE null
+    END, '')`
+
 const logTypeWhereCondition = (logTypes: string[]): SafeLogSqlFragment => {
   const effective = logTypes.filter((t) => t in LOG_TYPE_CONDITION)
   const types = effective.length ? effective : [...DEFAULT_LOG_TYPES]
@@ -248,7 +255,7 @@ const truncationFunction = (level: 'MINUTE' | 'HOUR' | 'DAY'): SafeLogSqlFragmen
  * inlined so the result can be referenced (or filtered) at the same query
  * level — the OTEL endpoint rejects subqueries.
  */
-const rowProjection = (): SafeLogSqlFragment => safeSql`
+const ROW_PROJECTION: SafeLogSqlFragment = safeSql`
     id,
     null AS source_id,
     timestamp,
@@ -258,6 +265,7 @@ const rowProjection = (): SafeLogSqlFragment => safeSql`
     ${ATTR.path} AS pathname,
     event_message,
     ${ATTR.method} AS method,
+    ${AUTH_USER_EXPR} AS auth_user,
     null AS log_count,
     null AS logs
 `
@@ -335,17 +343,14 @@ const userAttributionCondition = (search: QuerySearchParamsType): SafeLogSqlFrag
   const value = userFilterValue(search)
   if (!value) return null
   const exact = lit(value)
-  const contains = lit('%' + value + '%')
   return safeSql`(
-    (source = 'auth_logs' AND (
-      log_attributes['auth_event.actor_id'] = ${exact}
-      OR event_message ILIKE ${contains}
-    ))
-    OR (source = 'postgres_logs' AND event_message ILIKE ${contains})
+    (source = 'auth_logs' AND log_attributes['auth_event.actor_id'] = ${exact})
+    OR 
+    (source = 'edge_logs' AND log_attributes['request.sb.jwt.authorization.payload.subject'] = ${exact})
   )`
 }
 
-const USER_ATTRIBUTABLE_SOURCES = new Set([LOG_TYPE_TO_SOURCE.auth, LOG_TYPE_TO_SOURCE.postgres])
+const USER_ATTRIBUTABLE_SOURCES = new Set([LOG_TYPE_TO_SOURCE.auth, LOG_TYPE_TO_SOURCE.edge])
 
 /**
  * True when the user filter is active but an explicit log_type filter restricts the
@@ -411,7 +416,7 @@ const applySearchParamsFilter = (search: QuerySearchParamsType): SafeLogSqlFragm
 export const getUnifiedLogsQuery = (search: QuerySearchParamsType): SafeLogSqlFragment => {
   const conditions = buildBaseWhere(search)
   return safeSql`-- unified logs: row list
-SELECT ${rowProjection()}
+SELECT ${ROW_PROJECTION}
 FROM logs
 ${whereClause(conditions)}
 `
diff --git a/apps/studio/pages/project/[ref]/database/migrations.tsx b/apps/studio/pages/project/[ref]/database/migrations.tsx
index e57b15dd6fd58..425a6ec87626c 100644
--- a/apps/studio/pages/project/[ref]/database/migrations.tsx
+++ b/apps/studio/pages/project/[ref]/database/migrations.tsx
@@ -9,7 +9,7 @@ import {
 } from 'ui-patterns/PageHeader'
 import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'
 
-import Migrations from '@/components/interfaces/Database/Migrations/Migrations'
+import { Migrations } from '@/components/interfaces/Database/Migrations/Migrations'
 import DatabaseLayout from '@/components/layouts/DatabaseLayout/DatabaseLayout'
 import { DefaultLayout } from '@/components/layouts/DefaultLayout'
 import { DocsButton } from '@/components/ui/DocsButton'
diff --git a/apps/www/_blog/2026-07-23-observability-for-every-supabase-project-with-grafana-cloud.mdx b/apps/www/_blog/2026-07-23-observability-for-every-supabase-project-with-grafana-cloud.mdx
new file mode 100644
index 0000000000000..1ae2bfa11cc7d
--- /dev/null
+++ b/apps/www/_blog/2026-07-23-observability-for-every-supabase-project-with-grafana-cloud.mdx
@@ -0,0 +1,60 @@
+---
+title: 'Observability for every Supabase project with Grafana Cloud'
+description: 'Connect your Supabase project to Grafana Cloud in one click. A pre-built dashboard, alerting, and metrics: available on every plan, including free.'
+author: raminder_singh
+date: '2026-07-23'
+categories:
+  - product
+tags:
+  - integrations
+  - observability
+  - monitoring
+  - postgres
+imgSocial: observability-for-every-supabase-project-with-grafana-cloud/grafana-og.png
+imgThumb: observability-for-every-supabase-project-with-grafana-cloud/grafana-thumb.png
+toc_depth: 2
+---
+
+The [Grafana Cloud integration](https://supabase.com/dashboard/project/_/integrations/grafana-cloud/overview?utm_source=supabase-announcement&utm_medium=blog&utm_campaign=supabase_grafana_cloud_one_click_integration_launch) is available in Supabase. You've been able to connect Supabase to Grafana Cloud for years, and now you can connect to it instantly with the push of a button.
+
+From your Supabase Dashboard, in a single click, you get a fully-configured Grafana Cloud instance with authentication, metric scraping, and a pre-built observability dashboard already set up on any plan, including free.
+
+[Grafana Cloud](https://grafana.com/products/cloud/) is the AI-powered open observability cloud built on open source and open standards. Used by developers everywhere, the full-stack observability platform helps you improve the reliability of your applications, resolve incidents quickly, and optimize your telemetry to reduce noise and costs.
+
+<div className="video-container">
+  <iframe
+    className="w-full"
+    src="https://www.youtube-nocookie.com/embed/EDAi7JR6xRc"
+    title="Observability for every Supabase project with Grafana Cloud"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; fullscreen; gyroscope; picture-in-picture; web-share"
+    allowFullScreen
+  />
+</div>
+
+## What the Grafana Cloud integration includes
+
+The integration ships with a pre-built Grafana Cloud dashboard for tracking more than 200 metrics, organized around the signals that matter when you're debugging a production issue:
+
+- CPU and memory pressure
+- Disk IO and throughput
+- Network traffic
+- Connection counts and pooler behavior
+- Replication lag
+- Scheduled and requested checkpoints
+- Database size and query stats
+
+The integration reads from Supabase's [Metrics API](https://supabase.com/docs/guides/telemetry/metrics). It's one place to monitor your entire stack, whether that's your database, your servers, or anything else your team already tracks in Grafana Cloud.
+
+The dashboards are [open source](https://github.com/supabase/supabase-grafana) and work the same everywhere. The same dashboard definitions power self-hosted Grafana, the existing Grafana Cloud integration, and the new one-click setup. No matter how you connect, you're viewing the same dashboards.
+
+## What's next
+
+This release covers metrics. The integration is built to accommodate logs without any architectural changes, with support for log drains to Grafana Cloud already in progress.
+
+## Get started with Grafana Cloud on Supabase
+
+The Grafana Cloud integration is available now on Supabase, on every plan (including free). Get started using the Grafana Cloud free tier with no credit card required on either side.
+
+→ [Connect your project to Grafana Cloud](https://supabase.com/dashboard/project/_/integrations/grafana-cloud/overview?utm_source=supabase-announcement&utm_medium=blog&utm_campaign=supabase_grafana_cloud_one_click_integration_launch)
+
+→ [Read the Grafana Labs' launch post](https://grafana.com/blog/grafana-cloud-supabase-one-click-integration)
diff --git a/apps/www/components/Changelog/ChangelogInlineMarkdown.tsx b/apps/www/components/Changelog/ChangelogInlineMarkdown.tsx
new file mode 100644
index 0000000000000..ccc978ecc98f5
--- /dev/null
+++ b/apps/www/components/Changelog/ChangelogInlineMarkdown.tsx
@@ -0,0 +1,25 @@
+import ReactMarkdown, { type Components } from 'react-markdown'
+import remarkGfm from 'remark-gfm'
+
+/**
+ * Renders a changelog title/summary as inline markdown (backticks → inline code).
+ * `p` and `a` are unwrapped so the output is valid inside a heading and never
+ * nests an anchor (titles are already wrapped in a `<Link>`).
+ */
+const INLINE_COMPONENTS: Components = {
+  p: ({ children }) => <>{children}</>,
+  a: ({ children }) => <>{children}</>,
+  code: ({ children }) => (
+    <code className="bg-muted text-foreground rounded px-1 py-0.5 font-mono text-[0.85em] font-normal">
+      {children}
+    </code>
+  ),
+}
+
+export function ChangelogInlineMarkdown({ children }: { children: string }) {
+  return (
+    <ReactMarkdown remarkPlugins={[remarkGfm]} components={INLINE_COMPONENTS}>
+      {children}
+    </ReactMarkdown>
+  )
+}
diff --git a/apps/www/components/Changelog/ChangelogTimelineList.tsx b/apps/www/components/Changelog/ChangelogTimelineList.tsx
index a01a3490271bb..490fe46d0d6c6 100644
--- a/apps/www/components/Changelog/ChangelogTimelineList.tsx
+++ b/apps/www/components/Changelog/ChangelogTimelineList.tsx
@@ -11,6 +11,8 @@ import Link from 'next/link'
 import { type MouseEvent } from 'react'
 import { Badge, cn } from 'ui'
 
+import { ChangelogInlineMarkdown } from '@/components/Changelog/ChangelogInlineMarkdown'
+
 function groupChangelogIndexByYear(
   items: ChangelogTimelineIndexItem[]
 ): [number, ChangelogTimelineIndexItem[]][] {
@@ -99,10 +101,16 @@ function TimelineRow({ item, href }: { item: ChangelogTimelineIndexItem; href: s
       <div className="border-default timeline-row-content flex min-w-0 flex-1 flex-col gap-0.5 border-b py-3">
         <div className="min-w-0">
           <Link href={href} prefetch={false} className="min-w-0 text-left">
-            <h3 className="text-foreground text-lg leading-snug hover:underline">{item.title}</h3>
+            <h3 className="text-foreground text-lg leading-snug hover:underline [&_code]:align-middle">
+              <ChangelogInlineMarkdown>{item.title}</ChangelogInlineMarkdown>
+            </h3>
           </Link>
         </div>
-        {item.summary && <p className="text-foreground-lighter text-sm">{item.summary}</p>}
+        {item.summary && (
+          <p className="text-foreground-lighter text-sm">
+            <ChangelogInlineMarkdown>{item.summary}</ChangelogInlineMarkdown>
+          </p>
+        )}
         <div className="flex min-w-0 gap-2 pt-0.5">
           <time
             dateTime={item.sortDate}
diff --git a/apps/www/lib/changelog-entries-core.mjs b/apps/www/lib/changelog-entries-core.mjs
index db452741a4e8f..e7f8d5ed948ca 100644
--- a/apps/www/lib/changelog-entries-core.mjs
+++ b/apps/www/lib/changelog-entries-core.mjs
@@ -71,6 +71,40 @@ export async function fetchChangelogEntryFilesFromTarball(
   return files
 }
 
+/**
+ * The only frontmatter fields exposed to the browser. `matter()` also parses
+ * private blocks like `internal:`, and the page ships `entry.frontmatter` into
+ * props — so we allowlist to keep them out of the page source. Keep in sync with
+ * `ChangelogEntryFrontmatter` in `changelog-repo.ts`.
+ */
+export const PUBLIC_FRONTMATTER_KEYS = [
+  'title',
+  'change_type',
+  'product_stage',
+  'affected_products',
+  'affects_self_hosted',
+  'version',
+  'public',
+  'publish_date',
+  'sunset_date',
+  'learn_more_url',
+  'legacy_gh_discussion',
+]
+
+const DATE_FRONTMATTER_KEYS = new Set(['publish_date', 'sunset_date'])
+
+/** Projects raw frontmatter to the public allowlist; date fields are stringified. */
+export function toPublicFrontmatter(frontmatter) {
+  const publicFrontmatter = {}
+  for (const key of PUBLIC_FRONTMATTER_KEYS) {
+    if (frontmatter[key] === undefined) continue
+    publicFrontmatter[key] = DATE_FRONTMATTER_KEYS.has(key)
+      ? toDateString(frontmatter[key])
+      : frontmatter[key]
+  }
+  return publicFrontmatter
+}
+
 export function stripInternalBlock(body) {
   let sanitized = body.replace(/<!--\s*internal\s*-->[\s\S]*?<!--\s*\/internal\s*-->/gi, '')
   // MDX doesn't support raw HTML comments (only {/* */}) — strip any that are left
@@ -105,6 +139,16 @@ function resolveDateFromFilename(filename) {
   return m ? `${m[1]}-${m[2]}-${m[3]}` : null
 }
 
+/**
+ * Coerces a frontmatter date to `YYYY-MM-DD`. An unquoted YAML date parses to a
+ * JS `Date`, which breaks the string sort and can't be serialized into props.
+ */
+function toDateString(value) {
+  if (value == null) return null
+  if (value instanceof Date) return value.toISOString().slice(0, 10)
+  return String(value)
+}
+
 /**
  * `legacy_gh_discussion-suffix` for backfilled entries
  * (preserves old supabase.com/changelog URLs)
@@ -128,8 +172,8 @@ export function parseChangelogEntryFile(filename, raw) {
   return {
     slug: computeChangelogEntrySlug(filename, frontmatter),
     filename,
-    frontmatter,
-    sortDate: frontmatter.publish_date ?? resolveDateFromFilename(filename) ?? '',
+    frontmatter: toPublicFrontmatter(frontmatter),
+    sortDate: toDateString(frontmatter.publish_date) ?? resolveDateFromFilename(filename) ?? '',
     summary: extractSection(publicBody, 'Summary'),
     bodySection: extractSection(publicBody, 'Body', ['Migration steps']),
     migrationSteps: extractSection(publicBody, 'Migration steps'),
diff --git a/apps/www/lib/changelog-entries-core.test.ts b/apps/www/lib/changelog-entries-core.test.ts
new file mode 100644
index 0000000000000..de0636c1eecb1
--- /dev/null
+++ b/apps/www/lib/changelog-entries-core.test.ts
@@ -0,0 +1,119 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  parseChangelogEntryFile,
+  PUBLIC_FRONTMATTER_KEYS,
+  toPublicFrontmatter,
+} from './changelog-entries-core.mjs'
+
+const ENTRY_WITH_INTERNAL = `---
+title: Supabase Pipelines
+change_type: new-feature
+public: true
+publish_date: 2026-01-01
+affected_products:
+  - pipelines
+internal:
+  escalation_teams:
+    - team-etl
+  notes: Do not ship this to the browser
+reviewers:
+  - alice
+---
+
+# Summary
+
+Pipelines are here.
+
+# Body
+
+Long form body.
+`
+
+describe('toPublicFrontmatter', () => {
+  it('keeps only allowlisted public keys', () => {
+    const publicFrontmatter = toPublicFrontmatter({
+      title: 'Hello',
+      change_type: 'new-feature',
+      internal: { escalation_teams: ['team-etl'] },
+      reviewers: ['alice'],
+      some_future_private_field: 'secret',
+    })
+
+    expect(publicFrontmatter).toEqual({ title: 'Hello', change_type: 'new-feature' })
+    for (const key of Object.keys(publicFrontmatter)) {
+      expect(PUBLIC_FRONTMATTER_KEYS).toContain(key)
+    }
+  })
+
+  it('omits keys whose value is undefined', () => {
+    expect(toPublicFrontmatter({ title: 'Hello', product_stage: undefined })).toEqual({
+      title: 'Hello',
+    })
+  })
+
+  it('normalizes Date-valued date fields to YYYY-MM-DD strings', () => {
+    const publicFrontmatter = toPublicFrontmatter({
+      title: 'Hello',
+      publish_date: new Date('2026-05-18T00:00:00.000Z'),
+      sunset_date: new Date('2026-08-05T00:00:00.000Z'),
+    }) as Record<string, unknown>
+
+    expect(publicFrontmatter.publish_date).toBe('2026-05-18')
+    expect(publicFrontmatter.sunset_date).toBe('2026-08-05')
+    expect(typeof publicFrontmatter.publish_date).toBe('string')
+  })
+})
+
+describe('parseChangelogEntryFile', () => {
+  it('never exposes the internal block on the parsed entry frontmatter', () => {
+    const entry = parseChangelogEntryFile('20260101-pipelines.md', ENTRY_WITH_INTERNAL)
+    // Untyped .mjs export, so `frontmatter` is inferred as {}.
+    const frontmatter = entry.frontmatter as Record<string, unknown>
+
+    expect(frontmatter.internal).toBeUndefined()
+    expect(frontmatter.reviewers).toBeUndefined()
+    expect(JSON.stringify(frontmatter)).not.toContain('team-etl')
+    expect(JSON.stringify(frontmatter)).not.toContain('escalation_teams')
+
+    expect(frontmatter.title).toBe('Supabase Pipelines')
+    expect(frontmatter.change_type).toBe('new-feature')
+    expect(frontmatter.public).toBe(true)
+    expect(frontmatter.affected_products).toEqual(['pipelines'])
+  })
+
+  it('always yields a string sortDate, even for an unquoted (Date-parsed) publish_date', () => {
+    const unquoted = parseChangelogEntryFile(
+      '20260722-unquoted.md',
+      `---\ntitle: Unquoted\nchange_type: improvement\npublic: true\npublish_date: 2026-05-18\n---\n\n# Body\n\nx\n`
+    )
+    expect(typeof unquoted.sortDate).toBe('string')
+    expect(unquoted.sortDate).toBe('2026-05-18')
+
+    const quoted = parseChangelogEntryFile(
+      '20260722-quoted.md',
+      `---\ntitle: Quoted\nchange_type: improvement\npublic: true\npublish_date: "2026-05-18"\n---\n\n# Body\n\nx\n`
+    )
+    expect(quoted.sortDate).toBe('2026-05-18')
+
+    // publish_date: null falls back to the filename date, also as a string.
+    const nullDate = parseChangelogEntryFile(
+      '20260722-null-date.md',
+      `---\ntitle: Null date\nchange_type: improvement\npublic: true\npublish_date: null\n---\n\n# Body\n\nx\n`
+    )
+    expect(nullDate.sortDate).toBe('2026-07-22')
+  })
+
+  it('normalizes date frontmatter reaching detail-page props, even when unquoted', () => {
+    // `[slug].tsx` ships `entry.frontmatter` into props; a Date would break serialization.
+    const entry = parseChangelogEntryFile(
+      '20260722-unquoted-dates.md',
+      `---\ntitle: Unquoted dates\nchange_type: deprecation\npublic: true\npublish_date: 2026-05-18\nsunset_date: 2026-08-05\n---\n\n# Body\n\nx\n`
+    )
+    const frontmatter = entry.frontmatter as Record<string, unknown>
+
+    expect(frontmatter.publish_date).toBe('2026-05-18')
+    expect(frontmatter.sunset_date).toBe('2026-08-05')
+    expect(() => JSON.stringify(entry.frontmatter)).not.toThrow()
+  })
+})
diff --git a/apps/www/lib/changelog.utils.ts b/apps/www/lib/changelog.utils.ts
index 0ed4870fffafe..513f69725af7c 100644
--- a/apps/www/lib/changelog.utils.ts
+++ b/apps/www/lib/changelog.utils.ts
@@ -27,6 +27,17 @@ export function toChangelogTimelineIndexItem(entry: ChangelogEntry): ChangelogTi
   }
 }
 
+/** Strips inline markdown from a title for plain-text contexts (`<title>`, meta, Open Graph). */
+export function stripTitleMarkdown(title: string) {
+  return title
+    .replace(/!?\[([^\]]*)\]\([^)]*\)/g, '$1') // links / images
+    .replace(/(\*\*|__)(.*?)\1/g, '$2')
+    .replace(/(\*|_)(.*?)\1/g, '$2')
+    .replace(/~~(.*?)~~/g, '$1')
+    .replace(/`+([^`]*)`+/g, '$1') // inline code
+    .trim()
+}
+
 const CHANGE_TYPE_BADGE_VARIANT: Record<
   ChangeType,
   'default' | 'warning' | 'success' | 'destructive'
diff --git a/apps/www/pages/changelog.tsx b/apps/www/pages/changelog.tsx
index 7a260e9664a28..d91c86e625d12 100644
--- a/apps/www/pages/changelog.tsx
+++ b/apps/www/pages/changelog.tsx
@@ -12,6 +12,7 @@ import { NuqsAdapter } from 'nuqs/adapters/next/pages'
 import { useEffect, useMemo, useState } from 'react'
 import { Badge, Button, cn, IconYCombinator, Input } from 'ui'
 
+import { ChangelogInlineMarkdown } from '@/components/Changelog/ChangelogInlineMarkdown'
 import { ChangelogLlmMarkdownButton } from '@/components/Changelog/ChangelogLlmMarkdownButton'
 import {
   ChangelogTimelineList,
@@ -63,7 +64,6 @@ export const getServerSideProps: GetServerSideProps<PageProps> = async ({ res })
   const entries = await getChangelogEntries()
   const allIndex = entries.map(toChangelogTimelineIndexItem)
   const firstEntries = entries.slice(0, FEATURED_COUNT)
-  const restIndex = allIndex.slice(FEATURED_COUNT)
 
   // Serialized independently so one entry's MDX failure doesn't drop the others.
   const featuredResults = await Promise.allSettled(
@@ -86,6 +86,11 @@ export const getServerSideProps: GetServerSideProps<PageProps> = async ({ res })
     return [result.value]
   })
 
+  // Anything not successfully featured falls back to the timeline, so a featured
+  // entry whose MDX failed to serialize doesn't vanish from the page.
+  const featuredSlugs = new Set(featured.map((entry) => entry.slug))
+  const restIndex = allIndex.filter((item) => !featuredSlugs.has(item.slug))
+
   res.setHeader('Cache-Control', 'public, max-age=900, stale-while-revalidate=900')
   return { props: { featured, restIndex, allIndex } }
 }
@@ -505,8 +510,8 @@ function ChangelogIndex({ featured, restIndex, allIndex }: PageProps) {
                         <div className="flex w-full flex-col gap-1">
                           {entry.title && (
                             <Link href={`/changelog/${entry.slug}`}>
-                              <h3 className="text-foreground text-lg hover:underline">
-                                {entry.title}
+                              <h3 className="text-foreground text-lg hover:underline [&_code]:align-middle">
+                                <ChangelogInlineMarkdown>{entry.title}</ChangelogInlineMarkdown>
                               </h3>
                             </Link>
                           )}
diff --git a/apps/www/pages/changelog/[slug].tsx b/apps/www/pages/changelog/[slug].tsx
index 98b144d9e495d..c27fd4281f270 100644
--- a/apps/www/pages/changelog/[slug].tsx
+++ b/apps/www/pages/changelog/[slug].tsx
@@ -6,9 +6,11 @@ import Head from 'next/head'
 import Link from 'next/link'
 
 import { ChangelogDetailSidebar } from '@/components/Changelog/ChangelogDetailSidebar'
+import { ChangelogInlineMarkdown } from '@/components/Changelog/ChangelogInlineMarkdown'
 import CTABanner from '@/components/CTABanner'
 import DefaultLayout from '@/components/Layouts/Default'
 import { getChangelogEntries, type ChangelogEntryFrontmatter } from '@/lib/changelog-repo'
+import { stripTitleMarkdown } from '@/lib/changelog.utils'
 import mdxComponents from '@/lib/mdx/mdxComponents'
 import { mdxSerialize } from '@/lib/mdx/mdxSerialize'
 
@@ -20,61 +22,66 @@ type PageProps = {
   source: MDXRemoteSerializeResult
 }
 
-const ChangelogDetailPage = ({ title, created_at, slug, frontmatter, source }: PageProps) => (
-  <>
-    <Head>
-      <link rel="alternate" type="text/markdown" href={`/changelog/${slug}.md`} />
-    </Head>
-    <NextSeo
-      title={`${title} · Changelog`}
-      description={title}
-      openGraph={{
-        title,
-        url: `https://supabase.com/changelog/${slug}`,
-        type: 'article',
-      }}
-    />
-    <DefaultLayout>
-      <div className="container mx-auto max-w-5xl px-4 py-10 sm:px-16 xl:px-20">
-        <nav
-          aria-label="Breadcrumb"
-          className="text-foreground-lighter mb-6 flex flex-wrap items-center gap-x-2 gap-y-1 text-sm"
-        >
-          <Link href="/changelog" className="text-foreground-lighter hover:underline">
-            Changelog
-          </Link>
-        </nav>
-        <header className="border-default mb-8 flex flex-col gap-2 border-b pb-6">
-          <h1 className="h1 text-2xl sm:text-3xl">{title}</h1>
-          <div className="flex items-center gap-2">
-            <p className="text-foreground-lighter font-mono text-xs">
-              {dayjs(created_at).format('MMM D, YYYY')}
-            </p>
-          </div>
-        </header>
-
-        <div className="grid grid-cols-1 gap-8 lg:grid-cols-12 lg:gap-10 mb-8 lg:mb-20">
-          <div className="min-w-0 lg:col-span-8">
-            <article className="prose prose-docs max-w-none wrap-break-word [&>*:first-child:not(style):not(script)]:mt-0 [&>style:first-child+*]:mt-0 [&>script:first-child+*]:mt-0 [&>*:last-child:not(style):not(script)]:mb-0">
-              {'error' in source ? (
-                <p>Error rendering changelog entry: {source.error.message}</p>
-              ) : (
-                <MDXClient {...source} components={mdxComponents('blog')} />
-              )}
-            </article>
-          </div>
+const ChangelogDetailPage = ({ title, created_at, slug, frontmatter, source }: PageProps) => {
+  const plainTitle = stripTitleMarkdown(title)
+  return (
+    <>
+      <Head>
+        <link rel="alternate" type="text/markdown" href={`/changelog/${slug}.md`} />
+      </Head>
+      <NextSeo
+        title={`${plainTitle} · Changelog`}
+        description={plainTitle}
+        openGraph={{
+          title: plainTitle,
+          url: `https://supabase.com/changelog/${slug}`,
+          type: 'article',
+        }}
+      />
+      <DefaultLayout>
+        <div className="container mx-auto max-w-5xl px-4 py-10 sm:px-16 xl:px-20">
+          <nav
+            aria-label="Breadcrumb"
+            className="text-foreground-lighter mb-6 flex flex-wrap items-center gap-x-2 gap-y-1 text-sm"
+          >
+            <Link href="/changelog" className="text-foreground-lighter hover:underline">
+              Changelog
+            </Link>
+          </nav>
+          <header className="border-default mb-8 flex flex-col gap-2 border-b pb-6">
+            <h1 className="h1 text-2xl sm:text-3xl [&_code]:align-middle">
+              <ChangelogInlineMarkdown>{title}</ChangelogInlineMarkdown>
+            </h1>
+            <div className="flex items-center gap-2">
+              <p className="text-foreground-lighter font-mono text-xs">
+                {dayjs(created_at).format('MMM D, YYYY')}
+              </p>
+            </div>
+          </header>
 
-          <aside className="border-default border-t pt-6 lg:col-span-4 lg:border-t-0 lg:pl-4 lg:pt-0">
-            <div className="thin-scrollbar lg:sticky lg:top-24 lg:max-h-[calc(100vh-8rem)] lg:overflow-y-auto">
-              <ChangelogDetailSidebar slug={slug} frontmatter={frontmatter} />
+          <div className="grid grid-cols-1 gap-8 lg:grid-cols-12 lg:gap-10 mb-8 lg:mb-20">
+            <div className="min-w-0 lg:col-span-8">
+              <article className="prose prose-docs max-w-none wrap-break-word [&>*:first-child:not(style):not(script)]:mt-0 [&>style:first-child+*]:mt-0 [&>script:first-child+*]:mt-0 [&>*:last-child:not(style):not(script)]:mb-0">
+                {'error' in source ? (
+                  <p>Error rendering changelog entry: {source.error.message}</p>
+                ) : (
+                  <MDXClient {...source} components={mdxComponents('blog')} />
+                )}
+              </article>
             </div>
-          </aside>
+
+            <aside className="border-default border-t pt-6 lg:col-span-4 lg:border-t-0 lg:pl-4 lg:pt-0">
+              <div className="thin-scrollbar lg:sticky lg:top-24 lg:max-h-[calc(100vh-8rem)] lg:overflow-y-auto">
+                <ChangelogDetailSidebar slug={slug} frontmatter={frontmatter} />
+              </div>
+            </aside>
+          </div>
         </div>
-      </div>
-      <CTABanner />
-    </DefaultLayout>
-  </>
-)
+        <CTABanner />
+      </DefaultLayout>
+    </>
+  )
+}
 
 export const getStaticPaths: GetStaticPaths = async () => {
   return { paths: [], fallback: 'blocking' }
@@ -86,7 +93,9 @@ export const getStaticProps: GetStaticProps<PageProps> = async ({ params }) => {
 
   const entries = await getChangelogEntries()
   const entry = entries.find((e) => e.slug === slug)
-  if (!entry) return { notFound: true }
+  // `revalidate` on notFound too, else Next.js caches the 404 forever — an entry
+  // requested before it went live would keep 404ing after publish.
+  if (!entry) return { notFound: true, revalidate: 900 }
 
   const source = await mdxSerialize(entry.bodySection)
 
diff --git a/apps/www/public/images/blog/observability-for-every-supabase-project-with-grafana-cloud/grafana-og.png b/apps/www/public/images/blog/observability-for-every-supabase-project-with-grafana-cloud/grafana-og.png
new file mode 100644
index 0000000000000..167afd9223082
Binary files /dev/null and b/apps/www/public/images/blog/observability-for-every-supabase-project-with-grafana-cloud/grafana-og.png differ
diff --git a/apps/www/public/images/blog/observability-for-every-supabase-project-with-grafana-cloud/grafana-thumb.png b/apps/www/public/images/blog/observability-for-every-supabase-project-with-grafana-cloud/grafana-thumb.png
new file mode 100644
index 0000000000000..b63043fe06f7e
Binary files /dev/null and b/apps/www/public/images/blog/observability-for-every-supabase-project-with-grafana-cloud/grafana-thumb.png differ