Skip to content

Commit 20ea93c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-constrained-delegation-edit-conditions
2 parents a82dc22 + 6f95b11 commit 20ea93c

File tree

85 files changed

+908
-705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+908
-705
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/deployment-options.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ The following table highlights each method so that you can determine which works
3131
3232
Be sure to review the basic [prerequisites](prerequisites.md) and [network configuration requirements](network-requirements.md) before deploying the agent, as well as any specific requirements listed in the steps for the onboarding method you choose. To learn more about what changes the agent will make to your system, see [Overview of the Azure Connected Machine Agent](agent-overview.md).
3333

34+
[!INCLUDE [sql-server-auto-onboard](includes/sql-server-auto-onboard.md)]
35+
3436
## Next steps
3537

3638
* Learn about the Azure Connected Machine agent [prerequisites](prerequisites.md) and [network requirements](network-requirements.md).
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## Automatic connection for SQL Server
2+
3+
When you connect a Windows or Linux server to Azure Arc that also has Microsoft SQL Server installed, the SQL Server instances will automatically be connected to Azure Arc as well. [SQL Server enabled by Azure Arc](/sql/sql-server/azure-arc/overview) provides a detailed inventory and additional management capabilities for your SQL Server instances and databases. As part of the connection process, an extension is deployed to your Azure Arc-enabled server and [new roles](/sql/sql-server/azure-arc/permissions-granted-agent-extension) will be applied to your SQL Server and databases. If you don't want to automatically connect your SQL Servers to Azure Arc, you can opt out by adding a tag to the Windows or Linux server with the name `ArcSQLServerExtensionDeployment` and value `Disabled` when it's connected to Azure Arc.
4+
5+
For more information, see [Manage automatic connection for SQL Server enabled by Azure Arc](/sql/sql-server/azure-arc/manage-autodeploy).

articles/azure-arc/servers/onboard-ansible-playbooks.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Before you get started, be sure to review the [prerequisites](prerequisites.md)
1414

1515
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
1616

17+
[!INCLUDE [sql-server-auto-onboard](includes/sql-server-auto-onboard.md)]
18+
1719
## Generate a service principal and collect Azure details
1820

1921
Before you can run the script to connect your machines, you'll need to do the following:

articles/azure-arc/servers/onboard-configuration-manager-custom-task.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Before you get started, be sure to review the [prerequisites](prerequisites.md)
1515

1616
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
1717

18+
[!INCLUDE [sql-server-auto-onboard](includes/sql-server-auto-onboard.md)]
19+
1820
## Generate a service principal
1921

2022
Follow the steps to [create a service principal for onboarding at scale](onboard-service-principal.md#create-a-service-principal-for-onboarding-at-scale). Assign the **Azure Connected Machine Onboarding** role to your service principal, and limit the scope of the role to the target Azure landing zone. Make a note of the Service Principal ID and Service Principal Secret, as you'll need these values later.

0 commit comments

Comments
 (0)