Skip to content

Commit d1505c2

Browse files
authored
Merge pull request #109832 from craigcaseyMSFT/vcraic0331a
fix PM build issues
2 parents ef32b4e + cfc40ff commit d1505c2

File tree

7 files changed

+46
-46
lines changed

7 files changed

+46
-46
lines changed

articles/azure-government/documentation-government-services-monitoringandmanagement.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@ The URLs for Azure Monitor logs are different in Azure Government:
442442
| portal.loganalytics.io |portal.loganalytics.us |Advanced Analytics Portal - [configuring firewall settings](../azure-monitor/log-query/portals.md) |
443443
| api.loganalytics.io |api.loganalytics.us |Advanced Analytics Portal - [configuring firewall settings](../azure-monitor/log-query/portals.md) |
444444
| docs.loganalytics.io |docs.loganalytics.us |Advanced Analytics Portal - [configuring firewall settings](../azure-monitor/log-query/portals.md) |
445-
| \*.azure-automation.net |\*.azure-automation.us |Azure Automation - [configuring firewall settings](../azure-monitor/platform/log-analytics-agent.md#network-firewall-requirements) |
446-
| N/A | *.usgovtrafficmanager.net | Azure Traffic Manager - [configuring firewall settings](../azure-monitor/platform/log-analytics-agent.md#network-firewall-requirements) |
445+
| \*.azure-automation.net |\*.azure-automation.us |Azure Automation - [configuring firewall settings](../azure-monitor/platform/log-analytics-agent.md#firewall-requirements) |
446+
| N/A | *.usgovtrafficmanager.net | Azure Traffic Manager - [configuring firewall settings](../azure-monitor/platform/log-analytics-agent.md#firewall-requirements) |
447447

448448
The following Azure Monitor logs features behave differently in Azure Government:
449449

articles/azure-monitor/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Specify an existing or new [Action Group](platform/action-groups.md) so that whe
173173

174174

175175
### What are the firewall requirements for Azure Monitor agents?
176-
See [Network firewall requirements](platform/log-analytics-agent.md#network-firewall-requirements)for details on firewall requirements.
176+
See [Network firewall requirements](platform/log-analytics-agent.md#firewall-requirements)for details on firewall requirements.
177177

178178

179179
## Visualizations

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.custom: mvc, seo-javascript-september2019, seo-javascript-october2019
2020

2121
[Azure Monitor](../overview.md) can collect data directly from your physical or virtual Linux computers in your environment into a Log Analytics workspace for detailed analysis and correlation. Installing the [Log Analytics agent](../platform/log-analytics-agent.md) allows Azure Monitor to collect data from a datacenter or other cloud environment. This quickstart shows you how to configure and collect data from your Linux server with a few easy steps. For information about Azure Linux VMs, see [Collect data about Azure virtual machines](../../azure-monitor/learn/quick-collect-azurevm.md).
2222

23-
To understand the supported configuration, see [Supported Windows 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).
23+
To understand the supported configuration, see [Supported Windows operating systems](../../azure-monitor/platform/log-analytics-agent.md#supported-linux-operating-systems) and [Network firewall configuration](../../azure-monitor/platform/log-analytics-agent.md#firewall-requirements).
2424

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.custom: mvc, seo-javascript-october2019
2020

2121
[Azure Monitor](../overview.md) can collect data directly from your your physical or virtual Windows computers in your environment into a Log Analytics workspace for detailed analysis and correlation. Installing the [Log Analytics agent](../platform/log-analytics-agent.md) allows Azure Monitor to collect data from a datacenter or other cloud environment. This quickstart shows you how to configure and collect data from your Windows computer with a few easy steps. For information about Azure Windows VMs, see [Collect data about Azure virtual machines](../../azure-monitor/learn/quick-collect-azurevm.md).
2222

23-
To understand the supported configuration, see [Supported Windows operating systems](../../azure-monitor/platform/log-analytics-agent.md#supported-windows-operating-systems) and [Network firewall configuration](../../azure-monitor/platform/log-analytics-agent.md#network-firewall-requirements).
23+
To understand the supported configuration, see [Supported Windows operating systems](../../azure-monitor/platform/log-analytics-agent.md#supported-windows-operating-systems) and [Network firewall configuration](../../azure-monitor/platform/log-analytics-agent.md#firewall-requirements).
2424

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The Log Analytics agent for Linux can be installed by using one of the following
1818
* [Manually download and install](#install-the-agent-manually) the agent. This is required when the Linux computer does not have access to the Internet and will be communicating with Azure Monitor or Azure Automation through the [Log Analytics gateway](gateway.md).
1919
* [Install the agent for Linux using a wrapper-script](#install-the-agent-using-wrapper-script) hosted on GitHub. This is the recommended method to install and upgrade the agent when the computer has connectivity with the Internet, directly or through a proxy server.
2020

21-
To understand the supported configuration, review [supported Linux operating systems](log-analytics-agent.md#supported-linux-operating-systems) and [network firewall configuration](log-analytics-agent.md#network-firewall-requirements).
21+
To understand the supported configuration, review [supported Linux operating systems](log-analytics-agent.md#supported-linux-operating-systems) and [network firewall configuration](log-analytics-agent.md#firewall-requirements).
2222

2323
>[!NOTE]
2424
>The Log Analytics agent for Linux cannot be configured to report to more than one Log Analytics workspace. It can only be configured to report to both a System Center Operations Manager management group and Log Analytics workspace concurrently, or to either individually.

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The agent may be installed by using one of the following methods. Most installat
2828
2929
If you need to configure the agent to report to more than one workspace, this cannot be performed during initial setup, only afterwards by updating the settings from Control Panel or PowerShell as described in [Adding or removing a workspace](agent-manage.md#adding-or-removing-a-workspace).
3030

31-
To understand the supported configuration, review [supported Windows operating systems](log-analytics-agent.md#supported-windows-operating-systems) and [network firewall configuration](log-analytics-agent.md#network-firewall-requirements).
31+
To understand the supported configuration, review [supported Windows operating systems](log-analytics-agent.md#supported-windows-operating-systems) and [network firewall configuration](log-analytics-agent.md#firewall-requirements).
3232

3333
## Obtain workspace ID and key
3434
Before installing the Log Analytics agent for Windows, you need the workspace ID and key for your Log Analytics workspace. This information is required during setup from each installation method to properly configure the agent and ensure it can successfully communicate with Azure Monitor in Azure commercial and US Government cloud.
@@ -132,44 +132,44 @@ The 32-bit and 64-bit versions of the agent package have different product codes
132132
To retrieve the product code from the agent install package directly, you can use Orca.exe from the [Windows SDK Components for Windows Installer Developers](https://msdn.microsoft.com/library/windows/desktop/aa370834%28v=vs.85%29.aspx) that is a component of the Windows Software Development Kit or using PowerShell following an [example script](https://www.scconfigmgr.com/2014/08/22/how-to-get-msi-file-information-with-powershell/) written by a Microsoft Valuable Professional (MVP). For either approach, you first need to extract the **MOMagent.msi** file from the MMASetup installation package. This is shown earlier in the first step under the section [Install the agent using the command line](#install-the-agent-using-the-command-line).
133133
134134
1. Import the xPSDesiredStateConfiguration DSC Module from [https://www.powershellgallery.com/packages/xPSDesiredStateConfiguration](https://www.powershellgallery.com/packages/xPSDesiredStateConfiguration) into Azure Automation.
135-
2. Create Azure Automation variable assets for *OPSINSIGHTS_WS_ID* and *OPSINSIGHTS_WS_KEY*. Set *OPSINSIGHTS_WS_ID* to your Log Analytics workspace ID and set *OPSINSIGHTS_WS_KEY* to the primary key of your workspace.
136-
3. Copy the script and save it as MMAgent.ps1.
137-
138-
```powershell
139-
Configuration MMAgent
140-
{
141-
$OIPackageLocalPath = "C:\Deploy\MMASetup-AMD64.exe"
142-
$OPSINSIGHTS_WS_ID = Get-AutomationVariable -Name "OPSINSIGHTS_WS_ID"
143-
$OPSINSIGHTS_WS_KEY = Get-AutomationVariable -Name "OPSINSIGHTS_WS_KEY"
144-
145-
Import-DscResource -ModuleName xPSDesiredStateConfiguration
146-
Import-DscResource -ModuleName PSDesiredStateConfiguration
147-
148-
Node OMSnode {
149-
Service OIService
150-
{
151-
Name = "HealthService"
152-
State = "Running"
153-
DependsOn = "[Package]OI"
154-
}
155-
156-
xRemoteFile OIPackage {
157-
Uri = "https://go.microsoft.com/fwlink/?LinkId=828603"
158-
DestinationPath = $OIPackageLocalPath
159-
}
160-
161-
Package OI {
162-
Ensure = "Present"
163-
Path = $OIPackageLocalPath
164-
Name = "Microsoft Monitoring Agent"
165-
ProductId = "8A7F2C51-4C7D-4BFD-9014-91D11F24AAE2"
166-
Arguments = '/C:"setup.exe /qn NOAPM=1 ADD_OPINSIGHTS_WORKSPACE=1 OPINSIGHTS_WORKSPACE_ID=' + $OPSINSIGHTS_WS_ID + ' OPINSIGHTS_WORKSPACE_KEY=' + $OPSINSIGHTS_WS_KEY + ' AcceptEndUserLicenseAgreement=1"'
167-
DependsOn = "[xRemoteFile]OIPackage"
168-
}
169-
}
170-
}
171-
172-
```
135+
1. Create Azure Automation variable assets for *OPSINSIGHTS_WS_ID* and *OPSINSIGHTS_WS_KEY*. Set *OPSINSIGHTS_WS_ID* to your Log Analytics workspace ID and set *OPSINSIGHTS_WS_KEY* to the primary key of your workspace.
136+
1. Copy the script and save it as MMAgent.ps1.
137+
138+
```powershell
139+
Configuration MMAgent
140+
{
141+
$OIPackageLocalPath = "C:\Deploy\MMASetup-AMD64.exe"
142+
$OPSINSIGHTS_WS_ID = Get-AutomationVariable -Name "OPSINSIGHTS_WS_ID"
143+
$OPSINSIGHTS_WS_KEY = Get-AutomationVariable -Name "OPSINSIGHTS_WS_KEY"
144+
145+
Import-DscResource -ModuleName xPSDesiredStateConfiguration
146+
Import-DscResource -ModuleName PSDesiredStateConfiguration
147+
148+
Node OMSnode {
149+
Service OIService
150+
{
151+
Name = "HealthService"
152+
State = "Running"
153+
DependsOn = "[Package]OI"
154+
}
155+
156+
xRemoteFile OIPackage {
157+
Uri = "https://go.microsoft.com/fwlink/?LinkId=828603"
158+
DestinationPath = $OIPackageLocalPath
159+
}
160+
161+
Package OI {
162+
Ensure = "Present"
163+
Path = $OIPackageLocalPath
164+
Name = "Microsoft Monitoring Agent"
165+
ProductId = "8A7F2C51-4C7D-4BFD-9014-91D11F24AAE2"
166+
Arguments = '/C:"setup.exe /qn NOAPM=1 ADD_OPINSIGHTS_WORKSPACE=1 OPINSIGHTS_WORKSPACE_ID=' + $OPSINSIGHTS_WS_ID + ' OPINSIGHTS_WORKSPACE_KEY=' + $OPSINSIGHTS_WS_KEY + ' AcceptEndUserLicenseAgreement=1"'
167+
DependsOn = "[xRemoteFile]OIPackage"
168+
}
169+
}
170+
}
171+
172+
```
173173

174174
4. Update the `ProductId` value in the script with the product code extracted from the latest version of the agent install package using the methods recommended earlier.
175175
5. [Import the MMAgent.ps1 configuration script](../../automation/automation-dsc-getting-started.md#importing-a-configuration-into-azure-automation) into your Automation account.

articles/machine-learning/how-to-debug-pipelines-application-insights.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure Machine Learning
44
description: Add logging to your training and batch scoring pipelines and view the logged results in Application Insights.
55
services: machine-learning
66
author: aburek
7-
ms.author: anrode
7+
ms.author: cgronlun
88
ms.service: machine-learning
99
ms.subservice: core
1010
ms.workload: data-services

0 commit comments

Comments
 (0)