Skip to content

Commit 6633eb5

Browse files
authored
Merge pull request #266006 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 a4c6d9e + c33b96f commit 6633eb5

File tree

8 files changed

+11
-6
lines changed

8 files changed

+11
-6
lines changed

articles/ai-studio/how-to/prompt-flow-tools/prompt-flow-tools-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The following table provides an index of tools in prompt flow.
1919

2020
| Tool name | Description | Environment | Package name |
2121
|------|-----------|-------------|--------------|
22-
| [LLM](./llm-tool.md) | Use Azure Open AI large language models (LLM) for tasks such as text completion or chat. | Default | [promptflow-tools](https://pypi.org/project/promptflow-tools/) |
22+
| [LLM](./llm-tool.md) | Use Azure OpenAI large language models (LLM) for tasks such as text completion or chat. | Default | [promptflow-tools](https://pypi.org/project/promptflow-tools/) |
2323
| [Prompt](./prompt-tool.md) | Craft a prompt by using Jinja as the templating language. | Default | [promptflow-tools](https://pypi.org/project/promptflow-tools/) |
2424
| [Python](./python-tool.md) | Run Python code. | Default | [promptflow-tools](https://pypi.org/project/promptflow-tools/) |
2525
| [Azure OpenAI GPT-4 Turbo with Vision](./azure-open-ai-gpt-4v-tool.md) | Use AzureOpenAI GPT-4 Turbo with Vision model deployment to analyze images and provide textual responses to questions about them. | Default | [promptflow-tools](https://pypi.org/project/promptflow-tools/) |
@@ -28,7 +28,7 @@ The following table provides an index of tools in prompt flow.
2828
| [Vector Index Lookup](./vector-index-lookup-tool.md) | Search text or a vector-based query from a vector index. | Default | [promptflow-vectordb](https://pypi.org/project/promptflow-vectordb/) |
2929
| [Faiss Index Lookup](./faiss-index-lookup-tool.md) | Search a vector-based query from the Faiss index file. | Default | [promptflow-vectordb](https://pypi.org/project/promptflow-vectordb/) |
3030
| [Vector DB Lookup](./vector-db-lookup-tool.md) | Search a vector-based query from an existing vector database. | Default | [promptflow-vectordb](https://pypi.org/project/promptflow-vectordb/) |
31-
| [Embedding](./embedding-tool.md) | Use Azure Open AI embedding models to create an embedding vector that represents the input text. | Default | [promptflow-tools](https://pypi.org/project/promptflow-tools/) |
31+
| [Embedding](./embedding-tool.md) | Use Azure OpenAI embedding models to create an embedding vector that represents the input text. | Default | [promptflow-tools](https://pypi.org/project/promptflow-tools/) |
3232
| [Serp API](./serp-api-tool.md) | Use Serp API to obtain search results from a specific search engine. | Default | [promptflow-tools](https://pypi.org/project/promptflow-tools/) |
3333

3434
The following table shows an index of custom tools created by the community to extend prompt flow's capabilities for specific use cases. They aren't officially maintained or endorsed by prompt flow team. For questions or issues when using a tool, please see the support contact in the description.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Resource Provider and Type: [App Configuration Platform Metrics](../azure-monito
2626
| Daily Storage Usage | Percent | Represents the amount of storage in use as a percentage of the maximum allowance. This metric is updated at least once daily. |
2727
| Request Quota Usage | Percent | Represents the current total request usage in percentage. |
2828
| Replication Latency | Milliseconds | Represents the average time it takes for a replica to be consistent with current state. |
29+
| Snapshot Storage Size | Count | Represents the total storage usage of configuration snapshot(s) in bytes. |
2930

3031
For more information, see a list of [all platform metrics supported in Azure Monitor](../azure-monitor/essentials/metrics-supported.md).
3132

@@ -41,6 +42,7 @@ App Configuration has the following dimensions associated with its metr
4142
| Daily Storage Usage | This metric does not have any dimensions. |
4243
| Request Quota Usage | The supported dimensions are the **OperationType** ("Read"or "Write") and **Endpoint** of each request. |
4344
| Replication Latency | The **Endpoint** of the replica that data was replicated to is included as a dimension. |
45+
| Snapshot Storage Size | This metric does not have any dimensions. |
4446

4547
For more information on what metric dimensions are, see [Multi-dimensional metrics](../azure-monitor/essentials/data-platform-metrics.md#multi-dimensional-metrics).
4648

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ You can analyze metrics for App Configuration with metrics from other Azure serv
103103
* Daily Storage Usage
104104
* Request Quota Usage
105105
* Replication Latency
106+
* Snapshot Storage Size
106107
107108
In the portal, navigate to the **Metrics** section and select the **Metric Namespaces** and **Metrics** you want to analyze. This screenshot shows you the metrics view when selecting **Http Incoming Request Count** for your configuration store.
108109

articles/azure-monitor/essentials/azure-monitor-workspace-overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ This section provides answers to common questions.
8080

8181
An Azure Monitor workspace is a unique environment for data collected by Azure Monitor. Each workspace has its own data repository, configuration, and permissions. Azure Monitor workspaces will eventually contain all metrics collected by Azure Monitor, including native metrics. Currently, the only data hosted by an Azure Monitor workspace is Prometheus metrics.
8282

83+
You cannot use quota limits, similar to the Log Anlytics Workspace (Daily Cap or Data retention) in the Azure Monitor workspace.
84+
8385
### Can I delete Prometheus metrics from an Azure Monitor workspace?
8486
8587
Data is removed from the Azure Monitor workspace according to its data retention period, which is 18 months.

articles/azure-resource-manager/managed-applications/tutorial-create-managed-app-with-custom-provider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ az account set --subscription <subscriptionID>
222222
az group create --name $resourceGroup --location eastus
223223
224224
# Get object ID of your identity
225-
userid=$(az ad user show --upn-or-object-id [email protected] --query objectId --output tsv)
225+
userid=$(az ad user list --upn [email protected] --query [0].id --output tsv)
226226
# Get role definition ID for the Owner role
227227
roleid=$(az role definition list --name Owner --query [].name --output tsv)
228228

articles/container-apps/service-discovery-resiliency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ matches: {
358358
'5xx'
359359
'reset'
360360
'connect-failure'
361-
'retriabe-4xx'
361+
'retriable-4xx'
362362
]
363363
}
364364
```

articles/cosmos-db/choose-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ You can use your existing MongoDB apps with API for MongoDB by just changing the
7373

7474
Azure Cosmos DB for PostgreSQL is a managed service for running PostgreSQL at any scale, with the [Citus open source](https://github.com/citusdata/citus) superpower of distributed tables. It stores data either on a single node, or distributed in a multi-node configuration.
7575

76-
Azure Cosmos DB for PostgreSQL is built on native PostgreSQL--rather than a PostgreSQL fork--and lets you choose any major database versions supported by the PostgreSQL community. It's ideal for starting on a single-node database with rich indexing, geospatial capabilities, and JSONB support. Later, if need more performance, you can add nodes to the cluster with zero downtime.
76+
Azure Cosmos DB for PostgreSQL is built on native PostgreSQL--rather than a PostgreSQL fork--and lets you choose any major database versions supported by the PostgreSQL community. It's ideal for starting on a single-node database with rich indexing, geospatial capabilities, and JSONB support. Later, if you need more performance, you can add nodes to the cluster with zero downtime.
7777

7878
If you’re looking for a managed open source relational database with high performance and geo-replication, Azure Cosmos DB for PostgreSQL is the recommended choice. To learn more, see the [Azure Cosmos DB for PostgreSQL introduction](postgresql/introduction.md).
7979

articles/defender-for-iot/organizations/traffic-mirroring/configure-mirror-span.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Cisco2960# configure terminal
3333
Cisco2960(config)# monitor session 1 source interface fastehernet 0/2 - 23 rx
3434
Cisco2960(config)# monitor session 1 destination interface fastethernet 0/24
3535
Cisco2960(config)# end
36-
Cisco2960# show monitor 1
36+
Cisco2960# show monitor session 1
3737
Cisco2960# running-copy startup-config
3838
```
3939

0 commit comments

Comments
 (0)