Skip to content

Commit 0a3763f

Browse files
authored
Merge pull request #272209 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 c7f4b9a + 772c14e commit 0a3763f

File tree

10 files changed

+60
-20
lines changed

10 files changed

+60
-20
lines changed

articles/ai-services/document-intelligence/concept-invoice.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ Following are the line items extracted from an invoice in the JSON output respon
234234
| Amount | Number | The amount of the line item | $60.00 | 100 |
235235
| Description | String | The text description for the invoice line item | Consulting service | Consulting service |
236236
| Quantity | Number | The quantity for this invoice line item | 2 | 2 |
237+
| OrderQuantity | Number | The ordered quantity for this line item. May differ from the quantity shipped and invoiced | 3 | 3 |
237238
| UnitPrice | Number | The net or gross price (depending on the gross invoice setting of the invoice) of one unit of this item | $30.00 | 30 |
238239
| ProductCode | String| Product code, product number, or SKU associated with the specific line item | A123 | |
239240
| Unit | String| The unit of the line item, e.g, kg, lb etc. | Hours | |
@@ -301,6 +302,28 @@ The following are the line items extracted from an invoice in the JSON output re
301302
| Date | date| Date corresponding to each line item. Often it's a date the line item was shipped | 3/4/2021| 2021-03-04 |
302303
| Tax | number | Tax associated with each line item. Possible values include tax amount, tax %, and tax Y/N | 10% | |
303304

