Skip to content

Commit ffbc506

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-cert-path
2 parents 58d2278 + 26d2dd8 commit ffbc506

File tree

249 files changed

+1373
-512
lines changed

Some content is hidden

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

249 files changed

+1373
-512
lines changed

.openpublishing.redirection.communication-services.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

articles/active-directory/external-identities/direct-federation-adfs.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: B2B
88
ms.topic: how-to
9-
ms.date: 05/13/2022
9+
ms.date: 10/17/2022
1010

1111
ms.author: mimart
1212
author: msmimart
@@ -29,7 +29,7 @@ This article describes how to set up [SAML/WS-Fed IdP federation](direct-federat
2929

3030
Azure AD B2B can be configured to federate with IdPs that use the SAML protocol with specific requirements listed below. To illustrate the SAML configuration steps, this section shows how to set up AD FS for SAML 2.0.
3131

32-
To set up federation, the following attributes must be received in the SAML 2.0 response from the IdP. These attributes can be configured by linking to the online security token service XML file or by entering them manually. Step 12 in [Create a test AD FS instance](https://medium.com/in-the-weeds/create-a-test-active-directory-federation-services-3-0-instance-on-an-azure-virtual-machine-9071d978e8ed) describes how to find the AD FS endpoints or how to generate your metadata URL, for example `https://fs.iga.azure-test.net/federationmetadata/2007-06/federationmetadata.xml`.
32+
To set up federation, the following attributes must be received in the SAML 2.0 response from the IdP. These attributes can be configured by linking to the online security token service XML file or by entering them manually. Step 12 in [Create a test AD FS instance](https://medium.com/in-the-weeds/create-a-test-active-directory-federation-services-3-0-instance-on-an-azure-virtual-machine-9071d978e8ed) describes how to find the AD FS endpoints or how to generate your metadata URL, for example `https://fs.iga.azure-test.net/federationmetadata/2007-06/federationmetadata.xml`.
3333

3434
|Attribute |Value |
3535
|---------|---------|
@@ -60,7 +60,7 @@ An AD FS server must already be set up and functioning before you begin this pro
6060
1. In the **Add a Claim Description** window, specify the following values:
6161

6262
- **Display Name**: Persistent Identifier
63-
- **Claim identifier**: `urn:oasis:names:tc:SAML:2.0:nameid-format:persistent`
63+
- **Claim identifier**: `urn:oasis:names:tc:SAML:2.0:nameid-format:persistent`
6464
- Select the check box for **Publish this claim description in federation metadata as a claim type that this federation service can accept**.
6565
- Select the check box for **Publish this claim description in federation metadata as a claim type that this federation service can send**.
6666

@@ -79,7 +79,7 @@ An AD FS server must already be set up and functioning before you begin this pro
7979
9. In the **Identifiers** tab, enter ``https://login.microsoftonline.com/<tenant ID>/`` in the **Relying party identifier** text box using the tenant ID of the service partner’s Azure AD tenant. Select **Add**.
8080

8181
> [!NOTE]
82-
> Be sure to include a slash (/) after the tenant ID. For example, https://login.microsoftonline.com/094a6247-27d4-489f-a23b-b9672900084d/.
82+
> Be sure to include a slash (/) after the tenant ID, for example: `https://login.microsoftonline.com/00000000-27d4-489f-a23b-00000000084d/`.
8383
8484
10. Select **OK**.
8585

@@ -150,7 +150,7 @@ An AD FS server must already be set up and functioning before you begin this pro
150150
- `https://login.microsoftonline.com/<tenant ID>/`
151151

152152
> [!NOTE]
153-
> Be sure to include a slash (/) after the tenant ID, for example: https://login.microsoftonline.com/094a6247-27d4-489f-a23b-b9672900084d/.
153+
> Be sure to include a slash (/) after the tenant ID, for example: `https://login.microsoftonline.com/00000000-27d4-489f-a23b-00000000084d/`.
154154
155155
11. Select **Next**.
156156
12. In the **Choose Access Control Policy** page, select a policy, and then select **Next**.

articles/active-directory/external-identities/leave-the-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.custom: engagement-fy23
2121

2222
# Leave an organization as an external user
2323

24-
As an Azure Active Directory (Azure AD) [B2B collaboration](/articles/active-directory/external-identities/what-is-b2b.md) or [B2B direct connect](/articles/active-directory/external-identities/b2b-direct-connect-overview.md) user, you can leave an organization at any time if you no longer need to use apps from that organization, or maintain any association.
24+
As an Azure Active Directory (Azure AD) [B2B collaboration](what-is-b2b.md) or [B2B direct connect](b2b-direct-connect-overview.md) user, you can leave an organization at any time if you no longer need to use apps from that organization, or maintain any association.
2525

2626
You can usually leave an organization on your own without having to contact an administrator. However, in some cases this option won't be available and you'll need to contact your tenant admin, who can delete your account in the external organization. This article is intended for administrators. If you're a user looking for information about how to manage and leave an organization, see the [Manage organizations article.](https://support.microsoft.com/account-billing/manage-organizations-for-a-work-or-school-account-in-the-my-account-portal-a9b65a70-fec5-4a1a-8e00-09f99ebdea17)
2727

articles/active-directory/governance/entitlement-management-organization.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ To add an external Azure AD directory or domain as a connected organization, fol
7676

7777
1. Select the **Directory + domain** tab, and then select **Add directory + domain**.
7878

79-
The **Select directories + domains** pane opens.
79+
Then **Select directories + domains** pane opens.
8080

81-
1. In the search box, enter a domain name to search for the Azure AD directory or domain. Be sure to enter the entire domain name.
81+
1. In the search box, enter a domain name to search for the Azure AD directory or domain. You can also add domains that are not in Azure AD. Be sure to enter the entire domain name.
8282

83-
1. Confirm that the organization name and authentication type are correct. User sign in, prior to being able to access the MyAccess portal, depends on the authentication type for their organization. If the authentication type for a connected organization is Azure AD, all users with an account in any verified domain of that Azure AD directory will sign into their directory, and then can request access to access packages that allow that connected organization. If the authentication type is One-time passcode, this allows users with email addresses from just that domain to visit the MyAccess portal. After they authenticate with the passcode, the user can make a request.
83+
1. Confirm that the organization name(s) and authentication type(s) are correct. User sign in, prior to being able to access the MyAccess portal, depends on the authentication type for their organization. If the authentication type for a connected organization is Azure AD, all users with an account in any verified domain of that Azure AD directory will sign into their directory, and then can request access to access packages that allow that connected organization. If the authentication type is One-time passcode, this allows users with email addresses from just that domain to visit the MyAccess portal. After they authenticate with the passcode, the user can make a request.
8484

8585
![The "Select directories + domains" pane](./media/entitlement-management-organization/organization-select-directories-domains.png)
8686

8787
> [!NOTE]
8888
> Access from some domains could be blocked by the Azure AD business to business (B2B) allow or deny list. For more information, see [Allow or block invitations to B2B users from specific organizations](../external-identities/allow-deny-list.md).
8989
90-
1. Select **Add** to add the Azure AD directory or domain. Currently, you can add only one Azure AD directory or domain per connected organization.
90+
1. Select **Add** to add the Azure AD directory or domain. **You can add multiple Azure AD directories and domains**.
9191

92-
1. After you've added the Azure AD directory or domain, select **Select**.
92+
1. After you've added the Azure AD directories or domains, select **Select**.
9393

94-
The organization appears in the list.
94+
The organization(s) appears in the list.
9595

9696
![The "Directory + domain" pane](./media/entitlement-management-organization/organization-directory-domain.png)
9797

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ To read more about auto-upgrade, see [Azure AD Connect: Automatic upgrade](how-t
8484

8585
### Functional changes
8686

87-
- We added a new attribute 'employeeLeaveDateTime' for syncing to Azure AD
87+
- We added a new attribute 'employeeLeaveDateTime' for syncing to Azure AD. To learn more about how to use this attribute to manage your users' life cycles, please refer to [this article](https://learn.microsoft.com/azure/active-directory/governance/how-to-lifecycle-workflow-sync-attributes)
8888

8989
### Bug fixes
9090

articles/aks/aks-migration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Several open-source tools can help with your migration, depending on your scenar
2929

3030
* [Velero](https://velero.io/) (Requires Kubernetes 1.7+)
3131
* [Azure Kube CLI extension](https://github.com/yaron2/azure-kube-cli)
32-
* [ReShifter](https://github.com/mhausenblas/reshifter)
32+
3333

3434
In this article we will summarize migration details for:
3535

@@ -204,4 +204,4 @@ In this article, we summarized migration details for:
204204
> * Deployment of your cluster configuration
205205
206206

207-
[region-availability]: https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service
207+
[region-availability]: https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service

articles/azure-monitor/agents/agents-overview.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Overview of the Azure Monitor Agent, which collects monitoring data
44
ms.topic: conceptual
55
author: guywi-ms
66
ms.author: guywild
7-
ms.date: 10/17/2022
7+
ms.date: 11/3/2022
88
ms.custom: references_regions
99
ms.reviewer: shseth
1010

@@ -15,7 +15,7 @@ ms.reviewer: shseth
1515

1616
Azure Monitor Agent (AMA) collects monitoring data from the guest operating system of Azure and hybrid virtual machines and delivers it to Azure Monitor for use by features, insights, and other services, such as [Microsoft Sentinel](../../sentintel/../sentinel/overview.md) and [Microsoft Defender for Cloud](../../defender-for-cloud/defender-for-cloud-introduction.md). Azure Monitor Agent replaces all of Azure Monitor's legacy monitoring agents. This article provides an overview of Azure Monitor Agent's capabilities and supported use cases.
1717

18-
Here's a short **introduction to Azure Monitor video**, which includes a quick demo of how to set up the agent from the Azure portal: [ITOps Talk: Azure Monitor Agent](https://www.youtube.com/watch?v=f8bIrFU8tCs)
18+
Here's a short **introduction to Azure Monitor agent video**, which includes a quick demo of how to set up the agent from the Azure portal: [ITOps Talk: Azure Monitor Agent](https://www.youtube.com/watch?v=f8bIrFU8tCs)
1919

2020
## Consolidating legacy agents
2121

@@ -41,8 +41,8 @@ Azure Monitor Agent uses [data collection rules](../essentials/data-collection-r
4141
|:---|:---|:---|
4242
| Virtual machines, scale sets | [Virtual machine extension](./azure-monitor-agent-manage.md#virtual-machine-extension-details) | Installs the agent by using Azure extension framework. |
4343
| On-premises servers (Azure Arc-enabled servers) | [Virtual machine extension](./azure-monitor-agent-manage.md#virtual-machine-extension-details) (after installing the [Azure Arc agent](../../azure-arc/servers/deployment-options.md)) | Installs the agent by using Azure extension framework, provided for on-premises by first installing [Azure Arc agent](../../azure-arc/servers/deployment-options.md). |
44-
| Windows 10, 11 desktops, workstations | [Client installer (Public preview)](./azure-monitor-agent-windows-client.md) | Installs the agent by using a Windows MSI installer. |
45-
| Windows 10, 11 laptops | [Client installer (Public preview)](./azure-monitor-agent-windows-client.md) | Installs the agent by using a Windows MSI installer. The installer works on laptops, but the agent *isn't optimized yet* for battery or network consumption. |
44+
| Windows 10, 11 desktops, workstations | [Client installer](./azure-monitor-agent-windows-client.md) | Installs the agent by using a Windows MSI installer. |
45+
| Windows 10, 11 laptops | [Client installer](./azure-monitor-agent-windows-client.md) | Installs the agent by using a Windows MSI installer. The installer works on laptops, but the agent *isn't optimized yet* for battery or network consumption. |
4646

4747
1. Define a data collection rule and associate the resource to the rule.
4848

@@ -53,7 +53,6 @@ Azure Monitor Agent uses [data collection rules](../essentials/data-collection-r
5353
| Performance | Azure Monitor Metrics (Public preview)<sup>1</sup> - Insights.virtualmachine namespace<br>Log Analytics workspace - [Perf](/azure/azure-monitor/reference/tables/perf) table | Numerical values measuring performance of different aspects of operating system and workloads |
5454
| Windows event logs (including sysmon events) | Log Analytics workspace - [Event](/azure/azure-monitor/reference/tables/Event) table | Information sent to the Windows event logging system |
5555
| Syslog | Log Analytics workspace - [Syslog](/azure/azure-monitor/reference/tables/syslog)<sup>2</sup> table | Information sent to the Linux event logging system |
56-
| Text logs | Log Analytics workspace - custom table | Events sent to log file on agent machine |
5756

5857
<sup>1</sup> On Linux, using Azure Monitor Metrics as the only destination is supported in v1.10.9.0 or higher.<br>
5958
<sup>2</sup> Azure Monitor Linux Agent versions 1.15.2 and higher support syslog RFC formats including Cisco Meraki, Cisco ASA, Cisco FTD, Sophos XG, Juniper Networks, Corelight Zeek, CipherTrust, NXLog, McAfee, and Common Event Format (CEF).
@@ -82,7 +81,7 @@ In addition to the generally available data collection listed above, Azure Monit
8281

8382
## Supported regions
8483

85-
Azure Monitor Agent is available in all public regions and Azure Government clouds. It's not yet supported in air-gapped clouds. For more information, see [Product availability by region](https://azure.microsoft.com/global-infrastructure/services/?products=monitor&rar=true&regions=all).
84+
Azure Monitor Agent is available in all public regions and Azure Government clouds, for generally available features. It's not yet supported in air-gapped clouds. For more information, see [Product availability by region](https://azure.microsoft.com/global-infrastructure/services/?products=monitor&rar=true&regions=all).
8685
## Costs
8786

8887
There's no cost for the Azure Monitor Agent, but you might incur charges for the data ingested. For information on Log Analytics data collection and retention and for customer metrics, see [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/).

articles/azure-monitor/app/opentelemetry-enable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ You may want to collect metrics beyond what is collected by [instrumentation lib
965965

966966
The OpenTelemetry API offers six metric "instruments" to cover various metric scenarios and you'll need to pick the correct "Aggregation Type" when visualizing metrics in Metrics Explorer. This requirement is true when using the OpenTelemetry Metric API to send metrics and when using an instrumentation library.
967967

968-
The following table shows the recommended [aggregation types](/essentials/metrics-aggregation-explained.md#aggregation-types) for each of the OpenTelemetry Metric Instruments.
968+
The following table shows the recommended [aggregation types](../essentials/metrics-aggregation-explained.md#aggregation-types) for each of the OpenTelemetry Metric Instruments.
969969

970970
| OpenTelemetry Instrument | Azure Monitor Aggregation Type |
971971
|------------------------------------------------------|------------------------------------------------------------|

articles/azure-monitor/app/statsbeat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.reviwer: heya
99

1010
# Statsbeat in Azure Application Insights
1111

12-
Statsbeat collects essential and non-essential [custom metric](../essentials/metrics-custom-overview.md) about Application Insights SDKs and auto-instrumentation. Statsbeat serves three benefits for Azure Monitor Application insights customers:
12+
Statsbeat collects essential and non-essential [custom metric](../essentials/metrics-custom-overview.md) about Application Insights SDKs and auto-instrumentation. Statsbeat serves three benefits for Azure Monitor Application Insights customers:
1313
- Service Health and Reliability (outside-in monitoring of connectivity to ingestion endpoint)
1414
- Support Diagnostics (self-help insights and CSS insights)
1515
- Product Improvement (insights for design optimizations)

articles/azure-monitor/app/usage-funnels.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ To create a funnel:
2222

2323
1. To apply filters to the step select **Add filters**, which will appear after you choose an item for the top step.
2424
1. Then choose your *Second step* and so on.
25+
26+
> [!NOTE]
27+
> Funnels are limited to a maximum of six steps.
28+
2529
1. Select the **View** tab to see your funnel results
2630

2731
:::image type="content" source="./media/usage-funnels/funnel-2.png" alt-text="Screenshot of the funnel tab on view tab showing results from the top and second step." lightbox="./media/usage-funnels/funnel-2.png":::

0 commit comments

Comments
 (0)