Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vm-private-ip

Author: halkazwini

articles/active-directory/saas-apps/google-apps-tutorial.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 08/04/2022
+ms.date: 10/27/2022
 ms.author: jeedes
 ---
 
@@ -166,7 +166,10 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 
 1. Your Google Cloud / G Suite Connector by Microsoft application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows an example for this. The default value of **Unique User Identifier** is **user.userprincipalname** but Google Cloud / G Suite Connector by Microsoft expects this to be mapped with the user's email address. For that you can use **user.mail** attribute from the list or use the appropriate attribute value based on your organization configuration.
 
-	![image](common/default-attributes.png) 
+	![image](common/default-attributes.png)
+
+    > [!NOTE]
+    > Ensure that the the SAML Response doesn't include any non-standard ASCII characters in the DisplayName and Surname attributes.
 
 1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section,  find **Certificate (Base64)** and select **Download** to download the certificate and save it on your computer.
 

articles/azure-monitor/agents/azure-monitor-agent-troubleshoot-windows-arc.md

@@ -42,7 +42,7 @@ Follow the steps below to troubleshoot the latest version of the Azure Monitor a
 3. **Verify that the agent is running**:  
 	1. Check if the agent is emitting heartbeat logs to Log Analytics workspace using the query below. Skip if 'Custom Metrics' is the only destination in the DCR:
 		```Kusto
-		Heartbeat | where Category == "Azure Monitor Agent" and 'Computer' == "<computer-name>" | take 10
+		Heartbeat | where Category == "Azure Monitor Agent" and Computer == "<computer-name>" | take 10
 		```	
 	2. If not, open Task Manager and check if 'MonAgentCore.exe' process is running. If it is, wait for 5 minutes for heartbeat to show up.  
 	3. If not, check if you see any errors in core agent logs located at `C:\Resources\Directory\AMADataStore\Configuration` on your machine  

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

@@ -42,7 +42,7 @@ Download the [applicationinsights-agent-3.4.2.jar](https://github.com/microsoft/
 >
 > Starting from 3.3.0:
 >
->    - `LoggingLevel` is not captured by default as part of Traces' custom dimension since that data is already captured in the `SeverityLevel` field. For details on how to re-enable this if needed, please see the [config options](./java-standalone-config.md#logginglevel)
+>    - `LoggingLevel` is not captured by default as part of Traces' custom dimension since that data is already captured in the `SeverityLevel` field. For details on how to re-enable this if needed, please see the [config options](./java-standalone-config.md#logging-level-as-a-custom-dimension)
 >    - Exception records are no longer recorded for failed dependencies, they are only recorded for failed requests.
 >
 > Starting from 3.2.0:

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

@@ -57,6 +57,8 @@ Connection string is required. You can find your connection string in your Appli
 
 You can also set the connection string by using the environment variable `APPLICATIONINSIGHTS_CONNECTION_STRING`. It then takes precedence over the connection string specified in the JSON configuration.
 
+Or you can set the connection string by using the Java system property `applicationinsights.connection.string`. It also takes precedence over the 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's resolved relative to the directory where `applicationinsights-agent-3.4.2.jar` is located.
@@ -127,7 +129,7 @@ Sampling is also based on trace ID to help ensure consistent sampling decisions
 
 ### Rate-limited sampling
 
-Starting from 3.4.2, rate-limited sampling is available and is now the default.
+Starting from 3.4.0, rate-limited sampling is available and is now the default.
 
 If no sampling has been configured, the default is now rate-limited sampling configured to capture at most
 (approximately) 5 requests per second, along with all the dependencies and logs on those requests.
@@ -245,7 +247,7 @@ Starting from version 3.2.0, if you want to set a custom dimension programmatica
 
 ## Connection string overrides (preview)
 
-This feature is in preview, starting from 3.4.2.
+This feature is in preview, starting from 3.4.0.
 
 Connection string overrides allow you to override the [default connection string](#connection-string). For example, you can:
 
@@ -396,31 +398,22 @@ You can use these valid `level` values to specify in the `applicationinsights.js
 > | project timestamp, message, itemType
 > ```
 
-### Log markers for Logback and Log4j 2 (preview)
-
-Log markers are disabled by default.
-
-You can enable the `Marker` property for Logback and Log4j 2:
+### Log markers (preview)
 
-```json
-{
-  "preview": {
-    "captureLogbackMarker":  true
-  }
-}
-```
+Starting from 3.4.2, you can capture the log markers for Logback and Log4j 2:
 
 ```json
 {
   "preview": {
+    "captureLogbackMarker":  true,
     "captureLog4jMarker":  true
   }
 }
 ```
 
-This feature is in preview, starting from 3.4.2.
+### Additional log attributes for Logback (preview)
 
-You can enable code properties, such as `FileName`, `ClassName`, `MethodName`, and `LineNumber`, for Logback:
+Starting from 3.4.2, you can capture `FileName`, `ClassName`, `MethodName`, and `LineNumber`, for Logback:
 
 ```json
 {
@@ -432,11 +425,9 @@ You can enable code properties, such as `FileName`, `ClassName`, `MethodName`, a
 
 > [!WARNING]
 >
-> This feature could add a performance overhead.
-
-This feature is in preview, starting from 3.4.2.
+> Capturing these additional log attributes can add a performance overhead.
 
-### LoggingLevel
+### Logging level as a custom dimension
 
 Starting from version 3.3.0, `LoggingLevel` isn't captured by default as part of the Traces custom dimension because that data is already captured in the `SeverityLevel` field.
 
@@ -475,7 +466,7 @@ To disable auto-collection of Micrometer metrics and Spring Boot Actuator metric
 
 Literal values in JDBC queries are masked by default to avoid accidentally capturing sensitive data.
 
-Starting from 3.4.2, this behavior can be disabled. For example:
+Starting from 3.4.0, this behavior can be disabled. For example:
 
 ```json
 {
@@ -493,7 +484,7 @@ Starting from 3.4.2, this behavior can be disabled. For example:
 
 Literal values in Mongo queries are masked by default to avoid accidentally capturing sensitive data.
 
-Starting from 3.4.2, this behavior can be disabled. For example:
+Starting from 3.4.0, this behavior can be disabled. For example:
 
 ```json
 {