Skip to content

Commit 6da74f2

Browse files
authored
Merge pull request #212751 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 70d9a89 + 0e2ae0f commit 6da74f2

File tree

11 files changed

+25
-32
lines changed

11 files changed

+25
-32
lines changed

articles/active-directory/fundamentals/automate-provisioning-to-applications-solutions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The table depicts common scenarios and the recommended technology.
7777

7878
## Automate provisioning users into non-Microsoft applications
7979

80-
After identities are in Azure AD through HR-provisioning or Azure AD Connect Could Sync / Azure AD Connect Sync, the employee can use the identity to access Teams, SharePoint, and Microsoft 365 applications. However, employees still need access to many Microsoft applications to perform their work.
80+
After identities are in Azure AD through HR-provisioning or Azure AD Connect cloud sync / Azure AD Connect sync, the employee can use the identity to access Teams, SharePoint, and Microsoft 365 applications. However, employees still need access to many Microsoft applications to perform their work.
8181

8282
![Automation decision matrix](media/automate-user-provisioning-to-applications-solutions/automate-provisioning-decision-matrix.png)
8383

articles/active-directory/saas-apps/olfeo-saas-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
4747
1. Login to Olfeo SAAS admin console.
4848
1. Navigate to **Configuration > Annuaires**.
4949
1. Create a new directory and then name it.
50-
1. Select **Azure** provider and then click on **Cr�er** to save the new directory.
50+
1. Select **Azure** provider and then click on **Créer** to save the new directory.
5151
1. Navigate to the **Synchronisation** tab to see the **Tenant URL** and the **Jeton secret**. These values will be copied and pasted in the **Tenant URL** and **Secret Token** fields in the Provisioning tab of your Olfeo SAAS application in the Azure portal.
5252

5353
## Step 3. Add Olfeo SAAS from the Azure AD application gallery

articles/aks/use-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Example:
148148
az role assignment create --assignee 22222222-2222-2222-2222-222222222222 --role "Contributor" --scope "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/custom-resource-group"
149149
```
150150

151-
For user-assigned kubelet identity which is outside the default woker node resource group, you need to assign the `Managed Identity Operator`on kubelet identity.
151+
For user-assigned kubelet identity which is outside the default worker node resource group, you need to assign the `Managed Identity Operator`on kubelet identity.
152152

153153
```azurecli-interactive
154154
az role assignment create --assignee <control-plane-identity-principal-id> --role "Managed Identity Operator" --scope "<kubelet-identity-resource-id>"

articles/azure-monitor/autoscale/autoscale-custom-metric.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ This article describes how to set up autoscale for a web app by using a custom m
1818

1919
Autoscale allows you to add and remove resources to handle increases and decreases in load. In this article, we'll show you how to set up autoscale for a web app by using one of the Application Insights metrics to scale the web app in and out.
2020

21+
> [!NOTE]
22+
> Autoscaling on custom metrics in Application Insights is supported only for metrics published to **Standard** and **Azure.ApplicationInsights** namespaces. If any other namespaces are used for custom metrics in Application Insights, it will return **Unsupported Metric** error.
23+
2124
Azure Monitor autoscale applies to:
2225

