Skip to content

Commit 6c3e5f1

Browse files
authored
Merge pull request #228717 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents ba0b6f7 + 407de24 commit 6c3e5f1

File tree

6 files changed

+26
-38
lines changed

6 files changed

+26
-38
lines changed

articles/aks/command-invoke.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.date: 1/14/2022
77

88
# Use `command invoke` to access a private Azure Kubernetes Service (AKS) cluster
99

10-
Accessing a private AKS cluster requires that you connect to that cluster either from the cluster virtual network, from a peered network, or via a configured private endpoint. These approaches require configuring a VPN, Express Route, deploying a *jumpbox* within the cluster virtual network, or creating a private endpoint inside of another virtual network. Alternatively, you can use `command invoke` to access private clusters without having to configure a VPN or Express Route. Using `command invoke` allows you to remotely invoke commands like `kubectl` and `helm` on your private cluster through the Azure API without directly connecting to the cluster. Permissions for using `command invoke` are controlled through the `Microsoft.ContainerService/managedClusters/runcommand/action` and `Microsoft.ContainerService/managedclusters/commandResults/read` roles.
10+
Accessing a private AKS cluster requires that you connect to that cluster either from the cluster virtual network, from a peered network, or via a configured private endpoint. These approaches require configuring a VPN, Express Route, deploying a *jumpbox* within the cluster virtual network, or creating a private endpoint inside of another virtual network. Alternatively, you can use `command invoke` to access private clusters without having to configure a VPN or Express Route. Using `command invoke` allows you to remotely invoke commands like `kubectl` and `helm` on your private cluster through the Azure API without directly connecting to the cluster. Permissions for using `command invoke` are controlled through the `Microsoft.ContainerService/managedClusters/runcommand/action` and `Microsoft.ContainerService/managedclusters/commandResults/read` actions.
1111

1212
## Prerequisites
1313

articles/aks/workload-identity-migrate-from-pod-identity.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ If your application is using managed identity and still relies on IMDS to get an
120120
To update or deploy the workload, add these pod annotations only if you want to use the migration sidecar. You inject the following [annotation][pod-annotations] values to use the sidecar in your pod specification:
121121

122122
* `azure.workload.identity/inject-proxy-sidecar` - value is `true` or `false`
123-
* `azure.workload.identity/proxy-sidecar-port` - value is the desired port for the proxy sidecar. The default value is `8080`.
123+
* `azure.workload.identity/proxy-sidecar-port` - value is the desired port for the proxy sidecar. The default value is `8000`.
124124

125125
When a pod with the above annotations is created, the Azure Workload Identity mutating webhook automatically injects the init-container and proxy sidecar to the pod spec.
126126

