Skip to content

Commit d7e6bba

Browse files
authored
Merge branch 'main' into cm-linkfix-20220916
2 parents 8836408 + 5b812df commit d7e6bba

28 files changed

+124
-119
lines changed

articles/azure-developer-cli/overview.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ This list is grouped by supported language. Each repository contains a complete
5656

5757
| Template | App host | Tech stack |
5858
| ----------- | ----------| ----------- |
59-
| [Todo C# Cosmos DB (SQL)](https://github.com/Azure-Samples/todo-csharp-cosmos-sql) | [Azure App Service](/azure/app-service/) | [Azure Cosmos DB SQL API](/learn/modules/intro-to-azure-cosmos-db-core-api/), Bicep |
59+
| [Todo C# Cosmos DB (SQL)](https://github.com/Azure-Samples/todo-csharp-cosmos-sql) | [Azure App Service](/azure/app-service/) | [Azure Cosmos DB SQL API](/training/modules/intro-to-azure-cosmos-db-core-api/), Bicep |
6060
| [Todo C# Azure SQL Database](https://github.com/azure-samples/todo-csharp-sql) | [Azure App Service](/azure/app-service/) | [Azure SQL Database](/azure/azure-sql/database/sql-database-paas-overview), Bicep |
6161

6262
---
@@ -107,4 +107,4 @@ Currently supported/planned languages:
107107
## Next steps
108108

109109
> [!div class="nextstepaction"]
110-
> [Get started using Azure Developer CLI (azd)](get-started.md)
110+
> [Get started using Azure Developer CLI (azd)](get-started.md)

articles/github/github-actions.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Visit the [Marketplace for GitHub Actions for Azure](https://github.com/marketpl
8888
## Next Steps
8989

9090
> [!div class="nextstepaction"]
91-
> [Learning path, Automate your workflow with GitHub Actions](/learn/modules/github-actions-automate-tasks/)
91+
> [Learning path, Automate your workflow with GitHub Actions](/training/modules/github-actions-automate-tasks/)
9292
9393
> [!div class="nextstepaction"]
9494
> [Learning Lab, Continuous Delivery with Azure](https://lab.github.com/githubtraining/github-actions:-continuous-delivery-with-azure)

articles/go/index.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ landingContent:
2020
- linkListType: overview
2121
links:
2222
- text: Take your first steps with Go
23-
url: /learn/paths/go-first-steps
23+
url: /training/paths/go-first-steps
2424
- text: What is the Azure SDK for Go?
2525
url: overview.md
2626
- text: Configure your development environment
@@ -70,4 +70,4 @@ landingContent:
7070
- text: KEDA (Kubernetes Event Driven Autoscaler)
7171
url: https://github.com/kedacore/keda
7272
- text: KEDA HTTP Add-on
73-
url: https://github.com/kedacore/http-add-on
73+
url: https://github.com/kedacore/http-add-on

articles/includes/choose-the-right-azure-command-line-tool.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Azure CLI syntax is similar to that of Bash scripting. If you work primarily wit
8888
Azure PowerShell is a PowerShell module. If you work primarily with Windows systems, Azure PowerShell is a natural fit. Commands follow a verb-noun naming scheme and
8989
data is returned as objects.
9090

91-
Choose the tool that uses your experience and shortens your learning curve. Take advantage of [Microsoft learning](/learn/paths/manage-resources-in-azure) to become proficient at managing Azure at the command line.
91+
Choose the tool that uses your experience and shortens your learning curve. Take advantage of [Microsoft learning](/training/paths/manage-resources-in-azure) to become proficient at managing Azure at the command line.
9292

9393
With that said, being open-minded will only improve your abilities. Use a different tool when it makes sense.
9494

articles/intro/azure-developer-create-resources.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ The [Azure CLI](/cli/azure/what-is-azure-cli) is a cross-platform command line t
6161
* Outputs results as JSON (by default). Results can also be formatted as YAML, an ASCII table or tab-separated values with no keys.
6262
* Provides the ability to query and shape output through the use of [JMESPath queries](https://jmespath.org/).
6363

64-
Azure CLI commands are easily incorporated into popular scripting languages like [Bash](/learn/modules/bash-introduction/) giving you the ability to script common tasks.
64+
Azure CLI commands are easily incorporated into popular scripting languages like [Bash](/training/modules/bash-introduction/) giving you the ability to script common tasks.
6565

6666
```azurecli
6767
LOCATION='eastus'
@@ -239,4 +239,4 @@ Azure resources can also be created programmatically from code. This allows you
239239
> [Using the Azure SDK for Python](../python/sdk/azure-sdk-overview.md)
240240
241241
> [!div class="nextstepaction"]
242-
> [Using the Azure REST APIs](/rest/api/azure/)
242+
> [Using the Azure REST APIs](/rest/api/azure/)

articles/java/ee/jboss-on-azure.md

+13-8
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ description: An overview of the different JBoss EAP solutions on Azure, all join
44
author: KarlErickson
55
ms.author: jafreebe
66
ms.topic: overview
7-
ms.date: 06/27/2022
8-
ms.custom: template-overview, devx-track-java
7+
ms.date: 09/15/2022
8+
ms.custom: template-overview, devx-track-java, devx-track-javaee, devx-track-javaee-jbosseap, devx-track-javaee-jbosseap-aro, devx-track-javaee-jbosseap-vm
99
---
1010

1111
# Red Hat JBoss EAP on Azure
@@ -30,18 +30,23 @@ JBoss EAP on Azure App Service is jointly supported by Red Hat and Microsoft. Wh
3030
3131
## JBoss EAP on Azure Red Hat OpenShift (ARO)
3232

33-
[Azure Red Hat OpenShift](https://azure.microsoft.com/services/openshift/#overview) provides highly available, fully managed OpenShift clusters on demand, monitored and operated jointly by Microsoft and Red Hat. If you're already using containers, using Kubernetes, or adopting microservices, then deploying JBoss EAP on ARO is a compelling option. Red Hat and Microsoft provide official guidance for running JBoss EAP on Azure Red Hat OpenShift (ARO). For more information, see [Deploy a Java application with Red Hat JBoss Enterprise Application Platform (JBoss EAP) on an Azure Red Hat OpenShift (ARO) 4 cluster](/azure/openshift/howto-deploy-java-jboss-enterprise-application-platform-app). The guidance uses JBoss EAP Helm Charts. The Helm Charts let you easily and reliably deploy Java applications to OpenShift. The guidance also demonstrates the recommended use of Bootable JAR deployments, the WildFly JAR Maven plugin, Galleon layers, the Galleon data sources feature pack, clustered state on Kubernetes, OpenShift secrets, and liveness/readiness probes.
33+
[Azure Red Hat OpenShift](https://azure.microsoft.com/services/openshift/#overview) provides highly available, fully managed OpenShift clusters on demand, monitored and operated jointly by Microsoft and Red Hat. If you're already using or planning to adopt containers/Kubernetes, deploying JBoss EAP on ARO is a compelling option. Red Hat and Microsoft provide official guidance for running JBoss EAP on ARO. For more information, see [Deploy a Java application with Red Hat JBoss Enterprise Application Platform (JBoss EAP) on an Azure Red Hat OpenShift (ARO) 4 cluster](/azure/openshift/howto-deploy-java-jboss-enterprise-application-platform-app). The guidance uses JBoss EAP Helm Charts. The Helm Charts let you easily and reliably deploy Java applications to OpenShift. The guidance also demonstrates the recommended use of Bootable JAR deployments, the WildFly JAR Maven plugin, Galleon layers, the Galleon data sources feature pack, clustered state on Kubernetes, OpenShift secrets, and liveness/readiness probes.
3434

3535
## JBoss EAP on Azure Virtual Machines
3636

37-
Several plans are available for running JBoss EAP on Azure Virtual Machines. Visit the offer [in the Azure portal](https://aka.ms/jboss-eap-on-vms) and select the option best suited for your needs.
37+
Virtual machines are a mature, proven migration path to the cloud that provides maximum flexibility and control. These factors are especially important for mission-critical workloads most suited to lift-and-shift migration. Microsoft and Red Hat provide robust options for migrating JBoss EAP workloads to Azure Virtual Machines.
3838

39-
Virtual machine scale sets provide groups of load-balanced, highly scalable virtual machines for workloads of any size. For more information, see [Azure Virtual Machine Scale Sets](https://azure.microsoft.com/services/virtual-machine-scale-sets/).
39+
Azure solution templates help accelerate migrating JBoss EAP workloads. This solution automatically provisions several Azure resources to quickly create a JBoss EAP deployment on Azure Virtual Machines or virtual machine scale sets. The automatically provisioned resources include virtual network, storage, network security group, OpenJDK, Red Hat Enterprise Linux (RHEL), and JBoss EAP. The solution supports the latest versions of JBoss EAP 7, OpenJDK 8, and RHEL 8.
4040

41-
If you prefer a traditional cluster of VMs using the JBoss EAP clustering mechanism, is suitable for a lift and shift from deployments that are already using this feature. For more information, see [the JBoss EAP documentation](https://access.redhat.com/documentation/en-us/reference_architectures/2017/html-single/configuring_a_red_hat_jboss_eap_7_cluster/index).
41+
You can create different types of JBoss EAP deployments:
4242

43-
Choose a VM image of your preference and scale to thousands of VMs based on usage metrics. JBoss EAP on virtual machine scale sets uses jointly developed deployment templates to install JBoss EAP and Red Hat Enterprise Linux on your VMs behind a load balancer, all within a virtual network. These templates provide you with an enterprise-scale foundation to lift-and-shift your existing JBoss EAP applications. JBoss EAP on virtual machine scale sets supports clustered deployments via Azure Ping, so your stateful applications can run well.
43+
- A single instance on a VM.
44+
- A JBoss EAP cluster on a fixed number of VMs (with or without domain mode enabled). This option is very similar to traditional on-premises JBoss EAP clusters.
45+
- A dynamic JBoss EAP cluster on virtual machine scale sets. Virtual machine scale sets provide groups of load-balanced virtual machines that can be scaled up or down in response to demand. For more information, see [Azure Virtual Machine Scale Sets](https://azure.microsoft.com/services/virtual-machine-scale-sets/). The JBoss EAP cluster is formed using Azure Ping and is suitable for stateful applications. This option doesn't support domain mode.
4446

47+
You can launch the solution from [the Azure portal](https://aka.ms/jboss-eap-on-vms).
48+
49+
The offer requires a JBoss EAP subscription and works on a Bring-Your-Own-Subscription (BYOS) basis. For the RHEL part of the offer, you have a choice to use either Pay-As-You-Go (PAYGO) or BYOS. In case of PAYGO, there's an extra hourly RHEL subscription charge for using the offer on top of the normal Azure compute, network and storage costs. To use RHEL BYOS, you must [contact Red Hat](https://www.redhat.com/en/technologies/cloud-computing/cloud-access) to get your subscription enabled on Azure. Once you do so, the RHEL BYOS options will become visible as plans.
4550

4651
## Next steps
4752

@@ -50,5 +55,5 @@ The following articles provide more information on getting started with these te
5055
- [Red Hat JBoss EAP on Azure best practices](/azure/virtual-machines/workloads/redhat/jboss-eap-on-azure-best-practices)
5156
- [Quickstart: Create a Java app on Azure App Service](/azure/app-service/quickstart-java?tabs=javase&pivots=platform-linux)
5257
- [Configure a Java app for Azure App Service](/azure/app-service/configure-language-java?pivots=platform-linux)
53-
- [Getting Started with JBoss EAP for OpenShift](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.4/html/getting_started_with_jboss_eap_for_openshift_container_platform/index)
58+
- [Deploy a Java application with JBoss EAP on ARO](/azure/openshift/howto-deploy-java-jboss-enterprise-application-platform-app)
5459
- [Deploy Red Hat JBoss EAP on Azure VMs and virtual machine scale sets using the Azure Marketplace offer](/azure/virtual-machines/workloads/redhat/jboss-eap-marketplace-image)

articles/java/learning-resources/index.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ landingContent:
2626
links:
2727
- text: Java learning path
2828
url: fundamentals.md
29-
- text: Java on Azure (Microsoft Learn)
30-
url: /learn/paths/java-on-azure/
29+
- text: Java on Azure
30+
url: /training/paths/java-on-azure/
3131
- text: Books
3232
url: books.md
3333
- title: Explore workshops

articles/java/learning-resources/more-resources.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ The following links provide information about technologies related to Java.
2828

2929
## Next steps
3030

31-
- [Java on Azure](/learn/paths/java-on-azure/) learning path
31+
- [Java on Azure](/training/paths/java-on-azure/) learning path

articles/java/learning-resources/overview.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To supplement these resources, you might consider reading some books or consulti
2424

2525
## Hands-on learning
2626

27-
To learn more about Java on Azure using a hands-on approach, check out our learning path for [Java on Azure](/learn/paths/java-on-azure/). Also, be sure to visit [Workshops and videos](workshops-videos.md) for more hands-on content featuring migration scenarios and Azure Spring Apps. This article also provides links to our YouTube playlist and to the SpringOne 2021 conference.
27+
To learn more about Java on Azure using a hands-on approach, check out our learning path for [Java on Azure](/training/paths/java-on-azure/). Also, be sure to visit [Workshops and videos](workshops-videos.md) for more hands-on content featuring migration scenarios and Azure Spring Apps. This article also provides links to our YouTube playlist and to the SpringOne 2021 conference.
2828

2929
To understand the practical usage of Java on Azure, see our [samples](samples.md). If you run into issues, you can also troubleshoot with [Azure OSS Developer Support](https://azureossd.github.io/tags/).
3030

articles/java/learning-resources/toc.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
href: fundamentals.md
88
- name: Libraries, drivers, and modules
99
href: ../sdk/libraries-drivers-modules.md?toc=/azure/developer/java/learning-resources/toc.json&bc=/azure/developer/breadcrumb/toc.json
10-
- name: Java on Azure (Microsoft Learn)
11-
href: /learn/paths/java-on-azure/
10+
- name: Java on Azure
11+
href: /training/paths/java-on-azure/
1212
- name: Books
1313
href: books.md
1414
- name: Workshops and videos

articles/java/migration/includes/build-and-push-the-docker-image-to-azure-container-registry.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ Push the image to your Azure container registry:
5858
docker push ${MY_ACR}.azurecr.io/${MY_APP_NAME}
5959
```
6060

61-
For more in-depth information on building and storing container images in Azure, see the Learn module [Build and store container images with Azure Container Registry](/learn/modules/build-and-store-container-images/).
61+
For more in-depth information on building and storing container images in Azure, see the Learn module [Build and store container images with Azure Container Registry](/training/modules/build-and-store-container-images/).

articles/java/migration/migrate-spring-boot-to-azure-container-apps.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Push the image to your Azure container registry by using the following command:
171171
docker push ${MY_ACR}.azurecr.io/${MY_APP_NAME}
172172
```
173173

174-
For more in-depth information on building and storing container images in Azure, see [Build and store container images with Azure Container Registry](/learn/modules/build-and-store-container-images/).
174+
For more in-depth information on building and storing container images in Azure, see [Build and store container images with Azure Container Registry](/training/modules/build-and-store-container-images/).
175175

176176
If you used our [Spring Boot Container Quickstart GitHub repo](https://github.com/Azure/spring-boot-container-quickstart), you can also include a custom keystore that will be added to your JVM upon startup. This addition will occur if you put the keystore file at */opt/spring-boot/mycert.crt*. You can do so by adding the file directly to the Dockerfile.
177177

articles/java/migration/migrate-spring-boot-to-azure-kubernetes-service.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Push the image to your Azure container registry:
181181
docker push ${MY_ACR}.azurecr.io/${MY_APP_NAME}
182182
```
183183

184-
For more in-depth information on building and storing container images in Azure, see the Learn module [Build and store container images with Azure Container Registry](/learn/modules/build-and-store-container-images/).
184+
For more in-depth information on building and storing container images in Azure, see the Learn module [Build and store container images with Azure Container Registry](/training/modules/build-and-store-container-images/).
185185

186186
If you used our [Spring Boot Container Quickstart GitHub repo](https://github.com/Azure/spring-boot-container-quickstart), you can also include a custom keystore that will be added to your JVM upon startup. This addition will occur if you put the keystore file at */opt/spring-boot/mycert.crt*. You can do so by adding the file directly to the Dockerfile, or by using the Azure Key Vault Provider for Secrets Store CSI Driver, as mentioned previously.
187187

articles/java/migration/migrate-tomcat-to-azure-container-apps.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ sudo az acr login --name $acrName
160160
sudo docker push "${acrName}.azurecr.io/petclinic:1"
161161
```
162162

163-
For more information, see [Build and store container images with Azure Container Registry](/learn/modules/build-and-store-container-images/).
163+
For more information, see [Build and store container images with Azure Container Registry](/training/modules/build-and-store-container-images/).
164164

165165
### Deploy to Azure Container Apps
166166

articles/java/migration/migrate-tomcat-to-containers-on-azure-kubernetes-service.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ sudo az acr login -n $acrName
189189
sudo docker push "${acrName}.azurecr.io/petclinic:1"
190190
```
191191

192-
For more in-depth information on building and storing container images in Azure, see the respective [Microsoft Learn course](/learn/modules/build-and-store-container-images/).
192+
For more information, see the Learn module for [Building and storing container images in Azure](/training/modules/build-and-store-container-images/).
193193

194194
### Provision a public IP address
195195

articles/java/sdk/identity.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ SecretClient client = new SecretClientBuilder()
7171

7272
### Authenticate Azure management libraries
7373

74-
The Azure management libraries use the same credential APIs as the Azure client libraries, but also require an [Azure subscription ID](/learn/modules/create-an-azure-account/4-multiple-subscriptions) to manage the Azure resources on that subscription.
74+
The Azure management libraries use the same credential APIs as the Azure client libraries, but also require an [Azure subscription ID](/training/modules/create-an-azure-account/4-multiple-subscriptions) to manage the Azure resources on that subscription.
7575

7676
You can find the subscription IDs on the [Subscriptions page in the Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_Billing/SubscriptionsBlade). Alternatively, use the following [Azure CLI][azure_cli] command to get subscription IDs:
7777

@@ -118,4 +118,4 @@ This article introduced the Azure Identity functionality available in the Azure
118118
[eventhubs_client_library]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/eventhubs/azure-messaging-eventhubs
119119
[azure_core_library]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/core
120120
[javadoc]: https://azure.github.io/azure-sdk-for-java
121-
[jdk_link]: /java/azure/jdk
121+
[jdk_link]: /java/azure/jdk

articles/javascript/how-to/develop-serverless-apps.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Cosmos DB currently provides the following integration for functions:
153153

154154
The [Azure Functions developer guide for JavaScript](/azure/azure-functions/functions-reference-node) is a good starting point.
155155

156-
Use the Learn Module to learn how to [enable automatic updates in a web app using Azure functions and SignalR Service](/learn/modules/automatic-update-of-a-webapp-using-azure-functions-and-signalr/).
156+
Use the Learn module to learn how to [enable automatic updates in a web app using Azure functions and SignalR Service](/training/modules/automatic-update-of-a-webapp-using-azure-functions-and-signalr/).
157157

158158
* [Run code on a timer](/azure/azure-functions/functions-create-scheduled-function)
159159
* [Run code when files are uploaded or updated in Azure Blob storage](/azure/storage/blobs/storage-upload-process-images?tabs=nodejsv10)

articles/javascript/how-to/select-hosting-service.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Hosting options and deployment scenarios include several services and tools for
1414

1515
Use the following table to select a hosting service for most common app needs.
1616

17-
For a complete overview of different hosting options, see [Decision tree for Azure compute services](/azure/architecture/guide/technology-choices/compute-decision-tree) and the [Core Cloud Services - Azure compute options](/learn/modules/intro-to-azure-compute) module.
17+
For a complete overview of different hosting options, see [Decision tree for Azure compute services](/azure/architecture/guide/technology-choices/compute-decision-tree) and the [Core Cloud Services - Azure compute options](/training/modules/intro-to-azure-compute) module.
1818

1919

2020
| Service |App type supported| Suggested for |

0 commit comments

Comments
 (0)