Merge pull request #273709 from MicrosoftDocs/main

4/29/2024 AM Publish

Author: Taojunshen

articles/ai-services/content-safety/concepts/jailbreak-detection.md

@@ -71,7 +71,7 @@ Currently, the Prompt Shields API supports the English language. While our API d
 
 ### Text length limitations
 
-The maximum character limit for Prompt Shields is 10,000 characters per API call, between both the user prompts and documents combines. If your input (either user prompts or documents) exceeds these character limitations, you'll encounter an error.
+The maximum character limit for Prompt Shields allows for a user prompt of up to 10,000 characters, while the document array is restricted to a maximum of 5 documents with a combined total not exceeding 10,000 characters.
 
 ### TPS limitations
 

articles/ai-services/content-safety/how-to/use-blocklist.md

@@ -258,14 +258,18 @@ curl --location --request POST '<endpoint>/contentsafety/text/blocklists/<your_l
 > You can add multiple blocklistItems in one API call. Make the request body a JSON array of data groups:
 >
 > ```json
-> [{
->    "description": "string",
->    "text": "bleed"
-> },
 > {
->    "description": "string",
->    "text": "blood"
-> }]
+>    "blocklistItems": [
+>        {
+>            "description": "string",
+>            "text": "bleed"
+>        },
+>        {
+>            "description": "string",
+>            "text": "blood"
+>        }
+>    ]
+>}
 > ```
 
 

articles/ai-studio/concepts/rbac-ai-studio.md

