Skip to content

Commit b5dbac4

Browse files
maxvpmaxvp
authored
Merge branch 'production' into max/gw/update-http-selectors
2 parents 72de36f + 433eee2 commit b5dbac4

File tree

80 files changed

+1492
-998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1492
-998
lines changed

‎package-lock.json‎

Lines changed: 179 additions & 298 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
"@stoplight/json-schema-tree": "^4.0.0",
3737
"@types/dompurify": "^3.0.5",
3838
"@types/he": "^1.2.3",
39-
"@types/node": "^22.8.4",
39+
"@types/node": "^22.8.6",
4040
"@types/react": "^18.3.12",
4141
"@types/react-dom": "^18.3.1",
4242
"algoliasearch": "^5.12.0",
43-
"astro": "^4.16.7",
43+
"astro": "^4.16.8",
4444
"astro-breadcrumbs": "^3.2.0",
4545
"astro-icon": "^1.1.1",
4646
"astro-live-code": "^0.0.3",
@@ -62,7 +62,7 @@
6262
"playwright": "^1.48.2",
6363
"prettier": "^3.3.3",
6464
"prettier-plugin-astro": "^0.14.1",
65-
"puppeteer": "^23.6.0",
65+
"puppeteer": "^23.6.1",
6666
"react": "^18.3.1",
6767
"react-dom": "^18.3.1",
6868
"react-textarea-autosize": "^8.5.4",

‎public/_redirects‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,22 +298,30 @@
298298
# data loss prevention (dlp)
299299
/cloudflare-one/policies/data-loss-prevention/integration-profiles/ /cloudflare-one/policies/data-loss-prevention/dlp-profiles/integration-profiles/ 301
300300
/cloudflare-one/policies/data-loss-prevention/dlp-logs/ /cloudflare-one/policies/data-loss-prevention/dlp-policies/ 301
301+
/cloudflare-one/policies/data-loss-prevention/dlp-policies/payload-logging/ /cloudflare-one/policies/data-loss-prevention/dlp-policies/logging-options/#log-the-payload-of-matched-rules 301
301302
/cloudflare-one/policies/data-loss-prevention/exact-data-match/ /cloudflare-one/policies/data-loss-prevention/datasets/ 301
302303

303304
# ddos-protection
304305
/ddos-protection/change-log/http/2022-09-19-emergency-emergency/ /ddos-protection/change-log/http/2022-09-19-emergency/
305306
/ddos-protection/change-log/http/2022-12-07-emergency-emergency/ /ddos-protection/change-log/http/2022-12-07-emergency/
306-
/ddos-protection/managed-rulesets/tcp-protection/ /ddos-protection/tcp-protection/ 301
307307
/ddos-protection/managed-rulesets/http/location-aware-protection/ /ddos-protection/managed-rulesets/adaptive-protection/ 301
308308
/ddos-protection/managed-rulesets/network/fields/ /ddos-protection/managed-rulesets/network/override-expressions/ 301
309309
/support/about-cloudflare/attack-preparation-and-response/responding-to-ddos-attacks/ /ddos-protection/best-practices/respond-to-ddos-attacks/ 301
310310
/support/about-cloudflare/attack-preparation-and-response/understanding-cloudflare-ddos-protection/ /ddos-protection/about/ 301
311311
/ddos-protection/change-log/global-changes/ /ddos-protection/change-log/general-updates/ 301
312-
# Redirect the following pages temporarily (using HTTP 307 Temporary redirect)
313-
/ddos-protection/dns-protection/rule-settings/ /ddos-protection/dns-protection/ 307
314-
/ddos-protection/dns-protection/api/ /ddos-protection/dns-protection/ 307
315-
/ddos-protection/dns-protection/api/examples/ /ddos-protection/dns-protection/ 307
316-
/ddos-protection/dns-protection/api/json-objects/ /ddos-protection/dns-protection/ 307
312+
/ddos-protection/tcp-protection/api/examples/ /ddos-protection/advanced-ddos-systems/api/tcp-protection/examples/ 301
313+
/ddos-protection/tcp-protection/api/json-objects/ /ddos-protection/advanced-ddos-systems/api/tcp-protection/json-objects/ 301
314+
/ddos-protection/tcp-protection/concepts/ /ddos-protection/advanced-ddos-systems/concepts/ 301
315+
/ddos-protection/tcp-protection/how-to/add-prefix-allowlist/ /ddos-protection/advanced-ddos-systems/how-to/add-prefix-allowlist/ 301
316+
/ddos-protection/tcp-protection/how-to/add-prefix/ /ddos-protection/advanced-ddos-systems/how-to/add-prefix/ 301
317+
/ddos-protection/tcp-protection/how-to/create-filter/ /ddos-protection/advanced-ddos-systems/how-to/create-filter/ 301
318+
/ddos-protection/tcp-protection/how-to/exclude-prefix/ /ddos-protection/advanced-ddos-systems/how-to/exclude-prefix/ 301
319+
/ddos-protection/tcp-protection/how-to/ /ddos-protection/advanced-ddos-systems/how-to/ 301
320+
/ddos-protection/tcp-protection/ /ddos-protection/advanced-ddos-systems/overview/advanced-tcp-protection/ 301
321+
/ddos-protection/tcp-protection/mitigation-reasons/ /ddos-protection/advanced-ddos-systems/overview/advanced-tcp-protection/mitigation-reasons/ 301
322+
/ddos-protection/tcp-protection/rule-settings/ /ddos-protection/advanced-ddos-systems/rule-settings/ 301
323+
/ddos-protection/dns-protection/ /ddos-protection/advanced-ddos-systems/overview/advanced-dns-protection/ 301
324+
/ddos-protection/tcp-protection/api/ /ddos-protection/advanced-ddos-systems/api/ 301
317325

