Skip to content

Commit 5123bc9

Browse files
authored
Merge pull request #299010 from MicrosoftDocs/main
Publish to live, Tuesday 4 AM PST, 4/29
2 parents f1737e2 + fa6c953 commit 5123bc9

File tree

8 files changed

+72
-25
lines changed

8 files changed

+72
-25
lines changed

articles/defender-for-iot/organizations/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
href: appliance-catalog/dell-poweredge-r360-e1800.md
340340
- name: Production line
341341
items:
342-
- name: Heptagon YB3x
342+
- name: Heptagon Systems YB3x
343343
href: appliance-catalog/heptagon-yb3x.md
344344
- name: HPE ProLiant DL20 Gen11 Plus (NHP 2LFF)
345345
href: appliance-catalog/hpe-proliant-dl20-gen-11-nhp-2lff.md

articles/defender-for-iot/organizations/appliance-catalog/heptagon-yb3x.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: Heptagon YB3x for OT monitoring in L100 deployments - Microsoft Defender for IoT
3-
description: Learn about the YB3x appliance when used for OT monitoring with Microsoft Defender for IoT in L100 deployments.
2+
title: Heptagon Systems YB3x for OT monitoring in L100 deployments - Microsoft Defender for IoT
3+
description: Learn about the Heptagon Systems YB3x appliance when used for OT monitoring with Microsoft Defender for IoT in L100 deployments.
44
ms.date: 04/01/2024
55
ms.topic: reference
66
---
77

8-
# Heptagon YB3x
8+
# Heptagon Systems YB3x
99

10-
This article describes the **Heptagon YB3x** appliance deployment and installation for OT sensors.
10+
This article describes the **Heptagon Systems YB3x** appliance deployment and installation for OT sensors.
1111

1212
| Appliance characteristic |Details |
1313
|---------|---------|
@@ -16,9 +16,9 @@ This article describes the **Heptagon YB3x** appliance deployment and installati
1616
|**Physical specifications** | Ports: 6 x 1-GbE ports|
1717
|**Status** | Supported, available as preconfigured |
1818

19-
The following image shows a view of the Heptagon YB3x front panel:
19+
The following image shows a view of the Heptagon Systems YB3x front panel:
2020

21-
:::image type="content" source="media/yb3x.png" alt-text="Picture of the front view of the Heptagon YB3x." border="false":::
21+
:::image type="content" source="media/yb3x.png" alt-text="Picture of the front view of the Heptagon Systems YB3x." border="false":::
2222

2323
## Specifications
2424

@@ -40,7 +40,7 @@ The following image shows a view of the Heptagon YB3x front panel:
4040
|Safety |IEC 60950-1, AS/NZS |
4141
|EMC |CE, FCC, AS/NZS |
4242

43-
## Heptagon YB3x - Bill of Materials
43+
## Heptagon Systems YB3x - Bill of Materials
4444

4545
|Description| PN|Quantity|
4646
|--------------|--------------|---------|
@@ -50,9 +50,9 @@ The following image shows a view of the Heptagon YB3x front panel:
5050
|8 GB 2,666 MT/s DDR4 ECC Reg CL19 DIMM 1Rx8 Hynix D IDT | KSM26RS8/8HDI | 2|
5151
|Power supply, 110-220 VAC to 12 VDC, 100 W, IP 67, Industrial temp | PS100-12-IP67 | 1 |
5252

53-
## Heptagon YB3x software setup
53+
## Heptagon Systems YB3x software setup
5454

55-
This procedure describes how to install Defender for IoT software on the Heptagon YB3x. The installation process takes about 20 minutes. After the installation, the system restarts several times.
55+
This procedure describes how to install Defender for IoT software on the Heptagon Systems YB3x. The installation process takes about 20 minutes. After the installation, the system restarts several times.
5656

5757
To install Defender for IoT software:
5858

articles/defender-for-iot/organizations/appliance-catalog/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ landingContent:
4444
linkLists:
4545
- linkListType: deploy
4646
links:
47-
- text: Heptagon YB3x
47+
- text: Heptagon Systems YB3x
4848
url: heptagon-yb3x.md
4949
- text: HPE ProLiant DL20 Gen11 Plus (NHP 2LFF)
5050
url: hpe-proliant-dl20-gen-11-nhp-2lff.md

