Skip to content

Commit f59c105

Browse files
authored
Merge pull request #41763 from MicrosoftDocs/FromPublicRepo
From public repo
2 parents fe82e36 + 2fdc81b commit f59c105

10 files changed

+19
-17
lines changed

articles/active-directory/active-directory-privileged-identity-management-getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: pim
1717
---
1818
# Start using Azure AD Privileged Identity Management
1919

20-
With Azure Active Directory (AD) Privileged Identity Management, you can manage, control, and monitor access within your organization. This scope includes access to resources Azure resources, Azure AD and other Microsoft online services like Office 365 or Microsoft Intune.
20+
With Azure Active Directory (AD) Privileged Identity Management, you can manage, control, and monitor access within your organization. This scope includes access to Azure resources, Azure AD and other Microsoft online services like Office 365 or Microsoft Intune.
2121

2222
This article tells you how to add the Azure AD PIM app to your Azure portal dashboard.
2323

articles/active-directory/connect/active-directory-aadconnect-troubleshoot-objectsync.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ ms.author: billmath
1616
---
1717

1818
# Troubleshoot object synchronization with Azure AD Connect sync
19-
This document provides steps for how to troubleshoot issues with object synchronization using the troubleshooting task.
19+
This article provides steps for troubleshooting issues with object synchronization by using the troubleshooting task. To see how troubleshooting works in Azure Active Directory (Azure AD) Connect, watch [this short video](https://aka.ms/AADCTSVideo).
2020

2121
## Troubleshooting task
22-
For Azure Active Directory (AAD) Connect deployment with version 1.1.749.0 or higher, use the troubleshooting task in the wizard to troubleshoot object synchronization issues. For earlier versions, please troubleshoot manually as described [here](active-directory-aadconnectsync-troubleshoot-object-not-syncing.md).
22+
For Azure AD Connect deployment with version 1.1.749.0 or higher, use the troubleshooting task in the wizard to troubleshoot object synchronization issues. For earlier versions, please troubleshoot manually as described [here](active-directory-aadconnectsync-troubleshoot-object-not-syncing.md).
2323

2424
### Run the troubleshooting task in the wizard
2525
To run the troubleshooting task in the wizard, perform the following steps:

articles/active-directory/develop/active-directory-v2-protocols-oauth-client-creds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ To use application permissions in your app, do the steps we discuss in the next
5959

6060
#### Request the permissions in the app registration portal
6161
1. Go to your application in the [Application Registration Portal](https://apps.dev.microsoft.com/?referrer=https://azure.microsoft.com/documentation/articles&deeplink=/appList), or [create an app](active-directory-v2-app-registration.md), if you haven't already. You'll need to use at least one Application Secret when you create your app.
62-
2. Locate the **Mcrosoft Graph Permissions** section, and then add the **application permissions** that your app requires.
62+
2. Locate the **Microsoft Graph Permissions** section, and then add the **application permissions** that your app requires.
6363
3. **Save** the app registration.
6464

6565
#### Recommended: Sign the user in to your app

articles/azure-resource-manager/resource-manager-templates-parameters.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.author: tomfitz
1919
# Parameters section of Azure Resource Manager templates
2020
In the parameters section of the template, you specify which values you can input when deploying the resources. These parameter values enable you to customize the deployment by providing values that are tailored for a particular environment (such as dev, test, and production). You do not have to provide parameters in your template, but without parameters your template would always deploy the same resources with the same names, locations, and properties.
2121

22-
You are limited to 255 parameters in a template. You can reduce the number of parameters by using objects that contain multiple properties, as show in this article.
22+
You are limited to 255 parameters in a template. You can reduce the number of parameters by using objects that contain multiple properties, as shown in this article.
2323

2424
## Define and use a parameter
2525

@@ -266,4 +266,4 @@ These example templates demonstrate some scenarios for using parameters. Deploy
266266
* To view complete templates for many different types of solutions, see the [Azure Quickstart Templates](https://azure.microsoft.com/documentation/templates/).
267267
* For how to input the parameter values during deployment, see [Deploy an application with Azure Resource Manager template](resource-group-template-deploy.md).
268268
* For details about the functions you can use from within a template, see [Azure Resource Manager Template Functions](resource-group-template-functions.md).
269-
* For information about using a parameter object, see [Use an object as a parameter in an Azure Resource Manager template](/azure/architecture/building-blocks/extending-templates/objects-as-parameters).
269+
* For information about using a parameter object, see [Use an object as a parameter in an Azure Resource Manager template](/azure/architecture/building-blocks/extending-templates/objects-as-parameters).

articles/event-hubs/event-hubs-quickstart-kafka-enabled-event-hubs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ If your Event Hubs Kafka cluster has events queued from the producer, you should
8080

8181
* [Learn about Event Hubs for Kafka Ecosystem](event-hubs-for-kafka-ecosystem-overview.md)
8282
* [Learn about Event Hubs](event-hubs-what-is-event-hubs.md)
83-
* Use [MirrorMaker](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=27846330) to stream events from Kafka on-prem to Kafka enabled Event Hubs on cloud.](event-hubs-kafka-mirror-maker-tutorial.md)
83+
* Use [MirrorMaker](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=27846330) to [stream events from Kafka on-prem to Kafka enabled Event Hubs on cloud.](event-hubs-kafka-mirror-maker-tutorial.md)

articles/lab-services/devtest-lab-create-custom-image-from-vm-using-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ You can create a custom image from a provisioned VM, and afterwards use that cus
4040

4141
![Create custom image menu item](./media/devtest-lab-create-template/create-custom-image.png)
4242

43-
1. On the **Custom image** pane, enter a name and description for your custom image. This information is displayed in the list of bases when you create a VM.
43+
1. On the **Custom image** pane, enter a name and description for your custom image. This information is displayed in the list of bases when you create a VM. The custom image will include the OS disk and all the data disks attached to the virtual machine.
4444

4545
![Create custom image pane](./media/devtest-lab-create-template/create-custom-image-blade.png)
4646

articles/log-analytics/log-analytics-containers.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ You can verify that the Container Monitoring solution is set correctly for Windo
524524
525525
## Solution components
526526
527-
If you are using Windows agents, then the following management pack is installed on each computer with an agent when you add this solution. No configuration or maintenance is required for the management pack.
527+
From the OMS portal, navigate to the *Solutions Gallery* and add the **Container Monitoring Solution**. If you are using Windows agents, then the following management pack is installed on each computer with an agent when you add this solution. No configuration or maintenance is required for the management pack.
528528
529529
- *ContainerManagement.xxx* installed in C:\Program Files\Microsoft Monitoring Agent\Agent\Health Service State\Management Packs
530530
@@ -560,6 +560,7 @@ Labels appended to *PodLabel* data types are your own custom labels. The appende
560560
## Monitor containers
561561
After you have the solution enabled in the Log Analytics portal, the **Containers** tile shows summary information about your container hosts and the containers running in hosts.
562562
563+
563564
![Containers tile](./media/log-analytics-containers/containers-title.png)
564565
565566
The tile shows an overview of how many containers you have in the environment and whether they're failed, running, or stopped.

articles/marketplace/marketplace-publishers-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ Each storefront offers specialized publishing options to help you maximize your
7474
## How to Publish on Cloud Marketplace
7575

7676
Becoming a cloud marketplace publisher is an easy three-step process:
77-
1. Determine the listing type right for your offer
77+
1. Choose a publishing option for your offer
7878
2. Sign up to become a cloud marketplace publisher
7979
3. Complete technical and content pre-requisites required by offer and listing type
8080

8181

82-
**1. Determine the Listing Type Right for Your Offer**
82+
**1. Choose a publishing option for your offer**
8383

8484
Each storefront supports multiple publishing options and offer types. Select an offer type that best represents your application and service details. All publishing options will give partners access to lead sharing.
8585

articles/service-fabric/service-fabric-cluster-capacity.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ The durability tier is used to indicate to the system the privileges that your V
6767

6868
This privilege is expressed in the following values:
6969

70-
* Gold - The infrastructure jobs can be paused for a duration of two hours per UD. Gold durability can be enabled only on full-node VM SKUs like L32s, GS5, G5, DS15_v2, D15_v2. In general, all the VM Sizes listed at http://aka.ms/vmspecs that are marked as 'Instance is isolated to hardware dedicated to a single customer' in the note, are full-node VMs.
71-
* Silver - The infrastructure Jobs can be paused for a duration of 10 minutes per UD and is available on all standard VMs of single core and above.
72-
* Bronze - No privileges. This is the default. Only use this durability level for Node Types that run _only_ stateless workloads.
70+
* Gold - Updates you make to your VMSS can be delayed until approved by the Service Fabric cluster. Updates and maintenance initiated by Azure can be delayed for up two hours, allowing additional time for replicas to recover from earlier failures. Gold durability can be enabled only on full-node VM sizes like L32s, GS5, G5, DS15_v2, D15_v2. In general, all the VM sizes listed at http://aka.ms/vmspecs that are marked as 'Instance is isolated to hardware dedicated to a single customer' in the note are full-node VMs.
71+
* Silver - Updates you make to your VMSS can be delayed until approved by the Service Fabric cluster. Updates and maintenance initiated by Azure cannot be delayed for any significant period of time. Silver durability is available on all standard VMs of single core and above.
72+
* Bronze - This is the default. Updates and maintenance affecting your VMs will not be delayed by the Service Fabric cluster.
7373

7474
> [!WARNING]
7575
> NodeTypes running with Bronze durability obtain _no privileges_. This means that infrastructure jobs that impact your stateless workloads will not be stopped or delayed. It is possible that such jobs can still impact your workloads, causing downtime or other issues. For any sort of production workload, running with at least Silver is recommended. You must maintain a minimum count of five nodes for any node-type that has a durability of Gold or Silver.
@@ -108,10 +108,11 @@ Use Silver or Gold durability for all node types that host stateful services you
108108
> Changing the VM SKU Size for virtual machine scale sets not running at least Silver durability is not recommended. Changing VM SKU Size is a data-destructive in-place infrastructure operation. Without at least some ability to delay or monitor this change, it is possible that the operation can cause data loss for stateful services or cause other unforeseen operational issues, even for stateless workloads.
109109
>
110110

111-
- Maintain a minimum count of five nodes for any virtual machine scale set that has durability level of Gold or Silver enabled
111+
- Maintain a minimum count of five nodes for any virtual machine scale set that has durability level of Gold or Silver enabled.
112+
- Each VM scale set with durability level Silver or Gold must map to its own node type in the Service Fabric cluster. Mapping multiple VM scale sets to a single node type will prevent coordination between the Service Fabric cluster and the Azure infrastructure from working properly.
112113
- Do not delete random VM instances, always use virtual machine scale set scale down feature. The deletion of random VM instances has a potential of creating imbalances in the VM instance spread across UD and FD. This imbalance could adversely affect the systems ability to properly load balance amongst the service instances/Service replicas.
113114
- If using Autoscale, then set the rules such that scale in (removing of VM instances) are done only one node at a time. Scaling down more than one instance at a time is not safe.
114-
- If Scaling down a primary node type, you should never scale it down more than what the reliability tier allows.
115+
- If deleting or deallocating VMs on the primary node type, you should never reduce the count of allocated VMs below what the reliability tier requires. These operations will be blocked indefinitely in a scale set with a durability level of Silver or Gold.
115116

116117
## The reliability characteristics of the cluster
117118
The reliability tier is used to set the number of replicas of the system services that you want to run in this cluster on the primary node type. The more the number of replicas, the more reliable the system services are in your cluster.

articles/service-fabric/service-fabric-quickstart-java-spring-boot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.custom: mvc, devcenter
2222
# Quickstart: deploy a Java Spring Boot Application to Azure
2323
Azure Service Fabric is a distributed systems platform for deploying and managing microservices and containers.
2424

25-
This quickstart shows how to deploy a Spring Boot application to Service Fabric using a Mac or Linux developer machine. This quickstart uses the [Getting Started](https://spring.io/guides/gs/spring-boot/) sample from the Spring website. Using familiar command-line tools, this quickstart walks you through deploying the Spring Boot sample as a Service Fabric application. When you're finished, you have the Spring Boot Getting Started sample working on Service Fabric.
25+
Using familiar command-line tools, this quickstart walks you through how to deploy a functional Spring Boot application to Service Fabric on a Mac or Linux developer machine using the [Getting Started](https://spring.io/guides/gs/spring-boot/) sample from the Spring website.
2626

2727
![Application Screenshot](./media/service-fabric-quickstart-java-spring-boot/springbootsflocalhost.png)
2828

0 commit comments

Comments
 (0)