318326
# dmarc-management
319327
/dmarc-management/manage-sources/ /dmarc-management/ 301

‎src/components/Glossary.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ const INITIAL_VISIBLE_ROWS = 20;
9393
if (rows.length === 0) {
9494
button?.classList.add("hidden");
9595
}
96-
const extraRows = Array.from(rows).slice(0, 5);
96+
const extraRows = Array.from(rows).slice(0, 20);
9797

9898
extraRows.forEach((row) => row.classList.remove("hidden"));
9999
}

‎src/content/changelogs/magic-transit.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
link: "/magic-wan/changelog/"
3+
productName: Magic WAN
4+
productLink: "/magic-wan/"
5+
productArea: Cloudflare One
6+
productAreaLink: /cloudflare-one/changelog/
7+
entries:
8+
- publish_date: "2024-10-01"
9+
title: Early access testing for BGP on CNI 2.0 circuits
10+
description: |-
11+
Customers can exchange routes dynamically with their Magic virtual network overlay via Direct CNI or Cloud CNI based connectivity.

‎src/content/changelogs/magic-wan.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ productLink: "/magic-wan/"
55
productArea: Cloudflare One
66
productAreaLink: /cloudflare-one/changelog/
77
entries:
8+
- publish_date: "2024-10-01"
9+
title: Early access testing for BGP on CNI 2.0 circuits
10+
description: |-
11+
Customers can exchange routes dynamically with their Magic virtual network overlay via Direct CNI or Cloud CNI based connectivity.
812
- publish_date: "2024-09-27"
913
title: Magic WAN Connector sends WARP client traffic to Internet
1014
description: |-

‎src/content/changelogs/network-interconnect.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ productLink: "/network-interconnect/"
55
productArea: Cloudflare One
66
productAreaLink: /cloudflare-one/changelog/
77
entries:
8+
- publish_date: "2024-10-01"
9+
title: Early access testing for BGP on CNI 2.0 circuits
10+
description: |-
11+
Customers can exchange routes dynamically with their Magic virtual network overlay via Direct CNI or Cloud CNI based connectivity.
812
- publish_date: "2024-09-02"
913
title: Interconnect portal displays all available locations in a list
1014
description: |-

‎src/content/docs/analytics/graphql-api/migration-guides/network-analytics-v2/index.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,6 @@ The following example queries the top 20 logs of traffic dropped by mitigation s
113113
The `mitigationSystem` field can take one the following values:
114114

115115
* `dosd` for [DDoS managed rulesets](/ddos-protection/managed-rulesets/) (Network-layer DDoS Attack Protection or HTTP DDoS Attack Protection).
116-
* `flowtrackd` for [Advanced TCP Protection](/ddos-protection/tcp-protection/).
116+
* `flowtrackd` for [Advanced TCP Protection](/ddos-protection/advanced-ddos-systems/overview/advanced-tcp-protection/).
117117
* `magic-firewall` for [Magic Firewall](/magic-firewall/).
118118
* Empty string for unmitigated traffic.

‎src/content/docs/analytics/network-analytics/understand/main-dashboard.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ The following table contains a summary of what is shown in each tab:
2525
| --------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
2626
| **All traffic** | Traffic dropped by DDoS managed rules, Advanced TCP Protection, Advanced DNS Protection, and Magic Firewall, and traffic passed to the origin server. | Traffic dropped and passed by DDoS managed rules. |
2727
| **DDoS managed <br/>rules** | Traffic dropped and passed by [DDoS managed rules](/ddos-protection/managed-rulesets/). | Traffic dropped and passed by [DDoS managed rules](/ddos-protection/managed-rulesets/). |
28-
| **TCP <br/>Protection** | Traffic dropped and passed by the [Advanced TCP Protection](/ddos-protection/tcp-protection/) system. Does not include traffic dropped by DDoS managed rules. | N/A |
29-
| **DNS <br/>Protection** | Traffic dropped and passed by the [Advanced DNS Protection](/ddos-protection/dns-protection/) system. Does not include traffic dropped by DDoS managed rules. | N/A |
28+
| **TCP <br/>Protection** | Traffic dropped and passed by the [Advanced TCP Protection](/ddos-protection/advanced-ddos-systems/overview/advanced-tcp-protection/) system. Does not include traffic dropped by DDoS managed rules. | N/A |
29+
| **DNS <br/>Protection** | Traffic dropped and passed by the [Advanced DNS Protection](/ddos-protection/advanced-ddos-systems/overview/advanced-dns-protection/) system. Does not include traffic dropped by DDoS managed rules. | N/A |
3030
| **Magic Firewall** | Traffic dropped by [Magic Firewall](/magic-firewall/) and traffic passed to the origin server. Does not include traffic dropped by DDoS managed rules, Advanced TCP Protection, or Advanced DNS Protection. | N/A |
3131

3232

‎src/content/docs/api-shield/management-and-monitoring/api-routing/index.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pcx_content_type: how-to
33
type: overview
44
title: API Routing
55
sidebar:
6-
order: 2
6+
order: 3
77

88
---
99

0 commit comments

Comments
 (0)