Skip to content

Commit 9a6fcc7

Browse files
authored
Merge pull request #186154 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 5e463a1 + 34e4a97 commit 9a6fcc7

File tree

7 files changed

+41
-25
lines changed

7 files changed

+41
-25
lines changed

articles/active-directory/roles/custom-create.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ $roleAssignment = New-AzureADMSRoleAssignment -DirectoryScopeId $resourceScope -
111111
POST
112112

113113
``` HTTP
114-
https://graph.microsoft.com/beta/roleManagement/directory/roleDefinitions
114+
https://graph.microsoft.com/v1.0/roleManagement/directory/roleDefinitions
115115
```
116116
117117
Body
@@ -143,7 +143,7 @@ $roleAssignment = New-AzureADMSRoleAssignment -DirectoryScopeId $resourceScope -
143143
POST
144144
145145
```http
146-
https://graph.microsoft.com/beta/roleManagement/directory/roleAssignments
146+
https://graph.microsoft.com/v1.0/roleManagement/directory/roleAssignments
147147
```
148148
149149
Body
@@ -152,7 +152,7 @@ $roleAssignment = New-AzureADMSRoleAssignment -DirectoryScopeId $resourceScope -
152152
{
153153
"principalId":"<GUID OF USER>",
154154
"roleDefinitionId":"<GUID OF ROLE DEFINITION>",
155-
"resourceScope":"/<GUID OF APPLICATION REGISTRATION>"
155+
"directoryScopeId":"/<GUID OF APPLICATION REGISTRATION>"
156156
}
157157
```
158158

articles/api-management/api-management-howto-ca-certificates.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ Follow the steps below to upload a new CA certificate. If you have not created a
4040
1. Select **Save**. This operation may take a few minutes.
4141

4242
> [!NOTE]
43-
> You can also upload a CA certificate using the `New-AzApiManagementSystemCertificate` PowerShell command.
43+
> - The process of assigning the certificate might take 15 minutes or more depending on the size of the deployment. The Developer SKU has downtime during the process. The Basic and higher SKUs don't have downtime during the process.
44+
> - You can also upload a CA certificate using the `New-AzApiManagementSystemCertificate` PowerShell command.
4445
4546
## <a name="step1a"> </a>Delete a CA certificate
4647

articles/application-gateway/key-vault-certs.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,19 @@ Add-AzApplicationGatewaySslCertificate -KeyVaultSecretId $secretId -ApplicationG
136136
Set-AzApplicationGateway -ApplicationGateway $appgw
137137
```
138138
139+
> [!NOTE]
140+
> If you require Application Gateway to sync the last version of the certificate with the key vault, provide the versionless `secretId` value (no hash). To do this, in the preceding example, replace the following line:
141+
>
142+
> ```
143+
> $secretId = $secret.Id # https://<keyvaultname>.vault.azure.net/secrets/<hash>
144+
> ```
145+
>
146+
> With this line:
147+
>
148+
> ```
149+
> $secretId = $secret.Id.Replace($secret.Version, "") # https://<keyvaultname>.vault.azure.net/secrets/
150+
> ```
151+
139152
Once the commands have been executed, you can navigate to your Application Gateway in the Azure portal and select the Listeners tab. Click Add Listener (or select an existing) and specify the Protocol to HTTPS.
140153
141154
Under *Choose a certificate* select the certificate named in the previous steps. Once selected, select *Add* (if creating) or *Save* (if editing) to apply the referenced Key Vault certificate to the listener.

articles/application-gateway/self-signed-certificates.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,23 @@ Create your root CA certificate using OpenSSL.
5353

5454
### Create a Root Certificate and self-sign it
5555

56-
1. Use the following commands to generate the csr and the certificate.
56+
1. Use the following command to generate the Certificate Signing Request (CSR).
5757

5858
```
5959
openssl req -new -sha256 -key contoso.key -out contoso.csr
6060
```
61-
62-
```
63-
openssl x509 -req -sha256 -days 365 -in contoso.csr -signkey contoso.key -out contoso.crt
64-
```
65-
The previous commands create the root certificate. You'll use this to sign your server certificate.
6661

