Bring changes from 'production' and fix conflict

Author: RebeccaTamachiro

package-lock.json

@@ -35,7 +35,7 @@
 		"@astrojs/starlight": "0.35.1",
 		"@astrojs/starlight-docsearch": "0.6.0",
 		"@astrojs/starlight-tailwind": "4.0.1",
-		"@cloudflare/vitest-pool-workers": "0.8.56",
+		"@cloudflare/vitest-pool-workers": "0.8.57",
 		"@cloudflare/workers-types": "4.20250718.0",
 		"@codingheads/sticky-header": "1.0.2",
 		"@expressive-code/plugin-collapsible-sections": "0.41.3",
@@ -57,7 +57,7 @@
 		"@types/react-dom": "19.0.4",
 		"@typescript-eslint/parser": "8.38.0",
 		"algoliasearch": "5.34.1",
-		"astro": "5.12.0",
+		"astro": "5.12.3",
 		"astro-breadcrumbs": "3.3.1",
 		"astro-icon": "1.1.5",
 		"astro-live-code": "0.0.6",

package.json

@@ -956,7 +956,7 @@
 /load-balancing/local-traffic-management/ltm-magic-wan/ /load-balancing/private-network/magic-wan/ 301
 
 # logs
-/logs/log-fields/ /logs/reference/log-fields/ 301
+/logs/log-fields/ /logs/logpush/logpush-job/datasets/ 301
 /logs/logpull-api/ /logs/logpull/ 301
 /logs/logpull-api/requesting-logs/ /logs/logpull/requesting-logs/ 301
 /logs/logpush/aws-s3/ /logs/logpush/logpush-job/enable-destinations/aws-s3/ 301
@@ -2142,6 +2142,7 @@
 /cloudflare-one/policies/filtering/enforce-sessions/ /cloudflare-one/connections/connect-devices/warp/configure-warp/warp-sessions/ 301
 /cloudflare-one/policies/zero-trust/policy-management/ /cloudflare-one/policies/access/policy-management/ 301
 /cloudflare-one/policies/filtering/dns-policies-builder/ /cloudflare-one/policies/gateway/dns-policies/ 301
+/cloudflare-one/policies/gateway/http-policies/websocket/ /cloudflare-one/policies/gateway/http-policies/common-policies/#filter-websocket-traffic 301
 /cloudflare-one/cloudflare-teams-roles-permissions/ /cloudflare-one/roles-permissions/ 301
 /cloudflare-one/technical-limitations/ /cloudflare-one/account-limits/ 301
 /support/traffic/argo-tunnel/ /cloudflare-one/connections/connect-networks/ 301
@@ -2215,6 +2216,7 @@
 /fundamentals/setup/manage-domains/* /fundamentals/manage-domains/:splat 301
 /fundamentals/setup/manage-members/* /fundamentals/manage-members/:splat 301
 /logs/get-started/enable-destinations/* /logs/logpush/logpush-job/enable-destinations/:splat 301
+/logs/reference/log-fields/* /logs/logpush/logpush-job/datasets/:splat 301 
 
 # Cloudflare One / Zero Trust
 /cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/local/as-a-service/* /cloudflare-one/connections/connect-networks/configure-tunnels/local-management/as-a-service/:splat 301

public/__redirects

@@ -8,6 +8,6 @@ date: 2025-01-15
 Only available on Enterprise plans.
 :::
 
-Cloudflare now allows you to send SSH command logs to storage destinations configured in [Logpush](/logs/logpush/), including third-party destinations. Once exported, analyze and audit the data as best fits your organization! For a list of available data fields, refer to the [SSH logs dataset](/logs/reference/log-fields/account/ssh_logs/).
+Cloudflare now allows you to send SSH command logs to storage destinations configured in [Logpush](/logs/logpush/), including third-party destinations. Once exported, analyze and audit the data as best fits your organization! For a list of available data fields, refer to the [SSH logs dataset](/logs/logpush/logpush-job/datasets/account/ssh_logs/).
 
 To set up a Logpush job, refer to [Logpush integration](/cloudflare-one/insights/logs/logpush/).

src/assets/images/log-explorer/expressions.png

@@ -4,7 +4,7 @@ description: User action logs for Remote Browser Isolation
 date: 2025-03-04
 ---
 
-We're excited to announce that new logging capabilities for [Remote Browser Isolation (RBI)](/cloudflare-one/policies/browser-isolation/) through [Logpush](/logs/reference/log-fields/account/) are available in Beta starting today!
+We're excited to announce that new logging capabilities for [Remote Browser Isolation (RBI)](/cloudflare-one/policies/browser-isolation/) through [Logpush](/logs/logpush/logpush-job/datasets/account/) are available in Beta starting today!
 
 With these enhanced logs, administrators can gain visibility into end user behavior in the remote browser and track blocked data extraction attempts, along with the websites that triggered them, in an isolated session.
 

src/assets/images/log-explorer/not.png

@@ -10,4 +10,4 @@ You can now run your Browser Rendering locally using `npx wrangler dev`, which s
 
 ![Local Dev video](~/assets/images/browser-rendering//localshorterbrowserrendering.gif)
 
-Get started with this [example guide](/browser-rendering/workers-bindings/screenshots/) that shows how to use Cloudflare's [fork of Puppeteer](/browser-rendering/platform/puppeteer/) to take screenshots of webpages and store the results in [Workers KV](/kv/).
+Get started with this [example guide](/browser-rendering/workers-bindings/screenshots/) that shows how to use Cloudflare's [fork of Puppeteer](/browser-rendering/platform/puppeteer/) (you can also use [Playwright](/browser-rendering/platform/playwright/)) to take screenshots of webpages and store the results in [Workers KV](/kv/).