Skip to content

Commit 4349c65

Browse files
authored
Merge pull request #277484 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 cd9abc5 + 31d98be commit 4349c65

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

articles/aks/vertical-pod-autoscaler.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,15 +594,15 @@ To diagnose problems with a VPA installation, perform the following steps.
594594
1. Check if all system components are running using the following command:
595595
596596
```bash
597-
kubectl ---namespace=kube-system get pods|grep vpa
597+
kubectl --namespace=kube-system get pods|grep vpa
598598
```
599599
600600
The output should list three pods - recommender, updater and admission-controller all with the state showing a status of `Running`.
601601
602602
2. Confirm if the system components log any errors. For each of the pods returned by the previous command, run the following command:
603603
604604
```bash
605-
kubectl ---namespace=kube-system logs [pod name] | grep -e '^E[0-9]\{4\}'
605+
kubectl --namespace=kube-system logs [pod name] | grep -e '^E[0-9]\{4\}'
606606
```
607607
608608
3. Confirm that the custom resource definition was created by running the following command:

articles/azure-monitor/agents/data-collection-text-log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ $tableParams = @'
7878
"type": "String"
7979
},
8080
{
81-
"name": `"YourOptionalColumn",
81+
"name": "YourOptionalColumn",
8282
"type": "String"
8383
}
8484
]

articles/firewall/firewall-faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ sections:
172172
answer: |
173173
For Azure Firewall service limits, see [Azure subscription and service limits, quotas, and constraints](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-firewall-limits).
174174
175-
- question: Can Azure Firewall in a hub virtual network forward and filter network traffic between two spoke virtual networks?
176-
answer: Yes, you can use Azure Firewall in a hub virtual network to route and filter traffic between two spoke virtual network. Subnets in each of the spoke virtual networks must have a UDR pointing to the Azure Firewall as a default gateway for this scenario to work properly.
175+
- question: Can Azure Firewall in a hub virtual network forward and filter network traffic between multiple spoke virtual networks?
176+
answer: Yes, you can use Azure Firewall in a hub virtual network to route and filter traffic between multiple spoke virtual network. Subnets in each of the spoke virtual networks must have a UDR pointing to the Azure Firewall as a default gateway for this scenario to work properly.
177177

178178
- question: Can Azure Firewall forward and filter network traffic between subnets in the same virtual network or peered virtual networks?
179179
answer: Yes. However, configuring the UDRs to redirect traffic between subnets in the same VNET requires more attention. While using the VNET address range as a target prefix for the UDR is sufficient, this also routes all traffic from one machine to another machine in the same subnet through the Azure Firewall instance. To avoid this, include a route for the subnet in the UDR with a next hop type of **VNET**. Managing these routes might be cumbersome and prone to error. The recommended method for internal network segmentation is to use Network Security Groups, which don't require UDRs.

articles/lab-services/administrator-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ As you get started with Azure Lab Services, we recommend that you establish nami
124124
| Resource group | Contains one or more lab plans, labs, or compute galleries. | rg-labs-{org-name}-{env}-{instance}, rg-labs-{dept-name}-{env}-{instance} | rg-labs-contoso-pilot, rg-labs--math-prod-001 |
125125
| Lab plan | Template for newly created labs. | lp-{org-name}-{env}-{instance}, lp-{dept-name}-{env}-{instance} | lp-contoso, lp-contoso-pilot, lp-math-001 |
126126
| Lab | Contains student VMs. | {class-name}-{time}-{educator} | CS101-Fall2021, CS101-Fall2021-JohnDoe |
127-
| Azure Compute Gallery | Contains VM image versions. | sig-{org-name}-{env}-{instance}, sig-{dept-name}-{env}-{instance} | sig-contoso-001, sig-math-prod |
127+
| Azure Compute Gallery | Contains VM image versions. | sig_{org-name}\_{env}\_{instance}, sig_{dept-name}\_{env}\_{instance} | sig_contoso_001, sig_math_prod_001 |
128128

129129
In the proceeding table, the suggested name patterns use some terms and tokens:
130130

articles/postgresql/flexible-server/concepts-networking-private-link.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ ms.custom:
1616

1717
**Azure Private Link** allows you to create private endpoints for Azure Database for PostgreSQL flexible server to bring it inside your Virtual Network (virtual network). That functionality is introduced **in addition** to already [existing networking capabilities provided by VNET Integration](./concepts-networking-private.md), which is currently in general availability with Azure Database for PostgreSQL flexible server. With **Private Link**, traffic between your virtual network and the service travels the Microsoft backbone network. Exposing your service to the public internet is no longer necessary. You can create your own private link service in your virtual network and deliver it to your customers. Setup and consumption using Azure Private Link is consistent across Azure PaaS, customer-owned, and shared partner services.
1818

19+
> [!NOTE]
20+
> Private Links are available only for servers that have public access networking. They can't be created for servers that have private access (VNET integration).
21+
>
22+
> Private Links can be configured only for servers that were created after the release of this feature. Any server that existed before the release of the feature can't be set with Private Links.
1923
20-
21-
22-
23-
Private Link is exposed to users through two Azure resource types:
24+
Private Link is exposed to users through two Azure resource types:
2425

2526
- Private Endpoints (Microsoft.Network/PrivateEndpoints)
2627
- Private Link Services (Microsoft.Network/PrivateLinkServices)

articles/service-bus-messaging/batch-delete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You can delete messages by calling [DeleteMessagesAsync](/dotnet/api/azure.messa
3030
- messageCount : The desired number of messages to delete.The service may delete fewer messages than this limit.
3131
- beforeEnqueueTime : An optional DateTimeOffset, in UTC, representing the cutoff time for deletion. Only messages that were enqueued before this time will be deleted.
3232

33-
Additionally, you can call [PurgeMessagesAsync](/dotnet/api/azure.messaging.servicebus.servicebusreceiver.deletemessagesasync?view=azure-dotnet-preview) to purge all messages from entity.
33+
Additionally, you can call [PurgeMessagesAsync](/dotnet/api/azure.messaging.servicebus.servicebusreceiver.purgemessagesasync?view=azure-dotnet-preview) to purge all messages from entity.
3434

3535
When using Azure SDKs to perform these operations, the beforeEnqueueTime parameter defaults to the current UTC time (DateTime.UtcNow()). It’s important to ensure you provide the correct values to prevent unintended message deletion.
3636

0 commit comments

Comments
 (0)