Skip to content

Commit 09833e3

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into lfsStandard
2 parents 9753470 + 90359b7 commit 09833e3

File tree

5 files changed

+34
-34
lines changed

5 files changed

+34
-34
lines changed

articles/azure-monitor/learn/quick-collect-linux-computer.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ ms.service: log-analytics
1111
ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.topic: quickstart
14-
ms.date: 11/13/2018
14+
ms.date: 06/14/2019
1515
ms.author: magoedte
1616
ms.custom: mvc
1717
---
1818

1919
# Configure Log Analytics agent for Linux computers in a hybrid environment
20-
[Azure Log Analytics](../../azure-monitor/platform/agent-windows.md) can collect data directly from your physical or virtual Linux computer in your datacenter or other cloud environment into a single repository for detailed analysis and correlation. This quickstart shows you how to configure and collect data from your Linux computer with a few easy steps. For Azure Linux VMs, see the following topic [Collect data about Azure Virtual Machines](quick-collect-azurevm.md).
20+
[Azure Log Analytics](../platform/agent-windows.md) can collect data directly from your physical or virtual Linux computer in your datacenter or other cloud environment into a single repository for detailed analysis and correlation. This quickstart shows you how to configure and collect data from your Linux computer with a few easy steps. For Azure Linux VMs, see the following topic [Collect data about Azure Virtual Machines](quick-collect-azurevm.md).
2121

