Skip to content

Commit aff677c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-custom-roles-assignable-scopes
2 parents 594e19d + e8eb544 commit aff677c

File tree

46 files changed

+222
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+222
-206
lines changed

articles/active-directory/hybrid/reference-connect-sync-attributes-synchronized.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ In this case, start with the list of attributes in this topic and identify those
158158
| targetAddress |X |X | | |
159159
| telephoneAssistant |X |X | | |
160160
| telephoneNumber |X |X | | |
161-
| thumbnailphoto |X |X | |synced only once from Azure AD to Exchange Online after which Exchange Online becomes source of authority for this attribute and any later changes can't be synced from on-premise. See ([KB](https://support.microsoft.com/help/3062745/user-photos-aren-t-synced-from-the-on-premises-environment-to-exchange)) for more.|
161+
| thumbnailphoto |X |X | |synced only once from Azure AD to Exchange Online after which Exchange Online becomes source of authority for this attribute and any later changes can't be synced from on-premises. See ([KB](https://support.microsoft.com/help/3062745/user-photos-aren-t-synced-from-the-on-premises-environment-to-exchange)) for more.|
162162
| title |X |X | | |
163163
| unauthOrig |X |X |X | |
164164
| usageLocation |X | | |mechanical property. The user’s country/region. Used for license assignment. |
@@ -240,7 +240,7 @@ In this case, start with the list of attributes in this topic and identify those
240240
| targetAddress |X |X | | |
241241
| telephoneAssistant |X |X | | |
242242
| telephoneNumber |X |X | | |
243-
| thumbnailphoto |X |X | |synced only once from Azure AD to Exchange Online after which Exchange Online becomes source of authority for this attribute and any later changes can't be synced from on-premise. See ([KB](https://support.microsoft.com/help/3062745/user-photos-aren-t-synced-from-the-on-premises-environment-to-exchange)) for more.|
243+
| thumbnailphoto |X |X | |synced only once from Azure AD to Exchange Online after which Exchange Online becomes source of authority for this attribute and any later changes can't be synced from on-premises. See ([KB](https://support.microsoft.com/help/3062745/user-photos-aren-t-synced-from-the-on-premises-environment-to-exchange)) for more.|
244244
| title |X |X | | |
245245
| unauthOrig |X |X |X | |
246246
| url |X |X | | |

articles/active-directory/saas-apps/cisco-umbrella-user-management-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
4747
If your endpoints are running AnyConnect or the Cisco Secure Client version 4.10 MR5 or earlier, you will need to synchronize the ObjectGUID attribute for user identity attribution. You will need to reconfigure any Umbrella policy on groups after importing groups from Azure AD.
4848

4949
> [!NOTE]
50-
> The on-premise Umbrella AD Connector should be turned off before importing the ObjectGUID attribute.
50+
> The on-premises Umbrella AD Connector should be turned off before importing the ObjectGUID attribute.
5151
5252
When using Microsoft Azure AD Connect, the ObjectGUID attribute of users is not synchronized from on-premises AD to Azure AD by default. To synchronize this attribute, enable the optional **Directory Extension attribute sync** and select the objectGUID attributes for users.
5353

articles/app-service/overview-monitoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Azure App Service provides several monitoring options for monitoring resources f
1212

1313
## Diagnostic Settings (via Azure Monitor)
1414

15-
Azure Monitor is a monitoring service that provides a complete set of features to monitor your Azure resources in addition to resources in other clouds and on-premise. The Azure Monitor data platform collects data into logs and metrics where they can be analyzed. App Service monitoring data can be shipped to Azure Monitor through Diagnostic Settings.
15+
Azure Monitor is a monitoring service that provides a complete set of features to monitor your Azure resources in addition to resources in other clouds and on-premises. The Azure Monitor data platform collects data into logs and metrics where they can be analyzed. App Service monitoring data can be shipped to Azure Monitor through Diagnostic Settings.
1616

