Skip to content

Commit db9dc48

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-custom-roles-app-permissions-descriptions
2 parents 27cb438 + af7c2f8 commit db9dc48

File tree

11 files changed

+41
-26
lines changed

11 files changed

+41
-26
lines changed

articles/api-management/api-management-configuration-repository-git.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ These files can be created, deleted, edited, and managed on your local file syst
207207
> * [Subscriptions](/rest/api/apimanagement/current-ga/subscription)
208208
> * Named values
209209
> * Developer portal entities other than styles and templates
210+
> * Policy Fragments
210211
>
211212
212213
### Root api-management folder

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Connect Azure Functions to Azure Storage using Visual Studio Code
33
description: Learn how to connect Azure Functions to an Azure Queue Storage by adding an output binding to your Visual Studio Code project.
4-
ms.date: 06/15/2022
4+
ms.date: 01/31/2023
55
ms.topic: quickstart
66
ms.devlang: csharp, java, javascript, powershell, python, typescript
77
ms.custom: devx-track-python, devx-track-js, mode-ui, devdivchpfy22
@@ -174,17 +174,7 @@ Because you're using the storage connection string, your function connects to th
174174

175175
### Connect Storage Explorer to your account
176176

177-
Skip this section if you have already installed Azure Storage Explorer and connected it to your Azure account.
178-
179-
1. Run the [Azure Storage Explorer](https://storageexplorer.com/) tool, select the connect icon on the left, and select **Add an account**.
180-
181-
:::image type="content" source="./media/functions-add-output-binding-storage-queue-vs-code/storage-explorer-add-account.png" alt-text="Screenshot of how to add an Azure account to Microsoft Azure Storage Explorer.":::
182-
183-
1. In the **Connect** dialog, choose **Add an Azure account**, choose your **Azure environment**, and then select **Sign in...**.
184-
185-
:::image type="content" source="./media/functions-add-output-binding-storage-queue-vs-code/storage-explorer-connect-azure-account.png" alt-text="Screenshot of the sign-in to your Azure account window.":::
186-
187-
After you successfully sign in to your account, you see all of the Azure subscriptions associated with your account.
177+
[!INCLUDE [functions-storage-explorer-connect.md](../../includes/functions-storage-explorer-connect.md)]
188178

189179
### Examine the output queue
190180

articles/azure-functions/functions-add-output-binding-storage-queue-vs.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Connect functions to Azure Storage using Visual Studio
33
description: "Learn how to add an output binding to connect your C# class library functions to an Azure Storage queue using Visual Studio."
4-
ms.date: 05/30/2021
4+
ms.date: 01/31/2023
55
ms.topic: quickstart
66
ms.devlang: csharp
77
ms.custom: mvc, mode-ui
@@ -20,8 +20,8 @@ Most bindings require a stored connection string that Functions uses to access t
2020

2121
Before you start this article, you must:
2222

23-
- Complete [part 1 of the Visual Studio quickstart](./functions-create-your-first-function-visual-studio.md).
24-
23+
- Complete [part 1 of the Visual Studio quickstart](./functions-create-your-first-function-visual-studio.md).
24+
- Install [Azure Storage Explorer](https://storageexplorer.com/). Storage Explorer is a tool that you'll use to examine queue messages generated by your output binding. Storage Explorer is supported on macOS, Windows, and Linux-based operating systems.
2525
- Sign in to your Azure subscription from Visual Studio.
2626

2727
## Download the function app settings
@@ -72,21 +72,21 @@ After the binding is defined, you can use the `name` of the binding to access it
7272
7373
[!INCLUDE [functions-run-function-test-local-vs](../../includes/functions-run-function-test-local-vs.md)]
7474
75-
A new queue named `outqueue` is created in your storage account by the Functions runtime when the output binding is first used. You'll use Cloud Explorer to verify that the queue was created along with the new message.
75+
A new queue named `outqueue` is created in your storage account by the Functions runtime when the output binding is first used. You'll use Storage Explorer to verify that the queue was created along with the new message.
7676

77-
## Examine the output queue
77+
### Connect Storage Explorer to your account
7878

79-
1. In Visual Studio from the **View** menu, select **Cloud Explorer**.
79+
[!INCLUDE [functions-storage-explorer-connect.md](../../includes/functions-storage-explorer-connect.md)]
8080

81-
1. In **Cloud Explorer**, expand your Azure subscription and **Storage Accounts**, then expand the storage account used by your function. If you can't remember the storage account name, check the `AzureWebJobsStorage` connection string setting in the *local.settings.json* file.
81+
### Examine the output queue
8282

83-
1. Expand the **Queues** node, and then double-click the queue named **outqueue** to view the contents of the queue in Visual Studio.
83+
1. In Storage Explorer, expand the **Queues** node, and then select the queue named **outqueue**.
8484

8585
The queue contains the message that the queue output binding created when you ran the HTTP-triggered function. If you invoked the function with the default `name` value of *Azure*, the queue message is *Name passed to the function: Azure*.
8686

87-
![Queue message shown in Azure Storage Explorer](./media/functions-add-output-binding-storage-queue-vs-code/function-queue-storage-output-view-queue.png)
87+
:::image type="content" source="./media/functions-add-output-binding-storage-queue-vs-code/function-queue-storage-output-view-queue.png" alt-text="Screenshot of the queue message shown in Azure Storage Explorer.":::
8888

89-
1. Run the function again, send another request, and you'll see a new message appear in the queue.
89+
1. Run the function again, send another request, and you see a new message in the queue.
9090

9191
Now, it's time to republish the updated function app to Azure.
9292

articles/governance/policy/samples/guest-configuration-baseline-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ For more information, see [Azure Policy guest configuration](../concepts/guest-c
356356
|Name<br /><sub>(ID)</sub> |Details |Expected value<br /><sub>(Type)</sub> |Severity |
357357
|---|---|---|---|
358358
|Audit Plug and Play Events<br /><sub>(AZ-WIN-00182)</sub> |**Description**: This PNP Activity policy setting allows you to audit when plug and play detects an external device. The recommended state for this setting is: `Success`. **Note:** A Windows 10, Server 2016 or higher OS is required to access and set this value in Group Policy.<br />**Key Path**: {0CCE9248-69AE-11D9-BED3-505054503030}<br />**OS**: WS2016, WS2019, WS2022<br />**Server Type**: Domain Controller, Domain Member, Workgroup Member |\>\= Success<br /><sub>(Audit)</sub> |Critical |
359-
|Audit Process Creation<br /><sub>(CCE-36059-4)</sub> |**Description**: This subcategory reports the creation of a process and the name of the program or user that created it. Events for this subcategory include: - 4688: A new process has been created. - 4696: A primary token was assigned to process. Refer to Microsoft Knowledge Base article 947226: [Description of security events in Windows Vista and in Windows Server 2008](https://support.microsoft.com/en-us/kb/947226) for the most recent information about this setting. The recommended state for this setting is: `Success`.<br />**Key Path**: {0CCE922B-69AE-11D9-BED3-505054503030}<br />**OS**: WS2008, WS2008R2, WS2012, WS2012R2, WS2016, WS2019, WS2022<br />**Server Type**: Domain Controller, Domain Member, Workgroup Member |\>\= Success<br /><sub>(Audit)</sub> |Critical |
359+
|Audit Process Creation<br /><sub>(CCE-36059-4)</sub> |**Description**: This subcategory reports the creation of a process and the name of the program or user that created it. Events for this subcategory include: - 4688: A new process has been created. - 4696: A primary token was assigned to process. Refer to Microsoft Knowledge Base article 947226: [Description of security events in Windows Vista and in Windows Server 2008](https://support.microsoft.com/topic/ms16-014-description-of-the-security-update-for-windows-vista-windows-server-2008-windows-7-windows-server-2008-r2-windows-server-2012-windows-8-1-and-windows-server-2012-r2-february-9-2016-1ff344d3-cd1c-cdbd-15b4-9344c7a7e6bd) for the most recent information about this setting. The recommended state for this setting is: `Success`.<br />**Key Path**: {0CCE922B-69AE-11D9-BED3-505054503030}<br />**OS**: WS2008, WS2008R2, WS2012, WS2012R2, WS2016, WS2019, WS2022<br />**Server Type**: Domain Controller, Domain Member, Workgroup Member |\>\= Success<br /><sub>(Audit)</sub> |Critical |
360360

361361
## System Audit Policies - DS Access
362362

articles/key-vault/certificates/certificate-scenarios.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,14 @@ Key Vault service sends requests to CA (outbound traffic). Therefore, it’s ful
9696

9797
### Formats of Import we support
9898
Azure Key Vault supports .pem and .pfx certificate files for importing Certificates into Key vault.
99-
We support the following type of Import for PEM file format. A single PEM encoded certificate along with a PKCS#8 encoded, unencrypted key which has the following
99+
We support the following type of Import for PEM file format. A single PEM encoded certificate along with a PKCS#8 encoded, unencrypted key which has the following format:
100100

101101
-----BEGIN CERTIFICATE-----
102+
102103
-----END CERTIFICATE-----
103104

104105
-----BEGIN PRIVATE KEY-----
106+
105107
-----END PRIVATE KEY-----
106108

107109
When you are importing the certificate, you need to ensure that the key is included in the file itself. If you have the private key separately in a different format, you would need to combine the key with the certificate. Some certificate authorities provide certificates in different formats, therefore before importing the certificate, make sure that they are either in .pem or .pfx format.
@@ -111,10 +113,12 @@ When you are importing the certificate, you need to ensure that the key is inclu
111113
>Ensure that no other meta data is present in the certificate file and that the private key not showing as encrypted.
112114
113115
### Formats of Merge CSR we support
116+
114117
AKV supports 2 PEM based formats. You can either merge a single PKCS#8 encoded certificate or a base64 encoded P7B (chain of certificates signed by CA).
115118
If you need to covert the P7B's format to the supported one, you can use [certutil -encode](/windows-server/administration/windows-commands/certutil#-encode)
116119

117120
-----BEGIN CERTIFICATE-----
121+
118122
-----END CERTIFICATE-----
119123

120124

articles/purview/includes/data-factory-common-supported-capabilities.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.service: purview
55
ms.subservice: purview-data-catalog
66
ms.custom: ignite-2022
77
ms.topic: include
8-
ms.date: 11/01/2021
8+
ms.date: 01/31/2023
99
---
1010

1111
### Copy activity support
@@ -51,6 +51,7 @@ Currently, if you use the following copy activity features, the lineage is not y
5151
- Compression setting for Binary, delimited text, Excel, JSON, and XML files.
5252
- Source partition options for Azure SQL Database, Azure SQL Managed Instance, Azure Synapse Analytics, SQL Server, and SAP Table.
5353
- Copy data to file-based sink with setting of max rows per file.
54+
- Column level lineage is not currently supported by ADF copy for resource sets.
5455

5556
In additional to lineage, the data asset schema (shown in Asset -> Schema tab) is reported for the following connectors:
5657

includes/functions-add-output-binding-js.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ Add code that uses the `msg` output binding object on `context.bindings` to crea
1111

1212
:::code language="javascript" range="5-7" source="~/functions-docs-javascript/functions-add-output-binding-storage-queue-cli/HttpExample/index.js":::
1313

14-
At this point, your function must look as follows:
14+
At this point, your function could look as follows:
1515

1616
:::code language="javascript" source="~/functions-docs-javascript/functions-add-output-binding-storage-queue-cli/HttpExample/index.js":::
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
author: ggailey777
3+
ms.service: azure-functions
4+
ms.topic: include
5+
ms.date: 01/31/2023
6+
ms.author: glenga
7+
---
8+
9+
Skip this section if you've already installed Azure Storage Explorer and connected it to your Azure account.
10+
11+
1. Run the [Azure Storage Explorer](https://storageexplorer.com/) tool, select the connect icon on the left, and select **Add an account**.
12+
13+
:::image type="content" source="./media/functions-storage-explorer-connect/storage-explorer-add-account.png" alt-text="Screenshot of how to add an Azure account to Microsoft Azure Storage Explorer.":::
14+
15+
1. In the **Connect** dialog, choose **Add an Azure account**, choose your **Azure environment**, and then select **Sign in...**.
16+
17+
:::image type="content" source="./media/functions-storage-explorer-connect/storage-explorer-connect-azure-account.png" alt-text="Screenshot of the sign-in to your Azure account window.":::
18+
19+
After you successfully sign in to your account, you see all of the Azure subscriptions associated with your account. Choose your subscription and select **Open Explorer**.
43.2 KB
Loading

0 commit comments

Comments
 (0)