Skip to content

Commit fbfa2e5

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-old-review
2 parents 232ed94 + 5fc0c8b commit fbfa2e5

23 files changed

+98
-141
lines changed

articles/active-directory/manage-apps/migrate-adfs-apps-to-azure.md

Lines changed: 27 additions & 32 deletions
Large diffs are not rendered by default.

articles/active-directory/roles/permissions-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2096,7 +2096,7 @@ Users with this role have global read-only access on security-related feature, i
20962096
In | Can do
20972097
--- | ---
20982098
[Microsoft 365 Defender portal](/microsoft-365/security/defender/microsoft-365-defender-portal) | View security-related policies across Microsoft 365 services<br>View security threats and alerts<br>View reports
2099-
[Identity Protection](../identity-protection/overview-identity-protection.md) | Read all security reports and settings information for security features<br><ul><li>Anti-spam<li>Encryption<li>Data loss prevention<li>Anti-malware<li>Advanced threat protection<li>Anti-phishing<li>Mail flow rules
2099+
[Identity Protection](../identity-protection/overview-identity-protection.md) | View all Identity Protection reports and Overview
21002100
[Privileged Identity Management](../privileged-identity-management/pim-configure.md) | Has read-only access to all information surfaced in Azure AD Privileged Identity Management: Policies and reports for Azure AD role assignments and security reviews.<br>**Cannot** sign up for Azure AD Privileged Identity Management or make any changes to it. In the Privileged Identity Management portal or via PowerShell, someone in this role can activate additional roles (for example, Global Administrator or Privileged Role Administrator), if the user is eligible for them.
21012101
[Microsoft Purview compliance portal](/microsoft-365/compliance/microsoft-365-compliance-center) | View security policies<br>View and investigate security threats<br>View reports
21022102
[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint/prepare-deployment) | View and investigate alerts<br/>When you turn on role-based access control in Microsoft Defender for Endpoint, users with read-only permissions such as the Security Reader role lose access until they are assigned a Microsoft Defender for Endpoint role.

articles/aks/web-app-routing.md

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ spec:
396396

397397
### Create the ingress
398398

