Skip to content

Commit 4347245

Browse files
authored
Merge branch 'main' into patch-147
2 parents fad1ca9 + 0d7cdc1 commit 4347245

30 files changed

+1185
-145
lines changed

articles/azure-functions/functions-bindings-event-grid-trigger.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure Event Grid trigger for Azure Functions
33
description: Learn to run code when Event Grid events in Azure Functions are dispatched.
44
ms.topic: reference
5-
ms.date: 03/04/2022
5+
ms.date: 04/02/2023
66
ms.devlang: csharp, java, javascript, powershell, python
77
ms.custom: "devx-track-csharp, fasttrack-edit, devx-track-python"
88
zone_pivot_groups: programming-languages-set-functions-lang-workers
@@ -31,7 +31,7 @@ The type of the input parameter used with an Event Grid trigger depends on these
3131

3232
# [In-process](#tab/in-process)
3333

34-
The following example shows a Functions version 3.x function that uses a `CloudEvent` binding parameter:
34+
The following example shows a Functions version 4.x function that uses a `CloudEvent` binding parameter:
3535

3636
```cs
3737
using Azure.Messaging;
@@ -54,11 +54,11 @@ namespace Company.Function
5454
}
5555
```
5656

57-
The following example shows a Functions version 3.x function that uses an `EventGridEvent` binding parameter:
57+
The following example shows a Functions version 4.x function that uses an `EventGridEvent` binding parameter:
5858

5959
```cs
6060
using Microsoft.Azure.WebJobs;
61-
using Microsoft.Azure.EventGrid.Models;
61+
using Azure.Messaging.EventGrid;
6262
using Microsoft.Azure.WebJobs.Extensions.EventGrid;
6363
using Microsoft.Extensions.Logging;
6464

@@ -80,7 +80,6 @@ The following example shows a function that uses a `JObject` binding parameter
8080
```cs
8181
using Microsoft.Azure.WebJobs;
8282
using Microsoft.Azure.WebJobs.Extensions.EventGrid;
83-
using Microsoft.Azure.WebJobs.Host;
8483
using Newtonsoft.Json;
8584
using Newtonsoft.Json.Linq;
8685
using Microsoft.Extensions.Logging;

articles/azure-monitor/agents/azure-monitor-agent-extension-versions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Azure Monitor agent extension versions
33
description: This article describes the version details for the Azure Monitor agent virtual machine extension.
44
ms.topic: conceptual
55
ms.date: 4/2/2023
6+
ms.author: shseth
67
ms.custom: references_region
78
ms.reviewer: shseth
89