@@ -148,7 +148,7 @@ spec:
148148
runAsUser: 0
149149
env:
150150
- name: PROXY_PORT
151-
value: "8080"
151+
value: "8000"
152152
containers:
153153
- name: nginx
154154
image: nginx:alpine
@@ -157,7 +157,7 @@ spec:
157157
- name: proxy
158158
image: mcr.microsoft.com/oss/azure/workload-identity/proxy:v0.13.0
159159
ports:
160-
- containerPort: 8080
160+
- containerPort: 8000
161161
```
162162
163163
This configuration applies to any configuration where a pod is being created. After updating or deploying your application, you can verify the pod is in a running state using the [kubectl describe pod][kubectl-describe] command. Replace the value `podName` with the image name of your deployed pod.
@@ -210,4 +210,4 @@ This article showed you how to set up your pod to authenticate using a workload
210210

211211
<!-- EXTERNAL LINKS -->
212212
[kubectl-describe]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#describe
213-
[kubelet-logs]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#logs
213+
[kubelet-logs]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#logs

articles/azure-monitor/app/statsbeat.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ Statsbeat supports EU Data Boundary for Application Insights resources in the fo
4646
| Sweden | Sweden Central |
4747
| Switzerland | Switzerland North |
4848
| Switzerland | Switzerland West |
49-
49+
| United Kingdom | United Kingdom South |
50+
| United Kingdom | United Kingdom West |
5051

5152
#### [Node](#tab/eu-node)
5253

@@ -63,7 +64,9 @@ Statsbeat supports EU Data Boundary for Application Insights resources in the fo
6364
| Norway | Norway West |
6465
| Sweden | Sweden Central |
6566
| Switzerland | Switzerland North |
66-
| Switzerland | Switzerland West |
67+
| Switzerland | Switzerland West |
68+
| United Kingdom | United Kingdom South |
69+
| United Kingdom | United Kingdom West |
6770

6871
#### [Python](#tab/eu-python)
6972

@@ -80,7 +83,9 @@ Statsbeat supports EU Data Boundary for Application Insights resources in the fo
8083
| Norway | Norway West |
8184
| Sweden | Sweden Central |
8285
| Switzerland | Switzerland North |
83-
| Switzerland | Switzerland West |
86+
| Switzerland | Switzerland West |
87+
| United Kingdom | United Kingdom South |
88+
| United Kingdom | United Kingdom West |
8489

8590

8691
---

articles/container-registry/monitor-service.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ When you have critical applications and business processes relying on Azure reso
1515

1616
## Monitor overview
1717

18-
The **Overview** page in the Azure portal for each registry includes a brief view of recent resource usage and activity, such as push and pull operations. This high-level information is useful, but only a small amount of data is shown there.
18+
The **Overview** page in the Azure portal for each registry includes a brief view of recent resource usage and activity, such as push and pull operations. This high-level information is useful, but only a small amount of data is shown there.
1919

20-
:::image type="content" source="media/monitor-service/metrics-overview.png" alt-text="Registry metrics overview":::
20+
:::image type="content" source="media/monitor-service/metrics-overview.png" alt-text="Registry metrics overview":::
2121

2222
## What is Azure Monitor?
2323

@@ -33,9 +33,9 @@ Start with the article [Monitoring Azure resources with Azure Monitor](../azure-
3333

3434
The following sections build on this article by describing the specific data gathered for Azure Container Registry and providing examples for configuring data collection and analyzing this data with Azure tools.
3535

36-
## Monitoring data
36+
## Monitoring data
3737

38-
Azure Container Registry collects the same kinds of monitoring data as other Azure resources that are described in [Monitoring data from Azure resources](../azure-monitor/essentials/monitor-azure-resource.md#monitoring-data).
38+
Azure Container Registry collects the same kinds of monitoring data as other Azure resources that are described in [Monitoring data from Azure resources](../azure-monitor/essentials/monitor-azure-resource.md#monitoring-data).
3939

4040
See [Monitoring Azure Container Registry data reference](monitor-service-reference.md) for detailed information on the metrics and logs created by Azure Container Registry.
4141

@@ -56,12 +56,12 @@ The following image shows the options when you enable diagnostic settings for a
5656

5757
The metrics and logs you can collect are discussed in the following sections.
5858

59-
## Analyzing metrics (preview)
59+
## Analyzing metrics
6060

61-
You can analyze metrics for an Azure container registry with metrics from other Azure services using metrics explorer by opening **Metrics** from the **Azure Monitor** menu. See [Getting started with Azure Metrics Explorer](../azure-monitor/essentials/metrics-getting-started.md) for details on using this tool.
61+
You can analyze metrics for an Azure container registry with metrics from other Azure services using metrics explorer by opening **Metrics** from the **Azure Monitor** menu. See [Getting started with Azure Metrics Explorer](../azure-monitor/essentials/metrics-getting-started.md) for details on using this tool.
6262

6363
> [!TIP]
64-
> You can also go to the metrics explorer by navigating to your registry in the portal. In the menu, select **Metrics (preview)** under **Monitoring**.
64+
> You can also go to the metrics explorer by navigating to your registry in the portal. In the menu, select **Metrics** under **Monitoring**.
6565
6666
For a list of the platform metrics collected for Azure Container Registry, see [Monitoring Azure Container Registry data reference metrics](monitor-service-reference.md#metrics)
6767

@@ -74,7 +74,7 @@ The following Azure CLI commands can be used to get information about the Azure
7474
* [az monitor metrics list-definitions](/cli/azure/monitor/metrics#az-monitor-metrics-list-definitions) - List metric definitions and dimensions
7575
* [az monitor metrics list](/cli/azure/monitor/metrics#az-monitor-metrics-list) - Retrieve metric values
7676

77-
### REST API
77+
### REST API
7878

7979
You can use the Azure Monitor REST API to get information programmatically about the Azure Container Registry metrics.
8080

@@ -109,7 +109,7 @@ The following image shows sample output:
109109

110110
:::image type="content" source="media/monitor-service/azure-monitor-query.png" alt-text="Query log data":::
111111

112-
Following are queries that you can use to help you monitor your registry resource.
112+
Following are queries that you can use to help you monitor your registry resource.
113113

114114
### Error events from the last hour
115115

@@ -161,12 +161,10 @@ ContainerRegistryLoginEvents
161161
| project TimeGenerated, Identity, CallerIpAddress, ResultDescription
162162
```
163163

