Skip to content

Commit bfc88ed

Browse files
TaojunshenTaojunshen
authored
Merge pull request #289562 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 46d37a1 + ce94982 commit bfc88ed

20 files changed

+277
-18
lines changed

‎articles/app-service/configure-language-dotnetcore.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ az webapp config set --name <app-name> --resource-group <resource-group-name> --
7272

7373
## Customize build automation
7474

75+
> [!NOTE]
76+
> Building .NET 9 (STS) apps with Windows App Service using MSBuild or SCM_DO_BUILD is not yet supported. Support for these build scenarios will come after the initial GA date and by December 4th, 2024. Deployments that build outside of App Service through Visual Studio, Visual Studio Code, GitHub Actions and Azure DevOps are fully supported.
77+
7578
If you deploy your app using Git, or zip packages [with build automation enabled](deploy-zip.md#enable-build-automation-for-zip-deploy), the App Service build automation steps through the following sequence:
7679

7780
1. Run custom script if specified by `PRE_BUILD_SCRIPT_PATH`.

‎articles/app-service/quickstart-dotnetcore.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ Alternatively, you can deploy an ASP.NET web app as part of a [Windows or Linux
4444
> [!TIP]
4545
> Find GitHub Copilot tips in the Visual Studio, Visual Studio Code, and Azure portal steps.
4646
47+
> [!NOTE]
48+
> Building .NET 9 (STS) apps with Windows App Service using MSBuild or SCM_DO_BUILD is not yet supported. Support for these build scenarios will come after the initial GA date and by December 4th, 2024. Deployments that build outside of App Service through Visual Studio, Visual Studio Code, GitHub Actions and Azure DevOps are fully supported.
49+
4750
## Prerequisites
4851

4952
:::zone target="docs" pivot="development-environment-vs"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,8 @@
373373
href: appliance-catalog/dell-poweredge-r360-e1800.md
374374
- name: Production line
375375
items:
376+
- name: Heptagon YB3x
377+
href: appliance-catalog/heptagon-yb3x.md
376378
- name: HPE ProLiant DL20 Gen11 Plus (NHP 2LFF)
377379
href: appliance-catalog/hpe-proliant-dl20-gen-11-nhp-2lff.md
378380
- name: DELL XE4 SFF

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

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
---
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.
4+
ms.date: 04/01/2024
5+
ms.topic: reference
6+
---
7+
8+
# Heptagon YB3x
9+
10+
This article describes the **Heptagon YB3x** appliance deployment and installation for OT sensors.
11+
12+
| Appliance characteristic |Details |
13+
|---------|---------|
14+
|**Hardware profile** | L100 |
15+
|**Performance** | Max bandwidth: 20-25 Mbps <br> Max devices: 200 |
16+
|**Physical specifications** | Ports: 6 x 1-GbE ports|
17+
|**Status** | Supported, available as preconfigured |
18+
19+
The following image shows a view of the Heptagon YB3x front panel:
20+
21+
:::image type="content" source="media/yb3x.png" alt-text="Picture of the front view of the Heptagon YB3x." border="false":::
22+
23+
## Specifications
24+
25+
|Component|Technical specifications|
26+
|----|----|
27+
|Construction |Fanless cooling |
28+
|Dimensions |1U, 209x187x37.5mm |
29+
|Weight | 1.1 kg |
30+
|CPU |Intel C3708 – 8 cores |
31+
|Memory |16 GB |
32+
|Storage |500 GB |
33+
|Network controller |Intel I210, Intel x553 |
34+
|Device access | 4x USB 3.0, TPM 2.0, 2x Serial ports |
35+
|Power Adapter |12 VDC or optional 9-28 VDC with reverse polarity, <br>Over/under voltage protection |
36+
|BMC |BMC AST2600, OpenBMC, IPMI 2.0, iKVM, Virtual Media |
37+
|Temperature |-40 °C to +75 °C |
38+
|Humidity |95% @ 40°C (noncondensing) |
39+
|Shock & Vibration | ETSI standard ETS 300 019-1-5, 5M2 |
40+
|Safety |IEC 60950-1, AS/NZS |
41+
|EMC |CE, FCC, AS/NZS |
42+
43+
## Heptagon YB3x - Bill of Materials
44+
45+
|Description| PN|Quantity|
46+
|--------------|--------------|---------|
47+
|CPU: Atom-C3708, 8C, 16 MB Cache, 1.7Ghz, 17 W, Embedded/Ind. Temp <br> DRAM - Not installed <br> COMM1: COM-4X1: Quad 1G Base-T <br> COMM2: No Comm Module <br> BMC: BMC, based on Aspeed AST2600, with Display port video |YB3708-0-4T0B |1|
48+
|500G NV2 M.2 2280 PCIe 4.0 NVMe SSD |SNV2S/500G |1 |
49+
|Intel X710 Dual Port 10 GbE SFP+ Adapter | 540-BDQZ |1|
50+
|8 GB 2,666 MT/s DDR4 ECC Reg CL19 DIMM 1Rx8 Hynix D IDT | KSM26RS8/8HDI | 2|
51+
|Power supply, 110-220 VAC to 12 VDC, 100 W, IP 67, Industrial temp | PS100-12-IP67 | 1 |
52+
53+
## Heptagon YB3x software setup
54+
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.
56+
57+
To install Defender for IoT software:
58+
59+
1. Connect the screen and keyboard to the appliance, and then connect to the CLI.
60+
61+
1. Connect an external CD or disk-on-key that contains the software you downloaded from the Azure portal.
62+
63+
1. Start the appliance.
64+
65+
1. Continue by installing your Defender for IoT software. For more information, see [Defender for IoT software installation](../ot-deploy/install-software-ot-sensor.md#install-defender-or-iot-software-on-ot-sensors).
66+
67+
## Next steps
68+
69+
Continue understanding system requirements for physical or virtual appliances. For more information, see [Which appliances do I need?](../ot-appliance-sizing.md)
70+
71+
Then, use any of the following procedures to continue:
72+
73+
- [Download software for an OT sensor](../ot-deploy/install-software-ot-sensor.md#download-software-files-from-the-azure-portal)
74+
- [Download software files for an on-premises management console](../legacy-central-management/install-software-on-premises-management-console.md#download-software-files-from-the-azure-portal)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ landingContent:
4242
linkLists:
4343
- linkListType: deploy
4444
links:
45+
- text: Heptagon YB3x
46+
url: heptagon-yb3x.md
4547
- text: HPE ProLiant DL20 Gen11 Plus (NHP 2LFF)
4648
url: hpe-proliant-dl20-gen-11-nhp-2lff.md
4749
- text: Dell XE4 SFF

‎articles/defender-for-iot/organizations/appliance-catalog/media/yb3x.png

200 KB
Loading

‎articles/event-hubs/geo-replication.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,23 @@ These features shouldn't be confused with Availability Zones. Both geographic re
2121
> - This feature is currently in public preview, and as such shouldn't be used in production scenarios.
2222
> - The following regions are currently supported in the public preview.
2323
>
24-
> | US | Europe | APAC |
25-
> |------------------|---------------|---------------|
26-
> | Central US EUAP | Italy North | Australia Central |
27-
> | Canada Central | Spain Central | Australia East |
28-
> | Canada East | Norway East ||
24+
> | Region | Region | Region |
25+
> |--------------------|--------------------|------------------|
26+
> | AustraliaCentral | GermanyNorth | NorwayWest |
27+
> | AustraliaCentral2 | GermanyWestCentral | PolandCentral |
28+
> | AustraliaEast | IsraelCentral | SouthAfricaNorth |
29+
> | AustraliaSoutheast | ItalyNorth | SouthAfricaWest |
30+
> | BrazilSoutheast | JapanEast | SoutheastAsia |
31+
> | CanadaCentral | JapanWest | SouthIndia |
32+
> | CanadaEast | JioIndiaCentral | SpainCentral |
33+
> | CentralIndia | JioIndiaWest | SwedenCentral |
34+
> | CentralUS | KoreaCentral | SwitzerlandNorth |
35+
> | CentralUSEUAP | KoreaSouth | SwitzerlandWest |
36+
> | EastAsia | MexicoCentral | UAECentral |
37+
> | EastUS2 | NorthCentralUS | UAENorth |
38+
> | FranceCentral | NorthEurope | UKSouth |
39+
> | FranceSouth | NorwayEast | UKWest |
40+
>
2941
3042

3143
## Metadata disaster recovery vs. Geo-replication of metadata and data

‎articles/firewall/index.yml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ landingContent:
2929
links:
3030
- text: Azure Firewall rule processing logic
3131
url: rule-processing.md
32-
- text: Frequently asked questions
33-
url: firewall-faq.yml
3432
- linkListType: concept
3533
links:
3634
- text: Azure Firewall NAT behaviors
@@ -43,14 +41,7 @@ landingContent:
4341
links:
4442
- text: What's new
4543
url: https://azure.microsoft.com/updates/?category=networking&query=Firewall
46-
- linkListType: deploy
47-
links:
48-
- text: Provision and configure Azure Firewall and Application Gateway
49-
url: https://mslabs.cloudguides.com/en-us/guides/Azure%20Networking%20Solutions%20-%20Exercise%204
50-
- text: Secure your network infrastructure with Azure Firewall and Azure DDoS Protection
51-
url: https://mslearn.cloudguides.com/guides/Secure%20your%20network%20infrastructure%20with%20Azure%20Firewall%20and%20Azure%20DDoS%20Protection
52-
- text: Enhance network visibility and threat detection through Azure network security integrations with Microsoft Sentinel
53-
url: https://mslearn.cloudguides.com/guides/Enhance%20network%20visibility%20and%20threat%20detection%20through%20Azure%20network%20security%20integrations%20with%20Microsoft%20Sentinel
44+
5445

5546
# Card
5647
- title: Learn about Azure Firewall Premium
@@ -84,6 +75,24 @@ landingContent:
8475
links:
8576
- text: Deploy Firewall Basic
8677
url: deploy-firewall-basic-portal-policy.md
78+
- linkListType: deploy
79+
links:
80+
- text: Provision and configure Azure Firewall and Application Gateway
81+
url: https://mslabs.cloudguides.com/en-us/guides/Azure%20Networking%20Solutions%20-%20Exercise%204
82+
- text: Secure your network infrastructure with Azure Firewall and Azure DDoS Protection
83+
url: https://mslearn.cloudguides.com/guides/Secure%20your%20network%20infrastructure%20with%20Azure%20Firewall%20and%20Azure%20DDoS%20Protection
84+
- text: Enhance network visibility and threat detection through Azure network security integrations with Microsoft Sentinel
85+
url: https://mslearn.cloudguides.com/guides/Enhance%20network%20visibility%20and%20threat%20detection%20through%20Azure%20network%20security%20integrations%20with%20Microsoft%20Sentinel
86+
87+
# Card
88+
- title: Troubleshoot Azure Firewall
89+
linkLists:
90+
- linkListType: reference
91+
links:
92+
- text: Azure Firewall known issues and limitations
93+
url: firewall-known-issues.md
94+
- text: Frequently asked questions
95+
url: firewall-faq.yml
8796

8897
# Card
8998
- title: Learn about Azure Firewall integration in Copilot for Security

‎articles/update-manager/manage-hot-patching-arc-machines.md

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
---
2+
title: Hotpatching (preview) on Azure Arc-enabled machines
3+
description: This article details how to manage hotpatching (preview) on Azure Arc-enabled machines.
4+
ms.service: azure-update-manager
5+
ms.date: 10/30/2024
6+
ms.topic: how-to
7+
author: SnehaSudhirG
8+
ms.author: sudhirsneha
9+
---
10+
11+
# Manage hotpatches (preview) on Arc-enabled machines
12+
13+
**Applies to:** :heavy_check_mark: Windows VMs :heavy_check_mark: Linux VMs :heavy_check_mark: On-premises environment :heavy_check_mark: Azure Arc-enabled servers.
14+
15+
Azure Update Manager enables you to install hotpatches (preview) on Windows Server Azure Editions and Arc-enabled machines. For more information, see [Hotpatch for virtual machines](https://learn.microsoft.com/windows-server/get-started/hotpatch).
16+
17+
This article explains how to install hotpatches (preview) on compatible Arc-enabled machines. For hotpatches (preview) being non-intrusive on availability, you can create faster schedules and update your services immediately after release, with less planning to maintain reliability of your machines at-scale.
18+
19+
## Supported operating systems
20+
21+
- Windows Server 2025 Standard Edition
22+
- Windows Server 2025 Datacenter Edition
23+
24+
25+
## Prerequisites
26+
27+
- Verify that the machine has a supported OS SKU. [Learn more](#supported-operating-systems).
28+
- Ensure that Virtualization Based Security (VBS) is enabled. [Learn more](https://techcommunity.microsoft.com/t5/windows-server-news-and-best/how-to-preview-azure-arc-connected-hotpatching-for-windows/ba-p/4246895).
29+
- Ensure the machine is Arc-enabled.
30+
31+
## Manage Hotpatches (preview)
32+
33+
### Enroll hotpatch (preview) license
34+
35+
To enroll hotpatch (preview) license, follow these steps:
36+
37+
1. Sign in to the [Azure portal](https://portal.azure.com) and go to **Azure Update Manager**.
38+
1. Under **Resources**, select **Machines** and then select the specific *Arc-enabled server*.
39+
1. Under the **Recommended updates** section, in **Hotpatch**, select **Change**.
40+
1. In the Hotpatch (preview), select **I want to license this Windows Server to receive monthly patches** option.
41+
1. Select **Enable Hotpatching** and then select **Confirm**.
42+
43+
:::image type="content" source="./media/manage-hot-patching-arc-machines/enroll-hot-patch-license.png" alt-text="Screenshot showing how to enroll hotpatch license." lightbox="./media/manage-hot-patching-arc-machines/enroll-hot-patch-license.png":::
44+
45+
### Manage hotpatch (preview) updates
46+
47+
After you enroll to hotpatch (preview) license, your machine automatically receives hotpatch updates.
48+
49+
#### [At scale](#tab/manage-scale)
50+
51+
To enable or disable hotpaching at scale, follow these steps:
52+
53+
1. Sign in to the [Azure portal](https://portal.azure.com) and go to **Azure Update Manager**.
54+
1. Under **Resources**, select **Machines** and in the **Azure Update Manager | Machines** page, under **Settings**, select **Update settings**.
55+
1. In **Change update settings** page, select **+Add machine**, to select the machine to which you want to change the update settings.
56+
1. In **Select resources** page, select the machines and then select **Add** to view the machines in **Change update settings** page.
57+
1. In the **Hotpatch (preview)** dropdown, select **Enable (current)** and then select **Save**.
58+
59+
:::image type="content" source="./media/manage-hot-patching-arc-machines/manage-hot-patch-updates.png" alt-text="Screenshot showing how to manage hotpatch updates." lightbox="./media/manage-hot-patching-arc-machines/manage-hot-patch-updates.png":::
60+
61+
#### [On single VM](#tab/manage-single)
62+
63+
To re-enable or disable updates on a single VM, follow these steps:
64+
65+
1. Sign in to the [Azure portal](https://portal.azure.com) and go to **Azure Update Manager**.
66+
1. Under **Resources**, select **Machines** and then select the specific Arc-enabled machine.
67+
1. In the **Arc-enabled machine | Updates** page,
68+
under the **Recommended updates** section, in **Hotpatch**, select **Change**.
69+
1. In the Hotpatch (preview), select **Enable hotpatching** and then select **Confirm**.
70+
71+
:::image type="content" source="./media/manage-hot-patching-arc-machines/manage-hot-patch-single-vm.png" alt-text="Screenshot showing how to manage hotpatch updates on a single vm." lightbox="./media/manage-hot-patching-arc-machines/manage-hot-patch-single-vm.png":::
72+
---
73+
74+
### View hotpatch (preview) status
75+
76+
#### [At scale](#tab/hotpatch-scale)
77+
78+
To view the hotpatch (preview) status at scale on your machines, follow these steps:
79+
80+
1. Sign in to the [Azure portal](https://portal.azure.com) and go to **Azure Update Manager**.
81+
1. Under **Resources**, select **Machines** and then select **Edit columns**.
82+
1. In **Choose columns** pane, select **Hotpatch status** and then select **Save**.
83+
84+
The **Hotpatch status** column appears in the machines grid and displays the status for all Azure machines and Arc-enabled machines. To view only Arc related details, you can filter Resource Type as **Arc-enabled server**.
85+
86+
:::image type="content" source="./media/manage-hot-patching-arc-machines/view-status-at-scale.png" alt-text="Screenshot showing how to view hotpatching status at scale." lightbox="./media/manage-hot-patching-arc-machines/view-status-at-scale.png":::
87+
88+
#### [On single VM](#tab/hotpatch-single)
89+
90+
To view the hotpatch (preview) status on a single machine, follow these steps:
91+
92+
1. Sign in to the [Azure portal](https://portal.azure.com) and go to **Azure Update Manager**.
93+
1. Under **Resources**, select **Machines** and then select the specific Arc-enabled machine.
94+
1. In the **Arc-enabled machine | Updates** page, under the **Recommended updates** section, you can view the Hotpatch status for your VM.
95+
96+
:::image type="content" source="./media/manage-hot-patching-arc-machines/view-status-single-machine.png" alt-text="Screenshot showing how to view hotpatching status on single virtual machine." lightbox="./media/manage-hot-patching-arc-machines/view-status-single-machine.png":::
97+
98+
---
99+
100+
### Hotpatch (preview) statuses
101+
102+
| Status | Meaning |
103+
|------|-----|
104+
| Not enrolled| License is available but not enrolled on this machine. |
105+
| Enabled | License is enrolled and machine is enabled for receiving hotpatch updates.|
106+
| Canceled | License has been canceled on the machine. |
107+
| Disabled | License is enrolled but the machine is disabled for receiving hotpatch updates. |
108+
| Pending | Interim status while enrollment is in progress. |
109+
110+
### Check hotpatch (preview) updates
111+
112+
For latest hotpatch updates, enable either [periodic assessment](assessment-options.md#periodic-assessment) or a [one-time update](assessment-options.md#check-for-updates-nowon-demand-assessment).
113+
114+
Periodic assessment automatically assesses for available updates and ensures that available patches are detected. You can view the results of the assessment on the **Recommended updates** tab, including the time of the last assessment.
115+
116+
You can also choose to trigger an *on-demand patch assessment* for your VM at any time using the **Check for updates** option and review the results after assessment completes. In this assessment result, you can view the reboot status of the given update under **Reboot required** column.
117+
118+
:::image type="content" source="./media/manage-hot-patching-arc-machines/check-hot-patch-updates.png" alt-text="Screenshot showing how to check hotpatching updates." lightbox="./media/manage-hot-patching-arc-machines/check-hot-patch-updates.png":::
119+
120+
121+
### Install hotpatch (preview) updates
122+
123+
To install, you can create a [user-defined schedule](scheduled-patching.md#schedule-recurring-updates-on-a-single-vm) or [one-time update](quickstart-on-demand.md#install-updates). You can install it immediately after it's available, allowing your machine to get secure faster.
124+
125+
Using either of these options you can choose to install all available update classifications or only security updates. You can also specify updates to include or exclude by providing the individual hotpatch (preview) knowledge base IDs. You can enter more than one knowledge base ID in this flow.
126+
127+
:::image type="content" source="./media/manage-hot-patching-arc-machines/include-knowledge-base-id.png" alt-text="Screenshot showing how to include knowledge base ID." lightbox="./media/manage-hot-patching-arc-machines/include-knowledge-base-id.png":::
128+
129+
This ensures that the hotpatch (preview) update which doesn't require reboots is installed in the same schedule or one-time update schedule, making patch installation window predictable.
130+
131+
### View history
132+
133+
You can view the history of update deployments on your VM through the [history](deploy-updates.md#view-update-history-for-a-single-vm) option.
134+
135+
**Update history** displays the history for the past 30 days, along with patch installation details such as reboot status.
136+
137+
:::image type="content" source="./media/manage-hot-patching-arc-machines/history-update-deployments.png" alt-text="Screenshot showing how to view the history of update deployments on your VM." lightbox="./media/manage-hot-patching-arc-machines/history-update-deployments.png":::
138+
139+
140+
## Next steps
141+
142+
* Learn more about [hotpatching on Azure VMs](updates-maintenance-schedules.md#hotpatching).
143+
* Learn more about [configure update settings](manage-update-settings.md) on your machines.
144+
* Learn more on how to perform an [on-demand update](deploy-updates.md).
145+
146+

‎articles/update-manager/media/manage-hot-patching-arc-machines/check-hot-patch-updates.png

290 KB
Loading

0 commit comments

Comments
 (0)