6762
1. When prompted, type the password for the root key, and the organizational information for the custom CA such as Country/Region, State, Org, OU, and the fully qualified domain name (this is the domain of the issuer).
6863

6964
![create root certificate](media/self-signed-certificates/root-cert.png)
7065

66+
1. Use the following command to generate the Root Certificate.
67+
68+
```
69+
openssl x509 -req -sha256 -days 365 -in contoso.csr -signkey contoso.key -out contoso.crt
70+
```
71+
The previous commands create the root certificate. You'll use this to sign your server certificate.
72+
7173
## Create a server certificate
7274

7375
Next, you'll create a server certificate using OpenSSL.

articles/databox-online/azure-stack-edge-gpu-deploy-virtual-machine-high-performance-network.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ In addition to the above prerequisites that are used for VM creation, you'll als
7272
1. Identify all the VMs running on your device. This includes Kubernetes VMs, or any VM workloads that you may have deployed.
7373

7474
```powershell
75-
get-vm -force
75+
get-vm
7676
```
7777
1. Stop all the running VMs.
7878

articles/synapse-analytics/overview-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ sections:
6161
- question: |
6262
Can I link more than one Power BI workspace to a single Azure Synapse Workspace?
6363
answer: |
64-
Currently, you can only link a single Power BI workspace to an Azure Synapse Workspace.
64+
Yes, as of June 10, 2021, Synapse Studio now allows you to add more than one Power BI workspace to a single Azure Synapse Workspace.
6565
6666
- question: |
6767
Is Synapse Link to Cosmos DB GA?