164-
165164
## Alerts
166165

167166
Azure Monitor alerts proactively notify you when important conditions are found in your monitoring data. They allow you to identify and address issues in your system before your customers notice them. You can set alerts on [metrics](../azure-monitor/alerts/alerts-metric-overview.md), [logs](../azure-monitor/alerts/alerts-unified-log.md), and the [activity log](../azure-monitor/alerts/activity-log-alerts.md). Different types of alerts have benefits and drawbacks.
168167

169-
170168
<!-- only include next line if applications run on your service and work with App Insights.
171169
172170
If you are creating or running an application which run on <*service*> [Azure Monitor Application Insights](../azure-monitor/overview.md#application-insights) may offer additional types of alerts.
@@ -183,7 +181,7 @@ The following table lists common and recommended alert rules for Azure Container
183181
### Example: Send email alert when registry storage used exceeds a value
184182

185183
1. In the Azure portal, navigate to your registry.
186-
1. Select **Metrics (preview)** under **Monitoring**.
184+
1. Select **Metrics** under **Monitoring**.
187185
1. In the metrics explorer, in **Metric**, select **Storage used**.
188186
1. Select **New alert rule**.
189187
1. In **Scope**, confirm the registry resource for which you want to create an alert rule.
@@ -202,4 +200,4 @@ The following table lists common and recommended alert rules for Azure Container
202200

203201
- See [Monitoring Azure Container Registry data reference](monitor-service-reference.md) for a reference of the metrics, logs, and other important values created by Azure Container Registry.
204202
- See [Monitoring Azure resources with Azure Monitor](../azure-monitor/essentials/monitor-azure-resource.md) for details on monitoring Azure resources.
205-
- See [Show registry usage](container-registry-skus.md#show-registry-usage) for information about how to get a snapshot of storage usage and other resource consumption in your registry.
203+
- See [Show registry usage](container-registry-skus.md#show-registry-usage) for information about how to get a snapshot of storage usage and other resource consumption in your registry.

articles/load-balancer/components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Basic load balancer doesn't support outbound rules.
120120
- Outbound flow from a backend VM to a frontend of an internal Load Balancer will fail.
121121
- A load balancer rule cannot span two virtual networks. All load balancer frontends and their backend instances must be in a single virtual network.
122122
- Forwarding IP fragments isn't supported on load-balancing rules. IP fragmentation of UDP and TCP packets isn't supported on load-balancing rules.
123-
- You can only have 1 Public Load Balancer and 1 internal Load Balancer per availability set
123+
- You can only have 1 Public Load Balancer (NIC based) and 1 internal Load Balancer (NIC based) per availability set. However, this constraint doesn't apply to IP-based load balancers.
124124

125125
## Next steps
126126

articles/logic-apps/logic-apps-gateway-install.md

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,7 @@ For information about how to use the gateway with these services, see these arti
4444

4545
* Later in the Azure portal, you need to use the same Azure account to create an Azure gateway resource that's associated with your gateway installation. You can link only one gateway installation and one Azure gateway resource to each other. However, you can use your Azure account to set up different gateway installations that are each associated with an Azure gateway resource. Your logic app workflows can then use these gateway resources in triggers and actions that can access on-premises data sources.
4646

47-
* Local computer requirements:
48-
49-
**Minimum requirements**
50-
51-
* .NET Framework 4.8
52-
* 64-bit version of Windows 7 or Windows Server 2008 R2 (or later)
53-
54-
**Recommended requirements**
55-
56-
* An eight-core CPU
57-
* 8 GB of memory
58-
* 64-bit version of Windows Server 2012 R2 or later
59-
* Solid-state drive (SSD) storage for spooling
60-
61-
> [!NOTE]
62-
> The gateway doesn't support Windows Server Core.
47+
* For local computer operating system and hardware requirements, see the [main guide for how to install the on-premises data gateway](/data-integration/gateway/service-gateway-install).
6348

6449
* Related considerations:
6550

0 commit comments

Comments
 (0)