399-
The Web Application Routing add-on creates an Ingress class on the cluster called `webapprouting.kubernetes.azure.com `. When you create an ingress object with this class, this activates the add-on. To obtain the certificate URI to use in the Ingress from Azure Key Vault, run the following command.
399+
The Web Application Routing add-on creates an Ingress class on the cluster called `webapprouting.kubernetes.azure.com `. When you create an ingress object with this class, this activates the add-on. The `kubernetes.azure.com/use-osm-mtls: "true"` annotation on the Ingress object creates an Open Service Mesh (OSM) [IngressBackend](https://release-v1-2.docs.openservicemesh.io/docs/guides/traffic_management/ingress/#ingressbackend-api) to configure a backend service to accept ingress traffic from trusted sources. OSM issues a certificate that Nginx will use as the client certificate to proxy HTTPS connections to TLS backends. The client certificate and CA certificate are stored in a Kubernetes secret that Nginx will use to authenticate service mesh backends. For more information, see [Open Service Mesh: Ingress with Kubernetes Nginx Ingress Controller](https://release-v1-2.docs.openservicemesh.io/docs/demos/ingress_k8s_nginx/). To obtain the certificate URI to use in the Ingress from Azure Key Vault, run the following command.
400400

401401
```azurecli-interactive
402402
az keyvault certificate show --vault-name <KeyVaultName> -n <KeyVaultCertificateName> --query "id" --output tsv
@@ -441,34 +441,6 @@ spec:
441441
secretName: keyvault-aks-helloworld
442442
```
443443

444-
### Create the ingress backend
445-
446-
Open Service Mesh (OSM) uses its [IngressBackend API](https://release-v1-2.docs.openservicemesh.io/docs/guides/traffic_management/ingress/#ingressbackend-api) to configure a backend service to accept ingress traffic from trusted sources. To proxy connections to HTTPS backends, you configure the Ingress and IngressBackend configurations to use https as the backend protocol. OSM issues a certificate that Nginx will use as the client certificate to proxy HTTPS connections to TLS backends. The client certificate and CA certificate are stored in a Kubernetes secret that Nginx will use to authenticate service mesh backends. For more information, see [Open Service Mesh: Ingress with Kubernetes Nginx Ingress Controller](https://release-v1-2.docs.openservicemesh.io/docs/demos/ingress_k8s_nginx/).
447-
448-
Create a file named **ingressbackend.yaml** and copy in the following YAML.
449-
450-
```yaml
451-
apiVersion: policy.openservicemesh.io/v1alpha1
452-
kind: IngressBackend
453-
metadata:
454-
name: aks-helloworld
455-
namespace: hello-web-app-routing
456-
spec:
457-
backends:
458-
- name: aks-helloworld
459-
port:
460-
number: 80
461-
protocol: https
462-
tls:
463-
skipClientCertValidation: false
464-
sources:
465-
- kind: Service
466-
name: nginx
467-
namespace: app-routing-system
468-
- kind: AuthenticatedPrincipal
469-
name: ingress-nginx.ingress.cluster.local
470-
```
471-
472444
### Create the resources on the cluster
473445

474446
Use the [kubectl apply][kubectl-apply] command to create the resources.

articles/azure-functions/durable/quickstart-python-vscode.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,10 @@ You now have a Durable Functions app that can be run locally and deployed to Azu
178178
179179
::: zone pivot="python-mode-decorators"
180180
181+
> [!NOTE]
182+
> Using [Extension Bundles](../functions-bindings-register.md#extension-bundles) is not currently supported when trying out the Python V2 programming model with Durable Functions, so you will need to manage your extensions manually.
183+
> To do this, remove the `extensionBundle` section of your `host.json` as described [here](../functions-run-local.md#install-extensions) and run `func extensions install --package Microsoft.Azure.WebJobs.Extensions.DurableTask --version 2.9.1` on your terminal. This will install the Durable Functions extension for your app and will allow you to try out the new experience.
184+
181185
To create a basic Durable Functions app using these 3 function types, replace the contents of `function_app.py` with the following Python code.
182186
183187
```Python

articles/ddos-protection/TOC.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,28 @@
3636
href: telemetry.md
3737
- name: Concepts
3838
items:
39-
- name: Types of attacks
40-
href: types-of-attacks.md
41-
- name: Fundamental best practices
42-
href: fundamental-best-practices.md
4339
- name: Azure DDoS Protection features
4440
href: ddos-protection-features.md
45-
- name: Components of a DDoS response strategy
46-
href: ddos-response-strategy.md
4741
- name: Reference architectures
4842
href: ddos-protection-reference-architectures.md
43+
- name: Monitoring Azure DDoS Protection
44+
href: monitor-ddos-protection-reference.md
4945
- name: Business continuity
5046
href: ddos-disaster-recovery-guidance.md
47+
- name: Fundamental best practices
48+
href: fundamental-best-practices.md
49+
- name: Components of a DDoS response strategy
50+
href: ddos-response-strategy.md
5151
- name: Security baseline
5252
href: /security/benchmark/azure/baselines/azure-ddos-protection-security-baseline?toc=%2fazure%2fddos-protection%2ftoc.json?toc=/azure/ddos-protection/TOC.json
53-
- name: Monitoring Azure DDoS Protection
54-
href: monitor-ddos-protection-reference.md
53+
- name: Types of attacks
54+
href: types-of-attacks.md
55+
- name: Inline L7 DDoS protection with Gateway Load Balancer and partner NVAs
56+
href: inline-protection-glb.md
57+
- name: Onboard partners
58+
href: ddos-protection-partner-onboarding.md
59+
- name: Manage permissions and restrictions
60+
href: manage-permissions.md
5561
- name: How-to guides
5662
items:
5763
- name: Configure Monitoring and Logging
@@ -62,7 +68,7 @@
6268
href: alerts.md
6369
- name: Configure diagnostic logging alerts
6470
href: ddos-diagnostic-alert-templates.md
65-
- name: Configure DDoS diagnostic logging
71+
- name: Configure diagnostic logging
6672
href: diagnostic-logging.md
6773
- name: View Monitoring and Logging
6874
items:
@@ -72,14 +78,8 @@
7278
href: ddos-view-diagnostic-logs.md
7379
- name: Test with simulation partners
7480
href: test-through-simulations.md
75-
- name: Manage permissions and restrictions
76-
href: manage-permissions.md
7781
- name: Engage DDoS Rapid Response (DRR)
7882
href: ddos-rapid-response.md
79-
- name: Inline L7 DDoS protection with Gateway Load Balancer and partner NVAs
80-
href: inline-protection-glb.md
81-
- name: Onboard partners
82-
href: ddos-protection-partner-onboarding.md
8383
- name: Reference
8484
items:
8585
- name: Azure Policy built-ins

articles/ddos-protection/alerts.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,5 @@ You can keep your resources for the next tutorial. If no longer needed, delete t
126126
1. Select the alerts created in this tutorial, then select **Delete**.
127127
## Next steps
128128

129-
In this article, you learned how to configure metric alerts through Azure Monitor.
130-
131-
To learn how to test and simulate a DDoS attack, see the simulation testing guide:
132-
133-
> [!div class="nextstepaction"]
134-
> [Test through simulations](test-through-simulations.md)
129+
* [Test through simulations](test-through-simulations.md)
130+
* [View alerts in Microsoft Defender for Cloud](ddos-view-alerts-defender-for-cloud.md)

articles/ddos-protection/ddos-configure-log-analytics-workspace.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,4 @@ For more information, see [Log Analytics workspace overview](../azure-monitor/lo
6363

6464
## Next steps
6565

66-
In this article, you learned how to configure a Log Analytics workspace for Azure DDoS Protection.
67-
68-
To learn how to configure diagnostic logging, see the diagnostic logging guide:
69-
70-
> [!div class="nextstepaction"]
71-
> [Test through simulations](test-through-simulations.md)
66+
* [configure diagnostic logging alerts](ddos-diagnostic-alert-templates.md)

articles/ddos-protection/ddos-diagnostic-alert-templates.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,5 @@ You can keep your resources for the next guide. If no longer needed, delete the
9494

9595
## Next steps
9696

97-
In this article, you learned how to configure diagnostic logging alerts through Azure Monitor.
98-
99-
To learn how to test and simulate a DDoS attack, see the simulation testing guide:
100-
101-
> [!div class="nextstepaction"]
102-
> [Test through simulations](test-through-simulations.md)
97+
* [Test through simulations](test-through-simulations.md)
98+
* [View alerts in Microsoft Defender for Cloud](ddos-view-alerts-defender-for-cloud.md)

articles/ddos-protection/ddos-disaster-recovery-guidance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ To create a virtual network, see [Create a virtual network](../virtual-network/m
4343

4444
## Next steps
4545

46-
- Learn how to [create a DDoS protection plan](manage-ddos-protection.md).
46+
- Learn how to [configure diagnostic logging](diagnostic-logging.md).

articles/ddos-protection/ddos-protection-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ Learn how your services will respond to an attack by [testing through simulation
8080

8181
## Next steps
8282

83-
- Learn how to [create an Azure DDoS Protection plan](manage-ddos-protection.md).
83+
- Learn more about [reference architectures](ddos-protection-reference-architectures.md).

0 commit comments

Comments
 (0)