Skip to content

Commit ed4ade6

Browse files
authored
Merge pull request #283851 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 b82d1e4 + 634a1c6 commit ed4ade6

File tree

8 files changed

+66
-19
lines changed

8 files changed

+66
-19
lines changed

articles/application-gateway/configuration-frontend-ip.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ A frontend IP address is associated to a *listener*, which checks for incoming r
3838

3939
You can create private and public listeners with the same port number. However, be aware of any network security group (NSG) associated with the Application Gateway subnet. Depending on your NSG's configuration, you might need an allow-inbound rule with **Destination IP addresses** as your application gateway's public and private frontend IPs. When you use the same port, your application gateway changes the **Destination** of the inbound flow to the frontend IPs of your gateway.
4040

41-
> [!NOTE]
42-
> Currently, the use of the same port number for public and private TCP/TLS protocol or IPv6 listeners is not supported.
43-
4441
**Inbound rule**:
4542

4643
- **Source**: According to your requirement

articles/application-gateway/ingress-controller-autoscale-pods.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Use following two components:
3030
1. First, create a Microsoft Entra service principal and assign it `Monitoring Reader` access over Application Gateway's resource group.
3131

3232
```azurecli
33-
applicationGatewayGroupName="<application-gateway-group-id>"
34-
applicationGatewayGroupId=$(az group show -g $applicationGatewayGroupName -o tsv --query "id")
35-
az ad sp create-for-rbac -n "azure-k8s-metric-adapter-sp" --role "Monitoring Reader" --scopes applicationGatewayGroupId
33+
applicationGatewayGroupName="<application-gateway-group-id>"
34+
applicationGatewayGroupId=$(az group show -g $applicationGatewayGroupName -o tsv --query "id")
35+
az ad sp create-for-rbac -n "azure-k8s-metric-adapter-sp" --role "Monitoring Reader" --scopes applicationGatewayGroupId
3636
```
3737
3838
1. Now, deploy the [`Azure Kubernetes Metric Adapter`](https://github.com/Azure/azure-k8s-metrics-adapter) using the Microsoft Entra service principal created previously.
@@ -98,7 +98,7 @@ In following example, we target a sample deployment `aspnet`. We scale up Pods w
9898

9999
Replace your target deployment name and apply the following auto scale configuration:
100100
```yaml
101-
apiVersion: autoscaling/v2beta1
101+
apiVersion: autoscaling/v2
102102
kind: HorizontalPodAutoscaler
103103
metadata:
104104
name: deployment-scaler

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

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,20 +627,60 @@ useAzureMonitor(options);
627627

628628
### [Python](#tab/python)
629629

630+
Azure Monitor OpenTelemetry Distro for Python support the credential classes provided by [Azure Identity](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/identity/identity#credential-classes).
631+
632+
- We recommend `DefaultAzureCredential` for local development.
633+
- We recommend `ManagedIdentityCredential` for system-assigned and user-assigned managed identities.
634+
- For system-assigned, use the default constructor without parameters.
635+
- For user-assigned, provide the `client_id` to the constructor.
636+
- We recommend `ClientSecretCredential` for service principals.
637+
- Provide the tenant ID, client ID, and client secret to the constructor.
638+
639+
If using `ManagedIdentityCredential`
630640
```python
631641
# Import the `ManagedIdentityCredential` class from the `azure.identity` package.
632642
from azure.identity import ManagedIdentityCredential
633643
# Import the `configure_azure_monitor()` function from the `azure.monitor.opentelemetry` package.
634644
from azure.monitor.opentelemetry import configure_azure_monitor
645+
from opentelemetry import trace
635646

636647
# Configure the Distro to authenticate with Azure Monitor using a managed identity credential.
648+
credential = ManagedIdentityCredential(client_id="<client_id>")
637649
configure_azure_monitor(
638650
connection_string="your-connection-string",
639-
credential=ManagedIdentityCredential(),
651+
credential=credential,
640652
)
641653

654+
tracer = trace.get_tracer(__name__)
655+
656+
with tracer.start_as_current_span("hello with aad managed identity"):
657+
print("Hello, World!")
658+
642659
```
643660

661+
If using `ClientSecretCredential`
662+
```python
663+
# Import the `ClientSecretCredential` class from the `azure.identity` package.
664+
from azure.identity import ClientSecretCredential
665+
# Import the `configure_azure_monitor()` function from the `azure.monitor.opentelemetry` package.
666+
from azure.monitor.opentelemetry import configure_azure_monitor
667+
from opentelemetry import trace
668+
669+
# Configure the Distro to authenticate with Azure Monitor using a client secret credential.
670+
credential = ClientSecretCredential(
671+
tenant_id="<tenant_id",
672+
client_id="<client_id>",
673+
client_secret="<client_secret>",
674+
)
675+
configure_azure_monitor(
676+
connection_string="your-connection-string",
677+
credential=credential,
678+
)
679+
680+
with tracer.start_as_current_span("hello with aad client secret identity"):
681+
print("Hello, World!")
682+
683+
```
644684
---
645685

646686
## Offline Storage and Automatic Retries

articles/container-apps/health-probes.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ The optional `failureThreshold` setting defines the number of attempts Container
164164

165165
If ingress is enabled, the following default probes are automatically added to the main app container if none is defined for each type.
166166

167-
> [!NOTE]
168-
> Default probes are currently not applied on workload profile environments when using the Consumption plan. This behavior may change in the future.
169-
170167
| Probe type | Default values |
171168
| -- | -- |
172169
| Startup | Protocol: TCP<br>Port: ingress target port<br>Timeout: 3 seconds<br>Period: 1 second<br>Initial delay: 1 second<br>Success threshold: 1<br>Failure threshold: 240 |

articles/operator-nexus/howto-platform-prerequisites.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,22 +378,35 @@ ogcli update port "port-<PORT_#>" label=\"<NEW_NAME>\" <PORT_#>
378378
| NEW_NAME | Port label name |
379379
| PORT_# | Terminal Server port number |
380380

381+
381382
### Step 9: Settings required for PURE Array serial connections
382383

383-
For configuring PURE Array serial connections, use the following commands:
384+
Pure Storage arrays purchased prior to 2024 have revision R3 controllers which use rollover console cables and require the custom serial port connection commands below:
384385

386+
**Pure Stoarge R3 Controllers:**
385387
```bash
386388
ogcli update port ports-<PORT_#> 'baudrate="115200"' <PORT_#> Pure Storage Controller console
387389
ogcli update port ports-<PORT_#> 'pinout="X1"' <PORT_#> Pure Storage Controller console
388390
```
389391

392+
Newer Pure Storage appliances, and systems upgraded from R3 to R4 Pure Storage controllers, will use straight-through console cables with the updated settings below:
393+
394+
**Pure Storage R4 Controllers:**
395+
```bash
396+
ogcli update port ports-<PORT_#> 'baudrate="115200"' <PORT_#> Pure Storage Controller console
397+
ogcli update port ports-<PORT_#> 'pinout="X2"' <PORT_#> Pure Storage Controller console
398+
```
399+
390400
**Parameters:**
391401

392402
| Parameter Name | Description |
393403
| ----------------| --------------------------- |
394404
| PORT_# | Terminal Server port number |
395405

396-
These commands set the baudrate and pinout for connecting to the Pure Storage Controller console.
406+
These commands set the baud rate and pinout for connecting to the Pure Storage Controller console.
407+
408+
>[!NOTE]
409+
>All other Terminal Server port configurations settings should remain the same and work by default with a straight-through RJ45 console cable.
397410
398411
### Step 10: Verifying settings
399412

articles/postgresql/flexible-server/generative-ai-recommendation-system.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom:
1717

1818
[!INCLUDE [applies-to-postgresql-flexible-server](~/reusable-content/ce-skilling/azure/includes/postgresql/includes/applies-to-postgresql-flexible-server.md)]
1919

20-
This hands-on tutorial shows you how to build a recommender application using Azure Database for PostgreSQL flexible server and Azure OpenAI service. Recommendations have applications in different domains – service providers frequently tend to provide recommendations for products and services they offer based on prior history and contextual information collected from the customer and environment.
20+
This hands-on tutorial shows you how to build a recommender application using Azure Database for PostgreSQL flexible server and Azure OpenAI Service. Recommendations have applications in different domains – service providers frequently tend to provide recommendations for products and services they offer based on prior history and contextual information collected from the customer and environment.
2121

2222
There are different ways to model recommendation systems. This article explores the simplest form – recommendation based one product corresponding to, say, a prior purchase. This tutorial uses the recipe dataset used in the [Semantic Search](./generative-ai-semantic-search.md) article and the recommendation is for recipes based on a recipe a customer liked or searched for before.
2323

@@ -27,7 +27,7 @@ There are different ways to model recommendation systems. This article explores
2727
1. Grant access to Azure OpenAI in the desired subscription.
2828
1. Grant permissions to [create Azure OpenAI resources and to deploy models](../../ai-services/openai/how-to/role-based-access-control.md).
2929

30-
[Create and deploy an Azure OpenAI service resource and a model](../../ai-services/openai/how-to/create-resource.md), deploy the embeddings model [text-embedding-ada-002](../../ai-services/openai/concepts/models.md#embeddings-models). Copy the deployment name as it is needed to create embeddings.
30+
[Create and deploy an Azure OpenAI Service resource and a model](../../ai-services/openai/how-to/create-resource.md), deploy the embeddings model [text-embedding-ada-002](../../ai-services/openai/concepts/models.md#embeddings-models). Copy the deployment name as it is needed to create embeddings.
3131

3232
## Enable the `azure_ai` and `pgvector` extensions
3333

articles/security/fundamentals/customer-lockbox-alternative-email.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ ms.author: mbaldwin
88
ms.date: 03/15/2024
99
---
1010

11-
# Customer Lockbox for Microsoft Azure alternate email notifications (public preview)
11+
# Customer Lockbox for Microsoft Azure alternate email notifications
1212

1313
> [!NOTE]
1414
> To use this feature, your organization must have an [Azure support plan](https://azure.microsoft.com/support/plans/) with a minimal level of **Developer**.
1515
16-
Customer Lockbox for Microsoft Azure is launching a new feature that enables customers to use alternate email IDs for getting Customer Lockbox notifications. This enables Customer Lockbox for Microsoft Azure customers to receive notifications in scenarios where their Azure account is not email enabled or if they have a service principal defined as the tenant admin or subscription owner.
16+
Alternate email notification feature enables customers to use alternate email IDs for getting Customer Lockbox notifications. This enables Customer Lockbox for Microsoft Azure customers to receive notifications in scenarios where their Azure account is not email enabled or if they have a service principal defined as the tenant admin or subscription owner.
1717

1818
> [!IMPORTANT]
1919
> This feature only enables Customer Lockbox notifications to be sent to alternate email IDs. It does not enable alternate users to act as approvers for Customer Lockbox requests.
@@ -70,4 +70,4 @@ Here are the known issues with this feature:
7070
## Next steps
7171

7272
- [Customer Lockbox for Microsoft Azure](customer-lockbox-overview.md)
73-
- [Customer Lockbox for Microsoft Azure frequently asked questions](customer-lockbox-faq.yml)
73+
- [Customer Lockbox for Microsoft Azure frequently asked questions](customer-lockbox-faq.yml)

articles/virtual-machines/linux/azure-dns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Along with resolution of public DNS names, Azure provides internal name resoluti
5454
Names must use only 0-9, a-z, and '-', and they can't start or end with a '-'. See RFC 3696 Section 2.
5555
* DNS query traffic is throttled for each virtual machine. Throttling shouldn't impact most applications. If request throttling is observed, ensure that client-side caching is enabled. For more information, see [Getting the most from name resolution that Azure provides](#getting-the-most-from-name-resolution-that-azure-provides).
5656

57-
### Getting the most from name resolution that Azure provides\
57+
### Getting the most from name resolution that Azure provides
5858

5959
**Client-side caching:**
6060

0 commit comments

Comments
 (0)