Skip to content

Commit a25368c

Browse files
authored
Merge pull request #291596 from MicrosoftDocs/main
12/6/2024 AM Publish
2 parents 33bfbcd + b163bab commit a25368c

File tree

87 files changed

+796
-807
lines changed

Some content is hidden

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

87 files changed

+796
-807
lines changed

articles/automation/automation-manage-send-joblogs-log-analytics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Azure Automation diagnostics create the following types of records in Azure Moni
110110
| Caller_s |Caller that initiated the operation. Possible values are either an email address or system for scheduled jobs. |
111111
| Tenant_g | GUID (globally unique identifier) that identifies the tenant for the caller. |
112112
| JobId_g |GUID that identifies the runbook job. |
113-
| ResultType |Status of the runbook job. Possible values are:<br>- New<br>- Created<br>- Started<br>- Stopped<br>- Suspended<br>- Failed<br>- Completed |
113+
| ResultType |Status of the runbook job. Possible values are:<br>- Created<br>- Started<br>- Stopped<br>- Suspended<br>- Failed<br>- Completed |
114114
| Category | Classification of the type of data. For Automation, the value is JobLogs. |
115115
| OperationName | Type of operation performed in Azure. For Automation, the value is Job. |
116116
| Resource | Name of the Automation account |

articles/azure-functions/functions-create-first-java-gradle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Use the following command to clone the sample project:
3636

3737
```bash
3838
git clone https://github.com/Azure-Samples/azure-functions-samples-java.git
39-
cd azure-functions-samples-java/
39+
cd azure-functions-samples-java/triggers-bindings
4040
```
4141

4242
Open `build.gradle` and change the `appName` in the following section to a unique name to avoid domain name conflict when deploying to Azure.

articles/azure-functions/functions-create-first-quarkus.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ The resource group is not necessary for this part of the instructions, but it's
7272
1. Invoke Quarkus dev mode:
7373

7474
```bash
75-
cd functions-azure
7675
mvn -DskipTests -DresourceGroup=<yourResourceGroupName> quarkus:dev
7776
```
7877

articles/azure-functions/functions-event-hub-cosmos-db.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ az eventhubs eventhub create \
120120
--resource-group $RESOURCE_GROUP \
121121
--name $EVENT_HUB_NAME \
122122
--namespace-name $EVENT_HUB_NAMESPACE \
123-
--message-retention 1
123+
--retention-time 1 \
124+
--cleanup-policy Delete
124125
az eventhubs eventhub authorization-rule create \
125126
--resource-group $RESOURCE_GROUP \
126127
--name $EVENT_HUB_AUTHORIZATION_RULE \
@@ -139,7 +140,8 @@ az eventhubs eventhub create ^
139140
--resource-group %RESOURCE_GROUP% ^
140141
--name %EVENT_HUB_NAME% ^
141142
--namespace-name %EVENT_HUB_NAMESPACE% ^
142-
--message-retention 1
143+
--retention-time 1 ^
144+
--cleanup-policy Delete
143145
az eventhubs eventhub authorization-rule create ^
144146
--resource-group %RESOURCE_GROUP% ^
145147
--name %EVENT_HUB_AUTHORIZATION_RULE% ^
@@ -213,7 +215,7 @@ az functionapp create \
213215
--storage-account $STORAGE_ACCOUNT \
214216
--consumption-plan-location $LOCATION \
215217
--runtime java \
216-
--functions-version 3
218+
--functions-version 4
217219
```
218220

219221
# [Cmd](#tab/cmd)
@@ -229,7 +231,7 @@ az functionapp create ^
229231
--storage-account %STORAGE_ACCOUNT% ^
230232
--consumption-plan-location %LOCATION% ^
231233
--runtime java ^
232-
--functions-version 3
234+
--functions-version 4
233235
```
234236

