Skip to content

Commit 07af096

Browse files
authored
pull base content,head:MicrosoftDocs:main,into:wwlpublishsync
2 parents e4e2b9e + b7715c5 commit 07af096

File tree

98 files changed

+293
-195
lines changed

Some content is hidden

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

98 files changed

+293
-195
lines changed
-30.7 KB
Loading

learn-pr/azure/apply-networking-concepts-to-windows-containers/includes/5-windows-container-networking-with-azure-kubernetes-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ Here are some features of AKS to consider when planning for Windows container ne
4545
| **Automatic cluster node and pod scaling** | Scale up or down, scale resources in a large containerization environment | AKS supports easy scaling for your clusters and provides two auto-cluster scaling options for large environments.<br>- The **horizontal pod autoscaler** watches the resource demand of pods and increases pods to meet demand.<br>- The **cluster autoscaler** component watches for pods that can't be scheduled because of node constraints. It automatically scales cluster nodes to deploy scheduled pods. |
4646
| **Integrated logging and monitoring** | Monitor containers, pods, and clusters | AKS includes Azure Monitor for containers to provide performance visibility of the cluster. With a custom Kubernetes installation, use Azure Monitor, or install and configure Azure Log Analytics or Azure Application Insights. |
4747
| **High availability** | Ensure high availability and fault tolerance | AKS helps you achieve high availability and fault tolerance for your Windows clusters by distributing your nodes across availability zones and regions. |
48-
| **Security integration** | Protect your Windows clusters and applications | AKS integrates with Microsoft Entra ID (formerly *Azure Active Directory*), Azure Key Vault, Azure Policy, and Azure Security Center. |
48+
| **Security integration** | Protect your Windows clusters and applications | AKS integrates with Microsoft Entra ID (formerly *Azure Active Directory*), Azure Key Vault, Azure Policy, and Microsoft Defender for Cloud. |

learn-pr/azure/build-first-bicep-template/includes/4-exercise-define-resources-bicep-template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ During the process, you'll:
5050
Run the following command from the terminal in Visual Studio Code to deploy the Bicep template to Azure. The command can take a minute or two to complete, and then you'll see a successful deployment. If you see a warning about the location being hard-coded, you can ignore it. You'll fix the location later in the module. It's safe to proceed and the deployment will succeed.
5151

5252
```azurecli
53-
az deployment group create --template-file main.bicep
53+
az deployment group create --name main --template-file main.bicep
5454
```
5555

5656
You'll see `Running...` in the terminal.
@@ -137,7 +137,7 @@ In the previous task, you learned how to create a template that contains a singl
137137
Run the following Azure CLI command in the terminal. You can ignore the warnings about the hard-coded location. You'll fix the location soon.
138138

139139
```azurecli
140-
az deployment group create --template-file main.bicep
140+
az deployment group create --name main --template-file main.bicep
141141
```
142142

143143
::: zone-end

learn-pr/azure/build-first-bicep-template/includes/6-exercise-add-parameters-variables-bicep-template.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ Run the following Azure CLI command in the terminal.
7171

7272
```azurecli
7373
az deployment group create \
74+
--name main \
7475
--template-file main.bicep \
7576
--parameters environmentType=nonprod
7677
```
@@ -83,6 +84,7 @@ Run the following Azure PowerShell command in the terminal.
8384

8485
```azurepowershell
8586
New-AzResourceGroupDeployment `
87+
-Name main `
8688
-TemplateFile main.bicep `
8789
-environmentType nonprod
8890
```

learn-pr/azure/build-first-bicep-template/includes/8-exercise-refactor-template-modules.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ Run the following Azure CLI command in the terminal.
7575

7676
```azurecli
7777
az deployment group create \
78+
--name main \
7879
--template-file main.bicep \
7980
--parameters environmentType=nonprod
8081
```
@@ -87,6 +88,7 @@ Run the following Azure PowerShell command in the terminal.
8788

8889
```azurepowershell
8990
New-AzResourceGroupDeployment `
91+
-Name main `
9092
-TemplateFile main.bicep `
9193
-environmentType nonprod
9294
```

learn-pr/azure/build-first-bicep-template/includes/code/5-parameter-value.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resource appServiceApp 'Microsoft.Web/sites@2023-12-01' = {
1+
resource appServiceApp 'Microsoft.Web/sites@2024-04-01' = {
22
name: appServiceAppName
33
location: 'eastus'
44
properties: {

learn-pr/azure/build-first-bicep-template/includes/code/5-variable-value.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resource appServiceApp 'Microsoft.Web/sites@2023-12-01' = {
1+
resource appServiceApp 'Microsoft.Web/sites@2024-04-01' = {
22
name: appServiceAppName
33
location: location
44
properties: {

learn-pr/azure/build-first-bicep-template/includes/code/6-template-1.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
1616
}
1717
}
1818

19-
resource appServicePlan 'Microsoft.Web/serverfarms@2023-12-01' = {
19+
resource appServicePlan 'Microsoft.Web/serverfarms@2024-04-01' = {
2020
name: appServicePlanName
2121
location: location
2222
sku: {
2323
name: 'F1'
2424
}
2525
}
2626

27-
resource appServiceApp 'Microsoft.Web/sites@2023-12-01' = {
27+
resource appServiceApp 'Microsoft.Web/sites@2024-04-01' = {
2828
name: appServiceAppName
2929
location: location
3030
properties: {

learn-pr/azure/build-first-bicep-template/includes/code/6-template-2.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
2424
}
2525
}
2626

27-
resource appServicePlan 'Microsoft.Web/serverfarms@2023-12-01' = {
27+
resource appServicePlan 'Microsoft.Web/serverfarms@2024-04-01' = {
2828
name: appServicePlanName
2929
location: location
3030
sku: {
3131
name: appServicePlanSkuName
3232
}
3333
}
3434

35-
resource appServiceApp 'Microsoft.Web/sites@2023-12-01' = {
35+
resource appServiceApp 'Microsoft.Web/sites@2024-04-01' = {
3636
name: appServiceAppName
3737
location: location
3838
properties: {

learn-pr/azure/build-first-bicep-template/includes/code/8-app-service.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ param environmentType string
1010
var appServicePlanName = 'toy-product-launch-plan'
1111
var appServicePlanSkuName = (environmentType == 'prod') ? 'P2v3' : 'F1'
1212

13-
resource appServicePlan 'Microsoft.Web/serverfarms@2023-12-01' = {
13+
resource appServicePlan 'Microsoft.Web/serverfarms@2024-04-01' = {
1414
name: appServicePlanName
1515
location: location
1616
sku: {
1717
name: appServicePlanSkuName
1818
}
1919
}
2020

21-
resource appServiceApp 'Microsoft.Web/sites@2023-12-01' = {
21+
resource appServiceApp 'Microsoft.Web/sites@2024-04-01' = {
2222
name: appServiceAppName
2323
location: location
2424
properties: {

0 commit comments

Comments
 (0)