Merge pull request #187423 from heyams/heya/update-statsbeat

Update eu regions and ampl

Author: v-ccolin

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.5.jar](https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.2.5/applicationinsights-agent-3.2.5.jar) file.
+Download the [applicationinsights-agent-3.2.6.jar](https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.2.6/applicationinsights-agent-3.2.6.jar) file.
 
 > [!WARNING]
 > 
@@ -51,7 +51,7 @@ Download the [applicationinsights-agent-3.2.5.jar](https://github.com/microsoft/
 
 #### Point the JVM to the jar file
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.5.jar` to your application's JVM args.
+Add `-javaagent:path/to/applicationinsights-agent-3.2.6.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.5.jar` to your application
         APPLICATIONINSIGHTS_CONNECTION_STRING=InstrumentationKey=...
         ```
 
-   - Or you can create a configuration file named `applicationinsights.json`. Place it in the same directory as `applicationinsights-agent-3.2.5.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.6.jar` with the following content:
 
         ```json
         {

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

@@ -17,24 +17,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.5.jar` somewhere before `-jar`, for example:
+Add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.6.jar` somewhere before `-jar`, for example:
 
 ```
-java -javaagent:path/to/applicationinsights-agent-3.2.5.jar -jar <myapp.jar>
+java -javaagent:path/to/applicationinsights-agent-3.2.6.jar -jar <myapp.jar>
 ```
 
 ## Spring Boot via Docker entry point
 
-If you are using the *exec* form, add the parameter `"-javaagent:path/to/applicationinsights-agent-3.2.5.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
+If you are using the *exec* form, add the parameter `"-javaagent:path/to/applicationinsights-agent-3.2.6.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
 
 ```
-ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.2.5.jar", "-jar", "<myapp.jar>"]
+ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.2.6.jar", "-jar", "<myapp.jar>"]
 ```
 
-If you are using the *shell* form, add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.5.jar` somewhere before `-jar`, for example:
+If you are using the *shell* form, add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.6.jar` somewhere before `-jar`, for example:
 
 ```
-ENTRYPOINT java -javaagent:path/to/applicationinsights-agent-3.2.5.jar -jar <myapp.jar>
+ENTRYPOINT java -javaagent:path/to/applicationinsights-agent-3.2.6.jar -jar <myapp.jar>
 ```
 
 ## Tomcat 8 (Linux)
@@ -44,18 +44,18 @@ ENTRYPOINT java -javaagent:path/to/applicationinsights-agent-3.2.5.jar -jar <mya
 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.5.jar"
+JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.6.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.5.jar"
+CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.6.jar"
 ```
 
-If the file `<tomcat>/bin/setenv.sh` already exists, then modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.5.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.6.jar` to `CATALINA_OPTS`.
 
 
 ## Tomcat 8 (Windows)
@@ -65,36 +65,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.5.jar
+set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.6.jar
 ```
 
 Quotes are not necessary, but if you want to include them, the proper placement is:
 
 ```
-set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.5.jar"
+set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.6.jar"
 ```
 
-If the file `<tomcat>/bin/setenv.bat` already exists, just modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.5.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.6.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.5.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.6.jar` to the `Java Options` under the `Java` tab.
 
 
 ## JBoss EAP 7
 
 ### Standalone server
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.5.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.6.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.5.jar -Xms1303m -Xmx1303m ..."
+    JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.2.6.jar -Xms1303m -Xmx1303m ..."
     ...
 ```
 
 ### Domain server
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.5.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
+Add `-javaagent:path/to/applicationinsights-agent-3.2.6.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
 
 ```xml
 ...
@@ -104,7 +104,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.2.5.jar` to the existing `jv
         <jvm-options>
             <option value="-server"/>
             <!--Add Java agent jar file here-->
-            <option value="-javaagent:path/to/applicationinsights-agent-3.2.5.jar"/>
+            <option value="-javaagent:path/to/applicationinsights-agent-3.2.6.jar"/>
             <option value="-XX:MetaspaceSize=96m"/>
             <option value="-XX:MaxMetaspaceSize=256m"/>
         </jvm-options>
@@ -144,20 +144,20 @@ Add these lines to `start.ini`
 
 ```
 --exec
--javaagent:path/to/applicationinsights-agent-3.2.5.jar
+-javaagent:path/to/applicationinsights-agent-3.2.6.jar
 ```
 
 
 ## Payara 5
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.5.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
+Add `-javaagent:path/to/applicationinsights-agent-3.2.6.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.5.jar>
+        -javaagent:path/to/applicationinsights-agent-3.2.6.jar>
     </jvm-options>
         ...
 </java-config>
@@ -174,7 +174,7 @@ Java and Process Management > Process definition >  Java Virtual Machine
 ```
 In "Generic JVM arguments" add the following:
 ```
--javaagent:path/to/applicationinsights-agent-3.2.5.jar
+-javaagent:path/to/applicationinsights-agent-3.2.6.jar
 ```
 After that, save and restart the application server.
 
@@ -183,7 +183,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.5.jar
+-javaagent:path/to/applicationinsights-agent-3.2.6.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.5.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.6.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.5.jar` is located.
+If you specify a relative path, it will be resolved relative to the directory where `applicationinsights-agent-3.2.6.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`.
@@ -65,6 +65,22 @@ Connection string is required. You can find your connection string in your Appli
 You can also set the connection string using the environment variable `APPLICATIONINSIGHTS_CONNECTION_STRING`
 (which will then take precedence over connection string specified in the json configuration).
 
+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.6.jar` is located.
+
+```json
+{
+  "connectionString": "${file:connection-string-file.txt}"
+}
+```
+
+The file should contain only the connection string, for example:
+
+```
+InstrumentationKey=...
+```
+
 Not setting the connection string will disable the Java agent.
 
 ## Cloud role name
@@ -326,7 +342,7 @@ To disable auto-collection of Micrometer metrics (including Spring Boot Actuator
 
 ## HTTP headers
 
-Starting from 3.2.5, you can capture request and response headers on your server (request) telemetry:
+Starting from 3.2.6, you can capture request and response headers on your server (request) telemetry:
 
 ```json
 {
@@ -372,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.5, you can change this behavior to capture them as success if you prefer:
+Starting from version 3.2.6, you can change this behavior to capture them as success if you prefer:
 
 ```json
 {
@@ -474,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.5
+> Vertx HTTP Library instrumentation is available starting from version 3.2.6
 
 ## Metric interval
 
@@ -541,7 +557,7 @@ you can configure Application Insights Java 3.x to use an HTTP proxy:
 Application Insights Java 3.x also respects the global `https.proxyHost` and `https.proxyPort` system properties
 if those are set (and `http.nonProxyHosts` if needed).
 
-Starting from 3.2.5, authenticated proxies are supported. You can add `"user"` and `"password"` under `"proxy"` in
+Starting from 3.2.6, authenticated proxies are supported. You can add `"user"` and `"password"` under `"proxy"` in
 the json above (or if you are using the system properties above, you can add `https.proxyUser` and `https.proxyPassword`
 system properties).
 
@@ -573,7 +589,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.5.jar` is located.
+`applicationinsights-agent-3.2.6.jar` is located.
 
 `maxSizeMb` is the max size of the log file before it rolls over.
 

articles/azure-monitor/app/statsbeat.md

@@ -15,6 +15,8 @@ Statsbeat collects essential and non-essential [custom metric](../essentials/met
 
 Statsbeat data is stored in a Microsoft data store.  It doesn't impact customers' overall monitoring volume and cost. 
 
+Statsbeat doesn't support [Azure Private Link](../../automation/how-to/private-link-security.md). 
+
 ## What data does Statsbeat collect?
 
 Statsbeat collects essential and non-essential metrics.
@@ -25,6 +27,33 @@ Statsbeat collects essential and non-essential metrics.
 |---------------------------|-----------------|---------------------------|-----------------|-----------------|
 | Currently Not supported   | Supported       | Currently Not supported   | Supported       | Supported       |
 
+## Supported EU Regions
+
+#### [Java](#tab/eu-java)
+
+Statseat supports EU Data Boundary for Application Insights resources in the following regions:
+
+| Geo Name                  | Region Name            |
+|---------------------------|------------------------|
+| Europe                    | North Europe           |
+| Europe                    | West Europe            |
+| France                    | France Central         | 
+| France                    | France South           | 
+| Germany                   | Germany West Central   | 
+| Norway                    | Norway East            | 
+| Norway                    | Norway West            | 
+| Sweden                    | Sweden Central         | 
+| Switzerland               | Switzerland North      |
+| Switzerland               | Switzerland West       | 
+
+
+#### [Node](#tab/eu-node)
+
+N/A
+
+#### [Python](#tab/eu-python)
+
+N/A
 
 ### Essential Statsbeat