@@ -162,6 +162,18 @@ If your Azure AI hub is configured with a **user-assigned managed identity**, th
 
 Within the key vault, the user or service principal must have create, get, delete, and purge access to the key through a key vault access policy. For more information, see [Azure Key Vault security](/azure/key-vault/general/security-features#controlling-access-to-key-vault-data).
 
+## Scenario: Use Azure Container Registry
+
+An Azure Container Registry instance is an optional dependency for Azure AI Studio hub. The following table lists the support matrix when authenticating a hub to Azure Container Registry, depending on the authentication method and the __Azure Container Registry's__ [public network access configuration](/azure/container-registry/container-registry-access-selected-networks). 
+
+| Authentication method | Public network access</br>disabled | Azure Container Registry</br>Public network access enabled |
+| ---- | :----: | :----: |
+| Admin user | ✓ | ✓ |
+| AI Studio hub system-assigned managed identity | ✓ | ✓ |
+| AI Studio hub user-assigned managed identity</br>with the **ACRPull** role assigned to the identity |  | ✓ |
+
+A system-assigned managed identity is automatically assigned to the correct roles when the Azure AI hub is created. If you're using a user-assigned managed identity, you must assign the **ACRPull** role to the identity.
+
 ## Next steps
 
 - [How to create an Azure AI hub resource](../how-to/create-azure-ai-resource.md)

articles/aks/concepts-clusters-workloads.md

@@ -40,7 +40,7 @@ The control plane includes the following core Kubernetes components:
 | Component | Description |  
 | ----------------- | ------------- |  
 | *kube-apiserver* | The API server exposes the underlying Kubernetes APIs and provides the interaction for management tools, such as `kubectl` or the Kubernetes dashboard. |  
-| *etcd* | etcd is a highly available key vault store within Kubernetes that helps maintain the state of your Kubernetes cluster and configuration. |  
+| *etcd* | etcd is a highly available key-value store within Kubernetes that helps maintain the state of your Kubernetes cluster and configuration. |  
 | *kube-scheduler* | When you create or scale applications, the scheduler determines what nodes can run the workload and starts the identified nodes. |  
 | *kube-controller-manager* | The controller manager oversees a number of smaller controllers that perform actions such as replicating pods and handling node operations. |  
 

articles/aks/upgrade-aks-cluster.md

@@ -244,10 +244,10 @@ At times, you may have a long running workload on a certain pod and it can't be
 
     ```azurecli-interactive
     # Set drain timeout for a new node pool
-    az aks nodepool add -n mynodepool -g MyResourceGroup --cluster-name MyManagedCluster   --drainTimeoutInMinutes 100
+    az aks nodepool add -n mynodepool -g MyResourceGroup --cluster-name MyManagedCluster  --drain-timeout 100
 
     # Update drain timeout for an existing node pool
-    az aks nodepool update -n mynodepool -g MyResourceGroup --cluster-name MyManagedCluster --drainTimeoutInMinutes 45
+    az aks nodepool update -n mynodepool -g MyResourceGroup --cluster-name MyManagedCluster --drain-timeout 45
     ```
 
 #### Set node soak time value

articles/aks/what-is-aks.md

@@ -9,7 +9,7 @@ ms.date: 04/17/2024
 
 # What is Azure Kubernetes Service (AKS)?
 
-Azure Kubernetes Service (AKS) is a managed Kubernetes service that you can use to deploy and manage containerized applications. You don't need container orchestration expertise to use AKS. AKS reduces the complexity and operational overhead of managing Kubernetes by offloading much of that responsibility to Azure. AKS is an ideal platform for deploying and managing containerized applications that require high availability, scalability, and portability, and for deploying applications to multiple regions, using open-source tools, and integrating with existing DevOps tools.
+Azure Kubernetes Service (AKS) is a managed Kubernetes service that you can use to deploy and manage containerized applications. You need minimal container orchestration expertise to use AKS. AKS reduces the complexity and operational overhead of managing Kubernetes by offloading much of that responsibility to Azure. AKS is an ideal platform for deploying and managing containerized applications that require high availability, scalability, and portability, and for deploying applications to multiple regions, using open-source tools, and integrating with existing DevOps tools.
 
 This article is intended for platform administrators or developers who are looking for a scalable, automated, managed Kubernetes solution.
 

articles/azure-arc/vmware-vsphere/enable-guest-management-at-scale.md

@@ -25,7 +25,7 @@ Ensure the following before you install Arc agents at scale for VMware VMs:
 - The user account must have permissions listed in Azure Arc VMware Administrator role.
 - All the target machines are:
     - Powered on and the resource bridge has network connectivity to the host running the VM.
-    - Running a [supported operating system](../servers/prerequisites.md#supported-operating-systems).c
+    - Running a [supported operating system](../servers/prerequisites.md#supported-operating-systems).
     - VMware tools are installed on the machines. If VMware tools aren't installed, enable guest management operation is grayed out in the portal.  
         >[!Note]
         >You can use the [out-of-band method](./enable-guest-management-at-scale.md#approach-d-install-arc-agents-at-scale-using-out-of-band-approach) to install Arc agents if VMware tools aren't installed.  

articles/azure-government/documentation-government-manage-marketplace-partners.md

@@ -30,9 +30,6 @@ Currently, Azure Government Marketplace supports only the following offer types:
 - Virtual Machines > Bring your own license
 - Virtual Machines > Pay-as-you-go
 - Azure Application > Solution template / Managed app
-- Azure containers (container images) > Bring your own license
-- IoT Edge modules > Bring your own license
-
 ## Publishing
 
 > [!NOTE]

articles/azure-monitor/app/java-get-started-supplemental.md

@@ -33,13 +33,13 @@ For more information, see [Use Application Insights Java In-Process Agent in Azu
 
 If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.5.2.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
 
-```
+```dockerfile
 ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.5.2.jar", "-jar", "<myapp.jar>"]
 ```
 
 If you're using the *shell* form, add the Java Virtual Machine (JVM) arg `-javaagent:"path/to/applicationinsights-agent-3.5.2.jar"` somewhere before `-jar`, for example:
 
-```
+```dockerfile
 ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.5.2.jar" -jar <myapp.jar>
 ```
 
@@ -48,7 +48,7 @@ ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.5.2.jar" -jar <m
 
 A Dockerfile example:
 
-```
+```dockerfile
 FROM ...
 
 COPY target/*.jar app.jar
@@ -83,15 +83,15 @@ For information on setting up the Application Insights Java agent, see [Enabling
 
 If you installed Tomcat via `apt-get` or `yum`, you should have a file `/etc/tomcat8/tomcat8.conf`. Add this line to the end of that file:
 
-```
+```console
 JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.5.2.jar"
 ```
 
 #### Tomcat installed via download and unzip
 
 If you installed Tomcat via download and unzip from [https://tomcat.apache.org](https://tomcat.apache.org), you should have a file `<tomcat>/bin/catalina.sh`. Create a new file in the same directory named `<tomcat>/bin/setenv.sh` with the following content:
 
-```
+```console
 CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.5.2.jar"
 ```
 
@@ -103,13 +103,13 @@ If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-
 
 Locate the file `<tomcat>/bin/catalina.bat`. Create a new file in the same directory named `<tomcat>/bin/setenv.bat` with the following content:
 
-```
+```console
 set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.5.2.jar
 ```
 
 Quotes aren't necessary, but if you want to include them, the proper placement is:
 
-```
+```console
 set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.5.2.jar"
 ```
 
@@ -181,7 +181,7 @@ The specified `applicationinsights.agent.id` value must be unique. You use the v
 
 Add these lines to `start.ini`:
 
-```
+```console
 --exec
 -javaagent:path/to/applicationinsights-agent-3.5.2.jar
 ```
@@ -209,7 +209,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.5.2.jar` to the existing `jv
 
 1. In `Generic JVM arguments`, add the following JVM argument.
 
-    ```
+    ```console
     -javaagent:path/to/applicationinsights-agent-3.5.2.jar
     ```
 
@@ -219,10 +219,10 @@ Add `-javaagent:path/to/applicationinsights-agent-3.5.2.jar` to the existing `jv
 
 Create a new file `jvm.options` in the server directory (for example, `<openliberty>/usr/servers/defaultServer`), and add this line:
 
-```
+```console
 -javaagent:path/to/applicationinsights-agent-3.5.2.jar
 ```
 
 ### Others
 
-See your application server documentation on how to add JVM args.
+See your application server documentation on how to add JVM args.

articles/azure-monitor/app/java-jmx-metrics-configuration.md

@@ -14,7 +14,7 @@ Application Insights Java 3.x collects some of the Java Management Extensions (J
 
 ## How do I collect extra JMX metrics?
 
-JMX metrics collection can be configured by adding a ```"jmxMetrics"``` section to the applicationinsights.json file. Enter a name for the metric as you want it to appear in Azure portal in application insights resource. Object name and attribute are required for each of the metrics you want collected.
+JMX metrics collection can be configured by adding a ```"jmxMetrics"``` section to the applicationinsights.json file. Enter a name for the metric as you want it to appear in Azure portal in application insights resource. Object name and attribute are required for each of the metrics you want collected. You may use `*` in object names for glob-style wildcard ([details](/azure/azure-monitor/app/java-standalone-config#java-management-extensions-metrics)).
 
 ## How do I know what metrics are available to configure?