Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into lb-basic-overview

Author: asudbring

articles/azure-monitor/app/java-in-process-agent.md

@@ -29,7 +29,7 @@ This section shows you how to download the auto-instrumentation jar file.
 
 #### Download the jar file
 
-Download the [applicationinsights-agent-3.2.10.jar](https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.2.10/applicationinsights-agent-3.2.10.jar) file.
+Download the [applicationinsights-agent-3.2.11.jar](https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.2.11/applicationinsights-agent-3.2.11.jar) file.
 
 > [!WARNING]
 > 
@@ -51,7 +51,7 @@ Download the [applicationinsights-agent-3.2.10.jar](https://github.com/microsoft
 
 #### Point the JVM to the jar file
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to your application's JVM args.
+Add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to your application's JVM args.
 
 > [!TIP]
 > For help with configuring your application's JVM args, see [Tips for updating your JVM args](./java-standalone-arguments.md).
@@ -66,7 +66,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to your applicatio
         APPLICATIONINSIGHTS_CONNECTION_STRING = <Copy connection string from Application Insights Resource Overview>
         ```
 
-   - Or you can create a configuration file named `applicationinsights.json`. Place it in the same directory as `applicationinsights-agent-3.2.10.jar` with the following content:
+   - Or you can create a configuration file named `applicationinsights.json`. Place it in the same directory as `applicationinsights-agent-3.2.11.jar` with the following content:
 
         ```json
         {
@@ -367,7 +367,7 @@ If you want to attach custom dimensions to your logs, use [Log4j 1.2 MDC](https:
 
 ### Send custom telemetry by using the 2.x SDK
 
-1. Add `applicationinsights-core-2.6.4.jar` to your application. All 2.x versions are supported by Application Insights Java 3.x. If you have a choice. it's worth using the latest version:
+1. Add `applicationinsights-core-2.6.4.jar` to your application. All 2.x versions are supported by Application Insights Java 3.x. If you have a choice, it's worth using the latest version:
 
     ```xml
     <dependency>

articles/azure-monitor/app/java-standalone-arguments.md

@@ -15,24 +15,24 @@ Configure [App Services](../../app-service/configure-language-java.md#set-java-r
 
 ## Spring Boot
 
-Add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` somewhere before `-jar`, for example:
+Add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` somewhere before `-jar`, for example:
 
 ```
-java -javaagent:path/to/applicationinsights-agent-3.2.10.jar -jar <myapp.jar>
+java -javaagent:path/to/applicationinsights-agent-3.2.11.jar -jar <myapp.jar>
 ```
 
 ## Spring Boot via Docker entry point
 
-If you're using the *exec* form, add the parameter `"-javaagent:path/to/applicationinsights-agent-3.2.10.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
+If you're using the *exec* form, add the parameter `"-javaagent:path/to/applicationinsights-agent-3.2.11.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
 
 ```
-ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.2.10.jar", "-jar", "<myapp.jar>"]
+ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.2.11.jar", "-jar", "<myapp.jar>"]
 ```
 
-If you're using the *shell* form, add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` somewhere before `-jar`, for example:
+If you're using the *shell* form, add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` somewhere before `-jar`, for example:
 
 ```
-ENTRYPOINT java -javaagent:path/to/applicationinsights-agent-3.2.10.jar -jar <myapp.jar>
+ENTRYPOINT java -javaagent:path/to/applicationinsights-agent-3.2.11.jar -jar <myapp.jar>
 ```
 
 ## Tomcat 8 (Linux)
@@ -42,18 +42,18 @@ ENTRYPOINT java -javaagent:path/to/applicationinsights-agent-3.2.10.jar -jar <my
 If you installed Tomcat via `apt-get` or `yum`, then you should have a file `/etc/tomcat8/tomcat8.conf`.  Add this line to the end of that file:
 
 ```
-JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.10.jar"
+JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.11.jar"
 ```
 
 ### Tomcat installed via download and unzip
 
 If you installed Tomcat via download and unzip from [https://tomcat.apache.org](https://tomcat.apache.org), then 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:
 
 ```
-CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.10.jar"
+CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.11.jar"
 ```
 
-If the file `<tomcat>/bin/setenv.sh` already exists, then modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to `CATALINA_OPTS`.
+If the file `<tomcat>/bin/setenv.sh` already exists, then modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to `CATALINA_OPTS`.
 
 
 ## Tomcat 8 (Windows)
@@ -63,36 +63,36 @@ If the file `<tomcat>/bin/setenv.sh` already exists, then modify that file and a
 Locate the file `<tomcat>/bin/catalina.bat`.  Create a new file in the same directory named `<tomcat>/bin/setenv.bat` with the following content:
 
 ```
-set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.10.jar
+set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.11.jar
 ```
 
 Quotes aren't necessary, but if you want to include them, the proper placement is:
 
 ```
-set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.10.jar"
+set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.11.jar"
 ```
 
-If the file `<tomcat>/bin/setenv.bat` already exists, just modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to `CATALINA_OPTS`.
+If the file `<tomcat>/bin/setenv.bat` already exists, just modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to `CATALINA_OPTS`.
 
 ### Running Tomcat as a Windows service
 
-Locate the file `<tomcat>/bin/tomcat8w.exe`.  Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the `Java Options` under the `Java` tab.
+Locate the file `<tomcat>/bin/tomcat8w.exe`.  Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to the `Java Options` under the `Java` tab.
 
 
 ## JBoss EAP 7
 
 ### Standalone server
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `JAVA_OPTS` environment variable in the file `JBOSS_HOME/bin/standalone.conf` (Linux) or `JBOSS_HOME/bin/standalone.conf.bat` (Windows):
+Add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to the existing `JAVA_OPTS` environment variable in the file `JBOSS_HOME/bin/standalone.conf` (Linux) or `JBOSS_HOME/bin/standalone.conf.bat` (Windows):
 
 ```java    ...
-    JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.2.10.jar -Xms1303m -Xmx1303m ..."
+    JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.2.11.jar -Xms1303m -Xmx1303m ..."
     ...
 ```
 
 ### Domain server
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
+Add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
 
 ```xml
 ...
@@ -102,7 +102,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `j
         <jvm-options>
             <option value="-server"/>
             <!--Add Java agent jar file here-->
-            <option value="-javaagent:path/to/applicationinsights-agent-3.2.10.jar"/>
+            <option value="-javaagent:path/to/applicationinsights-agent-3.2.11.jar"/>
             <option value="-XX:MetaspaceSize=96m"/>
             <option value="-XX:MaxMetaspaceSize=256m"/>
         </jvm-options>
@@ -142,20 +142,20 @@ Add these lines to `start.ini`
 
 ```
 --exec
--javaagent:path/to/applicationinsights-agent-3.2.10.jar
+-javaagent:path/to/applicationinsights-agent-3.2.11.jar
 ```
 
 
 ## Payara 5
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
+Add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
 
 ```xml
 ...
 <java-config ...>
     <!--Edit the JVM options here-->
     <jvm-options>
-        -javaagent:path/to/applicationinsights-agent-3.2.10.jar>
+        -javaagent:path/to/applicationinsights-agent-3.2.11.jar>
     </jvm-options>
         ...
 </java-config>
@@ -165,14 +165,14 @@ Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `j
 ## WebSphere 8
 
 Open Management Console
-go to **servers > WebSphere application servers > Application servers**, choose the appropriate application servers and select: 
+Go to **servers > WebSphere application servers > Application servers**, choose the appropriate application servers and select: 
 
 ```
 Java and Process Management > Process definition >  Java Virtual Machine
 ```
 In "Generic JVM arguments" add the following:
 ```
--javaagent:path/to/applicationinsights-agent-3.2.10.jar
+-javaagent:path/to/applicationinsights-agent-3.2.11.jar
 ```
 After that, save and restart the application server.
 
@@ -181,7 +181,7 @@ After that, save and restart the application server.
 
 Create a new file `jvm.options` in the server directory (for example `<openliberty>/usr/servers/defaultServer`), and add this line:
 ```
--javaagent:path/to/applicationinsights-agent-3.2.10.jar
+-javaagent:path/to/applicationinsights-agent-3.2.11.jar
 ```
 
 ## Others

articles/azure-monitor/app/java-standalone-config.md

@@ -37,14 +37,14 @@ You will find more details and additional configuration options below.
 
 ## Configuration file path
 
-By default, Application Insights Java 3.x expects the configuration file to be named `applicationinsights.json`, and to be located in the same directory as `applicationinsights-agent-3.2.10.jar`.
+By default, Application Insights Java 3.x expects the configuration file to be named `applicationinsights.json`, and to be located in the same directory as `applicationinsights-agent-3.2.11.jar`.
 
 You can specify your own configuration file path using either
 
 * `APPLICATIONINSIGHTS_CONFIGURATION_FILE` environment variable, or
 * `applicationinsights.configuration.file` Java system property
 
-If you specify a relative path, it will be resolved relative to the directory where `applicationinsights-agent-3.2.10.jar` is located.
+If you specify a relative path, it will be resolved relative to the directory where `applicationinsights-agent-3.2.11.jar` is located.
 
 Alternatively, instead of using a configuration file, you can specify the entire _content_ of the json configuration
 via the environment variable `APPLICATIONINSIGHTS_CONFIGURATION_CONTENT`.
@@ -67,7 +67,7 @@ You can also set the connection string using the environment variable `APPLICATI
 
 You can also set the connection string by specifying a file to load the connection string from.
 
-If you specify a relative path, it will be resolved relative to the directory where `applicationinsights-agent-3.2.10.jar` is located.
+If you specify a relative path, it will be resolved relative to the directory where `applicationinsights-agent-3.2.11.jar` is located.
 
 ```json
 {
@@ -342,7 +342,7 @@ To disable auto-collection of Micrometer metrics (including Spring Boot Actuator
 
 ## HTTP headers
 
-Starting from 3.2.10, you can capture request and response headers on your server (request) telemetry:
+Starting from 3.2.11, you can capture request and response headers on your server (request) telemetry:
 
 ```json
 {
@@ -388,7 +388,7 @@ Again, the header names are case-insensitive, and the examples above will be cap
 
 By default, http server requests that result in 4xx response codes are captured as errors.
 
-Starting from version 3.2.10, you can change this behavior to capture them as success if you prefer:
+Starting from version 3.2.11, you can change this behavior to capture them as success if you prefer:
 
 ```json
 {
@@ -490,7 +490,7 @@ Starting from version 3.2.0, the following preview instrumentations can be enabl
 ```
 > [!NOTE]
 > Akka instrumentation is available starting from version 3.2.2
-> Vertx HTTP Library instrumentation is available starting from version 3.2.10
+> Vertx HTTP Library instrumentation is available starting from version 3.2.11
 
 ## Metric interval
 
@@ -585,7 +585,7 @@ and the console, corresponding to this configuration:
 `level` can be one of `OFF`, `ERROR`, `WARN`, `INFO`, `DEBUG`, or `TRACE`.
 
 `path` can be an absolute or relative path. Relative paths are resolved against the directory where
-`applicationinsights-agent-3.2.10.jar` is located.
+`applicationinsights-agent-3.2.11.jar` is located.
 
 `maxSizeMb` is the max size of the log file before it rolls over.
 

articles/azure-monitor/app/java-standalone-troubleshoot.md

@@ -13,12 +13,12 @@ In this article, we cover some of the common issues that you might face while in
 ## Check the self-diagnostic log file
 
 By default, Application Insights Java 3.x produces a log file named `applicationinsights.log` in the same directory
-that holds the `applicationinsights-agent-3.2.9.jar` file.
+that holds the `applicationinsights-agent-3.2.11.jar` file.
 
 This log file is the first place to check for hints to any issues you might be experiencing.
 
 If no log file is generated, check that your Java application has write permission to the directory that holds the
-`applicationinsights-agent-3.2.9.jar` file.
+`applicationinsights-agent-3.2.11.jar` file.
 
 If still no log file is generated, check the stdout log from your Java application. Application Insights Java 3.x
 should log any errors to stdout that would prevent it from logging to its normal location.

articles/azure-monitor/toc.yml

@@ -487,14 +487,14 @@ items:
       items:
       - name: Overview
         displayName: Azure Monitor agent
-        href: agents/azure-monitor-agent-overview.md
-      - name: Install and manage
+      - name: Installation options
         displayName: Azure Monitor agent
-        href: agents/azure-monitor-agent-manage.md
         items:
+        - name: Using extension
+          href: agents/azure-monitor-agent-manage.md
         - name: Extension versions
           href: agents/azure-monitor-agent-extension-versions.md
-        - name: Windows client setup (preview)
+        - name: Using Windows client installer (preview)
           href: agents/azure-monitor-agent-windows-client.md
       - name: Data collection
         items:

articles/azure-netapp-files/azure-netapp-files-resource-limits.md

@@ -12,7 +12,7 @@ ms.service: azure-netapp-files
 ms.workload: storage
 ms.tgt_pltfrm: na
 ms.topic: conceptual
-ms.date: 03/02/2022
+ms.date: 04/13/2022
 ms.author: anfdocs
 ---
 # Resource limits for Azure NetApp Files
@@ -81,11 +81,11 @@ The service dynamically adjusts the `maxfiles` limit for a volume based on its p
 
 |    Volume size (quota)     |  Automatic readjustment of the `maxfiles` limit    |
 |----------------------------|-------------------|
-|    <= 1 TiB                |    20 million     |
-|    > 1 TiB but <= 2 TiB    |    40 million     |
-|    > 2 TiB but <= 3 TiB    |    60 million     |
-|    > 3 TiB but <= 4 TiB    |    80 million     |
-|    > 4 TiB                 |    100 million    |
+|    <= 1 TiB                |    21,251,126     |
+|    > 1 TiB but <= 2 TiB    |    42,502,252     |
+|    > 2 TiB but <= 3 TiB    |    63,753,378     |
+|    > 3 TiB but <= 4 TiB    |    85,004,504     |
+|    > 4 TiB                 |    212,511,260    |
 
 If you have allocated at least 4 TiB of quota for a volume, you can initiate a [support request](#request-limit-increase) to increase the `maxfiles` (inodes) limit beyond 100 million. For every 100 million files you increase (or a fraction thereof), you need to increase the corresponding volume quota by 4 TiB.  For example, if you increase the `maxfiles` limit from 100 million files to 200 million files (or any number in between), you need to increase the volume quota from 4 TiB to 8 TiB.
 

articles/virtual-machines/linux/cli-ps-findimage.md

@@ -121,8 +121,8 @@ Another way to find an image in a location is to run the [az vm image list-publi
     ```azurecli
     az vm image list \
         --location westus \
-        --publisher Canonical \  
-        --offer UbuntuServer \    
+        --publisher Canonical \
+        --offer UbuntuServer \
         --sku 18.04-LTS \
         --all --output table
     ```