Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ddos-patch

asudbring · asudbring · commit 9681176a6ee7 · 2023-01-20T11:49:48.000-08:00
diff --git a/articles/active-directory/app-proxy/application-proxy-configure-complex-application.md b/articles/active-directory/app-proxy/application-proxy-configure-complex-application.md
@@ -59,7 +59,7 @@ Before you get started with Application Proxy Complex application scenario apps,
 To configure (and update) Application Segments for a complex app using the API, you first [create a wildcard application](application-proxy-wildcard.md#create-a-wildcard-application), and then update the application's onPremisesPublishing property to configure the application segments and respective CORS settings.
 
 > [!NOTE]
-> One application segment is supported in preview. Support for multiple application segment to be announced soon.
+> 2 application segment per complex application are supported for [Microsoft Azure AD premium subscription](https://azure.microsoft.com/pricing/details/active-directory). Licence requirement for more than 2 application segments per complex application to be announced soon.
 
 If successful, this method returns a `204 No Content` response code and does not return anything in the response body.
 ## Example
diff --git a/articles/active-directory/develop/msal-compare-msal-js-and-adal-js.md b/articles/active-directory/develop/msal-compare-msal-js-and-adal-js.md
@@ -304,7 +304,7 @@ Once your changes are done, run the app and test your authentication scenario:
 npm start
 ```
 
-## Example: Securing web apps with ADAL Node vs. MSAL Node
+## Example: Securing a SPA with ADAL.js vs. MSAL.js
 
 The snippets below demonstrates the minimal code required for a single-page application authenticating users with the Microsoft identity platform and getting an access token for Microsoft Graph using first ADAL.js and then MSAL.js:
 
diff --git a/articles/azure-monitor/essentials/metrics-supported.md b/articles/azure-monitor/essentials/metrics-supported.md
@@ -15,8 +15,6 @@ ms.reviewer: priyamishra
 > [!NOTE]
 > This list is largely auto-generated. Any modification made to this list via GitHub might be written over without warning. Contact the author of this article for details on how to make permanent updates.
 
-Date list was last updated: 2021-10-05.
-
 Azure Monitor provides several ways to interact with metrics, including charting them in the Azure portal, accessing them through the REST API, or querying them by using PowerShell or the Azure CLI (Command Line Interface). 
 
 This article is a complete list of all platform (that is, automatically collected) metrics currently available with the consolidated metric pipeline in Azure Monitor. Metrics changed or added after the date at the top of this article might not yet appear in the list. To query for and access the list of metrics programmatically, use the [2018-01-01 api-version](/rest/api/monitor/metricdefinitions). Other metrics not in this list might be available in the portal or through legacy APIs.
diff --git a/articles/chaos-studio/chaos-studio-fault-library.md b/articles/chaos-studio/chaos-studio-fault-library.md
@@ -1225,6 +1225,7 @@ Configuring the shutdown fault:
 ```
 
 ## Key Vault Deny Access
+
 | Property | Value |
 |-|-|
 | Capability Name | DenyAccess-1.0 |
@@ -1252,3 +1253,166 @@ Configuring the shutdown fault:
   ]
 }
 ```
+
+## Key Vault Disable Certificate
+
+
+| Property  | Value |
+| ---- | --- |
+| Capability Name | DisableCertificate-1.0 |
+| Target Type | Microsoft-KeyVault |
+| Description | Using certificate properties, fault will disable the certificate for specific duration (provided by user) and enables it after this fault duration. |
+| Prerequisites | For OneCert certificates, the domain must be registered with OneCert before attempting to run the fault. |
+| Urn | urn:csci:microsoft:keyvault:disableCertificate/1.0 |
+| Fault Type | Continuous |
+| Parameters (key, value) | |
+| certificateName | Name of AKV certificate on which fault will be executed |
+| version | The certificate version that should be updated; if not specified, the latest version will be updated. |
+
+### Sample JSON
+
+```json
+{
+  "name": "branchOne",
+  "actions": [
+    {
+      "type": "continuous",
+      "name": "urn:csci:microsoft:keyvault:disableCertificate/1.0",
+      "parameters": [
+        {
+            "key": "certificateName",
+            "value": "<name of AKV certificate>"
+        },
+        {
+            "key": "version",
+            "value": "<certificate version>"
+        }
+
+],
+      "duration": "PT10M",
+      "selectorid": "myResources"
+    }
+  ]
+}
+```
+
+## Key Vault Increment Certificate Version
+	
+| Property  | Value |
+| ---- | --- |
+| Capability Name | IncrementCertificateVersion-1.0 |
+| Target Type | Microsoft-KeyVault |
+| Description | Generates new certificate version and thumbprint using the Key Vault Certificate client library. Current working certificate will be upgraded to this version. |
+| Prerequisites | For OneCert certificates, the domain must be registered with OneCert before attempting to run the fault. |
+| Urn | urn:csci:microsoft:keyvault:incrementCertificateVersion/1.0 |
+| Fault Type | Discrete |
+| Parameters (key, value) | |
+| certificateName | Name of AKV certificate on which fault will be executed |
+
+### Sample JSON
+
+```json
+{
+  "name": "branchOne",
+  "actions": [
+    {
+      "type": "discrete",
+      "name": "urn:csci:microsoft:keyvault:incrementCertificateVersion/1.0",
+      "parameters": [
+        {
+            "key": "certificateName",
+            "value": "<name of AKV certificate>"
+        }
+    ],
+      "duration": "PT10M",
+      "selectorid": "myResources"
+    }
+  ]
+}
+```
+
+## Key Vault Update Certificate Policy
+
+| Property  | Value |        
+| ---- | --- |  
+| Capability Name | UpdateCertificatePolicy-1.0        |
+| Target Type | Microsoft-KeyVault        |
+| Description | Certificate policies (examples: certificate validity period, certificate type, key size, or key type) are updated based on the user input and reverted after the fault duration.        |
+| Prerequisites |  For OneCert certificates, the domain must be registered with OneCert before attempting to run the fault.       |
+| Urn | urn:csci:microsoft:keyvault:updateCertificatePolicy/1.0        |
+| Fault Type | Continuous        |
+| Parameters (key, value) |     |    
+| certificateName | Name of AKV certificate on which fault will be executed |
+| version | The certificate version that should be updated; if not specified, the latest version will be updated. |
+| enabled | Bool. Value indicating whether the new certificate version will be enabled  |
+| validityInMonths | The validity period of the certificate in months  |
+| certificateTransparency | Indicates whether the certificate should be published to the certificate transparency list when created  |
+| certificateType | the certificate type |
+| contentType | The content type of the certificate, eg Pkcs12 when the certificate contains raw PFX bytes, or Pem when it contains ASCII PEM-encoded btes. Pkcs12 is the default value assumed |
+| keySize | The size of the RSA key: 2048, 3072, or 4096 |
+| exportable | Boolean. Value indicating if the certificate key is exportable from the vault or secure certificate store |
+| reuseKey | Boolean. Value indicating if the certificate key should be reused when rotating the certificate|
+| keyType | The type of backing key to be generated when issuing new certificates: RSA or EC |
+
+### Sample JSON
+
+```json
+{
+  "name": "branchOne",
+  "actions": [
+    {
+      "type": "continuous",
+      "name": "urn:csci:microsoft:keyvault:updateCertificatePolicy/1.0",
+      "parameters": [
+        {
+            "key": "certificateName",
+            "value": "<name of AKV certificate>"
+        },
+        {
+            "key": "version",
+            "value": "<certificate version>"
+        },
+        {
+            "key": "enabled",
+            "value": "True"
+        },
+        {
+            "key": "validityInMonths",
+            "value": "12"
+        },
+        {
+            "key": "certificateTransparency",
+            "value": "True"
+        },
+        {
+            "key": "certificateType",
+            "value": "<certificate type>"
+        },
+        {
+            "key": "contentType",
+            "value": "Pem"
+        },
+        {
+            "key": "keySize",
+            "value": "4096"
+        },
+                {
+            "key": "exportable",
+            "value": "True"
+        },
+        {
+            "key": "reuseKey",
+            "value": "False"
+        },
+        {
+            "key": "keyType",
+            "value": "RSA"
+        }
+
+     ],
+      "duration": "PT10M",
+      "selectorid": "myResources"
+    }
+  ]
+}
+```
diff --git a/articles/data-factory/index.yml b/articles/data-factory/index.yml
@@ -111,6 +111,18 @@ landingContent:
             url: ./data-transformation-functions.md 
           - text: Change Data Capture (CDC)
             url: ./concepts-change-data-capture.md
+  - title: SAP knowledge center
+    linkLists:
+      - linkListType: concept
+        links:
+          - text: Overview
+            url: industry-sap-overview.md
+          - text: SAP connectors
+            url: industry-sap-connectors.md
+          - text: SAP templates
+            url: industry-sap-templates.md
+          - text: SAP change data capture (CDC) capabilities
+            url: sap-change-data-capture-introduction-architecture.md
   - title: Lift and shift SSIS packages
     linkLists:
       - linkListType: overview
diff --git a/articles/digital-twins/media/quickstart-azure-digital-twins-explorer/delete-instance.png b/articles/digital-twins/media/quickstart-azure-digital-twins-explorer/delete-instance.png
diff --git a/articles/digital-twins/reference-service-limits.md b/articles/digital-twins/reference-service-limits.md
@@ -36,6 +36,7 @@ To manage the throttling, here are some recommendations for working with limits.
 * Use retry logic. The [Azure Digital Twins SDKs](concepts-apis-sdks.md) implement retry logic for failed requests, so if you're working with a provided SDK, this functionality is already built-in. Otherwise, consider implementing retry logic in your own application. The service sends back a `Retry-After` header in the failure response, which you can use to determine how long to wait before retrying.
 * Use thresholds and notifications to warn about approaching limits. Some of the service limits for Azure Digital Twins have corresponding [metrics](../azure-monitor/essentials/data-platform-metrics.md) that can be used to track usage in these areas. To configure thresholds and set up an alert on any metric when a threshold is approached, see the instructions in [Create a new alert rule](../azure-monitor/alerts/alerts-create-new-alert-rule.md?tabs=metric). To set up notifications for other limits where metrics aren't provided, consider implementing this logic in your own application code.
 * Deploy at scale across multiple instances. Avoid having a single point of failure. Instead of one large graph for your entire deployment, consider sectioning out subsets of twins logically (like by region or tenant) across multiple instances. 
+* For modeling recommendations to help you operate within the functional limits, see [Modeling tools and best practices](concepts-models.md#modeling-tools-and-best-practices).
 
 >[!NOTE]
 >Azure Digital Twins will automatically scale resources to meet the rate limits described in this article. You may experience throttling before these limits are reached due to internal scaling to adapt to the incoming load. Internal scaling can take anywhere from 5 to 30 minutes, during which time your application may encounter 429 errors.
diff --git a/articles/storage/blobs/storage-blob-container-properties-metadata-java.md b/articles/storage/blobs/storage-blob-container-properties-metadata-java.md
@@ -41,8 +41,6 @@ You can specify metadata as one or more name-value pairs on a blob or container
 
 - [setMetadata](/java/api/com.azure.storage.blob.blobcontainerclient)
 
-The name of your metadata must conform to the naming conventions for C# identifiers. Metadata names preserve the case with which they were created, but are case-insensitive when set or read. If two or more metadata headers with the same name are submitted for a resource, the Blob service returns status code 400 (Bad Request).
-
 Setting container metadata overwrites all existing metadata associated with the container. It's not possible to modify an individual name-value pair.
 
 The following code example sets metadata on a container:
diff --git a/articles/storage/blobs/storage-blob-properties-metadata-java.md b/articles/storage/blobs/storage-blob-properties-metadata-java.md
@@ -53,7 +53,7 @@ The following code example gets a blob's system properties and displays some of
 
 ## Set and retrieve metadata
 
-You can specify metadata as one or more name-value pairs on a blob or container resource. To set metadata, send a JSON object of name-value pairs using the following method:
+You can specify metadata as one or more name-value pairs on a blob or container resource. To set metadata, send a [Map](https://docs.oracle.com/javase/8/docs/api/java/util/Map.html) object containing name-value pairs using the following method:
 
 - [setMetadata](/java/api/com.azure.storage.blob.specialized.blobclientbase)
 
diff --git a/includes/digital-twins-limits.md b/includes/digital-twins-limits.md
@@ -11,9 +11,6 @@ ms.author: baanders
 
 The following table lists the functional limits of Azure Digital Twins. 
 
-> [!TIP]
-> For modeling recommendations to operate within these functional limits, see [Modeling tools and best practices](../articles/digital-twins/concepts-models.md#modeling-tools-and-best-practices).
-
 | Area | Capability | Default limit | Adjustable? |
 | --- | --- | --- | --- |
 | Azure resource | Number of Azure Digital Twins instances in a region, per subscription | 10 | Yes |
