Skip to content

Commit 3e3d263

Browse files
author
RoseHJM
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ade-remove-roadmap
2 parents bc3b4d4 + 026e0e2 commit 3e3d263

File tree

111 files changed

+885
-5058
lines changed

Some content is hidden

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

111 files changed

+885
-5058
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
"redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
3131
"redirect_document_id": false
3232
},
33+
{
34+
"source_path": "articles/event-grid/event-schema-storage-actions.md",
35+
"redirect_url": "/azure/storage-actions/overview",
36+
"redirect_document_id": false
37+
},
3338
{
3439
"source_path_from_root": "/articles/hdinsight-aks/index.yml",
3540
"redirect_url": "/previous-versions/azure/hdinsight-aks",
@@ -5935,6 +5940,11 @@
59355940
"redirect_url": "/azure/reliability/overview-reliability-guidance",
59365941
"redirect_document_id": false
59375942
},
5943+
{
5944+
"source_path_from_root": "/articles/reliability/sovereign-cloud-china.md",
5945+
"redirect_url": "/azure/china/concepts-service-availability",
5946+
"redirect_document_id": false
5947+
},
59385948
{
59395949
"source_path_from_root": "/articles/managed-grafana/concept-role-based-access-control.md",
59405950
"redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",

articles/active-directory-b2c/localization-string-ids.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -496,18 +496,18 @@ The following IDs are used for a [time-based one-time password (TOTP) display co
496496
</LocalizedResources>
497497
```
498498

499-
## Restful service error messages
499+
## RESTful service error messages
500500

501-
The following IDs are used for [Restful service technical profile](restful-technical-profile.md) error messages:
501+
The following IDs are used for [RESTful service technical profile](restful-technical-profile.md) error messages:
502502

503503
| ID | Default value |
504504
| --- | ------------- |
505-
| `DefaultUserMessageIfRequestFailed` | Failed to establish connection to restful service end point. Restful service URL: {0} |
506-
| `UserMessageIfCircuitOpen` | {0} Restful Service URL: {1} |
507-
| `UserMessageIfDnsResolutionFailed` | Failed to resolve the hostname of the restful service endpoint. Restful service URL: {0} |
508-
| `UserMessageIfRequestTimeout` | Failed to establish connection to restful service end point within timeout limit {0} seconds. Restful service URL: {1} |
505+
| `DefaultUserMessageIfRequestFailed` | Failed to establish connection to restful service end point. RESTful service URL: {0} |
506+
| `UserMessageIfCircuitOpen` | {0} RESTful Service URL: {1} |
507+
| `UserMessageIfDnsResolutionFailed` | Failed to resolve the hostname of the restful service endpoint. RESTful service URL: {0} |
508+
| `UserMessageIfRequestTimeout` | Failed to establish connection to restful service end point within timeout limit {0} seconds. RESTful service URL: {1} |
509509

510-
### Restful service example
510+
### RESTful service example
511511

512512
```xml
513513
<LocalizedResources Id="api.localaccountsignup.en">

articles/api-management/graphql-apis-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ API Management helps you import, manage, protect, test, publish, and monitor Gra
2121

2222
|Pass-through GraphQL |Synthetic GraphQL |
2323
|---------|---------|
24-
| ▪️ Pass-through API to existing GraphQL service endpoint<br><br/>▪️ Support for GraphQL queries, mutations, and subscriptions | ▪️ API based on a custom GraphQL schema<br></br>▪️ Support for GraphQL queries, mutations, and subscriptions<br/><br/>▪️ Configure custom resolvers, for example, to HTTP data sources<br/><br/>▪️ Develop GraphQL schemas and GraphQL-based clients while consuming data from legacy APIs |
24+
| ▪️ Pass-through API to existing GraphQL service endpoint<br><br/>▪️ Support for GraphQL queries, mutations, and subscriptions | ▪️ API based on a custom GraphQL schema<br></br>▪️ Support for GraphQL queries, mutations, and subscriptions<br/><br/>▪️ Configure custom resolvers, for example, to HTTP data sources<br/><br/>▪️ Develop GraphQL schemas and GraphQL-based clients while consuming data from legacy APIs<br/><br/>▪️ Synthetic subscriptions do not require resolvers. See [publish-event](publish-event-policy.md) policy. |
2525

2626
## Availability
2727

articles/api-management/publish-event-policy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ The `publish-event` policy publishes an event to one or more subscriptions speci
5353
### Usage notes
5454

5555
* This policy is invoked only when a related GraphQL query or mutation is executed.
56+
* Resolver *should not* be defined for the corresponding subscription. Defining a `publish-event` policy on a source query or mutation is sufficient to trigger subscription events.
5657

5758
## Example
5859

articles/app-service/overview-tls.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ Key benefits include:
5555
- **Better Performance**: Uses streamlined encryption algorithms that lower computational overhead and improve efficiency.
5656
- **Enhanced Privacy**: Encrypts handshake messages, reducing metadata exposure and mitigating downgrade attacks.
5757

58-
#### Default Configuration
59-
TLS 1.3 is fully supported in Azure App Service and can be enabled by setting the **Minimum Inbound TLS Version** to **1.3** in the Azure portal, CLI, or ARM templates.
58+
#### Default Configuration
59+
The default incoming TLS version is TLS 1.2 for Azure App Service. Incoming TLS 1.3 is fully supported in Azure App Service and can be enabled by setting the **Minimum Inbound TLS Version** to **1.3** in the Azure portal, CLI, or ARM templates.
6060

6161
#### Cipher Suites
6262
A [Minimum TLS Cipher Suite](#minimum-tls-cipher-suite) setting is available with TLS 1.3. This includes two cipher suites at the top of the cipher suite order:

articles/azure-app-configuration/feature-management-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Feature | .NET | Spring | Python | JavaScript
3939
------- | ---- | ------ | ------ | ----------
4040
Targeting Filter | [GA](./feature-management-dotnet-reference.md#targeting) | GA | [GA](./feature-management-python-reference.md#targeting) | [GA](./feature-management-javascript-reference.md#targeting)
4141
Targeting Exclusion | [GA](./feature-management-dotnet-reference.md#targeting-exclusion) | GA | [GA](./feature-management-python-reference.md#targeting-exclusion) | [GA](./feature-management-javascript-reference.md#targeting-exclusion)
42+
Ambient Targeting | [GA](./feature-management-dotnet-reference.md#targeting-in-a-web-application) | GA | WIP | WIP
4243
Time Window Filter | [GA](./feature-management-dotnet-reference.md#microsofttimewindow) | GA | [GA](./feature-management-python-reference.md#microsofttimewindow) | [GA](./feature-management-javascript-reference.md#microsofttimewindow)
4344
Recurring Time Window | [GA](./feature-management-dotnet-reference.md#microsofttimewindow) | GA | WIP | WIP
4445
Custom Feature Filter | [GA](./feature-management-dotnet-reference.md#implementing-a-feature-filter) | GA | [GA](./feature-management-python-reference.md#implementing-a-feature-filter) | [GA](./feature-management-javascript-reference.md#implementing-a-feature-filter)

articles/azure-netapp-files/configure-ldap-extended-groups.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 03/17/2023
8+
ms.date: 02/21/2025
99
ms.author: anfdocs
1010
---
1111
# Enable Active Directory Domain Services (AD DS) LDAP authentication for NFS volumes
@@ -43,13 +43,13 @@ The following information is passed to the server in the query:
4343

4444
* The following table describes the Time to Live (TTL) settings for the LDAP cache. You need to wait until the cache is refreshed before trying to access a file or directory through a client. Otherwise, an access or permission denied message appears on the client.
4545

46-
| Cache | Default Timeout |
46+
| Cache | Default time out |
4747
|-|-|
4848
| Group membership list | 24-hour TTL |
4949
| Unix groups | 24-hour TTL, 1-minute negative TTL |
5050
| Unix users | 24-hour TTL, 1-minute negative TTL |
5151

52-
Caches have a specific timeout period called *Time to Live*. After the timeout period, entries age out so that stale entries don't linger. The *negative TTL* value is where a lookup that has failed resides to help avoid performance issues due to LDAP queries for objects that might not exist.
52+
Caches have a specific time-out period called *Time to Live*. After the time-out period, entries age out so that stale entries don't linger. The *negative TTL* value is where a lookup that has failed resides to help avoid performance issues due to LDAP queries for objects that might not exist.
5353

5454
* The **Allow local NFS users with LDAP** option in Active Directory connections intends to provide occasional and temporary access to local users. When this option is enabled, user authentication and lookup from the LDAP server stop working, and the number of group memberships that Azure NetApp Files will support will be limited to 16. As such, you should keep this option *disabled* on Active Directory connections, except for the occasion when a local user needs to access LDAP-enabled volumes. In that case, you should disable this option as soon as local user access is no longer required for the volume. See [Allow local NFS users with LDAP to access a dual-protocol volume](create-volumes-dual-protocol.md#allow-local-nfs-users-with-ldap-to-access-a-dual-protocol-volume) about managing local user access.
5555

@@ -108,8 +108,8 @@ The following information is passed to the server in the query:
108108

109109
To resolve the users and group from an LDAP server for large topologies, set the values of the **User DN**, **Group DN**, and **Group Membership Filter** options on the Active Directory Connections page as follows:
110110

111-
* Specify nested **User DN** and **Group DN** in the format of `OU=subdirectory,OU=directory,DC=domain,DC=com`.
112-
* Specify **Group Membership Filter** in the format of `(gidNumber=*)`.
111+
* Specify nested **User DN** and **Group DN** in the format of `OU=subdirectory,OU=directory,DC=domain,DC=com`. Multiple organizational units can be specified using a semicolon, for example: `OU=subdirectory1,OU=directory1,DC=domain,DC=com;OU=subdirectory2,OU=directory2,DC=domain,DC=com`
112+
* Specify **Group Membership Filter** in the format of `(gidNumber=*)`. For example, setting `(gidNumber=9*)` searches for `gidNumbers` starting with 9. You can also use two filters together: `(|(cn=*22)(cn=*33))` searches for CN values ending in 22 or 33.
113113
* If a user is a member of more than 256 groups, only 256 groups will be listed.
114114
* Refer to [errors for LDAP volumes](troubleshoot-volumes.md#errors-for-ldap-volumes) if you run into errors.
115115

articles/azure-netapp-files/create-active-directory-connections.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: b-hchen
66
ms.service: azure-netapp-files
77
ms.custom: devx-track-azurepowershell
88
ms.topic: how-to
9-
ms.date: 10/21/2024
9+
ms.date: 02/21/2025
1010
ms.author: anfdocs
1111
---
1212
# Create and manage Active Directory connections for Azure NetApp Files
@@ -71,11 +71,11 @@ Several features of Azure NetApp Files require that you have an Active Directory
7171
7272
* LDAP queries take effect only in the domain specified in the Active Directory connections (the **AD DNS Domain Name** field). This behavior applies to NFS, SMB, and dual-protocol volumes.
7373
74-
* <a name="ldap-query-timeouts"></a> LDAP query timeouts
74+
* <a name="ldap-query-timeouts"></a> LDAP query time outs
7575
76-
By default, LDAP queries time out if they cannot be completed in a timely fashion. If an LDAP query fails due to a timeout, the user and/or group lookup will fail and access to the Azure NetApp Files volume may be denied, depending on the permission settings of the volume.
76+
By default, LDAP queries time out if they cannot be completed in a timely fashion. If an LDAP query fails due to a time out, the user and/or group lookup will fail and access to the Azure NetApp Files volume may be denied, depending on the permission settings of the volume.
7777
78-
Query timeouts can occur in large LDAP environments with many user and group objects, over slow WAN connections, and if an LDAP server is over-utilized with requests. Azure NetApp Files timeout setting for LDAP queries is set to 10 seconds. Consider leveraging the user and group DN features on the Active Directory Connection for the LDAP server to filter searches if you are experiencing LDAP query timeout issues.
78+
Query time outs can occur in large LDAP environments with many user and group objects, over slow WAN connections, and if an LDAP server is over-utilized with requests. Azure NetApp Files time-out setting for LDAP queries is set to 10 seconds. Consider leveraging the user and group DN features on the Active Directory Connection for the LDAP server to filter searches if you're experiencing LDAP query time-out issues.
7979
8080
## NetApp accounts and Active Directory type
8181
@@ -132,7 +132,7 @@ For more information about the relationship between NetApp accounts and subscrip
132132
* **Organizational unit path**
133133
This is the LDAP path for the organizational unit (OU) where SMB server computer accounts will be created. That is, `OU=second level, OU=first level`. For example, if you want to use an OU called `ANF` created at the root of the domain, the value would be `OU=ANF`.
134134
135-
If no value is provided, Azure NetApp Files will use the `CN=Computers` container.
135+
If no value is provided, Azure NetApp Files uses the `CN=Computers` container.
136136
137137
If you're using Azure NetApp Files with Microsoft Entra Domain Services, the organizational unit path is `OU=AADDC Computers`
138138
@@ -178,7 +178,7 @@ For more information about the relationship between NetApp accounts and subscrip
178178
179179
The [**LDAP search scope**](/windows/win32/ad/search-scope) option optimizes Azure NetApp Files storage LDAP queries for use with large AD DS topologies and LDAP with extended groups or Unix security style with an Azure NetApp Files dual-protocol volume.
180180
181-
The **User DN** and **Group DN** options allow you to set the search base in AD DS LDAP. These options limit the search areas for LDAP queries, reducing the search time and helping to reduce LDAP query timeouts.
181+
The **User DN** and **Group DN** options allow you to set the search base in AD DS LDAP. These options limit the search areas for LDAP queries, reducing the search time and helping to reduce LDAP query time outs.
182182
183183
The **Group Membership Filter** option allows you to create a custom search filter for users who are members of specific AD DS groups.
184184

articles/azure-resource-manager/bicep/bicep-core-diagnostics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ If you need more information about a particular diagnostic code, select the **Fe
138138
| <a id='BCP130' />BCP130 | Error | Decorators aren't allowed here. |
139139
| <a id='BCP132' />[BCP132](./diagnostics/bcp132.md) | Error | Expected a declaration after the decorator. |
140140
| <a id='BCP133' />BCP133 | Error | The unicode escape sequence isn't valid. Valid unicode escape sequences range from \\u{0} to \\u{10FFFF}. |
141-
| <a id='BCP134' />BCP134 | Warning | Scope {ToQuotedString(LanguageConstants.GetResourceScopeDescriptions(suppliedScope))} isn't valid for this module. Permitted scopes: {ToQuotedString(LanguageConstants.GetResourceScopeDescriptions(supportedScopes))}. |
142-
| <a id='BCP135' />BCP135 | Warning | Scope {ToQuotedString(LanguageConstants.GetResourceScopeDescriptions(suppliedScope))} isn't valid for this resource type. Permitted scopes: {ToQuotedString(LanguageConstants.GetResourceScopeDescriptions(supportedScopes))}. |
141+
| <a id='BCP134' />BCP134 | Error | Scope \<scope-name> isn't valid for this module. Permitted scopes: \<scope-name>. |
142+
| <a id='BCP135' />[BCP135](./diagnostics/bcp135.md) | Error | Scope \<scope-name> isn't valid for this resource type. Permitted scopes: \<scope-name>. |
143143
| <a id='BCP136' />BCP136 | Error | Expected a loop item variable identifier at this location. |
144144
| <a id='BCP137' />BCP137 | Error | Loop expected an expression of type "{LanguageConstants.Array}" but the provided value is of type "{actualType}". |
145145
| <a id='BCP138' />BCP138 | Error | For-expressions aren't supported in this context. For-expressions may be used as values of resource, module, variable, and output declarations, or values of resource and module properties. |
@@ -237,7 +237,7 @@ If you need more information about a particular diagnostic code, select the **Fe
237237
| <a id='BCP235' />BCP235 | Error | Specified JSONPath doesn't exist in the given file or is invalid. |
238238
| <a id='BCP236' />BCP236 | Error | Expected a new line or comma character at this location. |
239239
| <a id='BCP237' />BCP237 | Error | Expected a comma character at this location. |
240-
| <a id='BCP238' />BCP238 | Error | Unexpected new line character after a comma. |
240+
| <a id='BCP238' />[BCP238](./diagnostics/bcp238.md) | Error | Unexpected new line character after a comma. |
241241
| <a id='BCP239' />BCP239 | Error | Identifier "{name}" is a reserved Bicep symbol name and can't be used in this context. |
242242
| <a id='BCP240' />BCP240 | Error | The "parent" property only permits direct references to resources. Expressions aren't supported. |
243243
| <a id='BCP241' />BCP241 | Warning | The \<function-name> function is deprecated and will be removed in a future release of Bicep. Add a comment to https://github.com/Azure/bicep/issues/2017 if you believe this will impact your workflow. |
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
title: BCP135
3+
description: Scope <scope-name> isn't valid for this resource type. Permitted scopes <scope-name>.
4+
ms.topic: reference
5+
ms.custom: devx-track-bicep
6+
ms.date: 02/20/2025
7+
---
8+
9+
# Bicep diagnostic code - BCP135
10+
11+
In Bicep, scopes determine the hierarchical level at which resources are deployed within Azure. ARM provides four deployment scopes—resource group, management group, subscription, and tenant. Resources must be deployed within the allowed scopes. For more information, see [Deployment scope](../deploy-to-resource-group.md#deployment-scopes).
12+
13+
## Description
14+
15+
Scope \<scope-name> isn't valid for this resource type. Permitted scopes: \<scope-name>.
16+
17+
## Level
18+
19+
Error
20+
21+
## Solutions
22+
23+
Deploy resources to the permitted scopes.
24+
25+
## Examples
26+
27+
The following example raises the diagnostic because `storageAccounts` can't be deployed at the management group scope.
28+
29+
```bicep
30+
targetScope = 'managementGroup'
31+
32+
resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
33+
name: 'demostorage0220'
34+
location: 'eastus'
35+
sku: {
36+
name: 'Standard_LRS'
37+
}
38+
kind: 'StorageV2'
39+
}
40+
```
41+
42+
You can fix the diagnostic by setting the `targetScope` to `resourceGroup`.
43+
44+
```bicep
45+
targetScope = 'resourceGroup'
46+
47+
resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
48+
name: 'demostorage0220'
49+
location: 'eastus'
50+
sku: {
51+
name: 'Standard_LRS'
52+
}
53+
kind: 'StorageV2'
54+
}
55+
56+
```
57+
58+
## Next steps
59+
60+
For more information about Bicep diagnostics, see [Bicep core diagnostics](../bicep-core-diagnostics.md).

0 commit comments

Comments
 (0)