Skip to content

Commit b14c299

Browse files
authored
Merge pull request #188445 from MicrosoftDocs/main
Merge main to live, 4 PM Sunday
2 parents dd2220b + eb708ed commit b14c299

18 files changed

+338
-400
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5813,6 +5813,11 @@
58135813
"redirect_url": "/azure/automation/update-management/update-mgmt-view-update-assessments",
58145814
"redirect_document_id": false
58155815
},
5816+
{
5817+
"source_path_from_root": "/articles/automation/source-control-integration-legacy.md",
5818+
"redirect_url": "source-control-integration",
5819+
"redirect_document_id": false
5820+
},
58165821
{
58175822
"source_path_from_root": "/articles/best-practices-availability-paired-regions.md",
58185823
"redirect_url": "/azure/availability-zones/cross-region-replication-azure",

articles/automation/source-control-integration-legacy.md

Lines changed: 0 additions & 130 deletions
This file was deleted.

articles/azure-resource-manager/bicep/learn-bicep.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ ms.date: 12/03/2021
88

99
Ready to see how Bicep can help simplify and accelerate your deployments to Azure? Check out the many hands-on courses on Microsoft Learn.
1010

11+
> [!TIP]
12+
> Want to learn Bicep live from subject matter experts? [Learn Live with our experts every Tuesday (Pacific time) beginning March 8, 2022.](https://aka.ms/learnlive-iac-and-bicep)
13+
1114
## Get started
1215

1316
If you're new to Bicep, a great way to get started is by taking this module on Microsoft Learn.

articles/azure-sql/database/scripts/restore-database-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This Azure CLI example restores a single database in Azure SQL Database to a spe
2929

3030
### Run the script
3131

32-
:::code language="azurecli" source="~/azure_cli_scripts/sql-database/restore-database/restore-database.sh" range="4-39":::
32+
:::code language="azurecli" source="~/azure_cli_scripts/sql-database/restore-database/restore-database.sh" range="4-42":::
3333

3434
## Clean up resources
3535

articles/azure-sql/managed-instance/scripts/restore-geo-backup-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This sample requires an existing pair of managed instances, see [Use Azure CLI t
3131

3232
### Run the script
3333

34-
:::code language="azurecli" source="~/azure_cli_scripts/sql-database/sql-managed-instance-restore-geo-backup/restore-geo-backup-cli.sh" range="4-29":::
34+
:::code language="azurecli" source="~/azure_cli_scripts/sql-database/sql-managed-instance-restore-geo-backup/restore-geo-backup-cli.sh" range="4-32":::
3535

3636
## Clean up resources
3737

articles/defender-for-cloud/defender-for-containers-introduction.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ The **Azure Policy add-on for Kubernetes** collects cluster and workload configu
8181

8282
| Pod Name | Namespace | Kind | Short Description | Capabilities | Resource limits | Egress Required |
8383
|--|--|--|--|--|--|--|
84-
| azuredefender-collector-ds-* | kube-system | [DeamonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | A set of containers that focus on collecting inventory and security events from the Kubernetes environment. | SYS_ADMIN, <br>SYS_RESOURCE, <br>SYS_PTRACE | memory: 64Mi<br> <br> cpu: 60m | No |
85-
| azuredefender-collector-misc-* | kube-system | [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) | A set of containers that focus on collecting inventory and security events from the Kubernetes environment that aren't bounded to a specific node. | N/A | memory: 64Mi <br> <br>cpu: 60m | No |
86-
| azuredefender-publisher-ds-* | kube-system | [DeamonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | Publish the collected data to Microsoft Defender for Containers' backend service where the data will be processed for and analyzed. | N/A | memory: 64Mi  <br> <br> cpu: 60m | Https 443 <br> <br> Learn more about the [outbound access prerequisites](../aks/limit-egress-traffic.md#microsoft-defender-for-containers) |
84+
| azuredefender-collector-ds-* | kube-system | [DeamonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | A set of containers that focus on collecting inventory and security events from the Kubernetes environment. | SYS_ADMIN, <br>SYS_RESOURCE, <br>SYS_PTRACE | memory: 64MIB<br>cpu: 60m | No |
85+
| azuredefender-collector-misc-* | kube-system | [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) | A set of containers that focus on collecting inventory and security events from the Kubernetes environment that aren't bounded to a specific node. | N/A | memory: 64MIB <br>cpu: 60m | No |
86+
| azuredefender-publisher-ds-* | kube-system | [DeamonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | Publish the collected data to Microsoft Defender for Containers' backend service where the data will be processed for and analyzed. | N/A | memory: 64MIB<br>cpu: 60m | Https 443 <br> <br> Learn more about the [outbound access prerequisites](../aks/limit-egress-traffic.md#microsoft-defender-for-containers) |
8787

8888
\* resource limits are not configurable
8989

0 commit comments

Comments
 (0)