feat: Module landing zone accelerator integration

Azure · Oct 2, 2023 · 1ffa649 · 1ffa649
1 parent 6262c9c
commit 1ffa649
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 8 deletions.
diff --git a/docs/aca/03-aca-dapr-integration/index.md b/docs/aca/03-aca-dapr-integration/index.md
@@ -182,7 +182,7 @@ The SDK offers developers three ways of making remote service invocation calls:
  Notice how we assigned the Dapr App Id “tasksmanager-frontend-webapp” to the Frontend WebApp.
 
 !!! note
-    If you need to run both microservices together, you need to keep calling `dapr run` manually each time in the terminal. And when you have multiple microservices talking to each other you need to run at the same time to debug the solution. This can be a convoluted process. You can refer to the [debug and launch Dapr applications in VSCode](../../aca/13-appendix/01-run-debug-dapr-app-vscode.md) to see how to configure VScode for running and debugging Dapr applications.
+    If you need to run both microservices together, you need to keep calling `dapr run` manually each time in the terminal. And when you have multiple microservices talking to each other you need to run at the same time to debug the solution. This can be a convoluted process. You can refer to the [debug and launch Dapr applications in VSCode](../14-appendix/01-run-debug-dapr-app-vscode.md) to see how to configure VScode for running and debugging Dapr applications.
 
 !!! success
     Now both Applications are running using Dapr sidecar. Open your browser and browse for `https://localhost:{localwebappport}`. E.g. `https://localhost:7000` and provide an email to load the tasks for the user (e.g. [email protected]).

diff --git a/docs/aca/04-aca-dapr-stateapi/index.md b/docs/aca/04-aca-dapr-stateapi/index.md
@@ -256,7 +256,7 @@ To add the component file state store, add a new folder named **components** und
 
 Now you should be ready to launch both applications and start doing CRUD operations from the Frontend Web App including querying the store. All your data will be stored in Cosmos DB Database you just provisioned. 
 
-If you have been running the different microservices using the [debug and launch Dapr applications in VSCode](../../aca/13-appendix/01-run-debug-dapr-app-vscode.md) then remember to uncomment the following line inside tasks.json file. 
+If you have been running the different microservices using the [debug and launch Dapr applications in VSCode](../14-appendix/01-run-debug-dapr-app-vscode.md) then remember to uncomment the following line inside tasks.json file. 
 This will instruct dapr to load the local projects components located at **./components** instead of the global components' folder.
 
 ```json hl_lines="2"

diff --git a/docs/aca/05-aca-dapr-pubsubapi/index.md b/docs/aca/05-aca-dapr-pubsubapi/index.md
@@ -39,7 +39,7 @@ We want to have more control and provide our own component file, so let's create
     --8<-- "docs/aca/05-aca-dapr-pubsubapi/dapr-pubsub-redis.yaml"
     ```
 
-To try out the Pub/Sub API, run the Backend API from VS Code by running the below command or using the Run and Debug tasks we have created in the [appendix](../../aca/13-appendix/01-run-debug-dapr-app-vscode.md). 
+To try out the Pub/Sub API, run the Backend API from VS Code by running the below command or using the Run and Debug tasks we have created in the [appendix](../14-appendix/01-run-debug-dapr-app-vscode.md). 
 
 !!! note
     Don't forget to include the property `--resources-path`.  Remember to replace the placeholders with your own values
@@ -263,7 +263,7 @@ in the terminal to indicate the processing of the message.
 
 #### 6. Optional: Update VS Code Tasks and Launch Configuration Files
 
-If you have followed the steps in the [appendix](../../aca/13-appendix/01-run-debug-dapr-app-vscode.md) so far in order to be able to run the three services together (frontend, backend api, and backend processor) 
+If you have followed the steps in the [appendix](../14-appendix/01-run-debug-dapr-app-vscode.md) so far in order to be able to run the three services together (frontend, backend api, and backend processor) 
 and debug them in VS Code, we need to update the files `tasks.json` and `launch.json` to include the new service we have added. 
 
 ??? example "Click to expand the files to update"

diff --git a/docs/aca/06-aca-dapr-bindingsapi/index.md b/docs/aca/06-aca-dapr-bindingsapi/index.md
@@ -188,7 +188,7 @@ Update and replace the code in the file with the code below. Pay close attention
 #### 6. Test Dapr Bindings Locally
 
 Now we are ready to give it an end-to-end test on our dev machines. Run the 3 applications together using Debug and Run button from VS Code. You can read how we configured the 3 apps to run together 
-in this [section](../../aca/13-appendix/01-run-debug-dapr-app-vscode.md).
+in this [section](../14-appendix/01-run-debug-dapr-app-vscode.md).
 
 Open Azure Storage Explorer on your local machine. If you don't have it installed you can install it from [here](https://azure.microsoft.com/en-us/products/storage/storage-explorer/#overview). 
 Login to your Azure Subscription and navigate to the storage account already created, create a queue, and use the same name you already used in the Dapr Input configuration file.

