Skip to content

Commit cf56019

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-roles-directory-writers-description
2 parents a50444c + bd7ab0e commit cf56019

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

articles/azure-monitor/essentials/azure-monitor-workspace-overview.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ The following table lists the contents of Azure Monitor workspaces. This table w
2222

2323

2424
## Workspace design
25-
A single Azure Monitor workspace can collect data from multiple sources, but there may be circumstances where you require multiple workspaces to address your particular business requirements. Azure Monitor workspace design is similar to [Log Analytics workspace design](../logs/workspace-design.md). There are several reasons that you may consider creating additional workspaces including the following.
25+
A single Azure Monitor workspace can collect data from multiple sources, but there may be circumstances where you require multiple workspaces to address your particular business requirements. Azure Monitor workspace design is similar to [Log Analytics workspace design](../logs/workspace-design.md), and you choose to match that design. Since Azure Monitor workspaces currently only contain Prometheus metrics, and metric data is typically not as sensitive as log data, you may choose to further consolidate your Azure Monitor workspaces for simplicity.
26+
27+
There are several reasons that you may consider creating additional workspaces including the following.
2628

2729
- Azure tenants. If you have multiple Azure tenants, you'll usually create a workspace in each because several data sources can only send monitoring data to a workspace in the same Azure tenant.
2830
- Azure regions. Each workspace resides in a particular Azure region, and you may have regulatory or compliance requirements to store data in particular locations.
@@ -33,11 +35,11 @@ A single Azure Monitor workspace can collect data from multiple sources, but the
3335
> [!NOTE]
3436
> You cannot currently query across multiple Azure Monitor workspaces.
3537
36-
## Workspace limits
37-
These are currently only related to Prometheus metrics, since this is the only data currently stored in Azure Monitor workspaces.
38-
39-
Many customers will choose an Azure Monitor workspace design to match their Log Analytics workspace design. Since Azure Monitor workspaces currently only contain Prometheus metrics, and metric data is typically not as sensitive as log data, you may choose to further consolidate your Azure Monitor workspaces for simplicity.
4038

39+
## Limitations
40+
See [Azure Monitor service limits](../service-limits.md#prometheus-metrics) for performance related service limits for Azure Monitor managed service for Prometheus.
41+
- Private Links aren't supported for Prometheus metrics collection into Azure monitor workspace.
42+
- Azure monitor workspaces are currently only supported in public clouds.
4143

4244

4345
## Create an Azure Monitor workspace

articles/data-factory/continuous-integration-delivery-improvements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Two commands are currently available in the package:
7777

7878
### Export ARM template
7979

80-
Run `npm run build export <rootFolder> <factoryId> [outputFolder]` to export the ARM template by using the resources of a given folder. This command also runs a validation check prior to generating the ARM template. Here's an example:
80+
Run `npm run build export <rootFolder> <factoryId> [outputFolder]` to export the ARM template by using the resources of a given folder. This command also runs a validation check prior to generating the ARM template. Here's an example using a resource group named **testResourceGroup**:
8181

8282
```dos
8383
npm run build export C:\DataFactories\DevDataFactory /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testResourceGroup/providers/Microsoft.DataFactory/factories/DevDataFactory ArmTemplateOutput

0 commit comments

Comments
 (0)