Skip to content

Commit a319864

Browse files
authored
Merge branch 'MicrosoftDocs:main' into docs-editor/container-insights-onboard-1695680784
2 parents af0c084 + a0079e1 commit a319864

File tree

12 files changed

+178
-29
lines changed

12 files changed

+178
-29
lines changed

articles/aks/learn/quick-kubernetes-deploy-terraform.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ In this article, you learn how to:
3636

3737
- **Kubernetes command-line tool (kubectl):** [Download kubectl](https://kubernetes.io/releases/download/).
3838

39+
## Login to your Azure Account
40+
41+
[!INCLUDE [authenticate-to-azure.md](~/azure-dev-docs-pr/articles/terraform/includes/authenticate-to-azure.md)]
42+
3943
## Implement the Terraform code
4044

4145
> [!NOTE]

articles/azure-functions/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,8 @@
543543
href: migrate-version-3-version-4.md
544544
- name: Migrate v1.x to v4.x
545545
href: migrate-version-1-version-4.md
546+
- name: Update Java versions
547+
href: update-java-versions.md
546548
- name: Monitor
547549
items:
548550
- name: Monitor function apps with Azure Monitor
106 KB
Loading
196 KB
Loading
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
---
2+
title: Update Java versions in Azure Functions
3+
description: Learn how to update an existing function app in Azure Functions to run on a new version of Java.
4+
ms.topic: how-to
5+
ms.date: 09/14/2023
6+
zone_pivot_groups: app-service-platform-windows-linux
7+
---
8+
9+
# Update Java versions in Azure Functions
10+
11+
The Azure Functions supports specific versions of Java. This support changes based on the support or Java versions. As these supported versions change, you need to update your Java function apps. You may also want to update your apps to take advantage of features in newer supported version of Java. For more information, see [Supported versions](functions-reference-java.md#supported-versions) in the Java developer guide.
12+
13+
:::zone pivot="platform-windows"
14+
The way that you update your function app depends on whether you run on Windows or Linux. This version is for Windows. Choose your OS at the [top](#top) of the article.
15+
:::zone-end
16+
:::zone pivot="platform-linux"
17+
The way that you update your function app depends on whether you run on Windows or Linux. This version is for Linux. Choose your OS at the [top](#top) of the article.
18+
:::zone-end
19+
20+
## Prepare to update
21+
22+
Before you update the Java version in Azure, you should complete these tasks:
23+
24+
### 1. Verify your functions locally
25+
26+
Before upgrading the Java version used by your function app in Azure, make sure that you have fully tested and verified your function code locally on the new target version of Java. Examples in this article assume you're updating to Java 17.
27+
28+
### 2. Move to the latest Functions runtime
29+
30+
Before updating your Java version, make sure your function app is running on the latest version of the Functions runtime (version 4.x).
31+
32+
### [Azure portal](#tab/azure-portal)
33+
34+
Use these steps to determine your Functions runtime version:
35+
36+
1. In the [Azure portal](https://portal.azure.com), locate your function app and select **Configuration** on the left-hand side under **Settings**.
37+
38+
1. Select the **Function runtime settings** tab and check the **Runtime version** value to see if your function app is running on version 4.x of the Functions runtime (`~4`).
39+
40+
:::image type="content" source="media/update-java-versions/update-functions-version-portal.png" alt-text="Screenshot of how to view the Functions runtime version for your app in the Azure portal.":::
41+
42+
### [Azure CLI](#tab/azure-cli)
43+
44+
Use this [`az functionapp config appsettings list`](/cli/azure/functionapp/config/appsettings#az-functionapp-config-appsettings-list) command to check your runtime version:
45+
46+
```azurecli
47+
az functionapp config appsettings list --name "<FUNCTION_APP_NAME>" --resource-group "<RESOURCE_GROUP_NAME>"
48+
```
49+
The `FUNCTIONS_EXTENSION_VERSION` setting sets the runtime version. A value of `~4` means that your function app is already running on the latest minor version of the latest major version (4.x).
50+
51+
---
52+
53+
If you need to first update your function app to version 4.x, see [Migrate apps from Azure Functions version 3.x to version 4.x](./migrate-version-3-version-4.md). You should follow the instructions in this article rather than just manually changing the `FUNCTIONS_EXTENSION_VERSION` setting.
54+
55+
## Update the Java version
56+
:::zone pivot="platform-windows"
57+
You can use the Azure portal, Azure CLI, or Azure PowerShell to update the Java version for your function app.
58+
These procedures apply to all [Functions hosting options](./functions-scale.md).
59+
:::zone-end
60+
:::zone pivot="platform-linux"
61+
>[!NOTE]
62+
> You can't change the Java version in the Azure portal when your function app is running on Linux in a [Consumption plan](./consumption-plan.md). Instead use the Azure CLI.
63+
:::zone-end
64+
### [Azure portal](#tab/azure-portal)
65+
:::zone pivot="platform-linux"
66+
You can only use these steps for function apps hosted in a [Premium plan](./functions-premium-plan.md) or a [Dedicated (App Service) plan](./dedicated-plan.md). For a [Consumption plan](./consumption-plan.md), you must instead use the Azure CLI.
67+
::: zone-end
68+
Use the following steps to update the Java version:
69+
70+
1. In the [Azure portal](https://portal.azure.com), locate your function app and select **Configuration** on the left-hand side.
71+
72+
1. In the **General settings** tab, update the **Java version** to `Java 17`.
73+
74+
:::image type="content" source="media/update-java-versions/update-java-version-portal.png" alt-text="Screenshot of how to set the desired Java version for a function app in the Azure portal.":::
75+
76+
1. When notified about a restart, select **Continue**, and then **Save**.
77+
78+
### [Azure CLI](#tab/azure-cli)
79+
80+
You can use the Azure CLI to update the Java version for any hosting plan.
81+
82+
:::zone pivot="platform-windows"
83+
Run the [`az functionapp config set`](/cli/azure/functionapp/config#az-functionapp-config-set) command to update the Java version site setting to `17`:
84+
85+
```azurecli
86+
az functionapp config set --java-version "17" --name "<APP_NAME>" --resource-group "<RESOURCE_GROUP>"
87+
```
88+
:::zone-end
89+
:::zone pivot="platform-linux"
90+
Run the [`az functionapp config set`](/cli/azure/functionapp/config#az-functionapp-config-set) command to update the Linux site setting with the new Java version for your function app.
91+
92+
```azurecli
93+
az functionapp config set --linux-fx-version "java|17" --name "<APP_NAME>" --resource-group "<RESOURCE_GROUP>"
94+
```
95+
:::zone-end
96+
97+
In this example, replace `<APP_NAME>` and `<RESOURCE_GROUP>` with the name of your function app and resource group, respectively.
98+
99+
---
100+
101+
Your function app restarts after you update the Java version. To learn more about Functions support for Java, see [Language runtime support policy](language-support-policy.md).
102+
103+
## Next steps
104+
105+
> [!div class="nextstepaction"]
106+
> [Java developer guide](./functions-reference-java.md)
107+

articles/azure-monitor/app/javascript-sdk.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ ms.reviewer: mmcc
1010

1111
# Enable Azure Monitor Application Insights Real User Monitoring
1212

13-
The Microsoft Azure Monitor Application Insights JavaScript SDK collects usage data which allows you to monitor and analyze the performance of JavaScript web applications. This is commonly referred to as Real User Monitoring or RUM.
13+
The Microsoft Azure Monitor Application Insights JavaScript SDK collects usage data, which allows you to monitor and analyze the performance of JavaScript web applications. This is commonly referred to as Real User Monitoring or RUM.
1414

15-
The Application Insights JavaScript SDK has a base SDK and several plugins for additional capabilities.
15+
The Application Insights JavaScript SDK has a base SDK and several plugins for more capabilities.
1616

1717
:::image type="content" source="media/javascript-sdk/conceptual-diagram-javascript-sdk.png" alt-text="Conceptual diagram that shows the Application Insights JavaScript SDK, its plugins/extensions, and their relationship to each other." lightbox="media/javascript-sdk/conceptual-diagram-javascript-sdk.png":::
1818

1919
We collect page views by default. But if you want to also collect clicks by default, consider adding the [Click Analytics Auto-Collection plug-in](./javascript-feature-extensions.md):
2020

21-
- If you're adding a [framework extension](./javascript-framework-extensions.md), which you can [add](#optional-add-advanced-sdk-configuration) after you follow the steps to get started below, you'll have the option to add Click Analytics when you add the framework extension.
21+
- If you're adding a [framework extension](./javascript-framework-extensions.md), which you can [add](#optional-add-advanced-sdk-configuration) after you follow the steps to get started below, you can optionally add Click Analytics when you add the framework extension.
2222
- If you're not adding a framework extension, [add the Click Analytics plug-in](./javascript-feature-extensions.md) after you follow the steps to get started.
2323

2424
We provide the [Debug plugin](https://github.com/microsoft/ApplicationInsights-JS/blob/main/extensions/applicationinsights-debugplugin-js/README.md) and [Performance plugin](https://github.com/microsoft/ApplicationInsights-JS/blob/main/extensions/applicationinsights-perfmarkmeasure-js/README.md) for debugging/testing. In rare cases, it's possible to build your own extension by adding a [custom plugin](https://github.com/microsoft/ApplicationInsights-JS/blob/e4be62c0aa9318b540157118b729bb0c4d8b6c6e/API-reference.md#custom-extension).
@@ -62,6 +62,7 @@ Two methods are available to add the code to enable Application Insights via the
6262
// useXhr: 1,
6363
crossOrigin: "anonymous",
6464
// onInit: null,
65+
// cr: 0,
6566
cfg: { // Application Insights Configuration
6667
connectionString: "YOUR_CONNECTION_STRING"
6768
}});
@@ -82,6 +83,7 @@ Two methods are available to add the code to enable Application Insights via the
8283
| useXhr | boolean | Optional | This setting is used only for reporting SDK load failures. For example, this setting is useful when the JavaScript (Web) SDK Loader Script is preventing the HTML page from loading, causing fetch() to be unavailable.<br><br>Reporting first attempts to use fetch() if available and then fallback to XHR. Set this setting to `true` to bypass the fetch check. This setting is only required if your application is being used in an environment where fetch would fail to send the failure events such as if the JavaScript (Web) SDK Loader Script isn't loading successfully.
8384
| crossOrigin | string | Optional | By including this setting, the script tag added to download the SDK includes the crossOrigin attribute with this string value. Use this setting when you need to provide support for CORS. When not defined (the default), no crossOrigin attribute is added. Recommended values are not defined (the default), "", or "anonymous". For all valid values, see the [cross origin HTML attribute](https://developer.mozilla.org/docs/Web/HTML/Attributes/crossorigin) documentation.
8485
| onInit | function(aiSdk) { ... } | Optional | This callback function is called after the main SDK script has been successfully loaded and initialized from the CDN (based on the src value). This callback function is useful when you need to insert a telemetry initializer. It's passed one argument, which is a reference to the SDK instance that's being called for and is also called before the first initial page view. If the SDK has already been loaded and initialized, this callback is still called. NOTE: During the processing of the sdk.queue array, this callback is called. You CANNOT add any more items to the queue because they're ignored and dropped. (Added as part of JavaScript (Web) SDK Loader Script version 5--the sv:"5" value within the script). |
86+
| cr | boolean | Optional | If the SDK fails to load and the endpoint value defined for `src` is the public CDN location, this configuration option attempts to immediately load the SDK from one of the following backup CDN endpoints:<ul><li>js.monitor.azure.com</li><li>js.cdn.applicationinsights.io</li><li>js.cdn.monitor.azure.com</li><li>js0.cdn.applicationinsights.io</li><li>js0.cdn.monitor.azure.com</li><li>js2.cdn.applicationinsights.io</li><li>js2.cdn.monitor.azure.com</li><li>az416426.vo.msecnd.net</li></ul>NOTE: az416426.vo.msecnd.net is partially supported, so it's not recommended.<br><br>If the SDK successfully loads from a backup CDN endpoint, it loads from the first available one, which is determined when the server performs a successful load check. If the SDK fails to load from any of the backup CDN endpoints, the SDK Failure error message appears.<br><br>When not defined, the default value is `true`. If you don’t want to load the SDK from the backup CDN endpoints, set this configuration option to `false`.<br><br>If you’re loading the SDK from your own privately hosted CDN endpoint, this configuration option is not applicable.
8587

8688
#### [npm package](#tab/npmpackage)
8789

-2.74 KB
Loading

articles/chaos-studio/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
href: chaos-studio-faults-actions.md
3939
- name: Targets and capabilities
4040
href: chaos-studio-targets-capabilities.md
41+
- name: Target selection
42+
href: chaos-studio-target-selection.md
4143
- name: Permissions and security
4244
href: chaos-studio-permissions-security.md
4345
- name: Private networking
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
title: Target selection in Azure Chaos Studio Preview
3+
description: Understand two different ways to select experiment targets in Azure Chaos Studio Preview.
4+
author: prasha-microsoft
5+
ms.author: prashabora
6+
ms.service: chaos-studio
7+
ms.topic: conceptual
8+
ms.date: 09/25/2023
9+
ms.custom: template-concept, ignite-fall-2021, devx-track-arm-template
10+
---
11+
12+
# Target selection in Azure Chaos Studio Preview
13+
14+
Every chaos experiment is made up of a different combination of faults and targets, building up to a unique outage scenario to test your system's resilience against. You may want to select a fixed set of targets for your chaos experiment, or provide a rule in which all matching fault-onboarded resources are included as targets in your experiment. Chaos Studio enables you to do both by providing both manual and query-based target selection.
15+
16+
## List-based manual target selection
17+
18+
List-based manual target selection allows you to select a fixed set of onboarded targets for a particular fault in your chaos experiment. Depending on the selected fault, you may select one or more onboarded resources to target. The aforementioned resources are added to the experiment upon creation time. In order to modify the list, you must navigate to the experiment's page and add or remove fault targets manually. An example of manual target selection is shown below.
19+
20+
[ ![Screenshot that shows the list-based manual target selection option in the Azure portal.](images/manual-target-selection.png) ](images/manual-target-selection.png#lightbox)
21+
22+
## Query-based dynamic target selection
23+
24+
Query-based dynamic target selection allows you to input a KQL query that will select all onboarded targets that match the query result set. Using your query, you may filter targets based on common Azure resource parameters including type, region, name, and more. Upon experiment creation time, only the query itself will be added to your chaos experiment.
25+
26+
The inputted query will run and add onboarded targets that match its result set upon experiment execution time. Thus, any resources onboarded to Chaos Studio after experiment creation time that match the query result set upon experiment execution time will be targeted by your experiment. You may preview your query's result set when adding it to your experiment, but be aware that it may not match the result set at experiment execution time. An example of a possible dynamic target query is shown below.
27+
28+
[ ![Screenshot that shows the query-based dynamic target selection option in the Azure portal.](images/dynamic-target-selection-preview.png) ](images/dynamic-target-selection-preview.png#lightbox)
29+
30+
## Next steps
31+
Now that you understand both ways to select targets within a chaos experiment, you're ready to:
32+
33+
- [Create and run your first experiment](chaos-studio-tutorial-service-direct-portal.md)
237 KB
Loading

0 commit comments

Comments
 (0)