Merge pull request #193736 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)

Author: huypub

articles/cost-management-billing/reservations/exchange-and-refund-azure-reservations.md

@@ -12,10 +12,10 @@ ms.author: banders
 
 # Self-service exchanges and refunds for Azure Reservations
 
-Azure Reservations provide flexibility to help meet your evolving needs. Reservation products are interchangeable with each other if they're the same type of reservation. For example, you can exchange multiple compute reservations including Azure Dedicated Host, Azure VMware Solution, and Azure Virtual Machines with each other all at once. In other words,  In an other example, you can exchange multiple SQL database reservation types including Managed Instances and Elastic Pool with each other.
+Azure Reservations provide flexibility to help meet your evolving needs. Reservation products are interchangeable with each other if they're the same type of reservation. For example, you can exchange multiple compute reservations including Azure Dedicated Host, Azure VMware Solution, and Azure Virtual Machines with each other all at once. In an other example, you can exchange multiple SQL database reservation types including Managed Instances and Elastic Pool with each other.
 However, you can't exchange dissimilar reservations. For example, you can't exchange a Cosmos DB reservation for SQL Database.
 
-You can also exchange a reservation to purchase another reservation of a similar type in a different region. For example, you can exchange a reservation that's in West US 2 for one that's in West Europe.
+You can also exchange a reservation to purchase another reservation of a similar type in a different region. For example, you can exchange a reservation that's in West US 2 region for one that's in West Europe region.
 
 When you exchange a reservation, you can change your term from one-year to three-year.
 
@@ -64,7 +64,7 @@ If you are exchanging for a different size, series, region or payment frequency,
 
 ## How transactions are processed
 
-First, Microsoft cancels the existing reservation and refunds the pro-rated amount for that reservation. If there's an exchange, the new purchase is processed. Microsoft processes refunds using one of the following methods, depending on your account type and payment method:
+First, Microsoft cancels the existing reservation and refunds the pro-rated amount for that reservation. If there's an exchange, the new purchase is processed. Microsoft processes refunds using one of the following methods, depending on your account type and payment method.
 
 ### Enterprise agreement customers
 

articles/governance/policy/concepts/definition-structure.md

@@ -951,13 +951,24 @@ functions](../../../azure-resource-manager/templates/template-functions.md) are
 within a policy rule, except the following functions and user-defined functions:
 
 - copyIndex()
+- dateTimeAdd()
 - deployment()
+- environment()
+- extensionResourceId()
+- listAccountSas()
+- listKeys()
+- listSecrets()
 - list*
+- managementGroup()
 - newGuid()
 - pickZones()
 - providers()
 - reference()
 - resourceId()
+- subscriptionResourceId()
+- tenantResourceId()
+- tenant()
+- utcNow(format)
 - variables()
 
 > [!NOTE]

articles/industrial-iot/tutorial-configure-industrial-iot-components.md

@@ -48,33 +48,47 @@ output of deployment script or reset the password
 * IoT Hub → IoT Edge → \<DEVICE> → Set Modules → OpcPublisher (for standalone OPC Publisher operation only)
 
 
-## Configuration options
+## OPC Publisher 2.8.2 Configuration options for orchestrated mode
 