22-
To understand the supported configuration, review [supported Linux operating systems](../../azure-monitor/platform/log-analytics-agent.md#supported-linux-operating-systems) and [network firewall configuration](../../azure-monitor/platform/log-analytics-agent.md#network-firewall-requirements).
22+
Before proceeding, you should first review the Log Analytics agent [overview](../platform/log-analytics-agent.md) article to understand what configurations are supported, the [supported Linux operating systems](../platform/log-analytics-agent.md#supported-linux-operating-systems) and [network firewall configuration](../platform/log-analytics-agent.md#network-firewall-requirements).
2323

2424
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
2525

articles/azure-monitor/platform/agent-manage.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: log-analytics
1111
ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.topic: conceptual
14-
ms.date: 04/23/2019
14+
ms.date: 06/14/2019
1515
ms.author: magoedte
1616
---
1717

@@ -295,4 +295,6 @@ Perform the following steps to configure the Log Analytics agent for Linux to re
295295
296296
## Next steps
297297
298-
Review [Troubleshooting the Linux agent](agent-linux-troubleshoot.md) if you encounter issues while installing or managing the agent.
298+
- Review [Troubleshooting the Linux agent](agent-linux-troubleshoot.md) if you encounter issues while installing or managing the Linux agent.
299+
300+
- Review [Troubleshooting the Windows agent](agent-windows-troubleshoot.md) if you encounter issues while installing or managing the Windows agent.

articles/azure-monitor/platform/agent-windows.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Connect Windows computers to Azure Log Analytics | Microsoft Docs
3-
description: This article describes how to connect Windows computers hosted in other clouds or on-premises to Log Analytics with the Microsoft Monitoring Agent (MMA).
2+
title: Connect Windows computers to Azure Monitor | Microsoft Docs
3+
description: This article describes how to connect Windows computers hosted in other clouds or on-premises to Azure Monitor with the Log Analytics agent for Windows.
44
services: log-analytics
55
documentationcenter: ''
66
author: mgoedtel
@@ -11,7 +11,7 @@ ms.service: log-analytics
1111
ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.topic: conceptual
14-
ms.date: 04/29/2019
14+
ms.date: 06/14/2019
1515
ms.author: magoedte
1616
---
1717

@@ -105,14 +105,16 @@ The following table highlights the specific parameters supported by setup for th
105105
2. To silently install the agent and configure it to report to a workspace in Azure commercial cloud, from the folder you extracted the setup files to type:
106106

107107
```dos
108-
setup.exe /qn NOAPM=1 ADD_OPINSIGHTS_WORKSPACE=1 OPINSIGHTS_WORKSPACE_AZURE_CLOUD_TYPE=0 OPINSIGHTS_WORKSPACE_ID=<your workspace ID> OPINSIGHTS_WORKSPACE_KEY=<your workspace key> AcceptEndUserLicenseAgreement=1
108+
setup.exe /qn NOAPM=1 ADD_OPINSIGHTS_WORKSPACE=1 OPINSIGHTS_WORKSPACE_AZURE_CLOUD_TYPE=0 OPINSIGHTS_WORKSPACE_ID="<your workspace ID>" OPINSIGHTS_WORKSPACE_KEY="<your workspace key>" AcceptEndUserLicenseAgreement=1
109109
```
110110
111111
or to configure the agent to report to Azure US Government cloud, type:
112112
113113
```dos
114-
setup.exe /qn NOAPM=1 ADD_OPINSIGHTS_WORKSPACE=1 OPINSIGHTS_WORKSPACE_AZURE_CLOUD_TYPE=1 OPINSIGHTS_WORKSPACE_ID=<your workspace ID> OPINSIGHTS_WORKSPACE_KEY=<your workspace key> AcceptEndUserLicenseAgreement=1
114+
setup.exe /qn NOAPM=1 ADD_OPINSIGHTS_WORKSPACE=1 OPINSIGHTS_WORKSPACE_AZURE_CLOUD_TYPE=1 OPINSIGHTS_WORKSPACE_ID="<your workspace ID>" OPINSIGHTS_WORKSPACE_KEY="<your workspace key>" AcceptEndUserLicenseAgreement=1
115115
```
116+
>[!NOTE]
117+
>The string values for the parameters *OPINSIGHTS_WORKSPACE_ID* and *OPINSIGHTS_WORKSPACE_KEY* need to be encapsulated in double-quotes to instruct Windows Installer to interprit as valid options for the package.
116118
117119
## Install the agent using DSC in Azure Automation
118120
@@ -197,4 +199,6 @@ In the search results returned, you should see heartbeat records for the compute
197199
198200
## Next steps
199201
200-
Review [Managing and maintaining the Log Analytics agent for Windows and Linux](agent-manage.md) to learn about how to manage the agent during its deployment lifecycle on your machines.
202+
- Review [Managing and maintaining the Log Analytics agent for Windows and Linux](agent-manage.md) to learn about how to manage the agent during its deployment lifecycle on your machines.
203+
204+
- Review [Troubleshooting the Windows agent](agent-windows-troubleshoot.md) if you encounter issues while installing or managing the agent.

articles/azure-monitor/platform/log-analytics-agent.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ ms.service: log-analytics
1111
ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.topic: conceptual
14-
ms.date: 06/06/2019
14+
ms.date: 06/14/2019
1515
ms.author: magoedte
1616
---
1717

18-
# Collect log data with the Azure Log Analytics agent
18+
# Collect log data with the Log Analytics agent
1919

2020
The Azure Log Analytics agent, previously referred to as the Microsoft Monitoring Agent (MMA) or OMS Linux agent, was developed for comprehensive management across on-premises machines, computers monitored by [System Center Operations Manager](https://docs.microsoft.com/system-center/scom/), and virtual machines in any cloud. The Windows and Linux agents attach to an Azure Monitor and store collected log data from different sources in your Log Analytics workspace, as well as any unique logs or metrics as defined in a monitoring solution.
2121

@@ -29,11 +29,11 @@ Before analyzing and acting on collected data, you first need to install and con
2929

3030
The agent for Linux and Windows communicates outbound to the Azure Monitor service over TCP port 443, and if the machine connects through a firewall or proxy server to communicate over the Internet, review requirements below to understand the network configuration required. If your IT security policies do not allow computers on the network to connect to the Internet, you can set up a [Log Analytics gateway](gateway.md) and then configure the agent to connect through the gateway to Azure Monitor logs. The agent can then receive configuration information and send data collected depending on what data collection rules and monitoring solutions you have enabled in your workspace.
3131

32-
If you are monitoring a computer with System Center Operations Manager 2012 R2 or later, it can be multi-homed with the Azure Monitor service to collect data and forward to the service and still be monitored by [Operations Manager](../../azure-monitor/platform/om-agents.md). With Linux computers, the agent doesn't include a health service component as the Windows agent does, and information is collected and processes by a management server on its behalf. Because Linux computers are monitored differently with Operations Manager, they do not receive configuration or collect data directly, and forward through the management group like a Windows agent-managed system does. As a result, this scenario isn't supported with Linux computers reporting to Operations Manager.
32+
If you are monitoring a computer with System Center Operations Manager 2012 R2 or later, it can be multi-homed with the Azure Monitor service to collect data and forward to the service and still be monitored by [Operations Manager](../../azure-monitor/platform/om-agents.md). With Linux computers, the agent doesn't include a health service component as the Windows agent does, and information is collected and processes by a management server on its behalf. Because Linux computers are monitored differently with Operations Manager, they do not receive configuration or collect data directly, and forward through the management group like a Windows agent-managed system does. As a result, this scenario isn't supported with Linux computers reporting to Operations Manager and you need to configure the Linux computer to [report to an Operations Manager management group](../platform/agent-manage.md#configure-agent-to-report-to-an-operations-manager-management-group) and a Log Analytics workspace in two steps.
3333

3434
The Windows agent can report up to four Log Analytics workspaces, while the Linux agent only supports reporting to a single workspace.
3535

36-
The agent for Linux and Windows isn't only for connecting to Azure Monitor, it also supports Azure Automation to host the Hybrid Runbook worker role and other services such as [Change Tracking](../../automation/change-tracking.md) and [Update Management](../../automation/automation-update-management.md). For more information about the Hybrid Runbook Worker role, see [Azure Automation Hybrid Runbook Worker](../../automation/automation-hybrid-runbook-worker.md).
36+
The agent for Linux and Windows isn't only for connecting to Azure Monitor, it also supports Azure Automation to host the Hybrid Runbook worker role and other services such as [Change Tracking](../../automation/change-tracking.md), [Update Management](../../automation/automation-update-management.md), and [Azure Security Center](../../security-center/security-center-intro.md). For more information about the Hybrid Runbook Worker role, see [Azure Automation Hybrid Runbook Worker](../../automation/automation-hybrid-runbook-worker.md).
3737

3838
## Supported Windows operating systems
3939
The following versions of the Windows operating system are officially supported for the Windows agent:

articles/dns/private-dns-getstarted-powershell.md

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,38 @@
11
---
2-
title: Tutorial - Create an Azure DNS private zone using Azure PowerShell
3-
description: In this tutorial, you create and test a private DNS zone and record in Azure DNS. This is a step-by-step guide to create and manage your first private DNS zone and record using Azure PowerShell.
2+
title: Create an Azure DNS private zone using Azure PowerShell
3+
description: In this article, you create and test a private DNS zone and record in Azure DNS. This is a step-by-step guide to create and manage your first private DNS zone and record using Azure PowerShell.
44
services: dns
55
author: vhorne
66
ms.service: dns
7-
ms.topic: tutorial
8-
ms.date: 06/13/2019
7+
ms.topic: article
8+
ms.date: 06/14/2019
99
ms.author: victorh
1010
#Customer intent: As an experienced network administrator I want to create an Azure DNS private zone, so I can resolve host names on my private virtual networks.
1111
---
1212

13-
# Tutorial: Create an Azure DNS private zone using Azure PowerShell
13+
# Create an Azure DNS private zone using Azure PowerShell
1414

1515
[!INCLUDE [private-dns-public-preview-notice](../../includes/private-dns-public-preview-notice.md)]
1616

17-
This tutorial walks you through the steps to create your first private DNS zone and record using Azure PowerShell.
17+
This article walks you through the steps to create your first private DNS zone and record using Azure PowerShell.
1818

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

2121
A DNS zone is used to host the DNS records for a particular domain. To start hosting your domain in Azure DNS, you need to create a DNS zone for that domain name. Each DNS record for your domain is then created inside this DNS zone. To publish a private DNS zone to your virtual network, you specify the list of virtual networks that are allowed to resolve records within the zone. These are called *linked* virtual networks. When autoregistration is enabled, Azure DNS also updates the zone records whenever a virtual machine is created, changes its' IP address, or is deleted.
2222

23-
In this tutorial, you learn how to:
23+
In this article, you learn how to:
2424

2525
> [!div class="checklist"]
2626
> * Create a DNS private zone
2727
> * Create test virtual machines
2828
> * Create an additional DNS record
2929
> * Test the private zone
3030
31-
If you don’t have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
32-
33-
If you prefer, you can complete this tutorial using [Azure CLI](private-dns-getstarted-cli.md).
34-
35-
<!--- ## Get the Preview PowerShell modules
36-
These instructions assume you have already installed and signed in to Azure PowerShell, including ensuring you have the required modules for the Private Zone feature. -->
31+
[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
3732

38-
<!---[!INCLUDE [dns-powershell-setup](../../includes/dns-powershell-setup-include.md)] -->
33+
If you don’t have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
3934

40-
[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
35+
If you prefer, you can complete this procedure using [Azure CLI](private-dns-getstarted-cli.md).
4136

4237
## Create the resource group
4338

@@ -200,16 +195,15 @@ Repeat for myVM02.
200195

201196
## Delete all resources
202197

203-
When no longer needed, delete the **MyAzureResourceGroup** resource group to delete the resources created in this tutorial.
198+
When no longer needed, delete the **MyAzureResourceGroup** resource group to delete the resources created in this article.
204199

205200
```azurepowershell
206201
Remove-AzResourceGroup -Name MyAzureResourceGroup
207202
```
208203

209204
## Next steps
210205

211-
In this tutorial, you deployed a private DNS zone, created a DNS record, and tested the zone.
206+
In this article, you deployed a private DNS zone, created a DNS record, and tested the zone.
212207
Next, you can learn more about private DNS zones.
213208

214-
> [!div class="nextstepaction"]
215-
> [Using Azure DNS for private domains](private-dns-overview.md)
209+
* [Using Azure DNS for private domains](private-dns-overview.md)

0 commit comments

Comments
 (0)