Skip to content

Commit aea2533

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into DICOMedits_29Aug24
2 parents 979678b + c4fd466 commit aea2533

File tree

49 files changed

+717
-355
lines changed

Some content is hidden

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

49 files changed

+717
-355
lines changed

articles/app-service/configure-ssl-certificate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,13 @@ The free certificate comes with the following limitations:
8282

8383
### [Apex domain](#tab/apex)
8484
- Must have an A record pointing to your web app's IP address.
85-
- Isn't supported on apps that aren't publicly accessible.
85+
- Must be on apps that are publicly accessible.
8686
- Isn't supported with root domains that are integrated with Traffic Manager.
8787
- Must meet all the above for successful certificate issuances and renewals.
8888

8989
### [Subdomain](#tab/subdomain)
9090
- Must have CNAME mapped _directly_ to `<app-name>.azurewebsites.net` or [trafficmanager.net](configure-domain-traffic-manager.md#enable-custom-domain). Mapping to an intermediate CNAME value blocks certificate issuance and renewal.
91+
- Must be on apps that are publicly accessible.
9192
- Must meet all the above for successful certificate issuance and renewals.
9293

9394
---

articles/azure-maps/how-to-use-map-control.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ For a list of supported languages and regional views, see [Localization support
238238

239239
Beginning with Azure Maps Web SDK 3.0, the Web SDK includes full compatibility with [WebGL 2], a powerful graphics technology that enables hardware-accelerated rendering in modern web browsers. By using WebGL 2, developers can harness the capabilities of modern GPUs to render complex maps and visualizations more efficiently, resulting in improved performance and visual quality.
240240

241-
![Map image showing WebGL 2 Compatibility.](./media/how-to-use-map-control/webgl-2-compatability.png)
241+
:::image type="content" source="./media/how-to-use-map-control/webgl-2-compatability.png" alt-text="Screenshot of a map image showing WebGL 2 Compatibility." lightbox="./media/how-to-use-map-control/webgl-2-compatability.png":::
242242

243243
```html
244244
<!DOCTYPE html>
@@ -249,7 +249,7 @@ Beginning with Azure Maps Web SDK 3.0, the Web SDK includes full compatibility w
249249
<title>WebGL2 - Azure Maps Web SDK Samples</title>
250250
<link href=https://atlas.microsoft.com/sdk/javascript/mapcontrol/3/atlas.min.css rel="stylesheet"/>
251251
<script src=https://atlas.microsoft.com/sdk/javascript/mapcontrol/3/atlas.min.js></script>
252-
<script src="https://unpkg.com/deck.gl@latest/dist.min.js"></script>
252+
<script src="https://unpkg.com/deck.gl@^8/dist.min.js"></script>
253253
<style>
254254
html,
255255
body {
-633 KB
Loading
858 KB
Loading
-335 KB
Loading
153 KB
Loading

articles/azure-monitor/app/azure-ad-authentication.md

Lines changed: 75 additions & 72 deletions
Large diffs are not rendered by default.

articles/azure-monitor/app/opentelemetry-enable.md

Lines changed: 154 additions & 161 deletions
Large diffs are not rendered by default.

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ms.devlang: python
77
ms.custom: devx-track-python
88
ms.reviewer: mmcc
99
---
10+
1011
# Migrating from OpenCensus Python SDK and Azure Monitor OpenCensus exporter for Python to Azure Monitor OpenTelemetry Python Distro
1112

1213
> [!NOTE]
@@ -15,9 +16,9 @@ ms.reviewer: mmcc
1516
Follow these steps to migrate Python applications to the [Azure Monitor](../overview.md) [Application Insights](./app-insights-overview.md) [OpenTelemetry Distro](./opentelemetry-enable.md?tabs=python).
1617

1718
> [!WARNING]
18-
> - The [OpenCensus "How to Migrate to OpenTelemetry" blog](https://opentelemetry.io/blog/2023/sunsetting-opencensus/#how-to-migrate-to-opentelemetry) is not applicable to Azure Monitor users.
19-
> - The [OpenTelemetry OpenCensus shim](https://pypi.org/project/opentelemetry-opencensus-shim/) is not recommended or supported by Microsoft.
20-
> - The following outlines the only migration plan for Azure Monitor customers.
19+
> * The [OpenCensus "How to Migrate to OpenTelemetry" blog](https://opentelemetry.io/blog/2023/sunsetting-opencensus/#how-to-migrate-to-opentelemetry) is not applicable to Azure Monitor users.
20+
> * The [OpenTelemetry OpenCensus shim](https://pypi.org/project/opentelemetry-opencensus-shim/) is not recommended or supported by Microsoft.
21+
> * The following outlines the only migration plan for Azure Monitor customers.
2122
2223
## Step 1: Uninstall OpenCensus libraries
2324

@@ -51,15 +52,15 @@ from opencensus.ext.azure.log_exporter import AzureLogHandler
5152

5253
The following documentation provides prerequisite knowledge of the OpenTelemetry Python APIs/SDKs.
5354

54-
- OpenTelemetry Python [documentation](https://opentelemetry-python.readthedocs.io/en/stable/)
55-
- Azure Monitor Distro documentation on [configuration](./opentelemetry-configuration.md?tabs=python) and [telemetry](./opentelemetry-add-modify.md?tabs=python)
55+
* OpenTelemetry Python [documentation](https://opentelemetry-python.readthedocs.io/en/stable/)
56+
* Azure Monitor Distro documentation on [configuration](./opentelemetry-configuration.md?tabs=python) and [telemetry](./opentelemetry-add-modify.md?tabs=python)
5657

5758
> [!NOTE]
5859
> OpenTelemetry Python and OpenCensus Python have different API surfaces, autocollection capabilities, and onboarding instructions.
5960
6061
## Step 4: Set up the Azure Monitor OpenTelemetry Distro
6162

62-
Follow the [getting started](./opentelemetry-enable.md?tabs=python#get-started)
63+
Follow the [getting started](./opentelemetry-enable.md?tabs=python#enable-opentelemetry-with-application-insights)
6364
page to onboard onto the Azure Monitor OpenTelemetry Distro.
6465

6566
## Changes and limitations
@@ -74,11 +75,11 @@ OpenTelemetry's Python-based monitoring solutions only support Python 3.7 and gr
7475

7576
OpenCensus Python provided some [configuration](https://github.com/census-instrumentation/opencensus-python#customization) options related to the collection and exporting of telemetry. You achieve the same configurations, and more, by using the [OpenTelemetry Python](https://opentelemetry-python.readthedocs.io/en/stable/) APIs and SDK. The OpenTelemetry Azure monitor Python Distro is more of a one-stop-shop for the most common monitoring needs for your Python applications. Since the Distro encapsulates the OpenTelemetry APIs/SDk, some configuration for more uncommon use cases may not currently be supported for the Distro. Instead, you can opt to onboard onto the [Azure monitor OpenTelemetry exporter](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-opentelemetry-exporter), which, with the OpenTelemetry APIs/SDKs, should be able to fit your monitoring needs. Some of these configurations include:
7677

77-
- Custom propagators
78-
- Custom samplers
79-
- Adding extra span/log processors/metrics readers
78+
* Custom propagators
79+
* Custom samplers
80+
* Adding extra span/log processors/metrics readers
8081

81-
### Cohesion with Azure functions
82+
### Cohesion with Azure Functions
8283

8384
In order to provide distributed tracing capabilities for Python applications that call other Python applications within an Azure function, the package [opencensus-extension-azure-functions](https://pypi.org/project/opencensus-extension-azure-functions/) was provided to allow for a connected distributed graph.
8485

@@ -112,7 +113,7 @@ The OpenCensus SDK offered ways to collect and export telemetry through OpenCens
112113

113114
As for the other OpenTelemetry Python [instrumentations](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation) that aren't included in this list, users may still manually instrument with them. However, it's important to note that stability and behavior aren't guaranteed or supported in those cases. Therefore, use them at your own discretion.
114115

115-
If you would like to suggest a community instrumentation library us to include in our distro, post or up-vote an idea in our [feedback community](https://feedback.azure.com/d365community/forum/3887dc70-2025-ec11-b6e6-000d3a4f09d0). For exporters, the Azure Monitor OpenTelemetry distro comes bundled with the [Azure Monitor OpenTelemetry exporter](https://pypi.org/project/azure-monitor-opentelemetry-exporter/). If you would like to use other exporters as well, you can use them with the distro, like in this [example](./opentelemetry-configuration.md?tabs=python#enable-the-otlp-exporter).
116+
If you would like to suggest a community instrumentation library us to include in our distro, post or up-vote an idea in our [feedback community](https://feedback.azure.com/d365community/forum/3887dc70-2025-ec11-b6e6-000d3a4f09d0). For exporters, the Azure Monitor OpenTelemetry distro comes bundled with the [Azure Monitor OpenTelemetry exporter](https://pypi.org/project/azure-monitor-opentelemetry-exporter/). If you would like to use other exporters as well, you can use them with the distro, like in this [example](./opentelemetry-configuration.md?tabs=python#enable-the-otlp-exporter).
116117

117118
### TelemetryProcessors
118119

articles/azure-monitor/azure-monitor-operations-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The following table describes the different features and strategies that are ava
3131
|:---|:---|
3232
| Dual-homed agents | SCOM uses the Microsoft Management Agent (MMA), which is the same as [Log Analytics agent](agents/log-analytics-agent.md) used by Azure Monitor. You can configure this agent to have a single machine connect to both SCOM and Azure Monitor simultaneously. This configuration does require that your Azure VMs have a connection to your on-premises management servers.<br><br>The [Log Analytics agent](agents/log-analytics-agent.md) has been replaced with the [Azure Monitor agent](agents/agents-overview.md), which provides significant advantages including simpler management and better control over data collection. The two agents can coexist on the same machine allowing you to connect to both Azure Monitor and SCOM. This configuration is a better option than dual-homing the legacy agent because of the significant [advantages of the Azure Monitor agent](agents/agents-overview.md#benefits). |
3333
| Connected management group | [Connect your SCOM management group to Azure Monitor](agents/om-agents.md) to forward data collected from your SCOM agents to Azure Monitor. This is similar to using dual-homed agents, but doesn't require each agent to be configured to connect to Azure Monitor. This strategy requires the legacy agent, so you can't specify monitoring with data collection rules. You also can't use VM insights unless you connect each VM directly to Azure Monitor. |
34-
| SCOM Managed instance | [SCOM managed instance (preview)](vm/scom-managed-instance-overview.md) is a full implementation of SCOM in Azure allowing you to continue running the same management packs that you run in your on-premises SCOM environment. You can continue to use the same Operations console for analyzing your health and alerts and can also view alerts in Azure Monitor and analyze SCOM data in Grafana.<br><br>SCOM MI is similar to maintaining your existing SCOM environment and dual-homing agents, although you can consolidate your monitoring configuration in Azure and retire your on-premises components such as database and management servers. Agents from Azure VMs can connect to the SCOM managed instance in Azure rather than connecting to management servers in your own data center. |
34+
| SCOM Managed instance | [SCOM managed instance](vm/scom-managed-instance-overview.md) is a full implementation of SCOM in Azure allowing you to continue running the same management packs that you run in your on-premises SCOM environment. You can continue to use the same Operations console for analyzing your health and alerts and can also view alerts in Azure Monitor and analyze SCOM data in Grafana.<br><br>SCOM MI is similar to maintaining your existing SCOM environment and dual-homing agents, although you can consolidate your monitoring configuration in Azure and retire your on-premises components such as database and management servers. Agents from Azure VMs can connect to the SCOM managed instance in Azure rather than connecting to management servers in your own data center. |
3535
| Azure management pack | The [Azure management pack](https://www.microsoft.com/download/details.aspx?id=50013) allows Operations Manager to discover Azure resources and monitor their health based on a particular set of monitoring scenarios. This management pack does require you to perform extra configuration for each resource in Azure. It may be helpful though to provide some visibility of your Azure resources in the Operations Console until you evolve your business processes to focus on Azure Monitor. |
3636

3737
## Monitor business applications

0 commit comments

Comments
 (0)