diff --git a/docs/aca/11-aca-landing-zone/index.md b/docs/aca/11-aca-landing-zone/index.md
@@ -0,0 +1,27 @@
+# Module 11 - Integration with Azure Container Apps landing zone accelerator
+
+Azure landing zone accelerators provide architectural guidance, reference architectures, reference implementations, and 
+automation to deploy workload platforms on Azure at scale. They are aligned with industry proven practices, such as 
+those presented in Azure landing zones guidance in the Cloud Adoption Framework.
+
+This Azure Container Apps landing zone accelerator represents the strategic design path and target technical state for 
+an Azure Container Apps deployment, owned and operated by a workload team.
+
+The application created as part of the workshop is integrated with the Azure Container Apps landing zone accelerator.
+
+
+# Deploy the landing zone
+
+To deploy the landing zone, you can follow the complete guide in [Azure Container Apps - Internal environment secure baseline [Bicep]](https://github.com/Azure/aca-landing-zone-accelerator/blob/main/scenarios/aca-internal/bicep/README.md).
+
+The deployment of the sample app deploys also an application gateway with the same name as the one of the landing zone.
+It is recommended to deploy only the first four building blocks of the landing zone and then deploy this sample app, 
+i.e. do not deploy hello world sample app and application gateway. 
+To do so, you can set the attribute `deployHelloWorldSampleApp` to `false` in the parameters file of the landing zone.
+
+To have Dapr observability in Application Insights, you need to set the attributes `enableApplicationInsights` and 
+`enableDaprInstrumentation` to `true` in the parameters file of the landing zone. To know more about monitoring and 
+observability, you can follow this documentation [Operations management considerations for Azure Container Apps](https://github.com/Azure/aca-landing-zone-accelerator/blob/main/docs/design-areas/management.md).
+
+
+--8<-- "https://raw.githubusercontent.com/Azure/aca-landing-zone-accelerator/main/scenarios/aca-internal/bicep/sample-apps/dotnet-task-tracker-service/docs/02-container-apps.md"
diff --git a/docs/aca/11-about-the-authors/index.md → docs/aca/12-about-the-authors/index.md b/docs/aca/11-about-the-authors/index.md → docs/aca/12-about-the-authors/index.md
diff --git a/docs/aca/13-contributing/1-contribution-guide.md b/docs/aca/13-contributing/1-contribution-guide.md
diff --git a/docs/aca/13-contributing/2-Submit-issue-suggestion.md b/docs/aca/13-contributing/2-Submit-issue-suggestion.md
diff --git a/docs/aca/13-contributing/3-minor-update-fix.md b/docs/aca/13-contributing/3-minor-update-fix.md
diff --git a/...-appendix/01-run-debug-dapr-app-vscode.md → ...-appendix/01-run-debug-dapr-app-vscode.md b/...-appendix/01-run-debug-dapr-app-vscode.md → ...-appendix/01-run-debug-dapr-app-vscode.md
diff --git a/...13-appendix/02-github-local-codespaces.md → ...14-appendix/02-github-local-codespaces.md b/...13-appendix/02-github-local-codespaces.md → ...14-appendix/02-github-local-codespaces.md
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -23,10 +23,15 @@ nav:
     - Deploy Infrastructure using Bicep: aca/10-aca-iac-bicep/iac-bicep.md
     - Deploy Infrastructure using Bicep via GitHub Actions: aca/10-aca-iac-bicep/ci-cd-git-action.md
     - Deploy infrastructure using Azure Devops Pipeline: aca/10-aca-iac-bicep/ci-cd-azdo.md
-  - About The Authors: aca/11-about-the-authors/index.md
+  - Module 11 - Integration with Azure Container Apps landing zone accelerator: aca/11-aca-landing-zone/index.md
+  - About The Authors: aca/12-about-the-authors/index.md
+  - Contributing:
+    - Contribution Guide: aca/13-contributing/1-contribution-guide.md
+    - Submit An Issue or Suggestion: aca/13-contributing/2-Submit-issue-suggestion.md
+    - Minor Update or fix, New Challenge: aca/13-contributing/3-minor-update-fix.md
   - Appendix:
-    - Debug and Launch Dapr Applications in VSCode: aca/13-appendix/01-run-debug-dapr-app-vscode.md
-    - Testing Changes Locally or with GitHub Codespaces: aca/13-appendix/02-github-local-codespaces.md
+    - Debug and Launch Dapr Applications in VSCode: aca/14-appendix/01-run-debug-dapr-app-vscode.md
+    - Testing Changes Locally or with GitHub Codespaces: aca/14-appendix/02-github-local-codespaces.md
 
 theme:
   name: material