Skip to content

Commit 89193fc

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into undoingScreen
2 parents 3a04feb + 17cc361 commit 89193fc

File tree

7 files changed

+19
-28
lines changed

7 files changed

+19
-28
lines changed

articles/aks/cluster-configuration.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ A container runtime is software that executes containers and manages container i
2424

2525
With a `containerd`-based node and node pools, instead of talking to the `dockershim`, the kubelet talks directly to `containerd` using the CRI (container runtime interface) plugin, removing extra hops in the data flow when compared to the Docker CRI implementation. As such, you see better pod startup latency and less resource (CPU and memory) usage.
2626

27-
By using `containerd` for AKS nodes, pod startup latency improves and node resource consumption by the container runtime decreases. These improvements through this new architecture enable kubelet communicating directly to `containerd` through the CRI plugin. While in a Moby/docker architecture, kubelet communicates to the `dockershim` and docker engine before reaching `containerd`, therefore having extra hops in the data flow.
27+
By using `containerd` for AKS nodes, pod startup latency improves and node resource consumption by the container runtime decreases. These improvements through this new architecture enable kubelet communicating directly to `containerd` through the CRI plugin. While in a Moby/docker architecture, kubelet communicates to the `dockershim` and docker engine before reaching `containerd`, therefore having extra hops in the data flow. For more details on the origin of the `dockershim` and its deprecation, see the [Dockershim removal FAQ][kubernetes-dockershim-faq].
2828

2929
![Docker CRI 2](media/cluster-configuration/containerd-cri.png)
3030

@@ -515,6 +515,7 @@ az aks update -n aksTest -g aksTest –-nrg-lockdown-restriction-level Unrestric
515515
[azurerm-azurelinux]: https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/kubernetes_cluster_node_pool#os_sku
516516
[general-usage]: https://kubernetes.io/docs/tasks/debug/debug-cluster/crictl/#general-usage
517517
[client-config-options]: https://github.com/kubernetes-sigs/cri-tools/blob/master/docs/crictl.md#client-configuration-options
518+
[kubernetes-dockershim-faq]: https://kubernetes.io/blog/2022/02/17/dockershim-faq/#why-was-the-dockershim-removed-from-kubernetes
518519

519520
<!-- LINKS - internal -->
520521
[azure-cli-install]: /cli/azure/install-azure-cli
@@ -526,7 +527,7 @@ az aks update -n aksTest -g aksTest –-nrg-lockdown-restriction-level Unrestric
526527
[az-feature-register]: /cli/azure/feature#az_feature_register
527528
[az-feature-list]: /cli/azure/feature#az_feature_list
528529
[az-provider-register]: /cli/azure/provider#az_provider_register
529-
[aks-add-np-containerd]: /create-node-pools.md#add-a-windows-server-node-pool-with-containerd
530+
[aks-add-np-containerd]: create-node-pools.md#add-a-windows-server-node-pool-with-containerd
530531
[az-aks-create]: /cli/azure/aks#az-aks-create
531532
[az-aks-update]: /cli/azure/aks#az-aks-update
532533
[baseline-reference-architecture-aks]: /azure/architecture/reference-architectures/containers/aks/baseline-aks

articles/defender-for-cloud/episode-four.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ ms.date: 04/27/2023
99

1010
**Episode description**: In this episode of Defender for Cloud in the field, Lior Arviv joins Yuri Diogenes to talk about the cloud security posture management improvements in Microsoft Defender for Cloud. Lior explains the MITRE ATT&CK Framework integration with recommendations, the overall improvements of recommendations and the other fields added in the API. Lior also demonstrates the different ways to access the MITRE ATT&CK integration via filters and recommendations.
1111

