Skip to content

Commit 53cf2bb

Browse files
authored
Merge pull request #260342 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 abf8d7e + 619e8e6 commit 53cf2bb

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

articles/aks/developer-best-practices-resource-management.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Use pod requests and limits to manage compute resources within an AKS cluster. P
3131

3232
*Pod requests* define a set amount of CPU and memory the pod needs regularly.
3333

34-
In your pod specifications, it's important you define these requests and limits based on the above information. If you don't include these values, the Kubernetes scheduler can't consider the resources your applications requires to help with scheduling decisions.
34+
In your pod specifications, it's important you define these requests and limits based on the above information. If you don't include these values, the Kubernetes scheduler can't consider the resources your applications require to help with scheduling decisions.
3535

3636
Monitor the performance of your application to adjust pod requests. If you underestimate pod requests, your application may receive degraded performance due to over-scheduling a node. If requests are overestimated, your application may have increased scheduling difficulty.
3737

@@ -47,7 +47,7 @@ Monitor the performance of your application at different times during the day or
4747

4848
> [!IMPORTANT]
4949
>
50-
> In your pod specifications, define these requests and limits based on the above information. Failing to include these values prevents the Kubernetes scheduler from accounting for resources your applications requires to help with scheduling decisions.
50+
> In your pod specifications, define these requests and limits based on the above information. Failing to include these values prevents the Kubernetes scheduler from accounting for resources your applications require to help with scheduling decisions.
5151
5252
If the scheduler places a pod on a node with insufficient resources, application performance is degraded. Cluster administrators **must set *resource quotas*** on a namespace that requires you to set resource requests and limits. For more information, see [resource quotas on AKS clusters][resource-quotas].
5353

articles/azure-monitor/containers/container-insights-enable-aks.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ az aks enable-addons -a monitoring -n <cluster-name> -g <cluster-resource-group-
124124
1. Download Bicep templates and parameter files depending on whether you want to enable Syslog collection.
125125

126126
**Syslog**
127-
- Template file: [Template without Syslog](https://aka.ms/enable-monitoring-msi-bicep-template)
128-
- Parameter file: [Parameter without Syslog](https://aka.ms/enable-monitoring-msi-bicep-parameters)
129-
130-
**No Syslog**
131127
- Template file: [Template with Syslog](https://aka.ms/enable-monitoring-msi-syslog-bicep-template)
132128
- Parameter file: [Parameter with Syslog](https://aka.ms/enable-monitoring-msi-syslog-bicep-parameters)
133129

130+
**No Syslog**
131+
- Template file: [Template without Syslog](https://aka.ms/enable-monitoring-msi-bicep-template)
132+
- Parameter file: [Parameter without Syslog](https://aka.ms/enable-monitoring-msi-bicep-parameters)
133+
134134
2. Edit the following values in the parameter file:
135135

136136
| Parameter | Description |

articles/container-apps/get-started.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,16 @@ az provider register --namespace Microsoft.OperationalInsights
100100

101101
Now that your Azure CLI setup is complete, you can define the environment variables that are used throughout this article.
102102

103+
## Create a resource group
104+
105+
```azurepowershell
106+
az group create --location centralus --resource-group name my-container-apps
107+
```
103108

104109
## Create and deploy the container app
105110

106111
Create and deploy your first container app with the `containerapp up` command. This command will:
107112

108-
- Create the resource group
109113
- Create the Container Apps environment
110114
- Create the Log Analytics workspace
111115
- Create and deploy the container app using a public container image

articles/service-health/resource-health-checks-resource-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Below is a complete list of all the checks executed through resource health by r
264264
## Microsoft.SQL/servers/databases
265265
|Executed Checks|
266266
|---|
267-
| - Have login attempts to the database failed because the database was unavailable?|
267+
| - When there are many logins, have more than a quarter of the login attempts failed for system reasons?<br> - Have more that one login attempt failed for system reasons (in two of the last three minutes)?|
268268

269269
## Microsoft.Storage/storageAccounts
270270
|Executed Checks|

articles/synapse-analytics/sql-data-warehouse/backup-and-restore.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ from sys.pdw_loader_backup_runs
4141
order by run_id desc
4242
;
4343
```
44+
> [!NOTE]
45+
> Backups occur every four (4) hours to meet an eight (8) hour SLA. Therefore, the sys.pdw_loader_backup_runs dynamic management view will display backup activity every four (4) hours.
4446
4547
## User-Defined Restore Points
4648

@@ -130,4 +132,4 @@ You can [submit a support ticket](sql-data-warehouse-get-started-create-support-
130132

131133
## Next steps
132134

133-
For more information about restore points, see [User-defined restore points](sql-data-warehouse-restore-points.md)
135+
For more information about restore points, see [User-defined restore points](sql-data-warehouse-restore-points.md)

articles/virtual-machines/windows-in-place-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ To start an in-place upgrade the upgrade media must be attached to the VM as a M
5757
| diskName | Name of the Managed Disk that will contain the upgrade media |
5858
| sku | Windows Server upgrade media version. This must be either: `server2016Upgrade` or `server2019Upgrade` or `server2022Upgrade` or `server2012Upgrade` |
5959

60-
If you have more than one subscription, you should run `Set-AzsSubscription -SubscriptionId <String>` to specify which subscription to use.
60+
If you have more than one subscription, you should run `Set-AzContext -Subscription '<subscription name or id>` to specify which subscription to use.
6161

6262
### PowerShell script
6363

0 commit comments

Comments
 (0)