Skip to content

Commit 25d6fcd

Browse files
authored
Merge pull request #269113 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 0e68b2e + 6f236e3 commit 25d6fcd

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

articles/ai-services/openai/concepts/provisioned-throughput.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You need to speak with your Microsoft sales/account team to acquire provisioned
4444

4545
### Provisioned throughput units
4646

47-
Provisioned throughput units (PTU) are units of model processing capacity that customers you can reserve and deploy for processing prompts and generating completions. The minimum PTU deployment, increments, and processing capacity associated with each unit varies by model type & version.
47+
Provisioned throughput units (PTU) are units of model processing capacity that you can reserve and deploy for processing prompts and generating completions. The minimum PTU deployment, increments, and processing capacity associated with each unit varies by model type & version.
4848

4949
### Deployment types
5050

articles/aks/use-trusted-launch.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Perform the following steps to deploy an AKS cluster using the Azure CLI.
9595
The following example creates a cluster named *myAKSCluster* with one node in the *myResourceGroup*, and enables Secure Boot and vTPM:
9696

9797
```azurecli
98-
az aks create --name myAKSCluster --resource-group myResourceGroup --enable-secure-boot --enable-vtpm --enable-managed-identity --generate-ssh-keys
98+
az aks create --name myAKSCluster --resource-group myResourceGroup --node-count 1 --enable-secure-boot --enable-vtpm --enable-managed-identity --generate-ssh-keys
9999
```
100100
101101
2. Run the following command to get access credentials for the Kubernetes cluster. Use the [az aks get-credentials][az-aks-get-credentials] command and replace the values for the cluster name and the resource group name.
@@ -214,4 +214,4 @@ In this article, you learned how to enable trusted launch. Learn more about [tru
214214
[azure-generation-two-virtual-machines]: ../virtual-machines/generation-2.md
215215
[verify-secure-boot-failures]: ../virtual-machines/trusted-launch-faq.md#verifying-secure-boot-failures
216216
[tusted-launch-ephemeral-os-sizes]: ../virtual-machines/ephemeral-os-disks.md#trusted-launch-for-ephemeral-os-disks
217-
[skip-gpu-driver-install]: gpu-cluster.md#skip-gpu-driver-installation-preview
217+
[skip-gpu-driver-install]: gpu-cluster.md#skip-gpu-driver-installation-preview

articles/azure-monitor/agents/agents-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ View [supported operating systems for Azure Arc Connected Machine agent](../../a
247247
> Machines and appliances that run heavily customized or stripped-down versions of the above distributions and hosted solutions that disallow customization by the user are not supported. Azure Monitor and legacy agents rely on various packages and other baseline functionality that is often removed from such systems, and their installation may require some environmental modifications considered to be disallowed by the appliance vendor. For instance, [GitHub Enterprise Server](https://docs.github.com/en/enterprise-server/admin/overview/about-github-enterprise-server) is not supported due to heavy customization as well as [documented, license-level disallowance](https://docs.github.com/en/enterprise-server/admin/overview/system-overview#operating-system-software-and-patches) of operating system modification.
248248
249249
> [!NOTE]
250-
> CBL-Mariner 2.0's disk size is by default around 1GB to provide storage COGS savings, compared to other Azure VMs that are around 30GB. However, the Azure Monitor Agent requires at least 4GB disk size in order to install and run successfully. Please check out [CBL-Mariner's documentation](https://eng.ms/docs/products/mariner-linux/gettingstarted/azurevm/azurevm#disk-size) for more information and instructions on how to increase disk size before installing the agent.
250+
> CBL-Mariner 2.0's disk size is by default around 1GB to provide storage savings, compared to other Azure VMs that are around 30GB. However, the Azure Monitor Agent requires at least 4GB disk size in order to install and run successfully. Please check out [CBL-Mariner's documentation](https://eng.ms/docs/products/mariner-linux/gettingstarted/azurevm/azurevm#disk-size) for more information and instructions on how to increase disk size before installing the agent.
251251
252252
### Linux Hardening Standards
253253

articles/cost-management-billing/savings-plan/scope-savings-plan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ You have the following options to scope a savings plan, depending on your needs:
2323
- **Single subscription scope** - Applies the savings plan benefit to the eligible resources in the selected subscription.
2424
- **Shared scope** - Applies the savings plan benefit to eligible resources within subscriptions that are in the billing context. If a subscription was moved to different billing context, the benefit will no longer be applied to this subscription and will continue to apply to other subscriptions in the billing context.
2525
- For Enterprise Agreement customers, the billing context is the enrollment. The savings plan shared scope would include multiple Microsoft Entra tenants in an enrollment.
26-
- For Microsoft Customer Agreement customers, the billing scope is the billing profile.
26+
- For Microsoft Customer Agreement customers, the billing scope is the billing profile. Usage from all billing subscriptions under the billing profile, is eligible to receive benefits for a Shared scoped savings plan.
2727
- **Management group** - Applies the savings plan benefit to eligible resources in the list of subscriptions that are a part of both the management group and billing scope. To buy a savings plan for a management group, you must have at least read permission on the management group and be a savings plan owner on the billing subscription.
2828

2929
## Scope processing order
@@ -39,4 +39,4 @@ You can always update the scope after you buy a savings plan. To do so, go to th
3939

4040
## Next steps
4141

42-
- [Change the savings plan scope](manage-savings-plan.md#change-the-savings-plan-scope).
42+
- [Change the savings plan scope](manage-savings-plan.md#change-the-savings-plan-scope).

articles/virtual-machines/trusted-launch-faq.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ $adminPassword = <PASSWORD> | ConvertTo-SecureString -AsPlainText -Force
5858
$vmCred = New-Object System.Management.Automation.PSCredential($adminUsername, $adminPassword)
5959
New-AzVM -Name MyVm -Credential $vmCred -SecurityType Standard
6060
```
61+
### Can I disable Secure Boot option for Trusted Launch VMs?
62+
63+
Secure Boot is NOT enabled by default but it is recommended to enable it if you are not using custom unsigned kernel or drivers. Once a VM is created with Trusted Launch and Secure Boot option enabled, you can go to VM, under Settings tab, go to Configurations and unselect 'Enable secure boot' option.
6164

6265
---
6366

0 commit comments

Comments
 (0)