Skip to content

Commit 77fc79a

Browse files
authored
Merge pull request #281883 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 433732d + b40ab69 commit 77fc79a

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

articles/azure-functions/flex-consumption-how-to.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@ You can use Maven to create a Flex Consumption hosted function app and required
225225
226226
You can enable [virtual network integration](functions-networking-options.md#virtual-network-integration) for your app in a Flex Consumption plan. The examples in this section assume that you already have [created a virtual network with subnet](../virtual-network/quick-create-cli.md#create-a-virtual-network-and-subnet) in your account. You can enable virtual network integration when you create your app or at a later time.
227227
228+
> [!IMPORTANT]
229+
> The Flex Consumption plan currently doesn't support subnets with names that contain underscore (`_`) characters.
230+
228231
To enable virtual networking when you create your app:
229232
230233
### [Azure CLI](#tab/azure-cli)

articles/confidential-computing/confidential-vm-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Azure confidential VMs offer strong security and confidentiality for tenants. Th
3131
- Secure key release with cryptographic binding between the platform's successful attestation and the VM's encryption keys.
3232
- Dedicated virtual [Trusted Platform Module (TPM)](/windows/security/information-protection/tpm/trusted-platform-module-overview) instance for attestation and protection of keys and secrets in the virtual machine.
3333
- Secure boot capability similar to [Trusted launch for Azure VMs](../virtual-machines/trusted-launch.md)
34+
- Ultra disk capability is supported on confidential VMs
3435

3536
## Confidential OS disk encryption
3637

articles/external-attack-surface-management/overview.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ Microsoft's proprietary discovery technology recursively searches for infrastruc
2121
Defender EASM includes the discovery of the following kinds of assets:
2222

2323
- Domains
24-
- Hostnames
25-
- Web Pages
2624
- IP Blocks
27-
- IP Addresses
25+
- Hosts
26+
- Email Contacts
2827
- ASNs
29-
- SSL Certificates
30-
- WHOIS Contacts
28+
- WHOIS Organizations
3129

3230
![Screenshot of Discovery View](media/Overview-2.png)
3331

articles/external-attack-surface-management/understanding-inventory-assets.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ Microsoft's proprietary discovery technology recursively searches for infrastruc
1717
Defender EASM includes the discovery of the following kinds of assets:
1818

1919
- Domains
20-
- Hosts
21-
- Pages
2220
- IP Blocks
23-
- IP Addresses
24-
- Autonomous System Numbers (ASNs)
25-
- SSL Certificates
26-
- WHOIS Contacts
21+
- Hosts
22+
- Email Contacts
23+
- ASNs
24+
- WHOIS Organizations
2725

2826
These asset types comprise your attack surface inventory in Defender EASM. This solution discovers externally facing assets that are exposed to the open internet outside of traditional firewall protection; they need to be monitored and maintained to minimize risk and improve an organization’s security posture. Microsoft Defender External Attack Surface Management (Defender EASM) actively discovers and monitors these assets, then surfacing key insights that help customers efficiently address any vulnerabilities to their organization.
2927

articles/external-attack-surface-management/what-is-discovery.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Through this process, Microsoft enables organizations to proactively monitor the
2222

2323
To create a comprehensive mapping of your organization’s attack surface, the system first intakes known assets (i.e. “seeds”) that are recursively scanned to discover additional entities through their connections to a seed. An initial seed may be any of the following kinds of web infrastructure indexed by Microsoft:
2424

25-
- Organization Names
2625
- Domains
2726
- IP Blocks
2827
- Hosts

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-automatic-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ Customers can set up the following using action groups:
476476

477477
## Investigate and Resolve Auto Upgrade Errors
478478

479-
The platform can return errors on VMs while performing Automatic Image Upgrade with Rolling Upgrade policy. The [Get Instance View](/rest/api/compute/virtual-machine-scale-sets/get-instance-view) of a VM contains the detailed error message to investigate and resolve an error. The [Rolling Upgrades - Get Latest](/rest/api/compute/virtual-machine-scale-sets/get) can provide more details on rolling upgrade configuration and status. The [Get OS Upgrade History](/rest/api/compute/virtual-machine-scale-sets/get) provides details on the last image upgrade operation on the scale set. Below are the topmost errors that can result in Rolling Upgrades.
479+
The platform can return errors on VMs while performing Automatic Image Upgrade with Rolling Upgrade policy. The [Get Instance View](/rest/api/compute/virtual-machine-scale-sets/get-instance-view) of a VM contains the detailed error message to investigate and resolve an error. The [Rolling Upgrades - Get Latest](/rest/api/compute/virtual-machine-scale-sets/get) can provide more details on rolling upgrade configuration and status. The [Get OS Upgrade History](/rest/api/compute/virtual-machine-scale-sets/get-os-upgrade-history) provides details on the last image upgrade operation on the scale set. Below are the topmost errors that can result in Rolling Upgrades.
480480

481481
**RollingUpgradeInProgressWithFailedUpgradedVMs**
482482
- Error is triggered for a VM failure.

articles/virtual-machines/extensions/guest-configuration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ To deploy the extension for Linux:
107107
"type": "ConfigurationForLinux",
108108
"typeHandlerVersion": "1.0",
109109
"autoUpgradeMinorVersion": true,
110-
"enableAutomaticUpgrade":true,
110+
"enableAutomaticUpgrade": true,
111111
"settings": {},
112112
"protectedSettings": {}
113113
}
@@ -130,7 +130,7 @@ To deploy the extension for Windows:
130130
"type": "ConfigurationforWindows",
131131
"typeHandlerVersion": "1.0",
132132
"autoUpgradeMinorVersion": true,
133-
"enableAutomaticUpgrade":true,
133+
"enableAutomaticUpgrade": true,
134134
"settings": {},
135135
"protectedSettings": {}
136136
}
@@ -154,7 +154,7 @@ resource windowsVMGuestConfigExtension 'Microsoft.Compute/virtualMachines/extens
154154
type: 'ConfigurationForLinux'
155155
typeHandlerVersion: '1.0'
156156
autoUpgradeMinorVersion: true
157-
enableAutomaticUpgrade:true
157+
enableAutomaticUpgrade: true
158158
settings: {}
159159
protectedSettings: {}
160160
}
@@ -176,7 +176,7 @@ resource windowsVMGuestConfigExtension 'Microsoft.Compute/virtualMachines/extens
176176
type: 'ConfigurationforWindows'
177177
typeHandlerVersion: '1.0'
178178
autoUpgradeMinorVersion: true
179-
enableAutomaticUpgrade:true
179+
enableAutomaticUpgrade: true
180180
settings: {}
181181
protectedSettings: {}
182182
}

