Skip to content

Commit e535817

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into fixGrammer
2 parents ad1f552 + e9e1b9a commit e535817

22 files changed

+119
-142
lines changed

articles/aks/cluster-container-registry-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.devlang: azurecli
1212

1313
You need to establish an authentication mechanism when using [Azure Container Registry (ACR)][acr-intro] with Azure Kubernetes Service (AKS). This operation is implemented as part of the Azure CLI, Azure PowerShell, and Azure portal experiences by granting the required permissions to your ACR. This article provides examples for configuring authentication between these Azure services.
1414

15-
You can set up the AKS to ACR integration in a few steps using the Azure CLI, Azure PowerShell, or Azure portal. The AKS to ACR integration assigns the [**AcrPull** role][acr-pull] to the [Azure Active Directory (Azure AD) **managed identity**][aad-identity] associated with your AKS cluster.
15+
You can set up the AKS to ACR integration using the Azure CLI or Azure PowerShell. The AKS to ACR integration assigns the [**AcrPull** role][acr-pull] to the [Azure Active Directory (Azure AD) **managed identity**][aad-identity] associated with your AKS cluster.
1616

1717
> [!NOTE]
1818
> This article covers automatic authentication between AKS and ACR. If you need to pull an image from a private external registry, use an [image pull secret][image-pull-secret].

articles/aks/use-mariner.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to use the Mariner container host on Azure Kubernetes Ser
55
services: container-service
66
ms.topic: article
77
ms.custom: ignite-2022
8-
ms.date: 09/22/2022
8+
ms.date: 11/17/2022
99
---
1010

1111
# Use the Mariner container host on Azure Kubernetes Service (AKS)
@@ -52,7 +52,7 @@ Mariner currently has the following limitations:
5252
* Mariner does not yet have image SKUs for GPU, ARM64, SGX, or FIPS.
5353
* Mariner does not yet have FedRAMP, FIPS, or CIS certification.
5454
* Mariner cannot yet be deployed through Azure portal or Terraform.
55-
* Qualys and Trivy are the only vulnerability scanning tools that support Mariner today.
55+
* Qualys, Trivy, and Microsoft Defender for Containers are the only vulnerability scanning tools that support Mariner today.
5656
* The Mariner container host is a Gen 2 image. Mariner does not plan to offer a Gen 1 SKU.
5757
* Node configurations are not yet supported.
5858
* Mariner is not yet supported in GitHub actions.

articles/azure-monitor/app/app-map.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ Filters can be reused in two ways:
400400
later time may be different from the one observed when the link was
401401
created.
402402

403-
- The dashboard pin :::image type="content" source="media/app-map/image-10.png" alt-text="A screenshot displaying the dashboard pin button."::: is located next to the title bar of the Application Map blade. This button pins the map to a dashboard, along with the filters applied to it. This action can be useful for filters that are frequently interesting. As an example, the user can pin a map with "Error connector" filter applied to it, and the dashboard view will only show nodes that have errors in their HTTP calls.
403+
- The dashboard pin :::image type="content" source="media/app-map/image-10.png" alt-text="A screenshot displaying the dashboard pin button."::: is located next to the title bar of the Application Map pane. This button pins the map to a dashboard, along with the filters applied to it. This action can be useful for filters that are frequently interesting. As an example, the user can pin a map with "Error connector" filter applied to it, and the dashboard view will only show nodes that have errors in their HTTP calls.
404404

405405
#### Filter usage scenarios
406406