articles/migrate/toc.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ items:
2222
- name: Supported Geographies
2323
href: supported-geographies.md
2424
- name: Security baseline
25-
href: /security/benchmark/azure/baselines/azure-migrate-security-baseline
25+
href: /security/benchmark/azure/baselines/azure-migrate-security-baseline?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
2626
- name: Requirements for Private endpoints # Explain about private end points and support requirements
2727
href: how-to-use-azure-migrate-with-private-endpoints.md
2828
- name: Support Matrix
@@ -34,7 +34,7 @@ items:
3434
- name: Discover VMware estate
3535
href: ./vmware/tutorial-discover-vmware.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
3636
- name: Scoped discovery of VMware estate
37-
href: set-discovery-scope.md
37+
href: ./vmware/set-discovery-scope.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
3838
- name: Discover Hyper-v estate
3939
href: tutorial-discover-hyper-v.md
4040
- name: Discover physical servers and servers running in AWS and GCP
@@ -150,15 +150,15 @@ items:
150150
- name: Server Migrations
151151
items:
152152
- name: Overview of Migration method
153-
href: server-migrate-overview.md
153+
href: ./vmware/server-migrate-overview.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
154154
- name: Agent-based migrations
155155
items:
156156
- name: Agent-based migration using portal
157157
href: ./vmware/tutorial-migrate-vmware-agent.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
158158
- name: Agentless migrations
159159
items:
160160
- name: Agentless migrations using portal
161-
href: vmware/tutorial-migrate-vmware.md
161+
href: ./vmware/tutorial-migrate-vmware.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
162162
- name: Agentless migrations using scripts
163163
href: ./vmware/tutorial-migrate-vmware-powershell.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
164164
# - name: Limitations
@@ -187,15 +187,15 @@ items:
187187
- name: Migrate to Azure Cloud
188188
href: ./vmware/tutorial-migrate-vmware.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
189189
- name: Migrate to Azure Local
190-
href: /azure/azure-local/migrate/migration-azure-migrate-vmware-overview?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
190+
href: /azure/azure-local/migrate/migration-azure-migrate-vmware-overview.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
191191
- name: Migrate Hyper-V servers
192192
items:
193193
# - name: Create Business case and assessment
194194
# href: tutorial-assess-hyper-v.md
195195
- name: Migrate to Azure Cloud
196196
href: tutorial-migrate-hyper-v.md
197197
- name: Migrate to Azure Local
198-
href: /azure/azure-local/migrate/migration-azure-migrate-overview?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
198+
href: /azure/azure-local/migrate/migration-azure-migrate-overview.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
199199
- name: Migrate physical servers
200200
items:
201201
- name: Create Business case and assessment
@@ -246,8 +246,6 @@ items:
246246
href: tutorial-app-containerization-java-app-service.md
247247
- name: Modernize ASP.NET web apps to App Service code
248248
href: tutorial-modernize-asp-net-appservice-code.md
249-
- name: Modernize ASP.NET web apps to AKS
250-
href: tutorial-modernize-asp-net-aks.md
251249
- name: CI/CD for Day 2 operations
252250
href: tutorial-app-containerization-azure-pipeline.md
253251
- name: How-to
@@ -270,8 +268,6 @@ items:
270268
href: how-to-set-up-appliance-physical.md
271269
- name: Deploy appliance in Azure Government
272270
href: deploy-appliance-script-government.md
273-
- name: Limit discovery scope for servers in VMware environment
274-
href: set-discovery-scope.md
275271
- name: Create least privilege credentials for SQL Server discovery
276272
href: least-privilege-credentials.md
277273
- name: Enable Arc on discovered items
@@ -300,7 +296,7 @@ items:
300296
# - name: Scale assessment
301297
items:
302298
- name: Assess large number of servers in VMware environment
303-
href: scale-vmware-assessment.md
299+
href: ./vmware/scale-vmware-assessment.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
304300
- name: Assess large number of servers in Hyper-V environment
305301
href: scale-hyper-v-assessment.md
306302
- name: Assess large numbers of physical servers
@@ -314,7 +310,7 @@ items:
314310
- name: Prepare Windows 2003 servers for migration
315311
href: prepare-windows-server-2003-migration.md
316312
- name: Migrate VMware VMs to encrypted Azure VMs
317-
href: how-to-migrate-vmware-vms-with-cmk-disks.md
313+
href: ./vmware/how-to-migrate-vmware-vms-with-cmk-disks.md?toc=/azure/migrate/toc.json&bc=/azure/migrate/breadcrumb/toc.json
318314
- name: Test migration
319315
href: how-to-test-replicating-virtual-machines.md
320316
- name: Upgrade Windows OS

articles/site-recovery/replication-appliance-support-matrix.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Support requirements for Azure Site Recovery replication appliance
33
description: This article describes support and requirements when deploying the replication appliance for VMware disaster recovery to Azure with Azure Site Recovery - Modernized
44
ms.service: azure-site-recovery
55
ms.topic: faq
6-
ms.date: 04/23/2025
6+
ms.date: 04/29/2025
77
ms.author: ankitadutta
88
author: ankitaduttaMSFT
99
---
@@ -37,7 +37,7 @@ Number of disks | 2, including the OS disk - 80 GB and a data disk - 620 GB
3737

