Skip to content

Commit bcd38e2

Browse files
authored
Merge pull request #212007 from MicrosoftDocs/main
Publish to Live, Wednesday 4AM PST, 9/21
2 parents cfd5d50 + 1c28a18 commit bcd38e2

File tree

116 files changed

+2869
-299
lines changed

Some content is hidden

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

116 files changed

+2869
-299
lines changed
155 KB
Loading
-121 KB
Loading

articles/active-directory/saas-apps/panorama9-tutorial.md

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: tutorial
12-
ms.date: 06/07/2021
12+
ms.date: 09/19/2022
1313
ms.author: jeedes
1414
---
1515
# Tutorial: Azure Active Directory integration with Panorama9
@@ -120,23 +120,19 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
120120

121121
1. In a different web browser window, sign in to your Panorama9 company site as an administrator.
122122

123-
2. In the toolbar on the top, click **Manage**, and then click **Extensions**.
124-
125-
![Extensions](./media/panorama9-tutorial/toolbar.png "Extensions")
126-
127-
3. On the **Extensions** dialog, click **Single Sign-On**.
128-
129-
![Single Sign-On](./media/panorama9-tutorial/extension.png "Single Sign-On")
123+
2. Navigate to **Manage** -> **Extensions** -> **Single Sign-On**.
130124

131125
4. In the **Settings** section, perform the following steps:
132126

133127
![Settings](./media/panorama9-tutorial/configuration.png "Settings")
134128

135-
a. In **Identity provider URL** textbox, paste the value of **Login URL**, which you have copied from Azure portal.
129+
a. Enable the Single Sign-On.
130+
131+
b. In **Identity URL** textbox, paste the value of **Identifier(Entity ID)**, which you have copied from Azure portal.
136132

137-
b. In **Certificate fingerprint** textbox, paste the **Thumbprint** value of certificate, which you have copied from Azure portal.
133+
c. In **Certificate fingerprint** textbox, paste the **Thumbprint** value of certificate, which you have copied from Azure portal.
138134
139-
5. Click **Save**.
135+
5. Click **Save Changes**.
140136

141137
### Create Panorama9 test user
142138

@@ -148,30 +144,21 @@ In the case of Panorama9, provisioning is a manual task.
148144

149145
1. Sign in to your **Panorama9** company site as an administrator.
150146

151-
2. In the menu on the top, click **Manage**, and then click **Users**.
152-
153-
![Screenshot that shows the "Manage" and "Users" tabs selected.](./media/panorama9-tutorial/user.png "Users")
154-
155-
3. In the Users section, Click **+** to add new user.
147+
1. In the Users section, type the email address of a valid Azure Active Directory user you want to provision into the **Email** textbox and give a valid **Name**.
156148

157149
![Users](./media/panorama9-tutorial/new-user.png "Users")
158150

159-
4. Go to the User data section, type the email address of a valid Azure Active Directory user you want to provision into the **Email** textbox.
160-
161-
5. Come to the Users section, Click **Save**.
162-
163-
> [!NOTE]
164-
> The Azure Active Directory account holder receives an email and follows a link to confirm their account before it becomes active.
151+
5. Click **Create user**.
165152

166153
## Test SSO
167154

168155
In this section, you test your Azure AD single sign-on configuration with following options.
169156

170-
* Click on **Test this application** in Azure portal. This will redirect to Panorama9 Sign-on URL where you can initiate the login flow.
157+
* Click on **Test this application** in Azure portal. This will redirect to Panorama9 Sign on URL where you can initiate the login flow.
171158

172-
* Go to Panorama9 Sign-on URL directly and initiate the login flow from there.
159+
* Go to Panorama9 Sign on URL directly and initiate the login flow from there.
173160

174-
* You can use Microsoft My Apps. When you click the Panorama9 tile in the My Apps, this will redirect to Panorama9 Sign-on URL. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
161+
* You can use Microsoft My Apps. When you click the Panorama9 tile in the My Apps, this will redirect to Panorama9 Sign on URL. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
175162

176163
## Next steps
177164

articles/app-service/configure-custom-container.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,18 @@ When persistent storage is disabled, then writes to the `C:\home` directory are
202202

