Skip to content

Commit cc6be98

Browse files
authored
Merge pull request #208514 from MicrosoftDocs/main
8/19 AM Publishing
2 parents 91948fb + 36d299d commit cc6be98

File tree

143 files changed

+800
-345
lines changed

Some content is hidden

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

143 files changed

+800
-345
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ The following example generates a JSON string based on the claim value of "email
152152
<InputClaims>
153153
<InputClaim ClaimTypeReferenceId="email" TransformationClaimType="personalizations.0.to.0.email" />
154154
<InputClaim ClaimTypeReferenceId="otp" TransformationClaimType="personalizations.0.dynamic_template_data.otp" />
155-
<InputClaim ClaimTypeReferenceId="email" TransformationClaimType="personalizations.0.dynamic_template_data.verify-email" />
155+
<InputClaim ClaimTypeReferenceId="copiedEmail" TransformationClaimType="personalizations.0.dynamic_template_data.verify-email" />
156156
</InputClaims>
157157
<InputParameters>
158158
<InputParameter Id="template_id" DataType="string" Value="d-4c56ffb40fa648b1aa6822283df94f60"/>
@@ -169,6 +169,7 @@ The following claims transformation outputs a JSON string claim that will be the
169169

170170
- Input claims:
171171
- **email**, transformation claim type **personalizations.0.to.0.email**: "[email protected]"
172+
- **copiedEmail**, transformation claim type **personalizations.0.dynamic_template_data.verify-email**: "[email protected]"
172173
- **otp**, transformation claim type **personalizations.0.dynamic_template_data.otp** "346349"
173174
- Input parameter:
174175
- **template_id**: "d-4c56ffb40fa648b1aa6822283df94f60"

articles/active-directory-b2c/openid-connect.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 04/12/2022
11+
ms.date: 08/12/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: fasttrack-edit
@@ -43,7 +43,7 @@ client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6
4343
&response_type=code+id_token
4444
&redirect_uri=https%3A%2F%2Fjwt.ms%2F
4545
&response_mode=fragment
46-
&scope=&scope=openid%20offline_access%20{application-id-uri}/{scope-name}
46+
&scope=openid%20offline_access%20{application-id-uri}/{scope-name}
4747
&state=arbitrary_data_you_can_receive_in_the_response
4848
&nonce=12345
4949
```

articles/active-directory-b2c/user-flow-custom-attributes.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,12 @@ You can create these attributes by using the portal UI before or after you use t
143143

144144
|Name |Used in |
145145
|---------|---------|
146-
|`extension_loyaltyId` | Custom policy|
146+
|`extension_loyaltyId` | Custom policy|
147147
|`extension_<b2c-extensions-app-guid>_loyaltyId` | [Microsoft Graph API](microsoft-graph-operations.md#application-extension-directory-extension-properties)|
148148

149+
> [!NOTE]
150+
> When using a custom attribute in custom policies, you must prefix the claim type ID with `extension_` to allow the correct data mapping to take place within the Azure AD B2C directory.
151+
149152
The following example demonstrates the use of custom attributes in an Azure AD B2C custom policy claim definition.
150153

151154
```xml

