Merge pull request #196206 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 5dd5d51802df · 2022-04-27T09:43:37.000-07:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory/saas-apps/atlassian-cloud-provisioning-tutorial.md b/articles/active-directory/saas-apps/atlassian-cloud-provisioning-tutorial.md
@@ -32,7 +32,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
 
 * [An Azure AD tenant](../develop/quickstart-create-new-tenant.md).
 * A user account in Azure AD with [permission](../roles/permissions-reference.md) to configure provisioning (e.g. Application Administrator, Cloud Application administrator, Application Owner, or Global Administrator).
-* [An Atlassian Cloud tenant](https://www.atlassian.com/licensing/cloud)
+* [An Atlassian Cloud tenant](https://www.atlassian.com/licensing/cloud) with an Atlassian Access subscription.
 * A user account in Atlassian Cloud with Admin permissions.
 
 > [!NOTE]
diff --git a/articles/azure-monitor/app/opencensus-python-request.md b/articles/azure-monitor/app/opencensus-python-request.md
@@ -145,11 +145,14 @@ OpenCensus doesn't have an extension for FastAPI. To write your own FastAPI midd
     HTTP_URL = COMMON_ATTRIBUTES['HTTP_URL']
     HTTP_STATUS_CODE = COMMON_ATTRIBUTES['HTTP_STATUS_CODE']
     
-    tracer = Tracer(exporter=AzureExporter(connection_string=f'InstrumentationKey={APPINSIGHTS_INSTRUMENTATIONKEY}'),sampler=ProbabilitySampler(1.0))
+    APPINSIGHTS_CONNECTION_STRING='<your-appinsights_connection-string-here>'
+    exporter=AzureExporter(connection_string=f'{APPINSIGHTS_CONNECTION_STRING}')
+    sampler=ProbabilitySampler(1.0)
 
     # fastapi middleware for opencensus
     @app.middleware("http")
-    async def middlewareOpencensus(request: Request, call_next):        
+    async def middlewareOpencensus(request: Request, call_next):  
+        tracer = Tracer(exporter=exporter, sampler=sampler)       
         with tracer.span("main") as span:
             span.span_kind = SpanKind.SERVER
 
diff --git a/articles/azure-resource-manager/templates/data-types.md b/articles/azure-resource-manager/templates/data-types.md
@@ -150,6 +150,8 @@ The following example shows two secure parameters.
   }
 }
 ```
+> [!NOTE] 
+> Secure strings and objects aren't recommended to be used as an output type because they're not stored in the deployment history.
 
 ## Next steps
 
diff --git a/articles/cognitive-services/Computer-vision/spatial-analysis-operations.md b/articles/cognitive-services/Computer-vision/spatial-analysis-operations.md
@@ -238,7 +238,7 @@ The following is an example of a JSON input for the SPACEANALYTICS_CONFIG parame
           "type": "count",
           "config": {
             "trigger": "event",
-            "threshold": 16.00,
+            "threshold": 13.00,
             "focus": "footprint"
           }
         }
@@ -283,7 +283,7 @@ The following is an example of a JSON input for the `SPACEANALYTICS_CONFIG` para
                    "type": "linecrossing",
                    "config": {
                        "trigger": "event",
-                       "threshold": 16.00,
+                       "threshold": 13.00,
                        "focus": "footprint"
                    }
                }
@@ -300,7 +300,7 @@ The following is an example of a JSON input for the `SPACEANALYTICS_CONFIG` para
 | `line` | list| The definition of the line. This is a directional line allowing you to understand "entry" vs. "exit".|
 | `start` | value pair| x, y coordinates for line's starting point. The float values represent the position of the vertex relative to the top left corner. To calculate the absolute x, y values, you multiply these values with the frame size. |
 | `end` | value pair| x, y coordinates for line's ending point. The float values represent the position of the vertex relative to the top left corner. To calculate the absolute x, y values, you multiply these values with the frame size. |
-| `threshold` | float| Events are egressed when the person is greater than this number of pixels inside the zone. The default value is 16. This is the recommended value to achieve maximum accuracy. |
+| `threshold` | float| Events are egressed when the person is greater than this number of pixels inside the zone. The default value is 13. This is the recommended value to achieve maximum accuracy. |
 | `type` | string| For **cognitiveservices.vision.spatialanalysis-personcrossingline**, this should be `linecrossing`.|
 |`trigger`|string|The type of trigger for sending an event.<br>Supported Values: "event": fire when someone crosses the line.|
 | `focus` | string| The point location within person's bounding box used to calculate events. Focus's value can be `footprint` (the footprint of person), `bottom_center` (the bottom center of person's bounding box), `center` (the center of person's bounding box). The default value is footprint.|
@@ -319,7 +319,7 @@ This is an example of a JSON input for the `SPACEANALYTICS_CONFIG` parameter tha
            "type": "zonecrossing",
            "config":{
                "trigger": "event",
-               "threshold": 48.00,
+               "threshold": 38.00,
                "focus": "footprint"
                }
            }]
@@ -331,7 +331,7 @@ This is an example of a JSON input for the `SPACEANALYTICS_CONFIG` parameter tha
            "type": "zonedwelltime",
            "config":{
                "trigger": "event",
-               "threshold": 16.00,
+               "threshold": 13.00,
                "focus": "footprint"
                }
            }]
@@ -345,7 +345,7 @@ This is an example of a JSON input for the `SPACEANALYTICS_CONFIG` parameter tha
 | `name` | string| Friendly name for this zone.|
 | `polygon` | list| Each value pair represents the x,y for vertices of polygon. The polygon represents the areas in which people are tracked or counted. The float values represent the position of the vertex relative to the top left corner. To calculate the absolute x, y values, you multiply these values with the frame size. 
 | `target_side` | int| Specifies a side of the zone defined by `polygon` to measure how long people face that side while in the zone. 'dwellTimeForTargetSide' will output that estimated time. Each side is a numbered edge between the two vertices of the polygon that represents your zone. For example, the edge between the first two vertices of the polygon represents the first side, 'side'=1. The value of `target_side` is between `[0,N-1]` where `N` is the number of sides of the `polygon`. This is an optional field.  |
-| `threshold` | float| Events are egressed when the person is greater than this number of pixels inside the zone. The default value is 48 when the type is `zonecrossing` and 16 when time is `DwellTime`. These are the recommended values to achieve maximum accuracy.  |
+| `threshold` | float| Events are egressed when the person is greater than this number of pixels inside the zone. The default value is 38 when the type is `zonecrossing` and 13 when time is `DwellTime`. These are the recommended values to achieve maximum accuracy.  |
 | `type` | string| For **cognitiveservices.vision.spatialanalysis-personcrossingpolygon** this should be `zonecrossing` or `zonedwelltime`.|
 | `trigger`|string|The type of trigger for sending an event<br>Supported Values: "event": fire when someone enters or exits the zone.|
 | `focus` | string| The point location within person's bounding box used to calculate events. Focus's value can be `footprint` (the footprint of person), `bottom_center` (the bottom center of person's bounding box), `center` (the center of person's bounding box). The default value is footprint.|
@@ -367,7 +367,7 @@ This is an example of a JSON input for the `SPACEANALYTICS_CONFIG` parameter tha
            "minimum_distance_threshold":6.0,
            "maximum_distance_threshold":35.0,
            "aggregation_method": "average"
-           "threshold": 16.00,
+           "threshold": 13.00,
            "focus": "footprint"
           }
           }]
@@ -412,7 +412,7 @@ The following is an example of a JSON input for the `SPACEANALYTICS_CONFIG` para
           "type": "linecrossing",
           "config": {
             "trigger": "event",
-            "threshold": 16.00,
+            "threshold": 13.00,
             "focus": "footprint"
           }
         }
@@ -431,7 +431,7 @@ The following is an example of a JSON input for the `SPACEANALYTICS_CONFIG` para
             "output_frequency": 1,
             "minimum_distance_threshold": 6.0,
             "maximum_distance_threshold": 35.0,
-            "threshold": 16.00,
+            "threshold": 13.00,
             "focus": "footprint"
           }
         },
@@ -440,21 +440,21 @@ The following is an example of a JSON input for the `SPACEANALYTICS_CONFIG` para
           "config": {
             "trigger": "event",
             "output_frequency": 1,
-            "threshold": 16.00,
+            "threshold": 13.00,
             "focus": "footprint"
           }
         },
         {
           "type": "zonecrossing",
           "config": {
-            "threshold": 48.00,
+            "threshold": 38.00,
             "focus": "footprint"
           }
         },
         {
           "type": "zonedwelltime",
           "config": {
-            "threshold": 16.00,
+            "threshold": 13.00,
             "focus": "footprint"
           }
         }
diff --git a/articles/service-fabric/service-fabric-tutorial-create-vnet-and-linux-cluster.md b/articles/service-fabric/service-fabric-tutorial-create-vnet-and-linux-cluster.md
@@ -1,5 +1,5 @@
 ---
-title: Create a Linux Service Fabric cluster in Azure 
+title: Create a Linux Service Fabric cluster in Azure
 description: Learn how to deploy a Linux Service Fabric cluster into an existing Azure virtual network using Azure CLI.
 
 ms.topic: conceptual
@@ -27,23 +27,30 @@ The following procedures create a seven-node Service Fabric cluster. To calculat
 Download the following Resource Manager template files:
 
 For Ubuntu 16.04 LTS:
-
-* [AzureDeploy.json][template]
-* [AzureDeploy.Parameters.json][parameters]
+- [AzureDeploy.json][template]
+  - **vmImageSku** attribute is to "16.04-LTS"
+  - Microsoft.ServiceFabric/clusters resource's
+    - **apiVersion** being set to "2018-02-01"
+    - **vmImage** property being set to "Linux"
+- [AzureDeploy.Parameters.json][parameters]
 
 For Ubuntu 18.04 LTS:
-
-* [AzureDeploy.json][template2]
-* [AzureDeploy.Parameters.json][parameters2]
-
-For Ubuntu 18.04 LTS the difference between the two templates are 
-* the **vmImageSku** attribute being set to "18.04-LTS"
-* each node's **typeHandlerVersion** being set to 1.1
-* Microsoft.ServiceFabric/clusters resource's
-   - **apiVersion** being set to "2019-03-01" or higher
-   - **vmImage** property being set to "Ubuntu18_04"
-
-This template deploys a secure cluster of seven virtual machines and three node types into a virtual network.  Other sample templates can be found on [GitHub](https://github.com/Azure-Samples/service-fabric-cluster-templates). The [AzureDeploy.json][template] deploys a number resources, including the following.
+- [AzureDeploy.json][template2]
+  - **vmImageSku** attribute is to "18.04-LTS"
+  - Microsoft.ServiceFabric/clusters resource's
+    - **apiVersion** being set to "2019-03-01"
+    - **vmImage** property being set to "Ubuntu18_04"
+- [AzureDeploy.Parameters.json][parameters2]
+
+For Ubuntu 20.04 LTS:
+- [AzureDeploy.json][template3]
+  - **vmImageSku** attribute is to "20.04-LTS"
+  - Microsoft.ServiceFabric/clusters resource's
+    - **apiVersion** being set to "2019-03-01"
+    - **vmImage** property being set to "Ubuntu20_04"
+- [AzureDeploy.Parameters.json][parameters3]
+
+These templates deploy a secure cluster of seven virtual machines and three node types into a virtual network.  Other sample templates can be found on [GitHub](https://github.com/Azure-Samples/service-fabric-cluster-templates). The AzureDeploy.json deploys a number of resources, including the following.
 
 ### Service Fabric cluster
 
@@ -174,3 +181,5 @@ The template in this article deploy a cluster that uses the certificate thumbpri
 [parameters]:https://github.com/Azure-Samples/service-fabric-cluster-templates/blob/master/7-VM-Ubuntu-3-NodeTypes-Secure/AzureDeploy.Parameters.json
 [template2]:https://github.com/Azure-Samples/service-fabric-cluster-templates/blob/master/7-VM-Ubuntu-1804-3-NodeTypes-Secure/AzureDeploy.json
 [parameters2]:https://github.com/Azure-Samples/service-fabric-cluster-templates/blob/master/7-VM-Ubuntu-1804-3-NodeTypes-Secure/AzureDeploy.Parameters.json
+[template3]:https://github.com/Azure-Samples/service-fabric-cluster-templates/blob/master/7-VM-Ubuntu-2004-3-NodeTypes-Secure/AzureDeploy.json
+[parameters3]:https://github.com/Azure-Samples/service-fabric-cluster-templates/blob/master/7-VM-Ubuntu-2004-3-NodeTypes-Secure/AzureDeploy.Parameters.json

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,8 @@ The following example shows two secure parameters.`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	```
	`153`	`+> [!NOTE]`
	`154`	`+> Secure strings and objects aren't recommended to be used as an output type because they're not stored in the deployment history.`
`153`	`155`
`154`	`156`	`## Next steps`
`155`	`157`