articles/virtual-machines/spot-vms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The amount of available capacity can vary based on size, region, time of day, an
2323

2424
## Eviction policy
2525

26-
VMs can be evicted based on capacity or the max price you set. When creating an Azure Spot Virtual Machine, you can set the eviction policy to *Deallocate* (default) or *Delete*.
26+
Spot VMs can be stopped if Azure needs capacity for other pay-as-you-go workloads or when the price of the spot instance exceeds the maximum price that you have set. When creating an Azure Spot Virtual Machine, you can set the eviction policy to *Deallocate* (default) or *Delete*.
2727

2828
The *Deallocate* policy moves your VM to the stopped-deallocated state, allowing you to redeploy it later. However, there's no guarantee that the allocation will succeed. The deallocated VMs will count against your quota and you'll be charged storage costs for the underlying disks.
2929

articles/virtual-machines/windows/quick-create-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: mvc, devx-track-azurecli, mode-api
1414

1515
**Applies to:** :heavy_check_mark: Windows VMs
1616

17-
The Azure CLI is used to create and manage Azure resources from the command line or in scripts. This quickstart shows you how to use the Azure CLI to deploy a virtual machine (VM) in Azure that runs Windows Server 2019. To see your VM in action, you then RDP to the VM and install the IIS web server.
17+
The Azure CLI is used to create and manage Azure resources from the command line or in scripts. This quickstart shows you how to use the Azure CLI to deploy a virtual machine (VM) in Azure that runs Windows Server 2022. To see your VM in action, you then RDP to the VM and install the IIS web server.
1818

1919
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
2020

articles/virtual-machines/workloads/redhat/redhat-rhui.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,13 @@ Extended Update Support (EUS) repositories are available to customers who might
9191
> [!NOTE]
9292
> EUS is not supported on RHEL Extras. This means that if you install a package that is usually available from the RHEL Extras channel, you can't install while on EUS. For more information, see [Red Hat Enterprise Linux Extras Product Life Cycle](https://access.redhat.com/support/policy/updates/extras/).
9393
94-
Support for EUS RHEL7 ended in August 30, 2021. For more information, see [Red Hat Enterprise Linux Extended Maintenance](https://access.redhat.com/support/policy/updates/errata/#Long_Support).
94+
Support for EUS RHEL7 ended in June 30, 2028. For more information, see [Red Hat Enterprise Linux Extended Maintenance](https://access.redhat.com/support/policy/updates/errata/#Long_Support).
9595

9696
- RHEL 7.4 EUS support ended August 31, 2019
9797
- RHEL 7.5 EUS support ended April 30, 2020
9898
- RHEL 7.6 EUS support ended May 31, 2021
9999
- RHEL 7.7 EUS support ended August 30, 2021
100+
- RHEL 7.9 EUS support ended June 30, 2028
100101
- RHEL 8.4 EUS support ended May 31, 2023
101102
- RHEL 8.6 EUS support ends May 31, 2024
102103
- RHEL 9.0 EUS support ends May 31, 2024
@@ -107,7 +108,7 @@ Support for EUS RHEL7 ended in August 30, 2021. For more information, see [Red H
107108
#### [Switching to EUS repositories on RHEL7](#tab/rhel7)
108109

109110
>[!NOTE]
110-
>Support for RHEL7 EUS ended in August 30, 2021. It is not recommended to switch to EUS repositories in RHEL7 anymore.
111+
>Support for RHEL7 EUS ended in June 30, 2028. It is not recommended to switch to EUS repositories in RHEL7 anymore.
111112
112113

113114
#### [Switching to EUS repositories on RHEL8](#tab/rhel8)

0 commit comments

Comments
 (0)