Skip to content

Commit c5661c5

Browse files
authored
Merge pull request #109871 from MicrosoftDocs/master
4/01 AM Publish
2 parents b0ff9c9 + 8649f04 commit c5661c5

File tree

61 files changed

+1140
-450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1140
-450
lines changed

articles/active-directory-b2c/boolean-transformations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 03/16/2020
12+
ms.date: 04/01/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -132,7 +132,7 @@ The following claims transformation demonstrates how to check the value of a boo
132132
<InputParameter Id="valueToCompareTo" DataType="boolean" Value="true" />
133133
</InputParameters>
134134
<OutputClaims>
135-
<OutputClaim ClaimTypeReferenceId="accountEnabled" TransformationClaimType="compareResult"/>
135+
<OutputClaim ClaimTypeReferenceId="accountEnabled" TransformationClaimType="compareResult"/>
136136
</OutputClaims>
137137
</ClaimsTransformation>
138138
```
@@ -163,6 +163,7 @@ Use this claim transformation to perform logical negation on a claim.
163163
<ClaimsTransformation Id="CheckWhetherEmailBePresented" TransformationMethod="NotClaims">
164164
<InputClaims>
165165
<InputClaim ClaimTypeReferenceId="userExists" TransformationClaimType="inputClaim" />
166+
</InputClaims>
166167
<OutputClaims>
167168
<OutputClaim ClaimTypeReferenceId="userExists" TransformationClaimType="outputClaim" />
168169
</OutputClaims>
@@ -198,7 +199,6 @@ The following claims transformation demonstrates how to `Or` two boolean ClaimTy
198199
<OutputClaim ClaimTypeReferenceId="presentTOSSelfAsserted" TransformationClaimType="outputClaim" />
199200
</OutputClaims>
200201
</ClaimsTransformation>
201-
</ClaimsTransformation>
202202
```
203203

204204
### Example

articles/active-directory-b2c/claimstransformations.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ For examples of claims transformations, see the following reference pages:
159159
- [Date](date-transformations.md)
160160
- [Integer](integer-transformations.md)
161161
- [JSON](json-transformations.md)
162+
- [Phone number](phone-number-claims-transformations.md)
162163
- [General](general-transformations.md)
163164
- [Social account](social-transformations.md)
164165
- [String](string-transformations.md)

articles/active-directory-b2c/ropc-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 02/27/2020
12+
ms.date: 04/01/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---

articles/aks/operator-best-practices-multi-region.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ For information on how to set up endpoints and routing, see [Configure the geogr
5555

5656
### Layer 7 application routing with Azure Front Door Service
5757

58-
Traffic Manager uses DNS (layer 3) to shape traffic. [Azure Front Door Service](https://docs.microsoft.com/azure/frontdoor/front-door-overview) provides an HTTP/HTTPS (layer 7) routing option. Additional features of Azure Front Door Service include SSL termination, custom domain, web application firewall, URL Rewrite, and session affinity. Review the needs of your application traffic to understand which solution is the most suitable.
58+
Traffic Manager uses DNS (layer 3) to shape traffic. [Azure Front Door Service](https://docs.microsoft.com/azure/frontdoor/front-door-overview) provides an HTTP/HTTPS (layer 7) routing option. Additional features of Azure Front Door Service include TLS termination, custom domain, web application firewall, URL Rewrite, and session affinity. Review the needs of your application traffic to understand which solution is the most suitable.
5959

6060
### Interconnect regions with global virtual network peering
6161

articles/azure-arc/servers/manage-agent.md

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: azure-arc
66
ms.subservice: azure-arc-servers
77
author: mgoedtel
88
ms.author: magoedte
9-
ms.date: 03/24/2020
9+
ms.date: 04/01/2020
1010
ms.topic: conceptual
1111
---
1212

@@ -57,6 +57,9 @@ The Setup Wizard discovers if a previous version exists, and then it automatical
5757
5858
To update the agent on a Linux machine to the latest version, it involves two commands. One command to update the local package index with the list of latest available packages from the repositories, and one command to upgrade the local package.
5959
60+
> [!NOTE]
61+
> To upgrade the agent, you must have *root* access permissions or with an account that has elevated rights using Sudo.
62+
6063
#### Upgrade Ubuntu
6164
6265
1. To update the local package index with the latest changes made in the repositories, run the following command:
@@ -107,14 +110,12 @@ Actions of the [zypper](https://en.opensuse.org/Portal:Zypper) command, such as
107110
108111
## Remove the agent
109112
110-
Use one of the following procedures to uninstall the Windows or Linux agent using the command line or setup wizard described in this section. Before uninstalling the agent, first disconnect the machine from Azure Arc for servers (preview) by completing these steps:
111-
112-
1. Open Azure Arc for servers (preview) by going to the [Azure portal](https://aka.ms/hybridmachineportal).
113-
114-
2. Select the machine in the list, select the ellipsis (**...**), and then select **Delete**.
113+
Perform one of the following methods to uninstall the Windows or Linux Connected Machine agent from the machine. Removing the agent does not unregister the machine with Arc for servers (preview), this is a separate process you perform when you no longer need to manage the machine in Azure.
115114
116115
### Windows agent
117116
117+
Both of the following methods remove the agent, but they do not remove the *C:\Program Files\AzureConnectedMachineAgent* folder on the machine.
118+
118119
#### Uninstall from Control Panel
119120
120121
1. To uninstall the Windows agent from the machine, do the following:
@@ -153,6 +154,9 @@ To uninstall the agent manually from the Command Prompt or to use an automated m
153154
154155
### Linux agent
155156
157+
> [!NOTE]
158+
> To uninstall the agent, you must have *root* access permissions or with an account that has elevated rights using Sudo.
159+
156160
To uninstall the Linux agent, the command to use depends on the Linux operating system.
157161
158162
- For Ubuntu, run the following command:
@@ -172,3 +176,11 @@ To uninstall the Linux agent, the command to use depends on the Linux operating
172176
```bash
173177
sudo zypper remove azcmagent
174178
```
179+
180+
## Unregister machine
181+
182+
If you are planning to stop managing the machine with supporting services in Azure, perform the following steps to unregister the machine with Arc for servers (preview). You can perform these step either before or after you have removed the Connected Machine agent from the machine.
183+
184+
1. Open Azure Arc for servers (preview) by going to the [Azure portal](https://aka.ms/hybridmachineportal).
185+
186+
2. Select the machine in the list, select the ellipsis (**...**), and then select **Delete**.

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.

0 commit comments

Comments
 (0)