articles/azure-monitor/app/java-2x-collectd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Restart collectd according to its [manual](https://collectd.org/wiki/index.php/F
8888
## View the data in Application Insights
8989
In your Application Insights resource, open [Metrics and add charts][metrics], selecting the metrics you want to see from the Custom category.
9090

91-
By default, the metrics are aggregated across all host machines from which the metrics were collected. To view the metrics per host, in the Chart details blade, turn on Grouping and then choose to group by CollectD-Host.
91+
By default, the metrics are aggregated across all host machines from which the metrics were collected. To view the metrics per host, in the Chart details pane, turn on Grouping and then choose to group by CollectD-Host.
9292

9393
## To exclude upload of specific statistics
9494
By default, the Application Insights plugin sends all the data collected by all the enabled collectd 'read' plugins.

articles/azure-monitor/app/java-2x-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Either run it in debug mode on your development machine, or publish to your serv
151151
## View your telemetry in Application Insights
152152
Return to your Application Insights resource in [Microsoft Azure portal](https://portal.azure.com).
153153

154-
HTTP requests data appears on the overview blade. (If it isn't there, wait a few seconds and then click Refresh.)
154+
HTTP requests data appears on the overview pane. (If it isn't there, wait a few seconds and then click Refresh.)
155155

156156
![Screenshot of overview sample data](./media/java-get-started/overview-graphs.png)
157157

articles/azure-monitor/app/java-2x-trace-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ To start getting traces, merge the relevant snippet of code to the Log4J or Logb
188188
The Application Insights appenders can be referenced by any configured logger, and not necessarily by the root logger (as shown in the code samples above).
189189

190190
## Explore your traces in the Application Insights portal
191-
Now that you've configured your project to send traces to Application Insights, you can view and search these traces in the Application Insights portal, in the [Search][diagnostic] blade.
191+
Now that you've configured your project to send traces to Application Insights, you can view and search these traces in the Application Insights portal, in the [Search][diagnostic] pane.
192192

193193
Exceptions submitted via loggers will be displayed on the portal as Exception Telemetry.
194194

articles/azure-monitor/app/java-standalone-profiler.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The Application Insights Java profiler uses the JFR profiler provided by the JVM
2424

2525
This data is gathered on demand when trigger conditions are met. The available triggers are thresholds over CPU usage and Memory consumption.
2626

27-
When a threshold is reached, a profile of the configured type and duration is gathered and uploaded. This profile is then visible within the performance blade of the associated Application Insights Portal UI.
27+
When a threshold is reached, a profile of the configured type and duration is gathered and uploaded. This profile is then visible within the performance pane of the associated Application Insights Portal UI.
2828

2929
> [!WARNING]
3030
> The JFR profiler by default executes the "profile-without-env-data" profile. A JFR file is a series of events emitted by the JVM. The "profile-without-env-data" configuration, is similar to the "profile" configuration that ships with the JVM, however has had some events disabled that have the potential to contain sensitive deployment information such as environment variables, arguments provided to the JVM and processes running on the system.
@@ -93,8 +93,8 @@ The following steps will guide you through enabling the profiling component on t
9393
1. Configure the resource thresholds that will cause a profile to be collected:
9494

9595
1. Browse to the Performance -> Profiler section of the Application Insights instance.
96-
:::image type="content" source="./media/java-standalone-profiler/performance-blade.png" alt-text="Screenshot of the link to open performance blade." lightbox="media/java-standalone-profiler/performance-blade.png":::
97-
:::image type="content" source="./media/java-standalone-profiler/profiler-button.png" alt-text="Screenshot of the Profiler button from the Performance blade." lightbox="media/java-standalone-profiler/profiler-button.png":::
96+
:::image type="content" source="./media/java-standalone-profiler/performance-blade.png" alt-text="Screenshot of the link to open performance pane." lightbox="media/java-standalone-profiler/performance-blade.png":::
97+
:::image type="content" source="./media/java-standalone-profiler/profiler-button.png" alt-text="Screenshot of the Profiler button from the Performance pane." lightbox="media/java-standalone-profiler/profiler-button.png":::
9898

9999
2. Select "Triggers"
100100

articles/azure-monitor/app/monitor-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The end-to-end diagnostics and the application map provide visibility into one s
2929

3030
### How to enable distributed tracing for Java Function apps
3131

32-
Navigate to the functions app Overview blade and go to configurations. Under Application Settings, click "+ New application setting".
32+
Navigate to the functions app Overview pane and go to configurations. Under Application Settings, click "+ New application setting".
3333

3434
> [!div class="mx-imgBorder"]
3535
> ![Under Settings, add new application settings](./media//functions/create-new-setting.png)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ for i in range(100):
471471
---
472472

473473
> [!TIP]
474-
> If you're not sure where to set the sampling rate, start at 5% (i.e., 0.05 sampling ratio) and adjust the rate based on the accuracy of the operations shown in the failures and performance blades. A higher rate generally results in higher accuracy. However, ANY sampling will affect accuracy so we recommend alerting on [OpenTelemetry metrics](#metrics), which are unaffected by sampling.
474+
> If you're not sure where to set the sampling rate, start at 5% (i.e., 0.05 sampling ratio) and adjust the rate based on the accuracy of the operations shown in the failures and performance panes. A higher rate generally results in higher accuracy. However, ANY sampling will affect accuracy so we recommend alerting on [OpenTelemetry metrics](#metrics), which are unaffected by sampling.
475475
476476
## Instrumentation libraries
477477

articles/azure-monitor/app/pre-aggregated-metrics-log-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This article explains the difference between "traditional" Application Insights
1212

1313
## Log-based Metrics
1414

15-
In the past, the application monitoring telemetry data model in Application Insights was solely based on a small number of predefined types of events, such as requests, exceptions, dependency calls, page views, etc. Developers can use the SDK to either emit these events manually (by writing code that explicitly invokes the SDK) or they can rely on the automatic collection of events from auto-instrumentation. In either case, the Application Insights backend stores all collected events as logs, and the Application Insights blades in the Azure portal act as an analytical and diagnostic tool for visualizing event-based data from logs.
15+
In the past, the application monitoring telemetry data model in Application Insights was solely based on a small number of predefined types of events, such as requests, exceptions, dependency calls, page views, etc. Developers can use the SDK to either emit these events manually (by writing code that explicitly invokes the SDK) or they can rely on the automatic collection of events from auto-instrumentation. In either case, the Application Insights backend stores all collected events as logs, and the Application Insights panes in the Azure portal act as an analytical and diagnostic tool for visualizing event-based data from logs.
1616

1717
Using logs to retain a complete set of events can bring great analytical and diagnostic value. For example, you can get an exact count of requests to a particular URL with the number of distinct users who made these calls. Or you can get detailed diagnostic traces, including exceptions and dependency calls for any user session. Having this type of information can significantly improve visibility into the application health and usage, allowing to cut down the time necessary to diagnose issues with an app.
1818

0 commit comments

Comments
 (0)