1717
Diagnostic settings lets you export logs to other services, such as Log Analytics, Storage account, and Event Hubs. Large amounts of data using SQL-like Kusto can be queried with Log Analytics. You can capture platform logs in Azure Monitor Logs as configured via Diagnostic Settings, and instrument your app further with the dedicated application performance management feature (Application Insights) for additional telemetry and logs.
1818

articles/app-service/reference-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ For more information on custom containers, see [Run a custom container in Azure]
340340
| `DOCKER_REGISTRY_SERVER_USERNAME` | Username to authenticate with the registry server at `DOCKER_REGISTRY_SERVER_URL`. For security, this variable is not passed on to the container. ||
341341
| `DOCKER_REGISTRY_SERVER_PASSWORD` | Password to authenticate with the registry server at `DOCKER_REGISTRY_SERVER_URL`. For security, this variable is not passed on to the container. ||
342342
| `DOCKER_ENABLE_CI` | Set to `true` to enable the continuous deployment for custom containers. The default is `false` for custom containers. ||
343-
| `WEBSITE_PULL_IMAGE_OVER_VNET` | Connect and pull from a registry inside a Virtual Network or on-premise. Your app will need to be connected to a Virtual Network using VNet integration feature. This setting is also needed for Azure Container Registry with Private Endpoint. ||
343+
| `WEBSITE_PULL_IMAGE_OVER_VNET` | Connect and pull from a registry inside a Virtual Network or on-premises. Your app will need to be connected to a Virtual Network using VNet integration feature. This setting is also needed for Azure Container Registry with Private Endpoint. ||
344344
| `WEBSITES_WEB_CONTAINER_NAME` | In a Docker Compose app, only one of the containers can be internet accessible. Set to the name of the container defined in the configuration file to override the default container selection. By default, the internet accessible container is the first container to define port 80 or 8080, or, when no such container is found, the first container defined in the configuration file. | |
345345
| `WEBSITES_PORT` | For a custom container, the custom port number on the container for App Service to route requests to. By default, App Service attempts automatic port detection of ports 80 and 8080. This setting is *not* injected into the container as an environment variable. ||
346346
| `WEBSITE_CPU_CORES_LIMIT` | By default, a Windows container runs with all available cores for your chosen pricing tier. To reduce the number of cores, set to the number of desired cores limit. For more information, see [Customize the number of compute cores](configure-custom-container.md?pivots=container-windows#customize-the-number-of-compute-cores).||

articles/automation/how-to/private-link-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For more information, see [Key Benefits of Private Link](../../private-link/pri
3939

4040
## Limitations
4141

42-
- In the current implementation of Private Link, Automation account cloud jobs cannot access Azure resources that are secured using private endpoint. For example, Azure Key Vault, Azure SQL, Azure Storage account, etc. To workaround this, use a [Hybrid Runbook Worker](../automation-hybrid-runbook-worker.md) instead. Hence, on-premise VMs are supported to run Hybrid Runbook Workers against an Automation Account with Private Link enabled.
42+
- In the current implementation of Private Link, Automation account cloud jobs cannot access Azure resources that are secured using private endpoint. For example, Azure Key Vault, Azure SQL, Azure Storage account, etc. To workaround this, use a [Hybrid Runbook Worker](../automation-hybrid-runbook-worker.md) instead. Hence, on-premises VMs are supported to run Hybrid Runbook Workers against an Automation Account with Private Link enabled.
4343
- You need to use the latest version of the [Log Analytics agent](../../azure-monitor/agents/log-analytics-agent.md) for Windows or Linux.
4444
- The [Log Analytics Gateway](../../azure-monitor/agents/gateway.md) does not support Private Link.
4545

articles/azure-monitor/app/ip-addresses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.reviewer: saars
1111
[Azure Monitor](../overview.md) uses several IP addresses. Azure Monitor is made up of core platform metrics and logs in addition to Log Analytics and Application Insights. You might need to know IP addresses if the app or infrastructure that you're monitoring is hosted behind a firewall.
1212

1313
> [!NOTE]
14-
> Although these addresses are static, it's possible that we'll need to change them from time to time. All Application Insights traffic represents outbound traffic with the exception of availability monitoring and webhooks, which require inbound firewall rules.
14+
> Although these addresses are static, it's possible that we'll need to change them from time to time. All Application Insights traffic represents outbound traffic with the exception of availability monitoring and webhook action groups, which also require inbound firewall rules.
1515
1616
You can use Azure [network service tags](../../virtual-network/service-tags-overview.md) to manage access if you're using Azure network security groups. If you're managing access for hybrid/on-premises resources, you can download the equivalent IP address lists as [JSON files](../../virtual-network/service-tags-overview.md#discover-service-tags-by-using-downloadable-json-files), which are updated each week. To cover all the exceptions in this article, use the service tags `ActionGroup`, `ApplicationInsightsAvailability`, and `AzureMonitor`.
1717

articles/azure-monitor/app/opencensus-python-dependency.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
title: Dependency Tracking in Azure Application Insights with OpenCensus Python | Microsoft Docs
33
description: Monitor dependency calls for your Python apps via OpenCensus Python.
44
ms.topic: conceptual
5-
ms.date: 10/15/2019
5+
ms.date: 8/19/2022
66
ms.devlang: python
77
ms.custom: devx-track-python
8+
ms.reviewer: mmcc
89
---
910

1011
# Track dependencies with OpenCensus Python
@@ -104,6 +105,8 @@ OPENCENSUS = {
104105
}
105106
```
106107

108+
You can find a Django sample application that uses dependencies in the Azure Monitor OpenCensus Python samples repository located [here](https://github.com/Azure-Samples/azure-monitor-opencensus-python/tree/master/azure_monitor/django_sample).
109+
107110
## Dependencies with "mysql" integration
108111

109112
Track your MYSQL dependencies with the OpenCensus `mysql` integration. This integration supports the [mysql-connector](https://pypi.org/project/mysql-connector-python/) library.

articles/azure-monitor/app/opencensus-python-request.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Incoming Request Tracking in Azure Application Insights with OpenCensus Python | Microsoft Docs
33
description: Monitor request calls for your Python apps via OpenCensus Python.
44
ms.topic: conceptual
5-
ms.date: 10/15/2019
5+
ms.date: 8/19/2022
66
ms.devlang: python
77
ms.custom: devx-track-python
88
ms.reviewer: mmcc
@@ -42,6 +42,7 @@ First, instrument your Python application with latest [OpenCensus Python SDK](./
4242
}
4343
```
4444

45+
You can find a Django sample application in the sample Azure Monitor OpenCensus Python samples repository located [here](https://github.com/givenscj/azure-monitor-opencensus-python/tree/master/azure_monitor/django_sample).
4546
## Tracking Flask applications
4647

4748
1. Download and install `opencensus-ext-flask` from [PyPI](https://pypi.org/project/opencensus-ext-flask/) and instrument your application with the `flask` middleware. Incoming requests sent to your `flask` application will be tracked.
@@ -86,6 +87,8 @@ First, instrument your Python application with latest [OpenCensus Python SDK](./
8687
> [!NOTE]
8788
> To run Flask under uWSGI in a Docker environment, you must first add `lazy-apps = true` to the uWSGI configuration file (uwsgi.ini). For more information, see the [issue description](https://github.com/census-instrumentation/opencensus-python/issues/660).
8889

90+
You can find a Flask sample application that tracks requests in the Azure Monitor OpenCensus Python samples repository located [here](https://github.com/Azure-Samples/azure-monitor-opencensus-python/tree/master/azure_monitor/flask_sample).
91+
8992
## Tracking Pyramid applications
9093

9194
1. Download and install `opencensus-ext-django` from [PyPI](https://pypi.org/project/opencensus-ext-pyramid/) and instrument your application with the `pyramid` tween. Incoming requests sent to your `pyramid` application will be tracked.

articles/azure-monitor/app/opencensus-python.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Monitor Python applications with Azure Monitor | Microsoft Docs
33
description: Provides instructions to wire up OpenCensus Python with Azure Monitor
44
ms.topic: conceptual
5-
ms.date: 10/12/2021
5+
ms.date: 8/19/2022
66
ms.devlang: python
77
ms.custom: devx-track-python
88
ms.reviewer: mmcc
@@ -24,8 +24,6 @@ You may have noted that OpenCensus is converging into [OpenTelemetry](https://op
2424
## Prerequisites
2525

2626
- An Azure subscription. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
27-
- Python installation. This article uses [Python 3.7.0](https://www.python.org/downloads/release/python-370/), although other versions will likely work with minor changes. The Opencensus Python SDK only supports Python v2.7 and v3.4+.
28-
- Create an Application Insights [resource](./create-new-resource.md). You'll be assigned your own instrumentation key (ikey) for your resource.
2927

3028
[!INCLUDE [azure-monitor-log-analytics-rebrand](../../../includes/azure-monitor-instrumentation-key-deprecation.md)]
3129

@@ -41,10 +39,7 @@ Install the OpenCensus Azure Monitor exporters:
4139
python -m pip install opencensus-ext-azure
4240
```
4341

44-
> [!NOTE]
45-
> The `python -m pip install opencensus-ext-azure` command assumes that you have a `PATH` environment variable set for your Python installation. If you haven't configured this variable, you need to give the full directory path to where your Python executable is located. The result is a command like this: `C:\Users\Administrator\AppData\Local\Programs\Python\Python37-32\python.exe -m pip install opencensus-ext-azure`.
46-
47-
The SDK uses three Azure Monitor exporters to send different types of telemetry to Azure Monitor. They're trace, metrics, and logs. For more information on these telemetry types, see [the data platform overview](../data-platform.md). Use the following instructions to send these telemetry types via the three exporters.
42+
The SDK uses three Azure Monitor exporters to send different types of telemetry to Azure Monitor. They are `trace`, `metrics`, and `logs`. For more information on these telemetry types, see [the data platform overview](../data-platform.md). Use the following instructions to send these telemetry types via the three exporters.
4843

4944
## Telemetry type mappings
5045

@@ -118,7 +113,7 @@ Here are the exporters that OpenCensus provides mapped to the types of telemetry
118113
main()
119114
```
120115

121-
1. The exporter sends log data to Azure Monitor. You can find the data under `traces`.
116+
1. The exporter sends log data to Azure Monitor. You can find the data under `traces`.
122117

123118
> [!NOTE]
124119
> In this context, `traces` isn't the same as `tracing`. Here, `traces` refers to the type of telemetry that you'll see in Azure Monitor when you utilize `AzureLogHandler`. But `tracing` refers to a concept in OpenCensus and relates to [distributed tracing](./distributed-tracing.md).
@@ -560,7 +555,7 @@ For more detailed information about how to use queries and logs, see [Logs in Az
560555
* [Customization](https://github.com/census-instrumentation/opencensus-python/blob/master/README.rst#customization)
561556
* [Azure Monitor Exporters on GitHub](https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-azure)
562557
* [OpenCensus Integrations](https://github.com/census-instrumentation/opencensus-python#extensions)
563-
* [Azure Monitor Sample Applications](https://github.com/Azure-Samples/azure-monitor-opencensus-python)
558+
* [Azure Monitor Sample Applications](https://github.com/Azure-Samples/azure-monitor-opencensus-python/tree/master/azure_monitor)
564559

565560
## Next steps
566561

0 commit comments

Comments
 (0)