Skip to content

Commit 417689a

Browse files
authored
Merge pull request #58219 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents eb87648 + a282196 commit 417689a

File tree

4 files changed

+29
-24
lines changed

4 files changed

+29
-24
lines changed

articles/active-directory-b2c/claim-resolver-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ In the following example, a claim type named `correlationId` is defined with a *
2929
</ClaimType>
3030
```
3131

32-
In the technical profile, map the claim resolver to the claim type. Azure AD B2C populates the value of the claim resolver `{context:corelationId}` into the claim `correlationId` and sends the claim to the technical profile.
32+
In the technical profile, map the claim resolver to the claim type. Azure AD B2C populates the value of the claim resolver `{Context:CorrelationId}` into the claim `correlationId` and sends the claim to the technical profile.
3333

3434
```XML
35-
<InputClaim ClaimTypeReferenceId="correlationId" DefaultValue="{context:corelationId}" />
35+
<InputClaim ClaimTypeReferenceId="correlationId" DefaultValue="{Context:CorrelationId}" />
3636
```
3737

3838
## Claim resolver types

articles/governance/management-groups/manage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ To see what permissions you have, select the management group and then select **
211211

212212
### Move subscriptions in PowerShell
213213

214-
To move a subscription in PowerShell, you use the Add-AzureRmManagementGroupSubscription command.
214+
To move a subscription in PowerShell, you use the New-AzureRmManagementGroupSubscription command.
215215

216216
```azurepowershell-interactive
217217
New-AzureRmManagementGroupSubscription -GroupName 'Contoso' -SubscriptionId '12345678-1234-1234-1234-123456789012'
@@ -286,4 +286,4 @@ To Learn more about management groups, see:
286286
- [Create management groups to organize Azure resources](create.md)
287287
- [Install the Azure Powershell module](https://www.powershellgallery.com/packages/AzureRM.ManagementGroups)
288288
- [Review the REST API Spec](https://github.com/Azure/azure-rest-api-specs/tree/master/specification/managementgroups/resource-manager/Microsoft.Management/preview)
289-
- [Install the Azure CLI Extension](/cli/azure/extension?view=azure-cli-latest#az-extension-list-available)
289+
- [Install the Azure CLI Extension](/cli/azure/extension?view=azure-cli-latest#az-extension-list-available)

articles/security/azure-operational-security-best-practices.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22

33
title: Azure Operational Security best practices| Microsoft Docs
44
description: This article provides a set of best practices for Azure Operational Security.
@@ -53,38 +53,38 @@ Customers build an end-to-end network in Azure by combining network resources li
5353

5454
The following are best practices for network monitoring and available tools.
5555

56-
**Best practice**: Automate remote network monitoring with packet capture.
56+
**Best practice**: Automate remote network monitoring with packet capture.
5757
**Detail**: Monitor and diagnose networking issues without logging in to your VMs by using Network Watcher. Trigger [packet capture](../network-watcher/network-watcher-alert-triggered-packet-capture.md) by setting alerts and gain access to real-time performance information at the packet level. When you see an issue, you can investigate in detail for better diagnoses.
5858

59-
**Best practice**: Gain insight into your network traffic by using flow logs.
59+
**Best practice**: Gain insight into your network traffic by using flow logs.
6060
**Detail**: Build a deeper understanding of your network traffic patterns by using [network security group flow logs](../network-watcher/network-watcher-nsg-flow-logging-overview.md). Information in flow logs helps you gather data for compliance, auditing, and monitoring your network security profile.
6161

62-
**Best practice**: Diagnose VPN connectivity issues.
62+
**Best practice**: Diagnose VPN connectivity issues.
6363
**Detail**: Use Network Watcher to [diagnose your most common VPN Gateway and connection issues](../network-watcher/network-watcher-diagnose-on-premises-connectivity.md). You can not only identify the issue but also use detailed logs to further investigate.
6464

6565
## Secure deployment by using proven DevOps tools
6666
Use the following DevOps best practices to ensure that your enterprise and teams are productive and efficient.
6767

68-
**Best practice**: Automate the build and deployment of services.
69-
**Detail**: [Infrastructure as code](https://en.wikipedia.org/wiki/Infrastructure_as_Code) is a set of techniques and practices that help IT pros remove the burden of day-to-day build and management of modular infrastructure. It enables IT pros to build and maintain their modern server environment in a way that’s like how software developers build and maintain application code.
68+
**Best practice**: Automate the build and deployment of services.
69+
**Detail**: [Infrastructure as code](https://docs.microsoft.com/azure/devops/learn/what-is-infrastructure-as-code) is a set of techniques and practices that help IT pros remove the burden of day-to-day build and management of modular infrastructure. It enables IT pros to build and maintain their modern server environment in a way that’s like how software developers build and maintain application code.
7070

7171
You can use [Azure Resource Manager](https://azure.microsoft.com/documentation/articles/resource-group-authoring-templates/) to provision your applications by using a declarative template. In a single template, you can deploy multiple services along with their dependencies. You use the same template to repeatedly deploy your application in every stage of the application lifecycle.
7272

73-
**Best practice**: Automatically build and deploy to Azure web apps or cloud services.
74-
**Detail**: You can configure your Visual Studio Team Services (VSTS) team projects to [automatically build and deploy](https://www.visualstudio.com/docs/build/overview) to Azure web apps or cloud services. VSTS automatically deploys the binaries after doing a build to Azure after every code check-in. The package build process is equivalent to the Package command in Visual Studio, and the publishing steps are equivalent to the Publish command in Visual Studio.
73+
**Best practice**: Automatically build and deploy to Azure web apps or cloud services.
74+
**Detail**: You can use Azure Pipelines to [automatically build and deploy](https://docs.microsoft.com/azure/devops/pipelines/index?view=vsts) to Azure web apps or cloud services. Azure Pipelines automatically deploys the binaries after doing a build to Azure after every code check-in. The package build process is equivalent to the Package command in Visual Studio, and the publishing steps are equivalent to the Publish command in Visual Studio.
7575

76-
**Best practice**: Automate release management.
77-
**Detail**: Visual Studio [Release Management](https://msdn.microsoft.com/library/vs/alm/release/overview) is a solution for automating multiple-stage deployment and managing the release process. Create managed continuous deployment pipelines to release quickly, easily, and often. With Release Management, you can automate your release process, and you can have predefined approval workflows. Deploy on-premises and to the cloud, extend, and customize as required.
76+
**Best practice**: Use continuous deployment.
77+
**Detail**: [Azure Pipelines](https://docs.microsoft.com/azure/devops/pipelines/index?view=vsts) is a solution for automating multiple-stage deployment and managing the release process. Create managed continuous deployment pipelines to release quickly, easily, and often. With Azure Pipelines, you can automate your release process, and you can have predefined approval workflows. Deploy on-premises and to the cloud, extend, and customize as required.
7878

79-
**Best practice**: Check your app's performance before you launch it or deploy updates to production.
80-
**Detail**: Run cloud-based [load tests](https://www.visualstudio.com/docs/test/performance-testing/getting-started/getting-started-with-performance-testing) by using VSTS to:
79+
**Best practice**: Check your app's performance before you launch it or deploy updates to production.
80+
**Detail**: Run cloud-based [load tests](https://docs.microsoft.com/azure/devops/test/load-test/app-service-web-app-performance-test?view=vsts) by using Azure Test Plans to:
8181

8282
- Find performance problems in your app.
8383
- Improve deployment quality.
8484
- Make sure that your app is always available.
8585
- Make sure that your app can handle traffic for your next launch or marketing campaign.
8686

87-
**Best practice**: Monitor application performance.
87+
**Best practice**: Monitor application performance.
8888
**Detail**: [Azure Application Insights](../application-insights/app-insights-overview.md) is an extensible application performance management (APM) service for web developers on multiple platforms. Use Application Insights to monitor your live web application. It automatically detects performance anomalies. It includes analytics tools to help you diagnose issues and to understand what users actually do with your app. It's designed to help you continuously improve performance and usability.
8989

9090
## Mitigate and protect against DDoS
@@ -94,19 +94,19 @@ Designing and building for DDoS resiliency requires planning and designing for a
9494

9595
Following are best practices for building DDoS-resilient services on Azure.
9696

97-
**Best practice**: Ensure that security is a priority throughout the entire lifecycle of an application, from design and implementation to deployment and operations. Applications can have bugs that allow a relatively low volume of requests to use a lot of resources, resulting in a service outage.
97+
**Best practice**: Ensure that security is a priority throughout the entire lifecycle of an application, from design and implementation to deployment and operations. Applications can have bugs that allow a relatively low volume of requests to use a lot of resources, resulting in a service outage.
9898
**Detail**: To help protect a service running on Microsoft Azure, you should have a good understanding of your application architecture and focus on the [five pillars of software quality](https://docs.microsoft.com/azure/architecture/guide/pillars). You should know typical traffic volumes, the connectivity model between the application and other applications, and the service endpoints that are exposed to the public internet.
9999

100100
Ensuring that an application is resilient enough to handle a denial of service that's targeted at the application itself is most important. Security and privacy are built into the Azure platform, beginning with the [Security Development Lifecycle (SDL)](https://www.microsoft.com/en-us/sdl). The SDL addresses security at every development phase and ensures that Azure is continually updated to make it even more secure.
101101

102-
**Best practice**: Design your applications to [scale horizontally](https://docs.microsoft.com/azure/architecture/guide/design-principles/scale-out) to meet the demand of an amplified load, specifically in the event of a DDoS attack. If your application depends on a single instance of a service, it creates a single point of failure. Provisioning multiple instances makes your system more resilient and more scalable.
102+
**Best practice**: Design your applications to [scale horizontally](https://docs.microsoft.com/azure/architecture/guide/design-principles/scale-out) to meet the demand of an amplified load, specifically in the event of a DDoS attack. If your application depends on a single instance of a service, it creates a single point of failure. Provisioning multiple instances makes your system more resilient and more scalable.
103103
**Detail**: For [Azure App Service](../app-service/app-service-value-prop-what-is.md), select an [App Service plan](../app-service/azure-web-sites-web-hosting-plans-in-depth-overview.md) that offers multiple instances.
104104

105105
For Azure Cloud Services, configure each of your roles to use [multiple instances](../cloud-services/cloud-services-choose-me.md).
106106

107107
For [Azure Virtual Machines](../virtual-machines/windows/overview.md), ensure that your VM architecture includes more than one VM and that each VM is included in an [availability set](../virtual-machines/virtual-machines-windows-manage-availability.md). We recommend using virtual machine scale sets for autoscaling capabilities.
108108

109-
**Best practice**: Layering security defenses in an application reduces the chance of a successful attack. Implement secure designs for your applications by using the built-in capabilities of the Azure platform.
109+
**Best practice**: Layering security defenses in an application reduces the chance of a successful attack. Implement secure designs for your applications by using the built-in capabilities of the Azure platform.
110110
**Detail**: The risk of attack increases with the size (surface area) of the application. You can reduce the surface area by using whitelisting to close down the exposed IP address space and listening ports that are not needed on the load balancers ([Azure Load Balancer](../load-balancer/load-balancer-get-started-internet-portal.md) and [Azure Application Gateway](../application-gateway/application-gateway-create-probe-portal.md)).
111111

112112
[Network security groups](../virtual-network/security-overview.md) are another way to reduce the attack surface. You can use [service tags](../virtual-network/security-overview.md#service-tags) and [application security groups](../virtual-network/security-overview.md#application-security-groups) to minimize complexity for creating security rules and configuring network security, as a natural extension of an application’s structure.

articles/service-fabric/service-fabric-patterns-networking.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,20 @@ In the examples in this article, we use the Service Fabric template.json. You ca
102102
},*/
103103
```
104104
105+
2. Comment out `nicPrefixOverride` attribute of `Microsoft.Compute/virtualMachineScaleSets`, because you are using existing subnet and you have disabled this variable in step 1.
105106
106-
2. Change the `vnetID` variable to point to the existing virtual network:
107+
```
108+
/*"nicPrefixOverride": "[parameters('subnet0Prefix')]",*/
109+
```
110+
111+
3. Change the `vnetID` variable to point to the existing virtual network:
107112
108113
```
109114
/*old "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',parameters('virtualNetworkName'))]",*/
110115
"vnetID": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('existingVNetRGName'), '/providers/Microsoft.Network/virtualNetworks/', parameters('existingVNetName'))]",
111116
```
112117
113-
3. Remove `Microsoft.Network/virtualNetworks` from your resources, so Azure does not create a new virtual network:
118+
4. Remove `Microsoft.Network/virtualNetworks` from your resources, so Azure does not create a new virtual network:
114119
115120
```
116121
/*{
@@ -140,7 +145,7 @@ In the examples in this article, we use the Service Fabric template.json. You ca
140145
},*/
141146
```
142147
143-
4. Comment out the virtual network from the `dependsOn` attribute of `Microsoft.Compute/virtualMachineScaleSets`, so you don't depend on creating a new virtual network:
148+
5. Comment out the virtual network from the `dependsOn` attribute of `Microsoft.Compute/virtualMachineScaleSets`, so you don't depend on creating a new virtual network:
144149
145150
```
146151
"apiVersion": "[variables('vmssApiVersion')]",
@@ -154,7 +159,7 @@ In the examples in this article, we use the Service Fabric template.json. You ca
154159
155160
```
156161
157-
5. Deploy the template:
162+
6. Deploy the template:
158163
159164
```powershell
160165
New-AzureRmResourceGroup -Name sfnetworkingexistingvnet -Location westus

0 commit comments

Comments
 (0)