235237
---
@@ -486,8 +488,8 @@ public class Function {
486488
@CosmosDBOutput(
487489
name = "databaseOutput",
488490
databaseName = "TelemetryDb",
489-
containerName = "TelemetryInfo",
490-
connection = "CosmosDBConnectionSetting")
491+
collectionName = "TelemetryInfo",
492+
connectionStringSetting = "CosmosDBConnectionSetting")
491493
OutputBinding<TelemetryItem> document,
492494
final ExecutionContext context) {
493495

articles/azure-functions/functions-scenarios.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ public static async Task<IActionResult> Run(
285285

286286
+ Article: [Create serverless APIs in Visual Studio using Azure Functions and API Management integration](./openapi-apim-integrate-visual-studio.md)
287287
+ Training: [Expose multiple function apps as a consistent API by using Azure API Management](/training/modules/build-serverless-api-with-functions-api-management/)
288+
+ Sample: [Implement the geode pattern by deploying the API to geodes in distributed Azure regions.](/mspnp/geode-pattern-accelerator)
289+
+ [Azure Functions HTTP trigger](functions-bindings-http-webhook.md?pivots=programming-language-csharp)
288290
+ Sample: [Web application with a C# API and Azure SQL DB on Static Web Apps and Functions](/samples/azure-samples/todo-csharp-sql-swa-func/todo-csharp-sql-swa-func/)
289291
+ [Azure Functions HTTP trigger](functions-bindings-http-webhook.md?pivots=programming-language-csharp)
290292
::: zone-end

articles/azure-netapp-files/configure-customer-managed-keys-hardware.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@ description: Learn how to encrypt data in Azure NetApp Files with customer-manag
44
services: azure-netapp-files
55
documentationcenter: ''
66
author: b-ahibbard
7-
manager: ''
8-
editor: ''
9-
10-
ms.assetid:
117
ms.service: azure-netapp-files
128
ms.workload: storage
139
ms.tgt_pltfrm: na
1410
ms.topic: how-to
1511
ms.custom: references_regions
16-
ms.date: 09/27/2024
12+
ms.date: 12/06/2024
1713
ms.author: anfdocs
1814
---
1915
# Configure customer-managed keys with managed Hardware Security Module for Azure NetApp Files volume encryption
@@ -55,6 +51,7 @@ Azure NetApp Files volume encryption with customer-managed keys with the managed
5551
* Japan East
5652
* Japan West
5753
* Korea Central
54+
* Korea South
5855
* North Central US
5956
* North Europe
6057
* Norway East

articles/azure-vmware/configure-virtual-trusted-platform-module.md

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Virtual Machines - Virtual Trusted Platform Module (vTPM)
33
description: Learn how to configure Virtual Machines - Virtual Trusted Platform Module (vTPM).
44
ms.topic: how-to
55
ms.service: azure-vmware
6-
ms.date: 12/05/2024
6+
ms.date: 12/06/2024
77
ms.custom: engagement-fy25
88
---
99

@@ -13,22 +13,15 @@ This article demonstrates how to enable the virtual Trusted Platform Module (vTP
1313

1414
A virtual Trusted Platform Module (vTPM) in VMware vSphere is a virtual counterpart of a physical TPM 2.0 chip, utilizing VM Encryption. It provides the same functionalities as a physical TPM but operates within VMs. Each VM can have its own unique and isolated vTPM, which helps secure sensitive information and maintain system integrity. This setting enables VMs to apply security features like BitLocker disk encryption and authenticate virtual hardware devices, creating a more secure virtual environment.
1515

16-
## Prerequisites
17-
18-
Before configuring vTPM on a VM in Azure VMware Solution, ensure the following prerequisites are met:
19-
20-
- The virtual machine must use EFI firmware.
21-
- The virtual machine must be at hardware version 14 or later.
22-
- Guest OS support: Linux, Windows Server 2008 and later, Windows 7 and later.
23-
24-
>[!IMPORTANT]
25-
>Customers do not need to configure a key provider to use vTPM with Azure VMware Solution. Azure VMware Solution already provides and manages key providers for each environment.
16+
## Background
2617

27-
## Trusted Launch for Azure VMware Solution
18+
### Trusted Launch for Azure VMware Solution
2819

2920
Trusted Launch is a comprehensive security solution that encompasses three key components: Secure Boot, Virtual Trusted Platform Module (vTPM), and Virtualization-based security (VBS). Each of these components plays a vital role in fortifying the security posture of VMs.
3021

31-
## Benefits
22+
:::image type="content" source="./media/trusted-launch.png" alt-text="Diagram showing the three pillars of trusted launch, Secure Boot, Virtual Trusted Platform Module, and Virtualization-based Security." border="false" lightbox="./media/trusted-launch.png":::
23+
24+
### Benefits
3225

3326
• Securely deploy VMs with verified boot loaders, operating system (OS) kernels, and drivers.
3427

@@ -42,13 +35,24 @@ Trusted Launch is a comprehensive security solution that encompasses three key c
4235

4336
Secure Boot is the first line of defense in Trusted Launch. It establishes a "root of trust" for VMs by ensuring that only signed operating systems and drivers are allowed to boot. This prevents the installation of malware-based rootkits and bootkits, which can compromise the security of the entire system. With Secure Boot enabled, every aspect of the boot process, from the boot loader to the kernel and kernel drivers, must be digitally signed by trusted publishers. This creates a robust shield against unauthorized modifications and ensures that the VM starts in a secure and trusted state.
4437

45-
## Virtual Trusted Platform Module (vTPM)
38+
### Virtual Trusted Platform Module (vTPM)
4639

4740
The vTPM is a virtualized version of a hardware Trusted Platform Module (TPM) 2.0 device. It serves as a dedicated secure vault for storing keys, certificates, and secrets. What sets vTPM apart is its ability to operate in a secure environment outside the reach of any VM, making it tamper-resistant and highly secure. One of the key functions of vTPM is attestation. It measures the entire boot chain of a VM, including UEFI, OS, system components, and drivers, to certify that the VM booted securely. This attestation mechanism is invaluable for verifying the integrity of VMs and ensuring that they haven't been compromised.
4841

49-
## Virtualization-based Security (VBS)
42+
### Virtualization-based Security (VBS)
5043

51-
VBS is the final piece of the Trusted Launch puzzle. It leverages the hypervisor to create isolated, secure memory regions within the VM. VBS uses virtualization to enhance system security by creating an isolated, hypervisor-restricted, specialized subsystem. It provides protection against unauthorized access of credential, prevents malware from running on windows system and ensures only trusted code runs from bootloader onwards.
44+
Virtualization-based Security (VBS) is the final piece of the Trusted Launch puzzle. It leverages the hypervisor to create isolated, secure memory regions within the VM. VBS uses virtualization to enhance system security by creating an isolated, hypervisor-restricted, specialized subsystem. It provides protection against unauthorized access of credential, prevents malware from running on windows system and ensures only trusted code runs from bootloader onwards.
45+
46+
## Prerequisites
47+
48+
Before configuring vTPM on a VM in Azure VMware Solution, ensure the following prerequisites are met:
49+
50+
- The virtual machine must use EFI firmware.
51+
- The virtual machine must be at hardware version 14 or later.
52+
- Guest OS support: Linux, Windows Server 2008 and later, Windows 7 and later.
53+
54+
>[!IMPORTANT]
55+
>Customers do not need to configure a key provider to use vTPM with Azure VMware Solution. Azure VMware Solution already provides and manages key providers for each environment.
5256
5357
## How to Configure vTPM
5458

@@ -72,6 +76,7 @@ To configure vTPM on a VM in Azure VMware Solution, follow these steps:
7276
Migration of VMs with vTPM might not be supported by some tools. Check the documentation of the migration tool. If it isn't supported, you can follow VMware documentation to safely disable vTPM and re-enable it post-migration.
7377

7478
## More information
79+
7580
[Securing Virtual Machines with Virtual Trusted Platform Module](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-A43B6914-E5F9-4CB1-9277-448AC9C467FB.html)
7681

7782
[What Is a Virtual Trusted Platform Module](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-security/GUID-6F811A7A-D58B-47B4-84B4-73391D55C268.html)
351 KB
Loading

articles/backup/backup-azure-security-feature-cloud.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,20 +130,20 @@ Follow these steps:
130130
1. Identify the items that are in soft-deleted state.
131131

132132
```powershell
133-
$vault = Get-AzRecoveryServicesVault -ResourceGroupName "yourResourceGroupName" -Name "yourVaultName"
134-
Get-AzRecoveryServicesBackupItem -BackupManagementType AzureVM -WorkloadType AzureVM -VaultID $vault.ID | Where-Object {$_.DeleteState -eq "ToBeDeleted"}
133+
$myVault = Get-AzRecoveryServicesVault -ResourceGroupName "yourResourceGroupName" -Name "yourVaultName"
134+
Get-AzRecoveryServicesBackupItem -BackupManagementType AzureVM -WorkloadType AzureVM -VaultID $myVault.ID | Where-Object {$_.DeleteState -eq "ToBeDeleted"}
135135
136136
Name ContainerType ContainerUniqueName WorkloadType ProtectionStatus HealthStatus DeleteState
137137
---- ------------- ------------------- ------------ ---------------- ------------ -----------
138138
VM;iaasvmcontainerv2;selfhostrg;AppVM1 AzureVM iaasvmcontainerv2;selfhostrg;AppVM1 AzureVM Healthy Passed ToBeDeleted
139139
140-
$myBkpItem = Get-AzRecoveryServicesBackupItem -BackupManagementType AzureVM -WorkloadType AzureVM -VaultId $myVaultID -Name AppVM1
140+
$myBkpItem = Get-AzRecoveryServicesBackupItem -BackupManagementType AzureVM -WorkloadType AzureVM -VaultId $myVault.ID -Name AppVM1
141141
```
142142

143143
2. Reverse the deletion operation that was performed when soft-delete was enabled.
144144

145145
```powershell
146-
Undo-AzRecoveryServicesBackupItemDeletion -Item $myBKpItem -VaultId $myVaultID -Force
146+
Undo-AzRecoveryServicesBackupItemDeletion -Item $myBKpItem -VaultId $myVault.ID -Force
147147
148148
WorkloadName Operation Status StartTime EndTime JobID
149149
------------ --------- ------ --------- ------- -----
@@ -152,7 +152,7 @@ Follow these steps:
152152
3. As the soft-delete is disabled, the deletion operation immediately removes the backup data.
153153

154154
```powershell
155-
Disable-AzRecoveryServicesBackupProtection -Item $myBkpItem -RemoveRecoveryPoints -VaultId $myVaultID -Force
155+
Disable-AzRecoveryServicesBackupProtection -Item $myBkpItem -RemoveRecoveryPoints -VaultId $myVault.ID -Force
156156
157157
WorkloadName Operation Status StartTime EndTime JobID
158158
------------ --------- ------ --------- ------- -----
@@ -172,4 +172,4 @@ Follow these steps:
172172
## Next steps
173173

174174
- [Overview of security features in Azure Backup](security-overview.md)
175-
- [Frequently asked questions](soft-delete-azure-backup-faq.yml).
175+
- [Frequently asked questions](soft-delete-azure-backup-faq.yml).

articles/backup/backup-azure-troubleshoot-blob-backup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ This article provides troubleshooting information to address issues you encounte
7979

8080
**Error message**: The required setting PITR is disabled on storage account.
8181

82-
**Recommendation**: Enable that the point-in-restore setting on the storage account. [Learn more](../storage/blobs/point-in-time-restore-manage.md?tabs=portal#enable-and-configure-point-in-time-restore).
82+
**Recommendation**: Enable that the point-in-time restore setting on the storage account. [Learn more](../storage/blobs/point-in-time-restore-manage.md?tabs=portal#enable-and-configure-point-in-time-restore).
8383

8484
### UserErrorImmutabilityPolicyConfigured
8585

0 commit comments

Comments
 (0)