@@ -19,6 +20,7 @@ We strongly recommended to update to the latest version at all times, or opt in
1920
| Release Date | Release notes | Windows | Linux |
2021
|:---|:---|:---|:---|
2122
| Mar 2023 | **Windows** <ul><li>Text file collection improvements to handle high rate of logging and for continuous tailing in case of longer lines</li><li>VM Insights fixes for collecting metrics from non-English OS</li></ul> | 1.14.0.0 | Coming soon |
23+
| Feb 2023 | **Windows** <ul><li>Reliability improvements in fluentbit buffering to handle larger text files</li></ul> | 1.13.1.0 | 1.25.2 |
2224
| Jan 2023 | **Linux** <ul><li>RHEL 9 and Amazon Linux 2 support</li><li>Update to OpenSSL 1.1.1s and require TLS 1.2 or higher</li><li>Performance improvements</li><li>Improvements in Garbage Collection for persisted disk cache and handling corrupted cache files better</li><li>**Fixes** <ul><li>Set agent service memory limit for CentOS/RedHat 7 distros. Resolved MemoryMax parsing error</li><li>Fixed modifying rsyslog system-wide log format caused by installer on RedHat/Centos 7.3</li><li>Fixed permissions to config directory</li><li>Installation reliability improvements</li><li>Fixed permissions on default file so rpm verification doesn't fail</li><li>Added traceFlags setting to enable trace logs for agent</li></ul></li></ul> **Windows** <ul><li>Fixed issue related to incorrect *EventLevel* and *Task* values for Log Analytics *Event* table, to match Windows Event Viewer values</li><li>Added missing columns for IIS logs - *TimeGenerated, Time, Date, Computer, SourceSystem, AMA, W3SVC, SiteName*</li><li>Reliability improvements for metrics collection</li><li>Fixed machine restart issues on for Arc-enabled servers related to repeated calls to HIMDS service</li></ul> | 1.12.0.0 | 1.25.1 |
2325
| Nov-Dec 2022 | <ul><li>Support for air-gapped clouds added for [Windows MSI installer for clients](./azure-monitor-agent-windows-client.md) </li><li>Reliability improvements for using AMA with Custom Metrics destination</li><li>Performance and internal logging improvements</li></ul> | 1.11.0.0 | None |
2426
| Oct 2022 | **Windows** <ul><li>Increased reliability of data uploads</li><li>Data quality improvements</li></ul> **Linux** <ul><li>Support for `http_proxy` and `https_proxy` environment variables for [network proxy configurations](./azure-monitor-agent-data-collection-endpoint.md#proxy-configuration) for the agent</li><li>[Text logs](./data-collection-text-log.md) <ul><li>Network proxy support enabled</li><li>Fixed missing `_ResourceId`</li><li>Increased maximum line size support to 1MB</li></ul></li><li>Support ingestion of syslog events whose timestamp is in the future</li><li>Performance improvements</li><li>Fixed `diskio` metrics instance name dimension to use the disk mount path(s) instead of the device name(s)</li><li>Fixed world writable file issue to lockdown write access to certain agent logs and configuration files stored locally on the machine</li></ul> | 1.10.0.0 | 1.24.2 |

articles/azure-monitor/agents/azure-monitor-agent-windows-client.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Set up the Azure Monitor agent on Windows client devices
33
description: This article describes the instructions to install the agent on Windows 10, 11 client OS devices, configure data collection, manage and troubleshoot the agent.
44
ms.topic: conceptual
5-
ms.date: 3/30/2023
5+
ms.date: 4/2/2023
66
ms.custom: references_region, devx-track-azurepowershell
77
ms.reviewer: shseth
88
---
@@ -43,7 +43,7 @@ Here is a comparison between client installer and VM extension for Azure Monitor
4343

4444
## Limitations
4545
1. The Windows client installer supports latest Windows machines only that are **Azure AD joined** or hybrid Azure AD joined. More information under [prerequisites](#prerequisites) below
46-
2. The Data Collection rules need can only target the Azure AD tenant scope, i.e. all DCRs associated to the tenant (via Monitored Object) will apply to all Windows client machines within that tenant with the agent installed using this client installer. **Granular targeting using DCRs is not supported** for Windows client devices yet
46+
2. The Data Collection rules can only target the Azure AD tenant scope, i.e. all DCRs associated to the tenant (via Monitored Object) will apply to all Windows client machines within that tenant with the agent installed using this client installer. **Granular targeting using DCRs is not supported** for Windows client devices yet
4747
3. No support for Windows machines connected via **Azure private links**
4848
4. The agent installed using the Windows client installer is designed mainly for Windows desktops or workstations that are **always connected**. While the agent can be installed via this method on laptops, it is not optimized for battery consumption and network limitations on a laptop.
4949

articles/azure-monitor/app/java-spring-boot.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure Azure Monitor Application Insights for Spring Boot
33
description: How to configure Azure Monitor Application Insights for Spring Boot applications
44
ms.topic: conceptual
5-
ms.date: 02/22/2023
5+
ms.date: 03/31/2023
66
ms.devlang: java
77
ms.custom: devx-track-java
88
---
@@ -13,24 +13,24 @@ There are two options for enabling Application Insights Java with Spring Boot: J
1313

1414
## Enabling with JVM argument
1515

16-
Add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.10.jar"` somewhere before `-jar`, for example:
16+
Add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.11.jar"` somewhere before `-jar`, for example:
1717

1818
```
19-
java -javaagent:"path/to/applicationinsights-agent-3.4.10.jar" -jar <myapp.jar>
19+
java -javaagent:"path/to/applicationinsights-agent-3.4.11.jar" -jar <myapp.jar>
2020
```
2121

2222
### Spring Boot via Docker entry point
2323

24-
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.10.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
24+
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.11.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
2525

2626
```
27-
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.10.jar", "-jar", "<myapp.jar>"]
27+
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.11.jar", "-jar", "<myapp.jar>"]
2828
```
2929

30-
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.10.jar"` somewhere before `-jar`, for example:
30+
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.11.jar"` somewhere before `-jar`, for example:
3131

3232
```
33-
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.10.jar" -jar <myapp.jar>
33+
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.11.jar" -jar <myapp.jar>
3434
```
3535

3636
### Configuration
@@ -45,7 +45,7 @@ To enable Application Insights Java programmatically, you must add the following
4545
<dependency>
4646
<groupId>com.microsoft.azure</groupId>
4747
<artifactId>applicationinsights-runtime-attach</artifactId>
48-
<version>3.4.10</version>
48+
<version>3.4.11</version>
4949
</dependency>
5050
```
5151

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Add the JVM arg - Application Insights for Java
33
description: Learn how to add the JVM arg that enables Application Insights for Java.
44
ms.topic: conceptual
5-
ms.date: 02/22/2023
5+
ms.date: 03/31/2023
66
ms.devlang: java
77
ms.custom: devx-track-java
88
ms.reviewer: mmcc
@@ -34,18 +34,18 @@ If you're using a third-party container image that you can't modify, mount the A
3434
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:
3535

3636
```
37-
JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.10.jar"
37+
JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.11.jar"
3838
```
3939

4040
### Tomcat installed via download and unzip
4141

4242
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:
4343

4444
```
45-
CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.10.jar"
45+
CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.11.jar"
4646
```
4747

48-
If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.10.jar` to `CATALINA_OPTS`.
48+
If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to `CATALINA_OPTS`.
4949

5050
## Tomcat 8 (Windows)
5151

@@ -54,35 +54,35 @@ If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-
5454
Locate the file `<tomcat>/bin/catalina.bat`. Create a new file in the same directory named `<tomcat>/bin/setenv.bat` with the following content:
5555

5656
```
57-
set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.10.jar
57+
set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.11.jar
5858
```
5959

6060
Quotes aren't necessary, but if you want to include them, the proper placement is:
6161

6262
```
63-
set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.10.jar"
63+
set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.11.jar"
6464
```
6565

66-
If the file `<tomcat>/bin/setenv.bat` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.10.jar` to `CATALINA_OPTS`.
66+
If the file `<tomcat>/bin/setenv.bat` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to `CATALINA_OPTS`.
6767

6868
### Run Tomcat as a Windows service
6969

70-
Locate the file `<tomcat>/bin/tomcat8w.exe`. Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.4.10.jar` to the `Java Options` under the `Java` tab.
70+
Locate the file `<tomcat>/bin/tomcat8w.exe`. Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to the `Java Options` under the `Java` tab.
7171

7272
## JBoss EAP 7
7373

7474
### Standalone server
7575

76-
Add `-javaagent:path/to/applicationinsights-agent-3.4.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):
76+
Add `-javaagent:path/to/applicationinsights-agent-3.4.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):
7777

7878
```java ...
79-
JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.4.10.jar -Xms1303m -Xmx1303m ..."
79+
JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.4.11.jar -Xms1303m -Xmx1303m ..."
8080
...
8181
```
8282

8383
### Domain server
8484

85-
Add `-javaagent:path/to/applicationinsights-agent-3.4.10.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
85+
Add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
8686

8787
```xml
8888
...
@@ -92,7 +92,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.10.jar` to the existing `j
9292
<jvm-options>
9393
<option value="-server"/>
9494
<!--Add Java agent jar file here-->
95-
<option value="-javaagent:path/to/applicationinsights-agent-3.4.10.jar"/>
95+
<option value="-javaagent:path/to/applicationinsights-agent-3.4.11.jar"/>
9696
<option value="-XX:MetaspaceSize=96m"/>
9797
<option value="-XX:MaxMetaspaceSize=256m"/>
9898
</jvm-options>
@@ -131,19 +131,19 @@ Add these lines to `start.ini`:
131131

132132
```
133133
--exec
134-
-javaagent:path/to/applicationinsights-agent-3.4.10.jar
134+
-javaagent:path/to/applicationinsights-agent-3.4.11.jar
135135
```
136136

137137
## Payara 5
138138

139-
Add `-javaagent:path/to/applicationinsights-agent-3.4.10.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
139+
Add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
140140

141141
```xml
142142
...
143143
<java-config ...>
144144
<!--Edit the JVM options here-->
145145
<jvm-options>
146-
-javaagent:path/to/applicationinsights-agent-3.4.10.jar>
146+
-javaagent:path/to/applicationinsights-agent-3.4.11.jar>
147147
</jvm-options>
148148
...
149149
</java-config>
@@ -162,7 +162,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.10.jar` to the existing `j
162162
1. In `Generic JVM arguments`, add the following JVM argument:
163163
164164
```
165-
-javaagent:path/to/applicationinsights-agent-3.4.10.jar
165+
-javaagent:path/to/applicationinsights-agent-3.4.11.jar
166166
```
167167
168168
1. Save and restart the application server.
@@ -172,7 +172,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.10.jar` to the existing `j
172172
Create a new file `jvm.options` in the server directory (for example, `<openliberty>/usr/servers/defaultServer`), and add this line:
173173
174174
```
175-
-javaagent:path/to/applicationinsights-agent-3.4.10.jar
175+
-javaagent:path/to/applicationinsights-agent-3.4.11.jar
176176
```
177177
178178
## Others

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configuration options - Azure Monitor Application Insights for Java
33
description: This article shows you how to configure Azure Monitor Application Insights for Java.
44
ms.topic: conceptual
5-
ms.date: 02/22/2023
5+
ms.date: 03/31/2023
66
ms.devlang: java
77
ms.custom: devx-track-java
88
ms.reviewer: mmcc
@@ -31,14 +31,14 @@ You'll find more information and configuration options in the following sections
3131

3232
## Configuration file path
3333

34-
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.4.10.jar`.
34+
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.4.11.jar`.
3535

3636
You can specify your own configuration file path by using one of these two options:
3737

3838
* `APPLICATIONINSIGHTS_CONFIGURATION_FILE` environment variable
3939
* `applicationinsights.configuration.file` Java system property
4040

41-
If you specify a relative path, it will be resolved relative to the directory where `applicationinsights-agent-3.4.10.jar` is located.
41+
If you specify a relative path, it will be resolved relative to the directory where `applicationinsights-agent-3.4.11.jar` is located.
4242

4343
Alternatively, instead of using a configuration file, you can specify the entire _content_ of the JSON configuration via the environment variable `APPLICATIONINSIGHTS_CONFIGURATION_CONTENT`.
4444

@@ -61,7 +61,7 @@ Or you can set the connection string by using the Java system property `applicat
6161

6262
You can also set the connection string by specifying a file to load the connection string from.
6363

64-
If you specify a relative path, it's resolved relative to the directory where `applicationinsights-agent-3.4.10.jar` is located.
64+
If you specify a relative path, it's resolved relative to the directory where `applicationinsights-agent-3.4.11.jar` is located.
6565

6666
```json
6767
{
@@ -340,7 +340,7 @@ and add `applicationinsights-core` to your application:
340340
<dependency>
341341
<groupId>com.microsoft.azure</groupId>
342342
<artifactId>applicationinsights-core</artifactId>
343-
<version>3.4.10</version>
343+
<version>3.4.11</version>
344344
</dependency>
345345
```
346346

@@ -812,7 +812,7 @@ In the preceding configuration example:
812812

813813
* `level` can be one of `OFF`, `ERROR`, `WARN`, `INFO`, `DEBUG`, or `TRACE`.
814814
* `path` can be an absolute or relative path. Relative paths are resolved against the directory where
815-
`applicationinsights-agent-3.4.10.jar` is located.
815+
`applicationinsights-agent-3.4.11.jar` is located.
816816

817817
Starting from version 3.0.2, you can also set the self-diagnostics `level` by using the environment variable
818818
`APPLICATIONINSIGHTS_SELF_DIAGNOSTICS_LEVEL`. It then takes precedence over the self-diagnostics level specified in the JSON configuration.

articles/azure-monitor/app/java-standalone-upgrade-from-2x.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Upgrading from 2.x - Azure Monitor Application Insights Java
33
description: Upgrading from Azure Monitor Application Insights Java 2.x
44
ms.topic: conceptual
5-
ms.date: 02/22/2023
5+
ms.date: 03/31/2023
66
ms.devlang: java
77
ms.custom: devx-track-java
88
ms.reviewer: mmcc
@@ -32,7 +32,7 @@ auto-instrumentation which is provided by the 3.x Java agent.
3232
Add the 3.x Java agent to your JVM command-line args, for example
3333

3434
```
35-
-javaagent:path/to/applicationinsights-agent-3.4.10.jar
35+
-javaagent:path/to/applicationinsights-agent-3.4.11.jar
3636
```
3737

3838
If you were using the Application Insights 2.x Java agent, just replace your existing `-javaagent:...` with the above.

0 commit comments

Comments
 (0)