Skip to content

Commit cf09b79

Browse files
authored
Merge pull request #184391 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 9309d78 + 7b0c02e commit cf09b79

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

articles/active-directory/roles/groups-concept.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Role-assignable groups are designed to help prevent potential breaches by having
5050
- Only Global Administrators and Privileged Role Administrators can create a role-assignable group.
5151
- The membership type for role-assignable groups must be Assigned and can't be an Azure AD dynamic group. Automated population of dynamic groups could lead to an unwanted account being added to the group and thus assigned to the role.
5252
- By default, only Global Administrators and Privileged Role Administrators can manage the membership of a role-assignable group, but you can delegate the management of role-assignable groups by adding group owners.
53-
- RoleManagement.ReadWrite.All Microsoft Graph permission is required to be able to manage the membership of such groups; Group.ReadWrite.All won't work.
53+
- RoleManagement.ReadWrite.Directory Microsoft Graph permission is required to be able to manage the membership of such groups; Group.ReadWrite.All won't work.
5454
- To prevent elevation of privilege, only a Privileged Authentication Administrator or a Global Administrator can change the credentials or reset MFA for members and owners of a role-assignable group.
5555
- Group nesting is not supported. A group can't be added as a member of a role-assignable group.
5656

articles/service-bus-messaging/service-bus-end-to-end-tracing.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ One part of this problem is tracking logical pieces of work. It includes message
1515
When a producer sends a message through a queue, it typically happens in the scope of some other logical operation, initiated by some other client or service. The same operation is continued by consumer once it receives a message. Both producer and consumer (and other services that process the operation), presumably emit telemetry events to trace the operation flow and result. In order to correlate such events and trace operation end-to-end, each service that reports telemetry has to stamp every event with a trace context.
1616

1717
Microsoft Azure Service Bus messaging has defined payload properties that producers and consumers should use to pass such trace context.
18-
The protocol is based on the [HTTP Correlation protocol](https://github.com/dotnet/runtime/blob/master/src/libraries/System.Diagnostics.DiagnosticSource/src/HttpCorrelationProtocol.md).
18+
The protocol is based on the [W3C Trace-Context](https://www.w3.org/TR/trace-context/).
1919

2020
# [Azure.Messaging.ServiceBus SDK (Latest)](#tab/net-standard-sdk-2)
2121
| Property Name | Description |
2222
|----------------------|-------------------------------------------------------------|
23-
| Diagnostic-Id | Unique identifier of an external call from producer to the queue. Refer to [Request-Id in HTTP protocol](https://github.com/dotnet/runtime/blob/master/src/libraries/System.Diagnostics.DiagnosticSource/src/HttpCorrelationProtocol.md#request-id) for the rationale, considerations, and format |
23+
| Diagnostic-Id | Unique identifier of an external call from producer to the queue. Refer to [W3C Trace-Context traceparent header](https://www.w3.org/TR/trace-context/#traceparent-header) for the format |
2424

2525
## Service Bus .NET Client autotracing
2626
The `ServiceBusProcessor` class of [Azure Messaging Service Bus client for .NET](/dotnet/api/azure.messaging.servicebus.servicebusprocessor) provides tracing instrumentation points that can be hooked by tracing systems, or piece of client code. The instrumentation allows tracking all calls to the Service Bus messaging service from client side. If message processing is done by using [`ProcessMessageAsync` of `ServiceBusProcessor`](/dotnet/api/azure.messaging.servicebus.servicebusprocessor.processmessageasync) (message handler pattern), the message processing is also instrumented.
@@ -77,6 +77,9 @@ If you're running any external code in addition to the Application Insights SDK,
7777

7878
It doesn't mean that there was a delay in receiving the message. In this scenario, the message has already been received since the message is passed in as a parameter to the SDK code. And, the **name** tag in the App Insights logs (**Process**) indicates that the message is now being processed by your external event processing code. This issue isn't Azure-related. Instead, these metrics refer to the efficiency of your external code given that the message has already been received from Service Bus.
7979

80+
### Tracking with OpenTelemetry
81+
Service Bus .NET Client library version 7.5.0 and later supports OpenTelemetry in experimental mode. Refer to [Distributed tracing in .NET SDK](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/Diagnostics.md#opentelemetry-with-azure-monitor-zipkin-and-others) documentation for more details.
82+
8083
### Tracking without tracing system
8184
In case your tracing system doesn't support automatic Service Bus calls tracking you may be looking into adding such support into a tracing system or into your application. This section describes diagnostics events sent by Service Bus .NET client.
8285

articles/storage/blobs/secure-file-transfer-protocol-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.reviewer: ylunagaria
1717
Blob storage now supports the SSH File Transfer Protocol (SFTP). This support provides the ability to securely connect to Blob Storage accounts via an SFTP endpoint, allowing you to leverage SFTP for file access, file transfer, as well as file management.
1818

1919
> [!IMPORTANT]
20-
> SFTP support is currently in PREVIEW and is available in [these regions](secure-file-transfer-protocol-support.md#regional-availability).
20+
> SFTP support currently is in PREVIEW and is available in only [these regions](secure-file-transfer-protocol-support.md#regional-availability) and only when you set these [data redundancy options](secure-file-transfer-protocol-known-issues.md#data-redundancy-options).
2121
>
2222
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
2323
>

articles/storage/common/storage-network-security.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,11 +471,13 @@ You can add or remove resource network rules in the Azure portal.
471471
472472
3. Select **Networking** to display the configuration page for networking.
473473
474-
4. In the **Resource type** drop-down list, choose the resource type of your resource instance.
474+
4. Under **Firewalls and virtual networks**, for **Selected networks**, select to allow access.
475475
476-
5. In the **Instance name** drop-down list, choose the resource instance. You can also choose to include all resource instances in the active tenant, subscription, or resource group.
476+
5. Scroll down to find **Resource instances**, and in the **Resource type** dropdown list, choose the resource type of your resource instance.
477477
478-
6. Select **Save** to apply your changes. The resource instance appears in the **Resource instances** section of the network settings page.
478+
6. In the **Instance name** dropdown list, choose the resource instance. You can also choose to include all resource instances in the active tenant, subscription, or resource group.
479+
480+
7. Select **Save** to apply your changes. The resource instance appears in the **Resource instances** section of the network settings page.
479481
480482
To remove the resource instance, select the delete icon (:::image type="icon" source="media/storage-network-security/delete-icon.png":::) next to the resource instance.
481483

articles/storage/common/storage-ref-azcopy-copy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For more information, see the examples section of this article.
3939

4040
## Advanced
4141

42-
AzCopy automatically detects the content type of the files when you upload them from the local disk. AzCopy detects the content type based on the file extension or content (if no extension is specified).
42+
AzCopy automatically detects the content type of the files based on the file extension or content (if no extension is specified) when you upload them from the local disk.
4343

4444
The built-in lookup table is small, but on Unix, it is augmented by the local system's `mime.types` file(s) if they are available under one or more of these names:
4545

0 commit comments

Comments
 (0)