-|Configuration Option (shorthand/full name)    |    Description   |
-|----------------------------------------------|------------------|
-pf/publishfile |The filename to configure the nodes to publish. If this option is specified, it puts OPC Publisher into standalone mode.
-lf/logfile |The filename of the logfile to use.
-ll/loglevel |The log level to use (allowed: fatal, error, warn, info, debug, verbose).
-me/messageencoding |The messaging encoding for outgoing messages allowed values: Json, Uadp
-mm/messagingmode |The messaging mode for outgoing messages allowed values: PubSub, Samples
-fm/fullfeaturedmessage |The full featured mode for messages (all fields filled in). Default is 'true', for legacy compatibility use 'false'
-aa/autoaccept |The publisher trusted all servers it's a connection to
-bs/batchsize |The number of OPC UA data-change messages to be cached for batching.
-si/iothubsendinterval |The trigger batching interval in seconds.
-ms/iothubmessagesize |The maximum size of the (IoT D2C) message.
-om/maxoutgressmessages |The maximum size of the (IoT D2C) message egress buffer.
-di/diagnosticsinterval |Shows publisher diagnostic info at the specified interval in seconds (need log level info). -1 disables remote diagnostic log and diagnostic output
-lt/logflugtimespan |The timespan in seconds when the logfile should be flushed.
-ih/iothubprotocol |Protocol to use for communication with the hub. Allowed values: AmqpOverTcp, AmqpOverWebsocket, MqttOverTcp, MqttOverWebsocket, Amqp, Mqtt, Tcp, Websocket, Any
-hb/heartbeatinterval |The publisher is using this as default value in seconds for the heartbeat interval setting of nodes without a heartbeat interval setting.
-ot/operationtimeout |The operation timeout of the publisher OPC UA client in ms.
-ol/opcmaxstringlen |The max length of a string opc can transmit/receive.
-oi/opcsamplinginterval |Default value in milliseconds to request the servers to sample values
-op/opcpublishinginterval |Default value in milliseconds for the publishing interval setting of the subscriptions against the OPC UA server.
-ct/createsessiontimeout |The interval the publisher is sending keep alive messages in seconds to the OPC servers on the endpoints it's connected to.
-kt/keepalivethresholt |Specify the number of keep alive packets a server can miss, before the session is disconnected.
-tm/trustmyself |The publisher certificate is put into the trusted store automatically.
-at/appcertstoretype |The own application cert store type (allowed: Directory, X509Store).
+The following OPC Publisher configuration can be applied by Command Line Interface (CLI) options or as environment variable settings. When both the environment variable and the CLI argument are provided, the latest will overrule the env variable.
+
+|Configuration Option     |    Description   |   Default  |
+|----------------------------------------------|------------------|--------------|
+site=VALUE |The site OPC Publisher is assigned to. |Not set
+AutoAcceptUntrustedCertificates=VALUE |OPC UA Client Security Config - auto accept untrusted peer certificates. |false
+BatchSize=VALUE |The number of OPC UA data-change messages to be cached for batching. When BatchSize is 1 or TriggerInterval is set to 0 batching is disabled. |50
+BatchTriggerInterval=VALUE |The trigger batching interval in seconds. When BatchSize is 1 or TriggerInterval is set to 0 batching is disabled. |{00:00:10}
+IoTHubMaxMessageSize=VALUE |The maximum size of the (IoT D2C) telemetry message. |0
+Transport=VALUE |Protocol to use for communication with the hub. Allowed values: AmqpOverTcp, AmqpOverWebsocket, MqttOverTcp, MqttOverWebsocket, Amqp, Mqtt, Tcp, Websocket, Any. |MqttOverTcp
+BypassCertVerification=VALUE |Enables/disables bypass of certificate verification for upstream communication to edgeHub. |false
+EnableMetrics=VALUE |Enables/disables upstream metrics propagation. |true
+OperationTimeout=VALUE |OPC UA Stack Transport Secure Channel - OPC UA Service call operation timeout |120,000 (2 min)
+MaxStringLength=VALUE |OPC UA Stack Transport Secure Channel - Maximum length of a string that can be send/received over the OPC UA Secure channel. |130,816 (128KB - 256)
+DefaultSessionTimeout=VALUE |The interval the OPC Publisher is sending keep alive messages in seconds to the OPC servers on the endpoints it's connected to. |0, meaning not set
+MinSubscriptionLifetime=VALUE | OPC UA Client Application Config - Minimum subscription lifetime as per OPC UA definition. |0, meaning not set
+AddAppCertToTrustedStore=VALUE |OPC UA Client Security Config - automatically copy own certificate's public key to the trusted certificate store |true
+ApplicationName=VALUE |OPC UA Client Application Config - Application name as per OPC UA definition. This is used for authentication during communication init handshake and as part of own certificate validation. |"Microsoft.Azure.IIoT" 
+ApplicationUri=VALUE | OPC UA Client Application Config - Application URI as per OPC UA definition. |$"urn:localhost:{ApplicationName}:microsoft:"
+KeepAliveInterval=VALUE |OPC UA Client Application Config - Keep alive interval as per OPC UA definition. |10,000 (10s)
+MaxKeepAliveCount=VALUE |OPC UA Client Application Config - Maximum count of kee alive events as per OPC UA definition. | 50
+PkiRootPath=VALUE | OPC UA Client Security Config - PKI certificate store root path. |"pki
+ApplicationCertificateStorePath=VALUE |OPC UA Client Security Config - application's own certificate store path. |$"{PkiRootPath}/own"
+ApplicationCertificateStoreType=VALUE |The own application cert store type (allowed: Directory, X509Store). |Directory
+ApplicationCertificateSubjectName=VALUE |OPC UA Client Security Config - the subject name in the application's own certificate. |"CN=Microsoft.Azure.IIoT, C=DE, S=Bav, O=Microsoft, DC=localhost"
+TrustedIssuerCertificatesPath=VALUE |OPC UA Client Security Config - trusted certificate issuer store path. |$"{PkiRootPath}/issuers"
+TrustedIssuerCertificatesType=VALUE | OPC UA Client Security Config - trusted issuer certificates store type. |Directory
+TrustedPeerCertificatesPath=VALUE | OPC UA Client Security Config - trusted peer certificates store path. |$"{PkiRootPath}/trusted"
+TrustedPeerCertificatesType=VALUE | OPC UA Client Security Config - trusted peer certificates store type. |Directory
+RejectedCertificateStorePath=VALUE | OPC UA Client Security Config - rejected certificates store path. |$"{PkiRootPath}/rejected"
+RejectedCertificateStoreType=VALUE | OPC UA Client Security Config - rejected certificates store type. |Directory
+RejectSha1SignedCertificates=VALUE | OPC UA Client Security Config - reject deprecated Sha1 signed certificates. |false
+MinimumCertificateKeySize=VALUE | OPC UA Client Security Config - minimum accepted certificates key size. |1024
+SecurityTokenLifetime=VALUE | OPC UA Stack Transport Secure Channel - Security token lifetime in milliseconds. |3,600,000 (1h)
+ChannelLifetime=VALUE | OPC UA Stack Transport Secure Channel - Channel lifetime in milliseconds. |300,000 (5 min)
+MaxBufferSize=VALUE | OPC UA Stack Transport Secure Channel - Max buffer size. |65,535 (64KB -1)
+MaxMessageSize=VALUE | OPC UA Stack Transport Secure Channel - Max message size. |4,194,304 (4 MB)
+MaxArrayLength=VALUE | OPC UA Stack Transport Secure Channel - Max array length. |65,535 (64KB - 1)
+MaxByteStringLength=VALUE | OPC UA Stack Transport Secure Channel - Max byte string length. |1,048,576 (1MB);
 
 
 ## Next steps

articles/service-bus-messaging/advanced-features-overview.md

@@ -33,7 +33,7 @@ A queue or subscription client can defer retrieval of a received message until a
 A transaction groups two or more operations together into an execution scope. Service Bus allows you to group operations against multiple messaging entities within the scope of a single transaction. A message entity can be a queue, topic, or subscription. For more information, see [Overview of Service Bus transaction processing](service-bus-transactions.md).
 
 ## Autodelete on idle
-Autodelete on idle enables you to specify an idle interval after which a queue or topic subscription is automatically deleted. The minimum duration is 5 minutes. 
+Autodelete on idle enables you to specify an idle interval after which a queue or topic subscription is automatically deleted. The interval is reset when there is traffic on the entity. The minimum duration is 5 minutes. 
 
 ## Duplicate detection
 The duplicate detection feature enables the sender to resend the same message again and for the broker to drop a potential duplicate. For more information, see [Duplicate detection](duplicate-detection.md).