Merge pull request #221639 from MicrosoftDocs/main

12/15 AM Publish

Author: huypub

articles/active-directory/app-provisioning/functions-for-customizing-application-data.md

@@ -294,7 +294,7 @@ The **interval** string must have one of the following values:
 | Get a date ten days prior to hire date | "d" | -10 | 2012-03-16-07:00 | 3/6/2012 7:00:00 AM |
 | Add two weeks to hire date | "ww" | 2 | 2012-03-16-07:00 | 3/30/2012 7:00:00 AM |
 | Add ten months to hire date | "m" | 10 | 2012-03-16-07:00 | 1/16/2013 7:00:00 AM |
-| Add two years to hire date | "yyyy" | 10 | 2012-03-16-07:00 | 3/16/2014 7:00:00 AM |
+| Add two years to hire date | "yyyy" | 2 | 2012-03-16-07:00 | 3/16/2014 7:00:00 AM |
 
 ---
 ### DateDiff

articles/active-directory/app-provisioning/how-provisioning-works.md

@@ -138,7 +138,6 @@ The provisioning service continues running back-to-back incremental cycles indef
 - The service is manually stopped using the Azure portal, or using the appropriate Microsoft Graph API command.
 - A new initial cycle is triggered using the **Restart provisioning** option in the Azure portal, or using the appropriate Microsoft Graph API command. This action clears any stored watermark and causes all source objects to be evaluated again. This will not break the links between source and target objects. To break the links use [Restart synchronizationJob](https://learn.microsoft.com/graph/api/synchronization-synchronizationjob-restart?view=graph-rest-beta&tabs=http) with the following request: 
 
-# [HTTP](#tab/http)
 <!-- {
   "blockType": "request",
   "name": "synchronizationjob_restart"

articles/active-directory/conditional-access/concept-conditional-access-users-groups.md

@@ -103,7 +103,7 @@ A workload identity is an identity that allows an application or service princip
 
 Organizations can target specific workload identities to be included or excluded from policy.
 
-For more information, see the article [Conditional Access for workload identities preview](workload-identity.md).
+For more information, see the article [Conditional Access for workload identities](workload-identity.md).
 
 ## Next steps
 

articles/active-directory/reports-monitoring/howto-download-logs.md

@@ -47,6 +47,10 @@ Azure AD stores activity logs for a specific period. For more information, see [
 - Timestamps in the downloaded files are based on UTC.
 - For large data sets (> 250,000 records), you should use the [reporting API](/graph/api/resources/azure-ad-auditlog-overview?view=graph-rest-1.0) to download the data.
 
+  > [!NOTE]
+   > **Issues downloading large data sets**  
+   > The Azure Portal downloader will time out if you attempt to download large data sets. Generally, data sets smaller than 250,000 records work well with the browser download feature. If you face issues completing large downloads in the browser, you should use the [reporting API](/graph/api/resources/azure-ad-auditlog-overview?view=graph-rest-1.0) to download the data.
+
 ## How to download activity logs
 
 You can access the activity logs from the **Monitoring** section of Azure AD or from the **Users** page of Azure AD. If you view the audit logs from the **Users** page, the filter category will be set to **UserManagement**. Similarly, if you view the audit logs from the **Groups** page, the filter category will be set to **GroupManagement**. Regardless of how you access the activity logs, your download is based on the filter you've set. 
@@ -72,4 +76,4 @@ If your tenant has enabled the [sign-in logs preview](concept-all-sign-ins.md),
 ## Next steps
 
 - [Integrate Azure AD logs with Azure Monitor](howto-integrate-activity-logs-with-log-analytics.md)
-- [Access Azure AD logs using the Graph API](quickstart-access-log-with-graph-api.md)
+- [Access Azure AD logs using the Graph API](quickstart-access-log-with-graph-api.md)

articles/aks/azure-files-volume.md

@@ -4,7 +4,7 @@ titleSuffix: Azure Kubernetes Service
 description: Learn how to manually create a volume with Azure Files for use with multiple concurrent pods in Azure Kubernetes Service (AKS)
 services: container-service
 ms.topic: article
-ms.date: 05/09/2022
+ms.date: 12/12/2022
 
 
 #Customer intent: As a developer, I want to learn how to manually create and attach storage using Azure Files to a pod in AKS.
@@ -113,6 +113,8 @@ kubectl apply -f azure-files-pod.yaml
 You now have a running pod with an Azure Files share mounted at */mnt/azure*. You can use `kubectl describe pod mypod` to verify the share is mounted successfully. 
 
 ## Mount file share as a persistent volume
+> [!NOTE]
+> For SMB mount, if `nodeStageSecretRef` field is not provided in PV config, azure file driver would try to get `azure-storage-account-{accountname}-secret` in the pod namespace, if that secret does not exist, it would get account key by Azure storage account API directly using kubelet identity (make sure kubelet identity has reader access to the storage account).
  - Mount options
 > The default value for *fileMode* and *dirMode* is *0777*.
 

articles/app-service/tutorial-dotnetcore-sqldb-app.md

@@ -7,7 +7,7 @@ author: alexwolfmsft
 ms.author: alexwolf
 ms.devlang: csharp
 ms.service: app-service
-ms.custom: "devx-track-csharp, mvc, cli-validate, seodec18, devx-track-azurecli, devdivchpfy22"
+ms.custom: devx-track-csharp, mvc, cli-validate, seodec18, devx-track-azurecli, devdivchpfy22, service-connector
 ---
 
 # Tutorial: Deploy an ASP.NET Core and Azure SQL Database app to Azure App Service

articles/app-service/tutorial-java-tomcat-connect-managed-identity-postgresql-database.md

@@ -6,7 +6,7 @@ ms.topic: tutorial
 ms.date: 09/26/2022
 author: KarlErickson
 ms.author: karler
-ms.custom: passwordless-java
+ms.custom: passwordless-java, service-connector
 ---
 
 # Tutorial: Connect to a PostgreSQL Database from Java Tomcat App Service without secrets using a managed identity

articles/azure-monitor/alerts/alerts-common-schema-definitions.md

@@ -627,6 +627,30 @@ The following fields describe the cause of an alert.
 }
 ```
 
+#### `monitoringService` = `Prometheus`
+
+**Sample values**
+
+```json
+{
+  "alertContext": {
+    "interval": "PT1M",
+    "expression": "sql_up > 0",
+    "expressionValue": "0",
+    "for": "PT2M",
+    "labels": {
+      "Environment": "Prod",
+      "cluster": "myCluster1"
+    },
+    "annotations": {
+      "summary": "alert on SQL availability"
+    },
+    "ruleGroup": "/subscriptions/<subscription ID>/resourceGroups/myResourceGroup/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myRuleGroup"
+  }
+}
+```
+
+
 ## Next steps
 
 - Learn more about the [common alert schema](./alerts-common-schema.md).

articles/azure-monitor/app/asp-net-dependencies.md

@@ -269,7 +269,7 @@ A list of the latest [currently supported modules](https://github.com/microsoft/
 * [Exceptions](./asp-net-exceptions.md)
 * [User and page data](./javascript.md)
 * [Availability](./monitor-web-app-availability.md)
-* Set up custom dependency tracking for [Java](java-in-process-agent.md#add-spans).
+* Set up custom dependency tracking for [Java](java-in-process-agent.md#add-spans-using-the-opentelemetry-annotation).
 * Set up custom dependency tracking for [OpenCensus Python](./opencensus-python-dependency.md).
 * [Write custom dependency telemetry](./api-custom-events-metrics.md#trackdependency)
 * See [data model](./data-model.md) for Application Insights types and data model.

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

@@ -233,29 +233,29 @@ Telemetry emitted by these Azure SDKs is automatically collected by default:
 
 This section explains how to modify telemetry.
 
-### Add spans
+### Add spans using the OpenTelemetry annotation
 
-The easiest way to add your own spans is using OpenTelemetry's `@WithSpan` annotation.
+The simplest way to add your own spans is using OpenTelemetry's `@WithSpan` annotation.
 
 Spans populate the `requests` and `dependencies` tables in Application Insights.
 
 > [!NOTE]
 > This feature is only in 3.2.0 and later.
 
-1. Add `opentelemetry-extension-annotations-1.16.0.jar` to your application:
+1. Add `opentelemetry-instrumentation-annotations-1.21.0.jar` (or later) to your application:
 
    ```xml
    <dependency>
      <groupId>io.opentelemetry</groupId>
-     <artifactId>opentelemetry-extension-annotations</artifactId>
-     <version>1.16.0</version>
+     <artifactId>opentelemetry-instrumentation-annotations</artifactId>
+     <version>1.21.0</version>
    </dependency>
    ```
 
 1. Use the `@WithSpan` annotation to emit a span each time your method is executed:
 
    ```java
-    import io.opentelemetry.extension.annotations.WithSpan;
+    import io.opentelemetry.instrumentation.annotations.WithSpan;
 
     @WithSpan(value = "your span name")
     public void yourMethod() {
@@ -268,20 +268,60 @@ If your method represents a background job that is not already captured by auto-
 it is recommended to apply the attribute `kind = SpanKind.SERVER` to the `@WithSpan` annotation
 so that it will end up in the Application Insights `requests` table.
 
+### Add spans using the OpenTelemetry API
+
+If the OpenTelemetry `@WithSpan` annotation above doesn't meet your needs,
+then you can add your spans using the OpenTelemetry API.
+
+> [!NOTE]
+> This feature is only in 3.2.0 and later.
+
+1. Add `opentelemetry-api-1.0.0.jar` (or later) to your application:
+
+   ```xml
+   <dependency>
+     <groupId>io.opentelemetry</groupId>
+     <artifactId>opentelemetry-api</artifactId>
+     <version>1.0.0</version>
+   </dependency>
+   ```
+
+1. Use the `GlobalOpenTelemetry` class to create a `Tracer`
+
+   ```java
+    import io.opentelemetry.api.GlobalOpenTelemetry;
+    import io.opentelemetry.api.trace.Tracer;
+
+    static final Tracer tracer = GlobalOpenTelemetry.getTracer("com.example");
+   ```
+
+1. Create a span, make it current, and then end it:
+
+   ```java
+    Span span = tracer.spanBuilder("my first span").startSpan();
+    try (Scope ignored = span.makeCurrent()) {
+        // do stuff within the context of this 
+    } catch (Throwable t) {
+        span.recordException(t);
+    } finally {
+        span.end();
+    }
+   ```
+
 ### Add span events
 
 You can use `opentelemetry-api` to create span events, which populate the traces table in Application Insights. The string passed in to `addEvent()` is saved to the _message_ field within the trace.
 
 > [!NOTE]
 > This feature is only in 3.2.0 and later.
 
-1. Add `opentelemetry-api-1.6.0.jar` to your application:
+1. Add `opentelemetry-api-1.0.0.jar` (or later) to your application:
 
    ```xml
    <dependency>
      <groupId>io.opentelemetry</groupId>
      <artifactId>opentelemetry-api</artifactId>
-     <version>1.6.0</version>
+     <version>1.0.0</version>
    </dependency>
    ```
 
@@ -302,13 +342,13 @@ Adding one or more span attributes populates the _customDimensions_ field in the
 > [!NOTE]
 > This feature is only in 3.2.0 and later.
 
-1. Add `opentelemetry-api-1.6.0.jar` to your application:
+1. Add `opentelemetry-api-1.0.0.jar` (or later) to your application:
 
    ```xml
    <dependency>
      <groupId>io.opentelemetry</groupId>
      <artifactId>opentelemetry-api</artifactId>
-     <version>1.6.0</version>
+     <version>1.0.0</version>
    </dependency>
    ```
 
@@ -329,13 +369,13 @@ You can use `opentelemetry-api` to update the status of a span and record except
 > [!NOTE]
 > This feature is only in 3.2.0 and later.
 
-1. Add `opentelemetry-api-1.6.0.jar` to your application:
+1. Add `opentelemetry-api-1.0.0.jar` (or later) to your application:
 
    ```xml
    <dependency>
      <groupId>io.opentelemetry</groupId>
      <artifactId>opentelemetry-api</artifactId>
-     <version>1.6.0</version>
+     <version>1.0.0</version>
    </dependency>
    ```
 
@@ -360,13 +400,13 @@ Populate the _user ID_ field in the requests, dependencies, or exceptions table.
 > [!NOTE]
 > This feature is only in 3.2.0 and later.
 
-1. Add `opentelemetry-api-1.6.0.jar` to your application:
+1. Add `opentelemetry-api-1.0.0.jar` (or later) to your application:
 
    ```xml
    <dependency>
      <groupId>io.opentelemetry</groupId>
      <artifactId>opentelemetry-api</artifactId>
-     <version>1.6.0</version>
+     <version>1.0.0</version>
    </dependency>
    ```
 
@@ -385,13 +425,13 @@ You can use `opentelemetry-api` to get the trace ID or span ID. This action can
 > [!NOTE]
 > This feature is only in 3.2.0 and later.
 
-1. Add `opentelemetry-api-1.6.0.jar` to your application:
+1. Add `opentelemetry-api-1.0.0.jar` (or later) to your application:
 
    ```xml
    <dependency>
      <groupId>io.opentelemetry</groupId>
      <artifactId>opentelemetry-api</artifactId>
-     <version>1.6.0</version>
+     <version>1.0.0</version>
    </dependency>
    ```