3838
**Component** | **Requirement**
3939
--- | ---
40-
Operating system | Windows Server 2022
40+
Operating system | Windows Server 2022 <br><br> **Note**: <br> - Windows Server 2019 appliances will continue to receive software updates. <br> - Upgrading OS on existing Windows server 2019 appliances to Windows Server 2022 is not supported.
4141
Operating system locale | English (en-*)
4242
Windows Server roles | Don't enable these roles: <br> - Active Directory Domain Services <br>- Internet Information Services <br> - Hyper-V
4343
Group policies | Don't enable these group policies: <br> - Prevent access to the command prompt. <br> - Prevent access to registry editing tools. <br> - Trust logic for file attachments. <br> - Turn on Script Execution. <br> [Learn more](/previous-versions/windows/it-pro/windows-7/gg176671(v=ws.10))
@@ -53,6 +53,7 @@ FIPS (Federal Information Processing Standards) | Don't enable FIPS mode|
5353
|NIC type | VMXNET3 (if the appliance is a VMware VM)|
5454
|NAT | Supported |
5555

56+
5657
>[!NOTE]
5758
> To support communication between source machines and replication appliance using multiple subnets, you should select FQDN as the mode of connectivity during the appliance setup. This will allow source machines to use FQDN, along with a list of IP addresses, to communicate with replication appliance.
5859
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
title: Azure Front Door Web Application Firewall CAPTCHA (preview)
3+
description: Learn about the CAPTCHA feature in Azure Front Door Web Application Firewall (WAF) and how it helps protect your web applications from automated attacks.
4+
author: halkazwini
5+
ms.author: halkazwini
6+
ms.service: azure-web-application-firewall
7+
ms.topic: concept-article
8+
ms.date: 04/29/2025
9+
10+
---
11+
12+
# Azure Front Door Web Application Firewall CAPTCHA (preview)
13+
14+
> [!IMPORTANT]
15+
> Web Application Firewall CAPTCHA on Azure Frond Door is currently in PREVIEW. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
16+
17+
Azure Web Application Firewall (WAF) offers a CAPTCHA feature designed to differentiate human users from automated bots. This interactive challenge requires suspected traffic to complete a CAPTCHA test, blocking malicious automated requests while allowing legitimate users to proceed seamlessly. As a result, WAF helps protect applications from bot-driven attacks, including brute-force attempts and account takeover risks.
18+
19+
CAPTCHA on Azure WAF is useful in login and sign-up flows where human authentication is crucial to protect sensitive user data. It acts as a strong defense against various automated threats, preventing bots from accessing critical website elements like login pages and forms, and reducing spam by ensuring only real users can submit comments, register accounts, or complete transactions.
20+
21+
Incorporating CAPTCHA into Azure WAF not only enhances security but also minimizes friction for legitimate users. This balance strengthens the overall protection of web applications against sophisticated automated threats.
22+
23+
## How it works
24+
25+
When the CAPTCHA challenge is active on Azure WAF, any client's HTTP(s) request matches a specific rule prompts an interactive Microsoft CAPTCHA page. This challenge requires user participation to verify they're human before their request is validated by Azure WAF. Upon successful completion, WAF recognizes the request as originating from a legitimate user, and proceeds with standard rule processing. Requests that fail to complete the challenge are blocked, thus preventing automated bots from accessing protected resources.
26+
27+
:::image type="content" source="../media/captcha-challenge/browser-captcha.png" alt-text="Screenshot of Web Application Firewall CAPTCHA in the browser.":::
28+
29+
30+
## Expiration
31+
32+
The WAF **Policy settings** define the CAPTCHA challenge cookie validity lifetime in minutes, determining how long a user remains validated before facing a new challenge. Once the lifetime expires, the user must complete the CAPTCHA challenge again to verify their identity. The lifetime is configurable between 5 and 1,440 minutes, with a default setting of 30 minutes. The CAPTCHA challenge cookie name is `afd_azwaf_captcha` on Azure Front Door.
33+
34+
> [!NOTE]
35+
> The CAPTCHA challenge expiration cookie is injected into the user’s browser after successfully completing the challenge.
36+
37+
## Limitations
38+
39+
- **Mobile Apps**: Not supported.
40+
41+
- **AJAX and API calls aren't supported**: CAPTCHA verification doesn't apply to AJAX and API requests.
42+
43+
- **POST body size restriction**: The first request that triggers a CAPTCHA challenge will be blocked if its POST body exceeds 128 KB.
44+
45+
- **Non-HTML embedded resources**: CAPTCHA is designed for HTML resources. Placing CAPTCHA in front of non-HTML resources, such as images, CSS, or JavaScript files, may likely result in issues with content loading and rendering.
46+
47+
- **Browser compatibility**: CAPTCHA isn't supported on Microsoft Internet Explorer. It's compatible with the latest versions of Microsoft Edge, Chrome, Firefox, and Safari.
48+
20.9 KB
Loading

articles/web-application-firewall/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ items:
184184
href: waf-copilot.md
185185
- name: JavaScript challenge
186186
href: waf-javascript-challenge.md
187+
- name: CAPTCHA challenge
188+
href: ./afds/captcha-challenge.md
187189
- name: Operational excellence
188190
items:
189191
- name: Application Gateway

0 commit comments

Comments
 (0)