203203
The only exception is the `C:\home\LogFiles` directory, which is used to store the container and application logs. This folder will always persist upon app restarts if [application logging is enabled](troubleshoot-diagnostic-logs.md?#enable-application-logging-windows) with the **File System** option, independently of the persistent storage being enabled or disabled. In other words, enabling or disabling the persistent storage will not affect the application logging behavior.
204204

205+
By default, persistent storage is *disabled* on Windows custom containers. To enable it, set the `WEBSITES_ENABLE_APP_SERVICE_STORAGE` app setting value to `true` via the [Cloud Shell](https://shell.azure.com). In Bash:
206+
207+
```azurecli-interactive
208+
az webapp config appsettings set --resource-group <group-name> --name <app-name> --settings WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
209+
```
210+
211+
In PowerShell:
212+
213+
```azurepowershell-interactive
214+
Set-AzWebApp -ResourceGroupName <group-name> -Name <app-name> -AppSettings @{"WEBSITES_ENABLE_APP_SERVICE_STORAGE"=true}
215+
```
216+
205217
::: zone-end
206218

207219
::: zone pivot="container-linux"
@@ -214,9 +226,7 @@ The only exception is the `/home/LogFiles` directory, which is used to store the
214226

215227
It is recommended to write data to `/home` or a [mounted azure storage path](configure-connect-to-azure-storage.md?tabs=portal&pivots=container-linux). Data written outside these paths will not be persistent during restarts and will be saved to platform-managed host disk space separate from the App Service Plans file storage quota.
216228

217-
::: zone-end
218-
219-
By default, persistent storage is **enabled** on custom containers, you can disable this through app settings. To disable it, set the `WEBSITES_ENABLE_APP_SERVICE_STORAGE` app setting value to `false` via the [Cloud Shell](https://shell.azure.com). In Bash:
229+
By default, persistent storage is *enabled* on Linux custom containers. To disable it, set the `WEBSITES_ENABLE_APP_SERVICE_STORAGE` app setting value to `false` via the [Cloud Shell](https://shell.azure.com). In Bash:
220230

221231
```azurecli-interactive
222232
az webapp config appsettings set --resource-group <group-name> --name <app-name> --settings WEBSITES_ENABLE_APP_SERVICE_STORAGE=false
@@ -228,6 +238,8 @@ In PowerShell:
228238
Set-AzWebApp -ResourceGroupName <group-name> -Name <app-name> -AppSettings @{"WEBSITES_ENABLE_APP_SERVICE_STORAGE"=false}
229239
```
230240

241+
::: zone-end
242+
231243
> [!NOTE]
232244
> You can also [configure your own persistent storage](configure-connect-to-azure-storage.md).
233245

articles/azure-arc/kubernetes/quickstart-connect-cluster.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,14 @@ You can delete the Azure Arc-enabled Kubernetes resource, any associated configu
412412
az connectedk8s delete --name AzureArcTest1 --resource-group AzureArcTest
413413
```
414414

415+
If the deletion process hangs, use the following command to force deletion (adding `-y` if you want to bypass the confirmation prompt):
416+
417+
```azurecli
418+
az connectedk8s delete -g AzureArcTest1 -n AzureArcTest --force
419+
```
420+
421+
This command can also be used if you experience issues when creating a new cluster deployment (due to previously created resources not being completely removed).
422+
415423
>[!NOTE]
416424
> Deleting the Azure Arc-enabled Kubernetes resource using the Azure portal removes any associated configuration resources, but *does not* remove any agents running on the cluster. Best practice is to delete the Azure Arc-enabled Kubernetes resource using `az connectedk8s delete` rather than deleting the resource in the Azure portal.
417425

articles/azure-functions/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
- name: Manage a function app
405405
href: functions-how-to-use-azure-function-app-settings.md
406406
displayName: app setting, application setting
407-
- name: Reference function app settings from App Configuration (preview)
407+
- name: App Configuration references
408408
href: ../app-service/app-service-configuration-references.md?toc=%2fazure%2fazure-functions%2ftoc.json
409409
- name: Set the runtime version
410410
href: set-runtime-version.md

articles/azure-functions/functions-develop-local.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Develop and run Azure Functions locally
33
description: Learn how to code and test Azure Functions on your local computer before you run them on Azure Functions.
44

55
ms.topic: conceptual
6-
ms.date: 05/19/2022
6+
ms.date: 09/22/2022
77

88
---
99
# Code and test Azure Functions locally
@@ -18,9 +18,9 @@ The way in which you develop functions on your local computer depends on your [l
1818

1919
|Environment |Languages |Description|
2020
|-----------------------------------------|------------|---|
21-
|[Visual Studio Code](functions-develop-vs-code.md)| [C# (class library)](functions-dotnet-class-library.md)<br/>[C# isolated process (.NET 5.0)](dotnet-isolated-process-guide.md)<br/>[JavaScript](functions-reference-node.md)<br/>[PowerShell](./create-first-function-vs-code-powershell.md)<br/>[Python](functions-reference-python.md) | The [Azure Functions extension for VS Code](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions) adds Functions support to VS Code. Requires the Core Tools. Supports development on Linux, macOS, and Windows, when using version 2.x of the Core Tools. To learn more, see [Create your first function using Visual Studio Code](./create-first-function-vs-code-csharp.md). |
22-
| [Command prompt or terminal](functions-run-local.md) | [C# (class library)](functions-dotnet-class-library.md)<br/>[C# isolated process (.NET 5.0)](dotnet-isolated-process-guide.md)<br/>[JavaScript](functions-reference-node.md)<br/>[PowerShell](functions-reference-powershell.md)<br/>[Python](functions-reference-python.md) | [Azure Functions Core Tools] provides the core runtime and templates for creating functions, which enable local development. Version 2.x supports development on Linux, macOS, and Windows. All environments rely on Core Tools for the local Functions runtime. |
23-
| [Visual Studio 2019](functions-develop-vs.md) | [C# (class library)](functions-dotnet-class-library.md)<br/>[C# isolated process (.NET 5.0)](dotnet-isolated-process-guide.md) | The Azure Functions tools are included in the **Azure development** workload of [Visual Studio 2019](https://www.visualstudio.com/vs/) and later versions. Lets you compile functions in a class library and publish the .dll to Azure. Includes the Core Tools for local testing. To learn more, see [Develop Azure Functions using Visual Studio](functions-develop-vs.md). |
21+
|[Visual Studio Code](functions-develop-vs-code.md)| [C# (in-process)](functions-dotnet-class-library.md)<br/>[C# (isolated process)](dotnet-isolated-process-guide.md)<br/>[JavaScript](functions-reference-node.md)<br/>[PowerShell](./create-first-function-vs-code-powershell.md)<br/>[Python](functions-reference-python.md) | The [Azure Functions extension for VS Code](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions) adds Functions support to VS Code. Requires the Core Tools. Supports development on Linux, macOS, and Windows, when using version 2.x of the Core Tools. To learn more, see [Create your first function using Visual Studio Code](./create-first-function-vs-code-csharp.md). |
22+
| [Command prompt or terminal](functions-run-local.md) | [C# (in-process)](functions-dotnet-class-library.md)<br/>[C# (isolated process)](dotnet-isolated-process-guide.md)<br/>[JavaScript](functions-reference-node.md)<br/>[PowerShell](functions-reference-powershell.md)<br/>[Python](functions-reference-python.md) | [Azure Functions Core Tools] provides the core runtime and templates for creating functions, which enable local development. Version 2.x supports development on Linux, macOS, and Windows. All environments rely on Core Tools for the local Functions runtime. |
23+
| [Visual Studio](functions-develop-vs.md) | [C# (in-process)](functions-dotnet-class-library.md)<br/>[C# (isolated process)](dotnet-isolated-process-guide.md) | The Azure Functions tools are included in the **Azure development** workload of [Visual Studio](https://www.visualstudio.com/vs/), starting with Visual Studio 2019. Lets you compile functions in a class library and publish the .dll to Azure. Includes the Core Tools for local testing. To learn more, see [Develop Azure Functions using Visual Studio](functions-develop-vs.md). |
2424
| [Maven](./create-first-function-cli-java.md) (various) | [Java](functions-reference-java.md) | Maven archetype supports Core Tools to enable development of Java functions. Version 2.x supports development on Linux, macOS, and Windows. To learn more, see [Create your first function with Java and Maven](./create-first-function-cli-java.md). Also supports development using [Eclipse](functions-create-maven-eclipse.md) and [IntelliJ IDEA](functions-create-maven-intellij.md). |
2525

2626
[!INCLUDE [Don't mix development environments](../../includes/functions-mixed-dev-environments.md)]
@@ -29,7 +29,7 @@ Each of these local development environments lets you create function app projec
2929

3030
## Local settings file
3131

32-
The local.settings.json file stores app settings and settings used by local development tools. Settings in the local.settings.json file are used only when you're running your project locally.
32+
The local.settings.json file stores app settings and settings used by local development tools. Settings in the local.settings.json file are used only when you're running your project locally. When you publish your project to Azure, be sure to also add any required settings to the app settings for the function app.
3333

3434
> [!IMPORTANT]
3535
> Because the local.settings.json may contain secrets, such as connection strings, you should never store it in a remote repository. Tools that support Functions provide ways to synchronize settings in the local.settings.json file with the [app settings](functions-how-to-use-azure-function-app-settings.md#settings) in the function app to which your project is deployed.
@@ -77,12 +77,20 @@ The following application settings can be included in the **`Values`** array whe
7777
|**`FUNCTIONS_WORKER_RUNTIME`** | `dotnet`<br/>`dotnet-isolated`<br/>`node`<br/>`java`<br/>`powershell`<br/>`python`| Indicates the targeted language of the Functions runtime. Required for version 2.x and higher of the Functions runtime. This setting is generated for your project by Core Tools. To learn more, see the [`FUNCTIONS_WORKER_RUNTIME`](functions-app-settings.md#functions_worker_runtime) reference.|
7878
| **`FUNCTIONS_WORKER_RUNTIME_VERSION`** | `~7` |Indicates to use PowerShell 7 when running locally. If not set, then PowerShell Core 6 is used. This setting is only used when running locally. The PowerShell runtime version is determined by the `powerShellVersion` site configuration setting, when it runs in Azure, which can be [set in the portal](functions-reference-powershell.md#changing-the-powershell-version). |
7979

80+
## Synchronize settings
81+
82+
When you develop your functions locally, any local settings required by your app must also be present in app settings of the function app to which your code is deployed. You may also need to download current settings from the function app to your local project. While you can [manually configure app settings in the Azure portal](functions-how-to-use-azure-function-app-settings.md?tabs=portal#settings), the following tools also let you synchronize app settings with local settings in your project:
83+
84+
+ [Visual Studio Code](functions-develop-vs-code.md#application-settings-in-azure)
85+
+ [Visual Studio](functions-develop-vs.md#function-app-settings)
86+
+ [Azure Functions Core Tools](functions-run-local.md#local-settings)
87+
8088
## Next steps
8189

82-
+ To learn more about local development of compiled C# functions using Visual Studio 2019, see [Develop Azure Functions using Visual Studio](functions-develop-vs.md).
90+
+ To learn more about local development of compiled C# functions (both in-process and isolated process) using Visual Studio, see [Develop Azure Functions using Visual Studio](functions-develop-vs.md).
8391
+ To learn more about local development of functions using VS Code on a Mac, Linux, or Windows computer, see the Visual Studio Code getting started article for your preferred language:
84-
+ [C# class library](create-first-function-vs-code-csharp.md)
85-
+ [C# isolated process (.NET 5.0)](create-first-function-vs-code-csharp.md?tabs=isolated-process)
92+
+ [C# (in-process)](create-first-function-vs-code-csharp.md)
93+
+ [C# )isolated process)](create-first-function-vs-code-csharp.md?tabs=isolated-process)
8694
+ [Java](create-first-function-vs-code-java.md)
8795
+ [JavaScript](create-first-function-vs-code-node.md)
8896
+ [PowerShell](create-first-function-vs-code-powershell.md)

articles/azure-functions/start-stop-vms/deploy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ To learn more about how Azure Monitor metric alerts work and how to configure th
325325
"EnableClassic": false,
326326
"AutoStop_MetricName": "Percentage CPU",
327327
"AutoStop_Condition": "LessThan",
328-
"AutoStop_Description": "Alert to stop the VM if the CPU % exceed the threshold",
328+
"AutoStop_Description": "Alert to stop the VM if the CPU % falls below the threshold",
329329
"AutoStop_Frequency": "00:05:00",
330330
"AutoStop_Severity": "2",
331331
"AutoStop_Threshold": "5",
@@ -347,7 +347,7 @@ To learn more about how Azure Monitor metric alerts work and how to configure th
347347
{
348348
"Action": "stop",
349349
"AutoStop_Condition": "LessThan",
350-
"AutoStop_Description": "Alert to stop the VM if the CPU % exceed the threshold",
350+
"AutoStop_Description": "Alert to stop the VM if the CPU % falls below the threshold",
351351
"AutoStop_Frequency": "00:05:00",
352352
"AutoStop_MetricName": "Percentage CPU",
353353
"AutoStop_Severity": "2",
@@ -372,7 +372,7 @@ To learn more about how Azure Monitor metric alerts work and how to configure th
372372
{
373373
"Action": "stop",
374374
"AutoStop_Condition": "LessThan",
375-
"AutoStop_Description": "Alert to stop the VM if the CPU % exceed the threshold",
375+
"AutoStop_Description": "Alert to stop the VM if the CPU % falls below the threshold",
376376
"AutoStop_Frequency": "00:05:00",
377377
"AutoStop_MetricName": "Percentage CPU",
378378
"AutoStop_Severity": "2",

0 commit comments

Comments
 (0)