Skip to content

Commit 0f852de

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into juneupdate2019
2 parents e03c652 + e396a7d commit 0f852de

File tree

9 files changed

+67
-61
lines changed

9 files changed

+67
-61
lines changed

articles/active-directory/hybrid/how-to-connect-install-prerequisites.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ Before you install Azure AD Connect, there are a few things that you need.
4343
* It is recommended to [enable the Active Directory recycle bin](how-to-connect-sync-recycle-bin.md).
4444

4545
### Azure AD Connect server
46+
>[!IMPORTANT]
47+
>The Azure AD Connect server contains critical identity data and should be treated as a Tier 0 component as documented in [the Active Directory administrative tier model](https://docs.microsoft.com/windows-server/identity/securing-privileged-access/securing-privileged-access-reference-material#ADATM_BM)
48+
4649
* Azure AD Connect cannot be installed on Small Business Server or Windows Server Essentials before 2019 (Windows Server Essentials 2019 is supported). The server must be using Windows Server standard or better.
4750
* Installing Azure AD Connect on a Domain Controller is not recommended due to security practices and more restrictive settings that can prevent Azure AD Connect from installing correctly
4851
* The Azure AD Connect server must have a full GUI installed. It is **not supported** to install on server core.

articles/azure-monitor/insights/vminsights-enable-hybrid-cloud.md

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ ms.author: magoedte
1919

2020
[!INCLUDE [updated-for-az](../../../includes/updated-for-az.md)]
2121

22-
This article explains how to enable Azure Monitor for VMs (preview) for virtual machines or physical computers hosted in your datacenter or other cloud environment. At the end of this process you will have successfully begun monitoring your virtual machines in your environment and learn if they are experiencing any performance or availability issues.
22+
This article explains how to enable Azure Monitor for VMs (preview) for virtual machines or physical computers hosted in your datacenter or other cloud environment. At the end of this process, you will have successfully begun monitoring your virtual machines in your environment and learn if they are experiencing any performance or availability issues.
2323

24-
Before getting started, be sure to review the [prerequisites](vminsights-enable-overview.md) and verify your subscription and resources meet the requirements. Review the requirements and deployment methods for the [Log Analytics Linux and Windows agent](../../log-analytics/log-analytics-agent-overview.md).
24+
Before you get started, be sure to review the [prerequisites](vminsights-enable-overview.md) and verify that your subscription and resources meet the requirements. Review the requirements and deployment methods for the [Log Analytics Linux and Windows agent](../../log-analytics/log-analytics-agent-overview.md).
2525

2626
[!INCLUDE [log-analytics-agent-note](../../../includes/log-analytics-agent-note.md)]
2727

2828
>[!NOTE]
29-
>The Azure Monitor for VMs Map Dependency agent doesn't transmit any data itself, and it doesn't require any changes to firewalls or ports. The Map data is always transmitted by the Log Analytics agent to the Azure Monitor service, either directly or through the [OMS Gateway](../../azure-monitor/platform/gateway.md) if your IT security policies don't allow computers on the network to connect to the internet.
29+
>The Azure Monitor for VMs Map Dependency agent doesn't transmit any data itself, and it doesn't require any changes to firewalls or ports. The Map data is always transmitted by the Log Analytics agent to the Azure Monitor service, either directly or through the [Operations Management Suite gateway](../../azure-monitor/platform/gateway.md) if your IT security policies don't allow computers on the network to connect to the internet.
3030
31-
The tasks to complete this task are summarized as follows:
31+
The steps to complete this task are summarized as follows:
3232

33-
1. Install Log Analytics agent for Windows or Linux. Before installing the agent, review the [Log Analytics agent overview](../platform/log-analytics-agent.md) article to understand system prerequisites and deployment methods.
33+
1. Install Log Analytics agent for Windows or Linux. Before you install the agent, review the [Log Analytics agent overview](../platform/log-analytics-agent.md) article to understand system prerequisites and deployment methods.
3434

3535
2. Download and install the Azure Monitor for VMs Map Dependency agent for [Windows](https://aka.ms/dependencyagentwindows) or [Linux](https://aka.ms/dependencyagentlinux).
3636

@@ -51,9 +51,9 @@ The following table highlights the parameters that are supported by setup for th
5151
| /? | Returns a list of the command-line options. |
5252
| /S | Performs a silent installation with no user interaction. |
5353

54-
For example, to run the installation program with the `/?` parameter, type **InstallDependencyAgent-Windows.exe /?**.
54+
For example, to run the installation program with the `/?` parameter, enter **InstallDependencyAgent-Windows.exe /?**.
5555

56-
Files for the Windows Dependency agent are installed in *C:\Program Files\Microsoft Dependency Agent* by default. If the Dependency agent fails to start after setup is complete, check the logs for detailed error information. The log directory is *%Programfiles%\Microsoft Dependency Agent\logs*.
56+
Files for the Windows Dependency agent are installed in *C:\Program Files\Microsoft Dependency Agent* by default. If the Dependency agent fails to start after setup is finished, check the logs for detailed error information. The log directory is *%Programfiles%\Microsoft Dependency Agent\logs*.
5757

5858
## Install the Dependency agent on Linux
5959
The Dependency agent is installed on Linux servers from *InstallDependencyAgent-Linux64.bin*, a shell script with a self-extracting binary. You can run the file by using `sh` or add execute permissions to the file itself.
@@ -68,9 +68,9 @@ The Dependency agent is installed on Linux servers from *InstallDependencyAgent-
6868
| -s | Perform a silent installation with no user prompts. |
6969
| --check | Check permissions and the operating system, but don't install the agent. |
7070

71-
For example, to run the installation program with the `-help` parameter, type **InstallDependencyAgent-Linux64.bin -help**.
71+
For example, to run the installation program with the `-help` parameter, enter **InstallDependencyAgent-Linux64.bin -help**.
7272

73-
Install the Linux Dependency agent as root by running the following command, `sh InstallDependencyAgent-Linux64.bin`.
73+
Install the Linux Dependency agent as root by running the command `sh InstallDependencyAgent-Linux64.bin`.
7474

7575
If the Dependency agent fails to start, check the logs for detailed error information. On Linux agents, the log directory is */var/opt/microsoft/dependency-agent/log*.
7676

@@ -85,18 +85,18 @@ Files for the Dependency agent are placed in the following directories:
8585
| Binary storage files | /var/opt/microsoft/dependency-agent/storage |
8686

8787
## Enable performance counters
88-
If the Log Analytics workspace that's referenced by the solution isn't already configured to collect the performance counters required by the solution, you will need to enable them. You can do so in either of two ways:
88+
If the Log Analytics workspace that's referenced by the solution isn't already configured to collect the performance counters required by the solution, you need to enable them. You can do so in one of two ways:
8989
* Manually, as described in [Windows and Linux performance data sources in Log Analytics](../../azure-monitor/platform/data-sources-performance-counters.md)
90-
* By downloading and running a PowerShell script that's available from [Azure PowerShell Gallery](https://www.powershellgallery.com/packages/Enable-VMInsightsPerfCounters/1.1)
90+
* By downloading and running a PowerShell script that's available from the [Azure PowerShell Gallery](https://www.powershellgallery.com/packages/Enable-VMInsightsPerfCounters/1.1)
9191

9292
## Deploy Azure Monitor for VMs
9393
This method includes a JSON template that specifies the configuration for enabling the solution components in your Log Analytics workspace.
9494

95-
If you're unfamiliar with deploying resources by using a template, see:
95+
If you don't know how to deploy resources by using a template, see:
9696
* [Deploy resources with Resource Manager templates and Azure PowerShell](../../azure-resource-manager/resource-group-template-deploy.md)
9797
* [Deploy resources with Resource Manager templates and the Azure CLI](../../azure-resource-manager/resource-group-template-deploy-cli.md)
9898

99-
If you choose to use the Azure CLI, you first need to install and use the CLI locally. You must be running the Azure CLI version 2.0.27 or later. To identify your version, run `az --version`. If you need to install or upgrade the Azure CLI, see [Install the Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli).
99+
To use the Azure CLI, you first need to install and use the CLI locally. You must be running the Azure CLI version 2.0.27 or later. To identify your version, run `az --version`. To install or upgrade the Azure CLI, see [Install the Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli).
100100

101101
### Create and execute a template
102102

@@ -174,7 +174,7 @@ If you choose to use the Azure CLI, you first need to install and use the CLI lo
174174
New-AzResourceGroupDeployment -Name DeploySolutions -TemplateFile InstallSolutionsForVMInsights.json -ResourceGroupName ResourceGroupName> -WorkspaceName <WorkspaceName> -WorkspaceLocation <WorkspaceLocation - example: eastus>
175175
```
176176

177-
The configuration change can take a few minutes to complete. When it's complete, a message is displayed that's similar to the following and includes the result:
177+
The configuration change can take a few minutes to finish. When it's finished, a message displays that's similar to the following and includes the result:
178178

179179
```powershell
180180
provisioningState : Succeeded
@@ -183,4 +183,9 @@ If you choose to use the Azure CLI, you first need to install and use the CLI lo
183183

184184
## Next steps
185185

186-
Now that monitoring is enabled for your virtual machines, this information is available for analysis with Azure Monitor for VMs. To learn how to use the Health feature, see [View Azure Monitor for VMs Health](vminsights-health.md). To view discovered application dependencies, see [View Azure Monitor for VMs Map](vminsights-maps.md). To identify bottlenecks and overall utilization with your VMs performance, see [View Azure VM Performance](vminsights-performance.md), or to view discovered application dependencies, see [View Azure Monitor for VMs Map](vminsights-maps.md).
186+
Now that monitoring is enabled for your virtual machines, this information is available for analysis with Azure Monitor for VMs.
187+
188+
- To learn how to use the Health feature, see [View Azure Monitor for VMs health](vminsights-health.md).
189+
- To view discovered application dependencies, see [View Azure Monitor for VMs Map](vminsights-maps.md).
190+
- To identify bottlenecks and overall utilization with your VM's performance, see [View Azure VM performance](vminsights-performance.md).
191+
- To view discovered application dependencies, see [View Azure Monitor for VMs Map](vminsights-maps.md).

articles/cognitive-services/cognitive-services-container-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ In addition, some containers are supported in Cognitive Services [**All-In-One o
7878
Azure Cognitive Services containers are publicly available through your Azure subscription, and Docker container images can be pulled from either the Microsoft Container Registry or Docker Hub. You can use the [docker pull](https://docs.docker.com/engine/reference/commandline/pull/) command to download a container image from the appropriate registry.
7979

8080
> [!IMPORTANT]
81-
> Currently, you must complete a sign-up process to access the following containers, in which you fill out and submit a questionnaire with questions about you, your company, and the use case for which you want to implement the containers. Once you're granted access and provided credentials, you can then pull the container images for the Face and Recognize Text containers from a private container registry hosted by Azure Container Registry.
81+
> Currently, you must complete a sign-up process to access the following containers, in which you fill out and submit a questionnaire with questions about you, your company, and the use case for which you want to implement the containers. Once you're granted access and provided credentials, you can then pull the container images from a private container registry hosted by Azure Container Registry.
8282
> * [Anomaly dectector](Anomaly-Detector/anomaly-detector-container-howto.md#request-access-to-the-container-registry)
8383
> * [Face](Face/face-how-to-install-containers.md)
8484
> * [Form Recognizer](form-recognizer/form-recognizer-container-howto.md#request-access-to-the-container-registry)
@@ -114,4 +114,4 @@ Install and explore the functionality provided by containers in Azure Cognitive
114114
* [Text Analytics containers](text-analytics/how-tos/text-analytics-how-to-install-containers.md)
115115

116116
<!--* [Personalizer containers](https://go.microsoft.com/fwlink/?linkid=2083928&clcid=0x409)
117-
-->
117+
-->

articles/hdinsight/hdinsight-component-versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The component versions associated with HDInsight cluster versions are listed in
4141
| Apache Storm | - | 1.1.0 | 1.0.1 | 0.10.0 | 0.10.0 | 0.9.3 |
4242
| Apache Mahout | - | 0.9.0+ | 0.9.0+ | 0.9.0+ | 0.9.0+ | 0.9.0 |
4343
| Apache Phoenix | 5 | 4.7.0 | 4.7.0 | 4.4.0 | 4.4.0 | 4.2.0 |
44-
| Apache Spark | 2.3.2 | 2.3.0, 2.2.0, 2.1.0 | 1.6.2, 2.0 | 1.6.0 | 1.5.2 | 1.3.1 (Windows only) |
44+
| Apache Spark | 2.3.1 | 2.3.0, 2.2.0, 2.1.0 | 1.6.2, 2.0 | 1.6.0 | 1.5.2 | 1.3.1 (Windows only) |
4545
| Apache Livy | 0.5 | 0.4, 0.4, 0.3 | 0.3 | 0.3 | 0.2 | - |
4646
| Apache Kafka | 1.1.1 | 1.1, 1.0 * (See Note below) | 0.10.0 | 0.9.0 | - | - |
4747
| Apache Ambari | 2.7.0 | 2.6.0 | 2.4.0 | 2.2.1 | 2.1.0 | - |

articles/hdinsight/hdinsight-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The official Apache versions of all HDInsight 4.0 components are given below. Th
3939
- Apache Pig 0.16.0
4040
- Apache Ranger 0.7.0
4141
- Apache Slider 0.92.0
42-
- Apache Spark 2.3.1
42+
- Apache Spark 2.3.2
4343
- Apache Sqoop 1.4.7
4444
- Apache TEZ 0.9.1
4545
- Apache Zeppelin 0.8.0

0 commit comments

Comments
 (0)