12-
<br>
13-
<br>
14-
<iframe src="https://aka.ms/docs/player?id=845108fd-e57d-40e0-808a-1239e78a7390" width="1080" height="530" allowFullScreen="true" frameBorder="0"></iframe>
12+
> [!VIDEO https://aka.ms/docs/player?id=845108fd-e57d-40e0-808a-1239e78a7390]
1513
1614
- [1:24](/shows/mdc-in-the-field/defender-for-containers#time=01m24s) - Security recommendation refresh time changes
1715

@@ -40,4 +38,4 @@ Learn how to [Review your security recommendations](review-security-recommendati
4038
## Next steps
4139

4240
> [!div class="nextstepaction"]
43-
> [Microsoft Defender for Servers](episode-five.md)
41+
> [Microsoft Defender for Servers](episode-five.md)

articles/defender-for-cloud/episode-one.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ ms.date: 04/27/2023
99

1010
**Episode description**: In this episode of Defender for Cloud in the field, Or Serok joins Yuri Diogenes to share the new AWS connector in Microsoft Defender for Cloud, which was released at Ignite 2021. Or explains the use case scenarios for the new connector and how the new connector work. She demonstrates the onboarding process to connect AWS with Microsoft Defender for Cloud and talks about the centralized management of all security recommendations.
1111

12-
<br>
13-
<br>
14-
<iframe src="https://aka.ms/docs/player?id=26cbaec8-0f3f-4bb1-9918-1bf7d912db57" width="1080" height="530" allowFullScreen="true" frameBorder="0"></iframe>
12+
> [!VIDEO https://aka.ms/docs/player?id=26cbaec8-0f3f-4bb1-9918-1bf7d912db57]
1513
1614
- [00:00](/shows/mdc-in-the-field/aws-connector) - Introduction
1715

@@ -44,4 +42,4 @@ Learn more about the new [AWS connector](quickstart-onboard-aws.md)
4442
## Next steps
4543

4644
> [!div class="nextstepaction"]
47-
> [Integrate Azure Purview with Microsoft Defender for Cloud](episode-two.md)
45+
> [Integrate Azure Purview with Microsoft Defender for Cloud](episode-two.md)

articles/defender-for-cloud/episode-twenty-three.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ ms.date: 04/27/2023
99
# Defender threat Intelligence | Defender for Cloud in the Field
1010

1111
**Episode description**: In this episode of Defender for Cloud in the Field, Alexandra Roland joins Yuri Diogenes to talk about Microsoft Defender Threat Intelligence (Defender TI). Alexandra explains how Defender TI works and how it integrates with Defender EASM. Alexandra goes over an end-to-end scenario to demonstrate how to use Defender TI to perform a security investigation based on the data collected by the platform.
12-
<br>
13-
<br>
14-
<iframe src="https://aka.ms/docs/player?id=adfb8027-21ca-4bd0-9e54-28b0d642558a" width="1080" height="530" allowFullScreen="true" frameBorder="0"></iframe>
12+
13+
> [!VIDEO https://aka.ms/docs/player?id=adfb8027-21ca-4bd0-9e54-28b0d642558a]
1514
1615
- [04:09](/shows/mdc-in-the-field/threat-intelligence#time=04m09s) - How Defender for Cloud leverages Defender TI
1716

articles/defender-for-cloud/episode-two.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ ms.date: 04/27/2023
99

1010
**Episode description**: In this episode of Defender for Cloud in the field, David Trigano joins Yuri Diogenes to share the new integration of Microsoft Defender for Cloud with Microsoft Purview, which was released at Ignite 2021.
1111

12-
David explains the use case scenarios for this integration and how the data classification is done by Microsoft Purview can help prioritize recommendations and alerts in Defender for Cloud. David also demonstrates the overall experience of data enrichment based on the information that flows from Microsoft Purview to Defender for Cloud.
12+
David explains the use case scenarios for this integration and how the data classification is done by Microsoft Purview can help prioritize recommendations and alerts in Defender for Cloud. David also demonstrates the overall experience of data enrichment based on the information that flows from Microsoft Purview to Defender for Cloud.
1313

14-
<br>
15-
<br>
16-
<iframe src="https://aka.ms/docs/player?id=9b911e9c-e933-4b7b-908a-5fd614f822c7" width="1080" height="530" allowFullScreen="true" frameBorder="0"></iframe>
14+
> [!VIDEO https://aka.ms/docs/player?id=9b911e9c-e933-4b7b-908a-5fd614f822c7]
1715
1816
- [1:36](/shows/mdc-in-the-field/integrate-with-purview) - Overview of Microsoft Purview
1917

@@ -44,4 +42,4 @@ Learn more about the [integration with Microsoft Purview](information-protection
4442
## Next steps
4543

4644
> [!div class="nextstepaction"]
47-
> [Watch Episode 3](episode-three.md)
45+
> [Watch Episode 3](episode-three.md)

articles/storage/common/videos-azure-files-and-file-sync.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ If you're new to Azure Files and File Sync or looking to deepen your understandi
1515

1616
:::row:::
1717
:::column:::
18-
<iframe width="560" height="315" src="https://www.youtube.com/embed/TOHaNJpAOfc" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
18+
> [!VIDEO https://www.youtube.com/embed/TOHaNJpAOfc]
1919
:::column-end:::
2020
:::column:::
2121
**How Azure Files can help protect against ransomware and accidental data loss**
@@ -24,7 +24,7 @@ If you're new to Azure Files and File Sync or looking to deepen your understandi
2424

2525
:::row:::
2626
:::column:::
27-
<iframe width="560" height="315" src="https://www.youtube.com/embed/jd49W33DxkQ" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
27+
> [!VIDEO https://www.youtube.com/embed/jd49W33DxkQ]
2828
:::column-end:::
2929
:::column:::
3030
**Domain join Azure file share with on-premises Active Directory and replace your file server with Azure file share**
@@ -33,7 +33,7 @@ If you're new to Azure Files and File Sync or looking to deepen your understandi
3333

3434
:::row:::
3535
:::column:::
36-
<iframe width="560" height="315" src="https://www.youtube.com/embed/bmRZi9iGsK0" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
36+
> [!VIDEO https://www.youtube.com/embed/bmRZi9iGsK0]
3737
:::column-end:::
3838
:::column:::
3939
**Mount an Azure file share in Windows**
@@ -42,7 +42,7 @@ If you're new to Azure Files and File Sync or looking to deepen your understandi
4242

4343
:::row:::
4444
:::column:::
45-
<iframe width="560" height="315" src="https://www.youtube.com/embed/44qVRZg-bMA?list=PLEq-KSMM-P-0jRrVF5peNCA0GbBZrOhE1" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
45+
> [!VIDEO https://www.youtube.com/embed/44qVRZg-bMA?list=PLEq-KSMM-P-0jRrVF5peNCA0GbBZrOhE1]
4646
:::column-end:::
4747
:::column:::
4848
**NFS 4.1 for Azure file shares**
@@ -51,7 +51,7 @@ If you're new to Azure Files and File Sync or looking to deepen your understandi
5151

5252
:::row:::
5353
:::column:::
54-
<iframe width="560" height="315" src="https://www.youtube.com/embed/V43p6qIhFkc?list=PLEq-KSMM-P-0jRrVF5peNCA0GbBZrOhE1" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
54+
> [!VIDEO https://www.youtube.com/embed/V43p6qIhFkc?list=PLEq-KSMM-P-0jRrVF5peNCA0GbBZrOhE1]
5555
:::column-end:::
5656
:::column:::
5757
**How to set up Azure File Sync**
@@ -60,9 +60,9 @@ If you're new to Azure Files and File Sync or looking to deepen your understandi
6060

6161
:::row:::
6262
:::column:::
63-
<iframe width="560" height="315" src="https://www.youtube.com/embed/uStaB09y6TE" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
63+
> [!VIDEO https://www.youtube.com/embed/uStaB09y6TE]
6464
:::column-end:::
6565
:::column:::
6666
**Integrating HPC Pack with Azure Files**
6767
:::column-end:::
68-
:::row-end:::
68+
:::row-end:::

articles/storage/file-sync/file-sync-release-notes.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ The following release notes are for Azure File Sync version 16.0.0.0 (released J
5353
### Improvements and issues that are fixed
5454
- Improved Azure File Sync service availability
5555
- Azure File Sync is now a zone-redundant service which means an outage in a zone has limited impact while improving the service resiliency to minimize customer impact. To fully leverage this improvement, configure your storage accounts to use zone-redundant storage (ZRS) or Geo-zone redundant storage (GZRS) replication. To learn more about different redundancy options for your storage accounts, see [Azure Files redundancy](../files/files-redundancy.md).
56-
> [!Note]
57-
> Azure File Sync is zone-redundant in all regions that [support zones](../../reliability/availability-zones-service-support.md#azure-regions-with-availability-zone-support) except US Gov Virginia.
58-
5956
- Immediately run server change enumeration to detect files changes that were missed on the server
6057
- Azure File Sync uses the [Windows USN journal](/windows/win32/fileio/change-journals) feature on Windows Server to immediately detect files that were changed and upload them to the Azure file share. If files changed are missed due to journal wrap or other issues, the files will not sync to the Azure file share until the changes are detected. Azure File Sync has a server change enumeration job that runs every 24 hours on the server endpoint path to detect changes that were missed by the USN journal. If you don't want to wait until the next server change enumeration job runs, you can now use the Invoke-StorageSyncServerChangeDetection PowerShell cmdlet to immediately run server change enumeration on a server endpoint path.
6158

0 commit comments

Comments
 (0)