305+
The following are complex fields extracted from an invoice in the JSON output response:
306+
307+
### TaxDetails
308+
Tax details aims at breaking down the different taxes applied to the invoice total.
309+
310+
|Name| Type | Description | Text (line item #1) | Value (standardized output) |
311+
|:-----|:----|:----|:----| :----|
312+
| Items | string | Full string text line of the tax item | V.A.T. 15% $60.00 | |
313+
| Amount | number | The tax amount of the tax item | 60.00 | 60 |
314+
| Rate | string | The tax rate of the tax item | 15% | |
315+
316+
### PaymentDetails
317+
List all the detected payment options detected on the field.
318+
319+
|Name| Type | Description | Text (line item #1) | Value (standardized output) |
320+
|:-----|:----|:----|:----| :----|
321+
| IBAN | string | Internal Bank Account Number | GB33BUKB20201555555555 | |
322+
| SWIFT | string | SWIFT code | BUKBGB22 | |
323+
| BPayBillerCode | string | Australian B-Pay Biller Code | 12345 | |
324+
| BPayReference | string | Australian B-Pay Reference Code | 98765432100 | |
325+
326+
304327
### JSON output
305328

306329
The JSON output has three parts:

articles/ai-services/document-intelligence/how-to-guides/includes/v4-0/javascript-sdk.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Create a Node.js Express application.
7979
1. Install the `ai-document-intelligence` client library and `azure/identity` npm packages:
8080

8181
```console
82-
npm i @azure/[email protected] @azure/identity
82+
npm i @azure-rest/[email protected] @azure/identity
8383
```
8484

8585
Your app's *package.json* file is updated with the dependencies.
@@ -106,7 +106,7 @@ Open the `index.js` file in Visual Studio Code or your favorite IDE and select o
106106
## Use the Read model
107107

108108
```javascript
109-
const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
109+
const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
110110

111111
//use your `key` and `endpoint` environment variables
112112
const key = process.env['DI_KEY'];
@@ -202,7 +202,7 @@ Visit the Azure samples repository on GitHub and view the [`read` model output](
202202
## Use the Layout model
203203

204204
```javascript
205-
const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
205+
const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
206206

207207
//use your `key` and `endpoint` environment variables
208208
const key = process.env['DI_KEY'];
@@ -272,7 +272,7 @@ Visit the Azure samples repository on GitHub and view the [layout model output](
272272
## Use the General document model
273273

274274
```javascript
275-
const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
275+
const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
276276

277277
//use your `key` and `endpoint` environment variables
278278
const key = process.env['DI_KEY'];
@@ -318,7 +318,7 @@ Visit the Azure samples repository on GitHub and view the [general document mode
318318
## Use the W-2 tax model
319319

320320
```javascript
321-
const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
321+
const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
322322

323323
//use your `key` and `endpoint` environment variables
324324
const key = process.env['DI_KEY'];
@@ -397,7 +397,7 @@ Visit the Azure samples repository on GitHub and view the [W-2 tax model output]
397397
## Use the Invoice model
398398

399399
```javascript
400-
const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
400+
const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
401401

402402
//use your `key` and `endpoint` environment variables
403403
const key = process.env['DI_KEY'];
@@ -459,7 +459,7 @@ Visit the Azure samples repository on GitHub and view the [invoice model output]
459459
## Use the Receipt model
460460
461461
```javascript
462-
const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
462+
const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
463463

464464
//use your `key` and `endpoint` environment variables
465465
const key = process.env['DI_KEY'];
@@ -518,7 +518,7 @@ Visit the Azure samples repository on GitHub and view the [receipt model output]
518518
## Use the ID document model
519519
520520
```javascript
521-
const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
521+
const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
522522

523523
//use your `key` and `endpoint` environment variables
524524
const key = process.env['DI_KEY'];

articles/ai-services/openai/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ curl -X POST https://{your-resource-name}.openai.azure.com/openai/deployments/{d
10261026
-d '{
10271027
"prompt": "An avocado chair",
10281028
"size": "1024x1024",
1029-
"n": 3,
1029+
"n": 1,
10301030
"quality": "hd",
10311031
"style": "vivid"
10321032
}'

articles/aks/workload-identity-deploy-cluster.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ This article assumes you have a basic understanding of Kubernetes concepts. For
2727

2828
- If you have multiple Azure subscriptions, select the appropriate subscription ID in which the resources should be billed using the [az account][az-account] command.
2929

30+
> [!NOTE]
31+
> Instead of configuring all steps manually, there is another implementation called _Service Connector_ which will help you configure some steps automatically and achieve the same outcome. See also: [Tutorial: Connect to Azure storage account in Azure Kubernetes Service (AKS) with Service Connector using workload identity][tutorial-python-aks-storage-workload-identity].
32+
3033
## Export environment variables
3134

3235
To help simplify steps to configure the identities required, the steps below define
@@ -268,6 +271,7 @@ In this article, you deployed a Kubernetes cluster and configured it to use a wo
268271
[az-keyvault-list]: /cli/azure/keyvault#az-keyvault-list
269272
[aks-identity-concepts]: concepts-identity.md
270273
[az-account]: /cli/azure/account
274+
[tutorial-python-aks-storage-workload-identity]: ../service-connector/tutorial-python-aks-storage-workload-identity.md
271275
[az-aks-create]: /cli/azure/aks#az-aks-create
272276
[az aks update]: /cli/azure/aks#az-aks-update
273277
[aks-two-resource-groups]: faq.md#why-are-two-resource-groups-created-with-aks

articles/aks/workload-identity-overview.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ Microsoft Entra Workload ID works especially well with the [Azure Identity clien
2020

2121
This article helps you understand this new authentication feature, and reviews the options available to plan your project strategy and potential migration from Microsoft Entra pod-managed identity.
2222

23+
> [!NOTE]
24+
> Instead of configuring all steps manually, there is another implementation called _Service Connector_ which will help you configure some steps automatically. See also: [What is Service Connector?][service-connector-overview]
25+
2326
## Dependencies
2427

2528
- AKS supports Microsoft Entra Workload ID on version 1.22 and higher.
@@ -303,6 +306,7 @@ The following table summarizes our migration or deployment recommendations for w
303306
[virtual-kubelet]: https://virtual-kubelet.io/docs/
304307

305308
<!-- INTERNAL LINKS -->
309+
[service-connector-overview]: ../service-connector/overview.md
306310
[use-azure-ad-pod-identity]: use-azure-ad-pod-identity.md
307311
[azure-ad-workload-identity]: ../active-directory/develop/workload-identities-overview.md
308312
[microsoft-authentication-library]: ../active-directory/develop/msal-overview.md

articles/app-service/reference-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ The following are 'fake' environment variables that don't exist if you enumerate
420420
| `WEBSITE_LOCAL_CACHE_READWRITE_OPTION` | Read-write options of the local cache. Available options are: <br/>- `ReadOnly`: Cache is read-only.<br/>- `WriteButDiscardChanges`: Allow writes to local cache but discard changes made locally. |
421421
| `WEBSITE_LOCAL_CACHE_SIZEINMB` | Size of the local cache in MB. Default is `1000` (1 GB). |
422422
| `WEBSITE_LOCALCACHE_READY` | Read-only flag indicating if the app using local cache. |
423-
| `WEBSITE_DYNAMIC_CACHE` | Due to network file shared nature to allow access for multiple instances, the dynamic cache improves performance by caching the recently accessed files locally on an instance. Cache is invalidated when file is modified. The cache location is `%SYSTEMDRIVE%\local\DynamicCache` (same `%SYSTEMDRIVE%\local` quota is applied). By default, full content caching is enabled (set to `1`), which includes both file content and directory/file metadata (timestamps, size, directory content). To conserve local disk use, set to `2` to cache only directory/file metadata (timestamps, size, directory content). To turn off caching, set to `0`. |
423+
| `WEBSITE_DYNAMIC_CACHE` | Due to network file shared nature to allow access for multiple instances, the dynamic cache improves performance by caching the recently accessed files locally on an instance. Cache is invalidated when file is modified. The cache location is `%SYSTEMDRIVE%\local\DynamicCache` (same `%SYSTEMDRIVE%\local` quota is applied). To enable full content caching, set to `1`, which includes both file content and directory/file metadata (timestamps, size, directory content). To conserve local disk use, set to `2` to cache only directory/file metadata (timestamps, size, directory content). To turn off caching, set to `0`. For Windows apps and for [Linux apps created with the WordPress template](quickstart-wordpress.md), the default is `1`. For all other Linux apps, the default is `0`. |
424424
| `WEBSITE_READONLY_APP` | When using dynamic cache, you can disable write access to the app root (`D:\home\site\wwwroot` or `/home/site/wwwroot`) by setting this variable to `1`. Except for the `App_Data` directory, no exclusive locks are allowed, so that deployments don't get blocked by locked files. |
425425

426426
<!--

articles/azure-arc/servers/private-link-security.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,7 @@ For Azure Arc-enabled servers that were set up prior to your private link scope,
282282

283283
1. Select the servers in the list that you want to associate with the Private Link Scope, and then select **Select** to save your changes.
284284

285-
> [!NOTE]
286-
> Only Azure Arc-enabled servers in the same subscription and region as your Private Link Scope is shown.
287-
288-
:::image type="content" source="./media/private-link-security/select-servers-private-link-scope.png" lightbox="./media/private-link-security/select-servers-private-link-scope.png" alt-text="Selecting Azure Arc resources" border="true":::
285+
:::image type="content" source="./media/private-link-security/select-servers-private-link-scope.png" lightbox="./media/private-link-security/select-servers-private-link-scope.png" alt-text="Selecting Azure Arc resources" border="true":::
289286

290287
It might take up to 15 minutes for the Private Link Scope to accept connections from the recently associated server(s).
291288

articles/iot-operations/manage-mqtt-connectivity/howto-configure-authentication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ BrokerListener and BrokerAuthentication are separate resources, but they're link
5656

5757
The order of authentication methods in the array determines how Azure IoT MQ authenticates clients. Azure IoT MQ tries to authenticate the client's credentials using the first specified method and iterates through the array until it finds a match or reaches the end.
5858

59-
For each method, Azure IoT MQ first checks if the client's credentials are *relevant* for that method. For example, SAT authentication requires a username starting with `sat://`, and X.509 authentication requires a client certificate. If the client's credentials are relevant, Azure IoT MQ then verifies if they're valid. For more information, see the [Configure authentication method](#configure-authentication-method) section.
59+
For each method, Azure IoT MQ first checks if the client's credentials are *relevant* for that method. For example, SAT authentication requires a username starting with `$sat`, and X.509 authentication requires a client certificate. If the client's credentials are relevant, Azure IoT MQ then verifies if they're valid. For more information, see the [Configure authentication method](#configure-authentication-method) section.
6060

6161
For custom authentication, Azure IoT MQ treats failure to communicate with the custom authentication server as *credentials not relevant*. This behavior lets Azure IoT MQ fall back to other methods if the custom server is unreachable.
6262

@@ -94,7 +94,7 @@ The earlier example specifies custom, SAT, and [username-password authentication
9494

9595
1. If the custom authentication server responds with `Pass` or `Fail` result, the authentication flow ends. However, if the custom authentication server isn't available, then Azure IoT MQ falls back to the remaining specified methods, with SAT being next.
9696

97-
1. Azure IoT MQ tries to authenticate the credentials as SAT credentials. If the MQTT username starts with `sat://`, Azure IoT MQ evaluates the MQTT password as a SAT. Otherwise, the broker falls back to username-password and check if the provided MQTT username and password are valid.
97+
1. Azure IoT MQ tries to authenticate the credentials as SAT credentials. If the MQTT username starts with `$sat`, Azure IoT MQ evaluates the MQTT password as a SAT. Otherwise, the broker falls back to username-password and check if the provided MQTT username and password are valid.
9898

9999
If the custom authentication server is unavailable and all subsequent methods determined that the provided credentials aren't relevant, then the broker denies the client connection.
100100

articles/notification-hubs/notification-hubs-diagnostic-logs.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ Operational logs are disabled by default. To enable logs, do the following:
103103

104104
b. Select one of the following three destinations for your diagnostics logs:
105105
- If you select **Send to Log Analytics workspace**, you need to specify which instance of Log Analytics the diagnostics will be sent to.
106-
> [!NOTE]
107-
> Sending to the Log Analytics workspace is currently not supported.
108106
- If you select **Archive to a storage account**, you need to configure the storage account where the diagnostics logs will be stored.
109107
- If you select **Stream to an event hub**, you need to configure the event hub that you want to stream the diagnostics logs to.
110108

@@ -122,4 +120,4 @@ To learn more about configuring diagnostics settings, see:
122120
* [Overview of Azure diagnostics logs](../azure-monitor/essentials/platform-logs-overview.md).
123121

124122
To learn more about Azure Notification Hubs, see:
125-
* [What is Azure Notification Hubs?](notification-hubs-push-notification-overview.md)
123+
* [What is Azure Notification Hubs?](notification-hubs-push-notification-overview.md)

articles/spring-apps/enterprise/whats-new.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: hangwan
66
ms.service: spring-apps
77
ms.topic: conceptual
88
ms.custom: devx-track-java
9-
ms.date: 10/10/2023
9+
ms.date: 04/15/2024
1010
---
1111

1212
# What's new in Azure Spring Apps?
@@ -18,6 +18,20 @@ Azure Spring Apps is improved on an ongoing basis. To help you stay up to date w
1818

1919
This article is updated quarterly, so revisit it regularly. You can also visit [Azure updates](https://azure.microsoft.com/updates/?query=azure%20spring), where you can search for updates or browse by category.
2020

21+
## Q1 2024
22+
23+
The following updates are now available in the Enterprise plan:
24+
25+
- **Save up to 47%: Azure Spring Apps Enterprise is now eligible for Azure savings plan**: All Azure Spring Apps regions under the Enterprise plan are eligible for substantial cost savings – 20% for one year and 47% for three years – when you commit to the Azure savings plan. For more information, see [Azure Spring Apps Enterprise is now eligible for Azure savings plan for compute](https://techcommunity.microsoft.com/t5/apps-on-azure-blog/azure-spring-apps-enterprise-is-now-eligible-for-azure-savings/ba-p/4021532).
26+
27+
- **Azure CLI supports log streaming for Spring Cloud Gateway**: This feature enables you to fetch the Spring Cloud Gateway log in real time for diagnosis purposes. For more information, see the [Use real-time log streaming](how-to-troubleshoot-enterprise-spring-cloud-gateway.md#use-real-time-log-streaming) section of [Troubleshoot VMware Spring Cloud Gateway](how-to-troubleshoot-enterprise-spring-cloud-gateway.md).
28+
29+
- **Azure CLI supports log streaming for Application Configuration Service**: The feature enables you to retrieve the Application Configuration Service log using the Azure CLI, making it possible to detect any configuration updates. For more information, see the [Use real-time log streaming](how-to-enterprise-application-configuration-service.md#use-real-time-log-streaming) section of [Use Application Configuration Service for Tanzu](how-to-enterprise-application-configuration-service.md).
30+
31+
- **Shows buildpack versions**: The latest feature added to buildpacks assists you in comprehending the version used and diagnosing issues associated with the build process.
32+
33+
- **Enhanced troubleshooting of Application Configuration Service**: Now you can directly view the linked `configMap` for your apps to further assist in troubleshooting issues with unrefreshed configurations. You can also export configuration files pulled by the Application Configuration Service from upstream Git repositories to your local environment through the Azure CLI. This process helps you examine the content and use configuration files for local development. For more information, see the [Examine configuration file in ConfigMap](how-to-enterprise-application-configuration-service.md#examine-configuration-file-in-configmap) section of [Use Application Configuration Service for Tanzu](how-to-enterprise-application-configuration-service.md).
34+
2135
## Q4 2023
2236

2337
The following updates are now available in the Enterprise plan:

0 commit comments

Comments
 (0)