articles/active-directory/develop/msal-net-token-cache-serialization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Here are examples of possible distributed caches:
9898
services.Configure<MsalDistributedTokenCacheAdapterOptions>(options =>
9999
{
100100
// Optional: Disable the L1 cache in apps that don't use session affinity
101-
// by setting DisableL1Cache to 'false'.
101+
// by setting DisableL1Cache to 'true'.
102102
options.DisableL1Cache = false;
103103

104104
// Or limit the memory (by default, this is 500 MB)

articles/active-directory/hybrid/reference-connect-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ sections:
143143
- question: |
144144
Are single label domains (SLDs) supported?
145145
answer: |
146-
While we strongly recommend against this network configuration ([see article](https://support.microsoft.com/help/2269810/microsoft-support-for-single-label-domains)), using Azure AD Connect sync with a single label domain is supported, as long as the network configuration for the single level domain is functioning correctly.
146+
While we strongly recommend against this network configuration ([see article](https://support.microsoft.com/help/2269810/microsoft-support-for-single-label-domains)), using Azure AD Connect sync with a single label domain is supported, as long as the network configuration for the single level domain is functioning correctly. In SLD scenarios where the Active Directory NetBIOS domain name differs from the FQDN domain name, it's unsupported to install Azure AD Connect.
147147
148148
- question: |
149149
Are Forests with disjoint AD domains supported?

articles/aks/command-invoke.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ az aks command invoke \
5151

5252
The above example runs three `helm` commands on the *myAKSCluster* cluster in *myResourceGroup*.
5353

54-
## Use `command invoke` to run commands an with attached file or directory
54+
## Use `command invoke` to run commands with an attached file or directory
5555

5656
Use `az aks command invoke --command` to run commands on your cluster and `--file` to attach a file or directory for use by those commands. For example:
5757

articles/aks/use-psa.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ ms.date: 08/08/2022
1111

1212
Pod Security Admission enforces Pod Security Standards policies on pods running in a namespace. Pod Security Admission is enabled by default in AKS and is controlled by adding labels to a namespace. For more information about Pod Security Admission, see [Enforce Pod Security Standards with Namespace Labels][kubernetes-psa]. For more information about the Pod Security Standards used by Pod Security Admission, see [Pod Security Standards][kubernetes-pss].
1313

14+
Pod Security Admission is a built-in policy solution for single cluster implementations. If you are looking for enterprise-grade policy, then [Azure policy](use-azure-policy.md) is a better choice.
15+
1416
## Before you begin
1517

1618
- An Azure subscription. If you don't have an Azure subscription, you can create a [free account](https://azure.microsoft.com/free).

articles/availability-zones/az-region.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn what services are supported by availability zones and underst
44
author: awysza
55
ms.service: azure
66
ms.topic: conceptual
7-
ms.date: 06/21/2022
7+
ms.date: 08/18/2022
88
ms.author: rarco
99
ms.reviewer: cynthn
1010
ms.custom: references_regions
@@ -56,6 +56,7 @@ In the Product Catalog, always-available services are listed as "non-regional" s
5656
| [Azure Backup](migrate-recovery-services-vault.md) | ![An icon that signifies this service is zonal.](media/icon-zonal.svg) |
5757
| [Azure Cosmos DB](../cosmos-db/high-availability.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
5858
| [Azure DNS: Azure DNS Private Zones](../dns/private-dns-getstarted-portal.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
59+
| [Azure DNS: Azure DNS Private Resolver](../dns/dns-private-resolver-get-started-portal.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
5960
| [Azure ExpressRoute](../expressroute/designing-for-high-availability-with-expressroute.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
6061
| [Azure Public IP](../virtual-network/ip-services/public-ip-addresses.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) ![An icon that signifies this service is zonal.](media/icon-zonal.svg) |
6162
| [Azure Site Recovery](migrate-recovery-services-vault.md) | ![An icon that signifies this service is zonal](media/icon-zonal.svg) |

articles/azure-monitor/agents/data-collection-rule-azure-monitor-agent.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ To send data to Log Analytics, create the data collection rule in the **same reg
2929
1. From the **Monitor** menu, select **Data Collection Rules**.
3030
1. Select **Create** to create a new Data Collection Rule and associations.
3131

32-
[![Screenshot showing the Create button on the Data Collection Rules screen.](media/data-collection-rule-azure-monitor-agent/data-collection-rules-updated.png)](media/data-collection-rule-azure-monitor-agent/data-collection-rules-updated.png#lightbox)
32+
[ ![Screenshot showing the Create button on the Data Collection Rules screen.](media/data-collection-rule-azure-monitor-agent/data-collection-rules-updated.png) ](media/data-collection-rule-azure-monitor-agent/data-collection-rules-updated.png#lightbox)
3333

3434
1. Provide a **Rule name** and specify a **Subscription**, **Resource Group**, **Region**, and **Platform Type**.
3535

3636
**Region** specifies where the DCR will be created. The virtual machines and their associations can be in any subscription or resource group in the tenant.
3737

3838
**Platform Type** specifies the type of resources this rule can apply to. Custom allows for both Windows and Linux types.
3939

40-
[![Screenshot showing the Basics tab of the Data Collection Rules screen.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-basics-updated.png)](media/data-collection-rule-azure-monitor-agent/data-collection-rule-basics-updated.png#lightbox)
40+
[ ![Screenshot showing the Basics tab of the Data Collection Rules screen.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-basics-updated.png) ](media/data-collection-rule-azure-monitor-agent/data-collection-rule-basics-updated.png#lightbox)
4141

4242
1. On the **Resources** tab, add the resources (virtual machines, virtual machine scale sets, Arc for servers) to which to associate the data collection rule. The portal will install Azure Monitor Agent on resources that don't already have it installed, and will also enable Azure Managed Identity.
4343

@@ -46,23 +46,24 @@ To send data to Log Analytics, create the data collection rule in the **same reg
4646
4747
If you need network isolation using private links, select existing endpoints from the same region for the respective resources, or [create a new endpoint](../essentials/data-collection-endpoint-overview.md).
4848

49-
[![Screenshot showing the Resources tab of the Data Collection Rules screen.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-virtual-machines-with-endpoint.png)](media/data-collection-rule-azure-monitor-agent/data-collection-rule-virtual-machines-with-endpoint.png#lightbox)
49+
[ ![Screenshot showing the Resources tab of the Data Collection Rules screen.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-virtual-machines-with-endpoint.png) ](media/data-collection-rule-azure-monitor-agent/data-collection-rule-virtual-machines-with-endpoint.png#lightbox)
50+
5051

5152
1. On the **Collect and deliver** tab, select **Add data source** to add a data source and set a destination.
5253
1. Select a **Data source type**.
5354
1. Select which data you want to collect. For performance counters, you can select from a predefined set of objects and their sampling rate. For events, you can select from a set of logs and severity levels.
5455

55-
[![Screenshot of Azure portal form to select basic performance counters in a data collection rule.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-data-source-basic-updated.png)](media/data-collection-rule-azure-monitor-agent/data-collection-rule-data-source-basic-updated.png#lightbox)
56+
[ ![Screenshot of Azure portal form to select basic performance counters in a data collection rule.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-data-source-basic-updated.png) ](media/data-collection-rule-azure-monitor-agent/data-collection-rule-data-source-basic-updated.png#lightbox)
5657

5758
1. Select **Custom** to collect logs and performance counters that are not [currently supported data sources](azure-monitor-agent-overview.md#data-sources-and-destinations) or to [filter events using XPath queries](#filter-events-using-xpath-queries). You can then specify an [XPath](https://www.w3schools.com/xml/xpath_syntax.asp) to collect any specific values. See [Sample DCR](data-collection-rule-sample-agent.md) for an example.
5859

59-
[![Screenshot of Azure portal form to select custom performance counters in a data collection rule.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-data-source-custom-updated.png)](media/data-collection-rule-azure-monitor-agent/data-collection-rule-data-source-custom-updated.png#lightbox)
60+
[ ![Screenshot of Azure portal form to select custom performance counters in a data collection rule.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-data-source-custom-updated.png) ](media/data-collection-rule-azure-monitor-agent/data-collection-rule-data-source-custom-updated.png#lightbox)
6061

6162
1. On the **Destination** tab, add one or more destinations for the data source. You can select multiple destinations of the same or different types - for instance multiple Log Analytics workspaces (known as "multi-homing").
6263

6364
You can send Windows event and Syslog data sources can to Azure Monitor Logs only. You can send performance counters to both Azure Monitor Metrics and Azure Monitor Logs.
6465

65-
[![Screenshot of Azure portal form to add a data source in a data collection rule.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-destination.png)](media/data-collection-rule-azure-monitor-agent/data-collection-rule-destination.png#lightbox)
66+
[ ![Screenshot of Azure portal form to add a data source in a data collection rule.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-destination.png) ](media/data-collection-rule-azure-monitor-agent/data-collection-rule-destination.png#lightbox)
6667

6768
1. Select **Add Data Source** and then **Review + create** to review the details of the data collection rule and association with the set of virtual machines.
6869
1. Select **Create** to create the data collection rule.
@@ -117,7 +118,7 @@ In Windows, you can use Event Viewer to extract XPath queries as shown below.
117118

118119
When you paste the XPath query into the field on the **Add data source** screen, (step 5 in the picture below), you must append the log type category followed by '!'.
119120

120-
[![Screenshot of steps in Azure portal showing the steps to create an XPath query in the Windows Event Viewer.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-extract-xpath.png)](media/data-collection-rule-azure-monitor-agent/data-collection-rule-extract-xpath.png#lightbox)
121+
[ ![Screenshot of steps in Azure portal showing the steps to create an XPath query in the Windows Event Viewer.](media/data-collection-rule-azure-monitor-agent/data-collection-rule-extract-xpath.png) ](media/data-collection-rule-azure-monitor-agent/data-collection-rule-extract-xpath.png#lightbox)
121122

122123
See [XPath 1.0 limitations](/windows/win32/wes/consuming-events#xpath-10-limitations) for a list of limitations in the XPath supported by Windows event log.
123124

articles/azure-monitor/app/java-spring-boot.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,17 @@ To use the programmatic configuration and attach the Application Insights agent
4848

4949
And invoke the `attach()` method of the `com.microsoft.applicationinsights.attach.ApplicationInsights` class.
5050

51-
> [!TIP]
52-
> ⚠ JRE is not supported.
51+
> [!WARNING]
52+
>
53+
> JRE is not supported.
5354
54-
> [!TIP]
55-
> ⚠ Read-only file system is not supported.
55+
> [!WARNING]
56+
>
57+
> Read-only file system is not supported.
5658
57-
> [!TIP]
58-
> ⚠ The invocation must be requested at the beginning of the `main` method.
59+
> [!WARNING]
60+
>
61+
> The invocation must be requested at the beginning of the `main` method.
5962
6063
Example:
6164

@@ -72,7 +75,7 @@ public class SpringBootApp {
7275

7376
If you want to use a JSON configuration:
7477
* The `applicationinsights.json` file has to be in the classpath
75-
* Or you can use an environmental variable or a system property, more in the _Configuration file path_ part on [this page](../app/java-standalone-config.md).
78+
* Or you can use an environmental variable or a system property, more in the _Configuration file path_ part on [this page](../app/java-standalone-config.md). Spring properties defined in a Spring _.properties_ file are not supported.
7679

7780

7881
> [!TIP]

0 commit comments

Comments
 (0)