articles/virtual-machines/trusted-launch.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Azure offers trusted launch as a seamless way to improve the security of [genera
2222
2323

2424

25-
## Benefits
25+
## Benefits
2626

2727
- Securely deploy virtual machines with verified boot loaders, OS kernels, and drivers.
2828
- Securely protect keys, certificates, and secrets in the virtual machines.
@@ -62,7 +62,7 @@ Azure offers trusted launch as a seamless way to improve the security of [genera
6262
- Windows 10 Enterprise
6363
- Windows 10 Enterprise multi-session
6464

65-
**Regions**:
65+
**Regions**:
6666
- All public regions
6767

6868
**Pricing**:
@@ -75,7 +75,7 @@ No additional cost to existing VM pricing.
7575
- Shared disk
7676
- Ultra disk
7777
- Managed image
78-
- Azure Dedicated Host
78+
- Azure Dedicated Host
7979
- Nested Virtualization
8080

8181
## Secure boot
@@ -84,7 +84,7 @@ At the root of trusted launch is Secure Boot for your VM. This mode, which is im
8484

8585
## vTPM
8686

87-
Trusted launch also introduces vTPM for Azure VMs. This is a virtualized version of a hardware [Trusted Platform Module](/windows/security/information-protection/tpm/trusted-platform-module-overview), compliant with the TPM2.0 spec. It serves as a dedicated secure vault for keys and measurements. Trusted launch provides your VM with its own dedicated TPM instance, running in a secure environment outside the reach of any VM. The vTPM enables [attestation](/windows/security/information-protection/tpm/tpm-fundamentals#measured-boot-with-support-for-attestation) by measuring the entire boot chain of your VM (UEFI, OS, system, and drivers).
87+
Trusted launch also introduces vTPM for Azure VMs. This is a virtualized version of a hardware [Trusted Platform Module](/windows/security/information-protection/tpm/trusted-platform-module-overview), compliant with the TPM2.0 spec. It serves as a dedicated secure vault for keys and measurements. Trusted launch provides your VM with its own dedicated TPM instance, running in a secure environment outside the reach of any VM. The vTPM enables [attestation](/windows/security/information-protection/tpm/tpm-fundamentals#measured-boot-with-support-for-attestation) by measuring the entire boot chain of your VM (UEFI, OS, system, and drivers).
8888

8989
Trusted launch uses the vTPM to perform remote attestation by the cloud. This is used for platform health checks and for making trust-based decisions. As a health check, trusted launch can cryptographically certify that your VM booted correctly. If the process fails, possibly because your VM is running an unauthorized component, Microsoft Defender for Cloud will issue integrity alerts. The alerts include details on which components failed to pass integrity checks.
9090

@@ -99,11 +99,11 @@ With trusted launch and VBS you can enable Windows Defender Credential Guard. Th
9999

100100
## Azure Defender for Cloud integration
101101

102-
Trusted launch is integrated with Azure Defender for Cloud to ensure your VMs are properly configured. Azure Azure Defender for Cloud will continually assess compatible VMs and issue relevant recommendations.
102+
Trusted launch is integrated with Azure Defender for Cloud to ensure your VMs are properly configured. Azure Defender for Cloud will continually assess compatible VMs and issue relevant recommendations.
103103

104-
- **Recommendation to enable Secure Boot** - This Recommendation only applies for VMs that support trusted launch. Azure Azure Defender for Cloud will identify VMs that can enable Secure Boot, but have it disabled. It will issue a low severity recommendation to enable it.
105-
- **Recommendation to enable vTPM** - If your VM has vTPM enabled, Azure Defender for Cloud can use it to perform Guest Attestation and identify advanced threat patterns. If Azure Defender for Cloud identifies VMs that support trusted launch and have vTPM disabled, it will issue a low severity recommendation to enable it.
106-
- **Recommendation to install guest attestation extension** - If your VM has secure boot and vTPM enabled but it doesn't have the guest attestation extension installed, Azure Defender for Cloud will issue a low severity recommendation to install the guest attestation extension on it. This extension allows Azure Defender for Cloud to proactively attest and monitor the boot integrity of your VMs. Boot integrity is attested via remote attestation.
104+
- **Recommendation to enable Secure Boot** - This Recommendation only applies for VMs that support trusted launch. Azure Defender for Cloud will identify VMs that can enable Secure Boot, but have it disabled. It will issue a low severity recommendation to enable it.
105+
- **Recommendation to enable vTPM** - If your VM has vTPM enabled, Azure Defender for Cloud can use it to perform Guest Attestation and identify advanced threat patterns. If Azure Defender for Cloud identifies VMs that support trusted launch and have vTPM disabled, it will issue a low severity recommendation to enable it.
106+
- **Recommendation to install guest attestation extension** - If your VM has secure boot and vTPM enabled but it doesn't have the guest attestation extension installed, Azure Defender for Cloud will issue a low severity recommendation to install the guest attestation extension on it. This extension allows Azure Defender for Cloud to proactively attest and monitor the boot integrity of your VMs. Boot integrity is attested via remote attestation.
107107
- **Attestation health assessment** - If your VM has vTPM enabled and attestation extension installed, Azure Defender for Cloud can remotely validate that your VM booted in a healthy way. This is known as remote attestation. Azure Defender for Cloud issues an assessment, indicating the status of remote attestation.
108108

109109

@@ -115,7 +115,7 @@ If your VMs are properly set up with trusted launch, Microsoft Defender for Clou
115115
VM attestation can fail for the following reasons:
116116
- The attested information, which includes a boot log, deviates from a trusted baseline. This can indicate that untrusted modules have been loaded, and the OS may be compromised.
117117
- The attestation quote could not be verified to originate from the vTPM of the attested VM. This can indicate that malware is present and may be intercepting traffic to the vTPM.
118-
118+
119119
> [!NOTE]
120120
> This alert is available for VMs with vTPM enabled and the Attestation extension installed. Secure Boot must be enabled for attestation to pass. Attestation will fail if Secure Boot is disabled. If you must disable Secure Boot, you can suppress this alert to avoid false positives.
121121
@@ -131,7 +131,7 @@ Frequently asked questions about trusted launch.
131131
### Why should I use trusted launch? What does trusted launch guard against?
132132

133133
Trusted launch guards against boot kits, rootkits, and kernel-level malware. These sophisticated types of malware run in kernel mode and remain hidden from users. For example:
134-
- Firmware rootkits: these kits overwrite the firmware of the virtual machine’s BIOS, so the rootkit can start before the OS.
134+
- Firmware rootkits: these kits overwrite the firmware of the virtual machine’s BIOS, so the rootkit can start before the OS.
135135
- Boot kits: these kits replace the OS’s bootloader so that the virtual machine loads the boot kit before the OS.
136136
- Kernel rootkits: these kits replace a portion of the OS kernel so the rootkit can start automatically when the OS loads.
137137
- Driver rootkits: these kits pretend to be one of the trusted drivers that OS uses to communicate with the virtual machine’s components.
@@ -147,18 +147,18 @@ Trusted launch for Azure virtual machines is monitored for advanced threats. If
147147
Defender for Cloud periodically performs attestation. If the attestation fails, a medium severity alert will be triggered. Trusted launch attestation can fail for the following reasons:
148148

149149
Trusted launch for Azure virtual machines is monitored for advanced threats. If such threats are detected, an alert will be triggered. Alerts are only available in the [Standard Tier](../security-center/security-center-pricing.md) of Azure Defender for Cloud.
150-
Azure Defender for Cloud periodically performs attestation. If the attestation fails, a medium severity alert will be triggered. Trusted launch attestation can fail for the following reasons:
150+
Azure Defender for Cloud periodically performs attestation. If the attestation fails, a medium severity alert will be triggered. Trusted launch attestation can fail for the following reasons:
151151
- The attested information, which includes a log of the Trusted Computing Base (TCB), deviates from a trusted baseline (like when Secure Boot is enabled). This can indicate that untrusted modules have been loaded and the OS may be compromised.
152152
- The attestation quote could not be verified to originate from the vTPM of the attested VM. This can indicate that malware is present and may be intercepting traffic to the TPM.
153153
- The attestation extension on the VM is not responding. This can indicate a denial-of-service attack by malware, or an OS admin.
154154

155155
### How does trusted launch compared to Hyper-V Shielded VM?
156156

157-
Hyper-V Shielded VM is currently available on Hyper-V only. [Hyper-V Shielded VM](/windows-server/security/guarded-fabric-shielded-vm/guarded-fabric-and-shielded-vms) is typically deployed in conjunction with Guarded Fabric. A Guarded Fabric consists of a Host Guardian Service (HGS), one or more guarded hosts, and a set of Shielded VMs. Hyper-V Shielded VMs are intended for use in fabrics where the data and state of the virtual machine must be protected from both fabric administrators and untrusted software that might be running on the Hyper-V hosts. Trusted launch on the other hand can be deployed as a standalone virtual machine or virtual machine scale sets on Azure without additional deployment and management of HGS. All of the trusted launch features can be enabled with a simple change in deployment code or a checkbox on the Azure portal.
157+
Hyper-V Shielded VM is currently available on Hyper-V only. [Hyper-V Shielded VM](/windows-server/security/guarded-fabric-shielded-vm/guarded-fabric-and-shielded-vms) is typically deployed in conjunction with Guarded Fabric. A Guarded Fabric consists of a Host Guardian Service (HGS), one or more guarded hosts, and a set of Shielded VMs. Hyper-V Shielded VMs are intended for use in fabrics where the data and state of the virtual machine must be protected from both fabric administrators and untrusted software that might be running on the Hyper-V hosts. Trusted launch on the other hand can be deployed as a standalone virtual machine or virtual machine scale sets on Azure without additional deployment and management of HGS. All of the trusted launch features can be enabled with a simple change in deployment code or a checkbox on the Azure portal.
158158

159159
### What is VM Guest State (VMGS)?
160160

161-
VM Guest State (VMGS) is specific to Trusted Launch VM. It is a blob that is managed by Azure and contains the unified extensible firmware interface (UEFI) secure boot signature databases and other security information. The lifecycle of the VMGS blob is tied to that of the OS Disk.
161+
VM Guest State (VMGS) is specific to Trusted Launch VM. It is a blob that is managed by Azure and contains the unified extensible firmware interface (UEFI) secure boot signature databases and other security information. The lifecycle of the VMGS blob is tied to that of the OS Disk.
162162

163163
## Next steps
164164

0 commit comments

Comments
 (0)