Skip to content

Commit 0150571

Browse files
Merge pull request #276582 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 64d822e + 8d2f669 commit 0150571

File tree

8 files changed

+18
-19
lines changed

8 files changed

+18
-19
lines changed

articles/azure-functions/functions-add-output-binding-azure-sql-vs-code.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,16 @@ Update *HttpExample\\function_app.py* to match the following code. Add the `toDo
223223
import azure.functions as func
224224
import logging
225225
from azure.functions.decorators.core import DataType
226+
import uuid
226227

227228
app = func.FunctionApp()
228229

229230
@app.function_name(name="HttpTrigger1")
230231
@app.route(route="hello", auth_level=func.AuthLevel.ANONYMOUS)
231-
@app.generic_output_binding(arg_name="toDoItems", type="sql", CommandText="dbo.ToDo", ConnectionStringSetting="SqlConnectionString"
232-
data_type=DataType.STRING)
232+
@app.generic_output_binding(arg_name="toDoItems", type="sql", CommandText="dbo.ToDo", ConnectionStringSetting="SqlConnectionString",data_type=DataType.STRING)
233233
def test_function(req: func.HttpRequest, toDoItems: func.Out[func.SqlRow]) -> func.HttpResponse:
234234
logging.info('Python HTTP trigger function processed a request.')
235-
name = req.params.get('name')
235+
name = req.get_json().get('name')
236236
if not name:
237237
try:
238238
req_body = req.get_json()
@@ -242,7 +242,7 @@ def test_function(req: func.HttpRequest, toDoItems: func.Out[func.SqlRow]) -> fu
242242
name = req_body.get('name')
243243

244244
if name:
245-
toDoItems.set(func.SqlRow({"id": uuid.uuid4(), "title": name, "completed": false, url: ""}))
245+
toDoItems.set(func.SqlRow({"Id": str(uuid.uuid4()), "title": name, "completed": False, "url": ""}))
246246
return func.HttpResponse(f"Hello {name}!")
247247
else:
248248
return func.HttpResponse(

articles/azure-government/documentation-government-csp-list.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ Below you can find a list of all the authorized Cloud Solution Providers (CSPs),
381381
|[Saasplaza](https://www.intwo.cloud/)|
382382
|[Science Applications International Corporation](https://www.saic.com)|
383383
|[Secure-24](https://www.secure-24.com)|
384+
|[Sela Cloud](https://www.selacloud.com)|
384385
|[Selex Galileo Inc](http://www.selexgalileo.com/)|
385386
|[Sentinel Blue](https://www.sentinelblue.com/)|
386387
|[Sev1Tech](https://www.sev1tech.com/)|

articles/azure-monitor/containers/container-insights-persistent-volumes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure PV monitoring with Container insights | Microsoft Docs
33
description: This article describes how you can configure monitoring Kubernetes clusters with persistent volumes with Container insights.
44
ms.topic: conceptual
5-
ms.date: 2/28/2024
5+
ms.date: 5/15/2024
66
ms.reviewer: aul
77
---
88

@@ -12,7 +12,7 @@ Starting with agent version *ciprod10052020*, the Container insights integrated
1212

1313
## PV metrics
1414

15-
Container insights automatically starts monitoring PV usage by collecting the following metrics at 60-second intervals and storing them in the **InsightMetrics** table.
15+
Container insights automatically starts monitoring PV usage by collecting the following metrics at 60-second intervals and storing them in the **InsightsMetrics** table.
1616

1717
| Metric name | Metric dimension (tags) | Metric description |
1818
|-----|-----------|----------|
@@ -54,4 +54,4 @@ Persistent volumes where storage class is "azureblob-*" won't collect PV metrics
5454

5555
## Next steps
5656

57-
To learn more about collected PV metrics, see [Configure agent data collection for Container insights](./container-insights-data-collection-configmap.md).
57+
To learn more about collected PV metrics, see [Configure agent data collection for Container insights](./container-insights-data-collection-configmap.md).

articles/azure-monitor/visualize/workbooks-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This table lists the limits of specific data visualizations.
3333

3434
|Visualization|Limits |
3535
|---------|---------|
36-
|Grid|By default, grids only display the first 250 rows of data. This setting can be changed in the query component's advanced settings to display up to 10,000 rows. Any further items are ignored, and a warning appears.|
36+
|Grid|By default, grids only display the first 250 rows of data. This setting can be changed in the query component's advanced settings to display up to 10,000 rows. Any further items are ignored, and a warning appears.<br>The checkbox for toggling the selection of all items is available only when the grid displays 150 rows of data or fewer.|
3737
|Charts|Charts are limited to 100 series.<br>Charts are limited to 10,000 data points. |
3838
|Tiles|Tiles is limited to displaying 100 tiles. Any further items are ignored, and a warning appears.|
3939
|Maps|Maps are limited to displaying 100 points. Any further items are ignored, and a warning appears.|
@@ -48,4 +48,4 @@ This table lists the limits of specific data parameters.
4848
|Drop down|Drop-down-based parameters are limited to 1,000 items. Any items returned by a query after that are ignored.<br>When based on a query, only the first four columns of data produced by the query are used. Any other columns are ignored.|
4949
|Multi-value|Multi-value parameters are limited to 100 items. Any items returned by a query after that are ignored.<br>When based on a query, only the first column of data produced by the query is used. Any other columns are ignored. |
5050
|Options group|Options group parameters are limited to 1,000 items. Any items returned by a query after that are ignored. <br>When based on a query, only the first column of data produced by the query is used. Any other columns are ignored.|
51-
|Text|Text parameters that retrieve their value based on a query will only display the first cell returned by the query (row 1, column 1). Any other data is ignored.|
51+
|Text|Text parameters that retrieve their value based on a query will only display the first cell returned by the query (row 1, column 1). Any other data is ignored.|

articles/azure-resource-manager/management/lock-resources.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Applying locks can lead to unexpected results. Some operations, which don't seem
6161
- A read-only lock on a **storage account** protects RBAC assignments scoped for a storage account or a data container (blob container or queue).
6262

6363
- A read-only lock on a **storage account** prevents the creation of a blob container.
64+
- A read-only lock on a **storage account** prevents the creation of a blob container. However, create operations on a storage account can be done through both the control plane and data plane. Read-only locks only block control plane create requests, but a user can still perform a valid create operation on the resource through the data plane.
6465

6566
- A read-only lock or cannot-delete lock on a **storage account** doesn't prevent its data from deletion or modification. It also doesn't protect the data in a blob, queue, table, or file.
6667

articles/machine-learning/v1/how-to-deploy-azure-kubernetes-service.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,9 @@ In Azure Machine Learning, deployment is used in the more general sense of makin
8888
The front-end component (azureml-fe) that routes incoming inference requests to deployed services automatically scales as needed. Scaling of azureml-fe is based on the AKS cluster purpose and size (number of nodes). The cluster purpose and nodes are configured when you [create or attach an AKS cluster](../how-to-create-attach-kubernetes.md). There's one azureml-fe service per cluster, which might be running on multiple pods.
8989

9090
> [!IMPORTANT]
91-
> When using a cluster configured as `dev-test`, the self-scaler is *disabled*. Even for FastProd/DenseProd clusters, Self-Scaler is only enabled when telemetry shows that it's needed.
92-
93-
> [!IMPORTANT]
94-
> Azure Machine Learning does not upload and or save container logs, even for system containers. For full debuggability, you should [enable Container Insights for your AKS cluster](../../azure-monitor/containers/kubernetes-monitoring-enable.md#enable-container-insights) on your own to save and manage container logs, and share the related logs with AML team when necessary. Otherwise, AML does not commit SLA on azureml-fe related issues.
95-
96-
> [!NOTE]
97-
> The maximum request payload is 100MB.
91+
> * When using a cluster configured as `dev-test`, the self-scaler is *disabled*. Even for FastProd/DenseProd clusters, Self-Scaler is only enabled when telemetry shows that it's needed.
92+
> * Azure Machine Learning doesn't automatically upload or store logs from any containers, including system containers. For comprehensive debugging, it's recommended that you [enable Container Insights for your AKS cluster](../../azure-monitor/containers/kubernetes-monitoring-enable.md#enable-container-insights). This allows you to save, manage, and share container logs with the AML team when needed. Without this, AML can't guarantee support for issues related to azureml-fe.
93+
> * The maximum request payload is 100MB.
9894
9995
Azureml-fe scales both up (vertically) to use more cores, and out (horizontally) to use more pods. When making the decision to scale up, the time that it takes to route incoming inference requests is used. If this time exceeds the threshold, a scale-up occurs. If the time to route incoming requests continues to exceed the threshold, a scale-out occurs.
10096

articles/storage/tables/table-storage-design-modeling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ You can persist instances of the two concrete classes in the Table service using
113113

114114
![Person table](media/storage-table-design-guide/storage-table-design-IMAGE04.png)
115115

116-
For more information about working with multiple entity types in the same table in client code, see the section Working with heterogeneous entity types later in this guide. This provides examples of how to recognize the entity type in client code.
116+
For more information about working with multiple entity types in the same table in client code, see the section [Working with heterogeneous entity types](table-storage-design-patterns.md#working-with-heterogeneous-entity-types) later in this guide. This provides examples of how to recognize the entity type in client code.
117117

118118

119119
## Next steps

includes/container-instances-create-docker-context.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ ms.custom: include file
1616
To use Docker commands to run containers in Azure Container Instances, first log into Azure:
1717

1818
```bash
19-
docker login azure
19+
docker login azure --tenant-id "[tenant ID]"
2020
```
21+
Browse to the Microsoft Entra ID properties to find your tenant ID.
2122

2223
When prompted, enter or select your Azure credentials.
2324

@@ -35,4 +36,4 @@ Run `docker context ls` to confirm that you added the ACI context to your Docker
3536

3637
```
3738
docker context ls
38-
```
39+
```

0 commit comments

Comments
 (0)