2326
+ [Azure Virtual Machine Scale Sets](https://azure.microsoft.com/services/virtual-machine-scale-sets/)
@@ -153,4 +156,4 @@ To learn more about autoscale, see the following articles:
153156
- [Overview of autoscale](./autoscale-overview.md)
154157
- [Azure Monitor autoscale common metrics](./autoscale-common-metrics.md)
155158
- [Best practices for Azure Monitor autoscale](./autoscale-best-practices.md)
156-
- [Autoscale REST API](/rest/api/monitor/autoscalesettings)
159+
- [Autoscale REST API](/rest/api/monitor/autoscalesettings)

articles/azure-monitor/logs/analyze-usage.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ If you find that you have excessive billable data for a particular data type, th
171171
```kusto
172172
SecurityEvent
173173
| summarize AggregatedValue = count() by EventID
174+
| order by AggregatedValue desc nulls last
174175
```
175176

176177
**Log Management** solution
@@ -179,6 +180,7 @@ SecurityEvent
179180
Usage
180181
| where Solution == "LogManagement" and iff(isnotnull(toint(IsBillable)), IsBillable == true, IsBillable == "true") == true
181182
| summarize AggregatedValue = count() by DataType
183+
| order by AggregatedValue desc nulls last
182184
```
183185

184186
**Perf** data type

articles/azure-resource-manager/bicep/bicep-functions-files.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Bicep functions - files
33
description: Describes the functions to use in a Bicep file to load content from a file.
44
ms.topic: conceptual
5-
ms.date: 07/08/2022
5+
ms.date: 09/28/2022
66
---
77

88
# File functions for Bicep
@@ -21,11 +21,11 @@ Namespace: [sys](bicep-functions.md#namespaces-for-functions).
2121

2222
| Parameter | Required | Type | Description |
2323
|:--- |:--- |:--- |:--- |
24-
| filePath | Yes | string | The path to the file to load. The path is relative to the deployed Bicep file. |
24+
| filePath | Yes | string | The path to the file to load. The path is relative to the deployed Bicep file, and it should be a compile-time constant (cannot use variables). |
2525

2626
### Remarks
2727

28-
Use this function when you have binary content you would like to include in deployment. Rather than manually encoding the file to a base64 string and adding it to your Bicep file, load the file with this function. The file is loaded when the Bicep file is compiled to a JSON template. During deployment, the JSON template contains the contents of the file as a hard-coded string.
28+
Use this function when you have binary content you would like to include in deployment. Rather than manually encoding the file to a base64 string and adding it to your Bicep file, load the file with this function. The file is loaded when the Bicep file is compiled to a JSON template. Hence variables cannot be used in filePath as they are not resolved at this stage. During deployment, the JSON template contains the contents of the file as a hard-coded string.
2929

3030
This function requires **Bicep version 0.4.412 or later**.
3131

@@ -47,13 +47,13 @@ Namespace: [sys](bicep-functions.md#namespaces-for-functions).
4747

4848
| Parameter | Required | Type | Description |
4949
|:--- |:--- |:--- |:--- |
50-
| filePath | Yes | string | The path to the file to load. The path is relative to the deployed Bicep file. |
50+
| filePath | Yes | string | The path to the file to load. The path is relative to the deployed Bicep file. The path is relative to the deployed Bicep file, and it should be a compile-time constant (cannot use variables). |
5151
| jsonPath | No | string | JSONPath expression to take only a part of the JSON into ARM. |
5252
| encoding | No | string | The file encoding. The default value is `utf-8`. The available options are: `iso-8859-1`, `us-ascii`, `utf-16`, `utf-16BE`, or `utf-8`. |
5353

5454
### Remarks
5555

56-
Use this function when you have JSON content or minified JSON content that is stored in a separate file. Rather than duplicating the JSON content in your Bicep file, load the content with this function. You can load a part of a JSON file by specifying a JSON path. The file is loaded when the Bicep file is compiled to the JSON template. During deployment, the JSON template contains the contents of the file as a hard-coded string.
56+
Use this function when you have JSON content or minified JSON content that is stored in a separate file. Rather than duplicating the JSON content in your Bicep file, load the content with this function. You can load a part of a JSON file by specifying a JSON path. The file is loaded when the Bicep file is compiled to the JSON template. Hence variables cannot be used in filePath as they are not resolved at this stage. During deployment, the JSON template contains the contents of the file as a hard-coded string.
5757

5858
In VS Code, the properties of the loaded object are available intellisense. For example, you can create a file with values to share across many Bicep files. An example is shown in this article.
5959

@@ -89,12 +89,12 @@ Namespace: [sys](bicep-functions.md#namespaces-for-functions).
8989

9090
| Parameter | Required | Type | Description |
9191
|:--- |:--- |:--- |:--- |
92-
| filePath | Yes | string | The path to the file to load. The path is relative to the deployed Bicep file. |
92+
| filePath | Yes | string | The path to the file to load. The path is relative to the deployed Bicep file. The path is relative to the deployed Bicep file, and it should be a compile-time constant (cannot use variables). |
9393
| encoding | No | string | The file encoding. The default value is `utf-8`. The available options are: `iso-8859-1`, `us-ascii`, `utf-16`, `utf-16BE`, or `utf-8`. |
9494

9595
### Remarks
9696

97-
Use this function when you have content that is more stored in a separate file. Rather than duplicating the content in your Bicep file, load the content with this function. For example, you can load a deployment script from a file. The file is loaded when the Bicep file is compiled to the JSON template. During deployment, the JSON template contains the contents of the file as a hard-coded string.
97+
Use this function when you have content that is more stored in a separate file. Rather than duplicating the content in your Bicep file, load the content with this function. For example, you can load a deployment script from a file. The file is loaded when the Bicep file is compiled to the JSON template. Hence variables cannot be used in filePath as they are not resolved at this stage. During deployment, the JSON template contains the contents of the file as a hard-coded string.
9898

9999
Use the [`loadJsonContent()`](#loadjsoncontent) function to load JSON files.
100100

articles/cosmos-db/mongodb/change-log.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,6 @@ The API for MongoDB now offers a built-in role-based access control (RBAC) that
4141
[Learn more](./how-to-setup-rbac.md)
4242

4343

44-
### Unique partial indexes in Azure Cosmos DB API for MongoDB
45-
The unique partial indexes feature allows you more flexibility to specify exactly which fields in which documents you’d like to index, all while enforcing uniqueness of that field’s value. Resulting in the unique constraint being applied only to the documents that meet the specified filter expression.
46-
47-
[Learn more](./feature-support-42.md)
48-
49-
50-
### Azure Cosmos DB API for MongoDB unique index reindexing (Preview)
51-
The unique index feature for Azure Cosmos DB allows you to create unique indexes when your collection was empty and didn't contain documents. This feature provides you with more flexibility by giving you the ability to create unique indexes whenever you want to—meaning there’s no need to plan unique indexes ahead of time before inserting any data into the collection.
52-
53-
[Learn more](./mongodb-indexing.md) and enable the feature today by [submitting a support ticket request](https://azure.microsoft.com/support/create-ticket/)
54-
55-
5644
### Azure Cosmos DB API for MongoDB supports version 4.2
5745
The Azure Cosmos DB API for MongoDB version 4.2 includes new aggregation functionality and improved security features such as client-side field encryption. These features help you accelerate development by applying the new functionality instead of developing it yourself.
5846

articles/energy-data-services/concepts-ddms.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ ms.custom: template-concept #Required; leave this attribute/value as-is.
1414
**Domain Data Management Service (DDMS)** – is a platform component that extends [OSDU&trade;](https://osduforum.org) core data platform with domain specific model and optimizations. DDMS is a mechanism of a platform extension that:
1515

1616
* delivers optimized handling of data for each (non-overlapping) "domain."
17-
* single vertical discipline or business area, for example, Petrophysics, Geophysics, Seismic
18-
* a functional aspect of one or more vertical disciplines or business areas, for example, Earth Model
17+
* pertains to a single vertical discipline or business area, for example, Petrophysics, Geophysics, Seismic
18+
* serves a functional aspect of one or more vertical disciplines or business areas, for example, Earth Model
1919
* delivers high performance capabilities not supported by OSDU&trade; generic normal APIs.
20-
* can help achieve the extension of OSDU&trade; scope to new business areas.
20+
* helps achieve the extension of OSDU&trade; scope to new business areas.
2121
* may be developed in a distributed manner with separate resources/sponsors.
2222

2323
OSDU&trade; Technical Standard defines the following types of OSDU&trade; application types:

0 commit comments

Comments
 (0)