-
Notifications
You must be signed in to change notification settings - Fork 173
chore: merge dev into main #791
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Harmanpreet-Microsoft
wants to merge
13
commits into
main
Choose a base branch
from
dev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
2b91977
Merge pull request #766 from microsoft/main
Prajwal-Microsoft 0820160
feat: Implementation of Configurable Logging Control via Flag (#756)
AjitPadhi-Microsoft 0e7ca15
Fix typo in CustomizingAzdParameters.md (#772)
Thanusree-Microsoft 7e36e63
Update src/App/app.py
AjitPadhi-Microsoft 322114d
feat: Add Troubleshooting Guide for Log Analytics Workspace Deletion …
Thanusree-Microsoft 8b74a26
Update CosmosDB parameters for improved redundancy and location handl…
Abdul-Microsoft 2adf0da
update main.json
Abdul-Microsoft 4b40db2
Merge pull request #782 from microsoft/psl-redeplomentissuefix
Prajwal-Microsoft 6cfd2fe
Update infra/main.bicep
Abdul-Microsoft 58fb2f9
Update infra/main.bicep
Abdul-Microsoft 7b5355f
resolved copilot comments
Abdul-Microsoft 5590128
Merge remote-tracking branch 'origin/main' into dev
Abdul-Microsoft 98d9de6
docs: Improve Troubleshoot Document (#786)
NirajC-Microsoft File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -236,7 +236,8 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain | |||||
| 5. Once the deployment is complete, please follow the [Import Sample Data](#post-deployment-steps) instructions under **Post Deployment Steps** to load the sample data correctly. | ||||||
| 6. Open the [Azure Portal](https://portal.azure.com/), go to the deployed resource group, find the App Service and get the app URL from `Default domain`. | ||||||
| 7. Test the app locally with the sample question with any selected client: _Show latest asset value by asset type?_. For more sample questions you can test in the application, see [Sample Questions](SampleQuestions.md). | ||||||
| 8. You can now delete the resources by running `azd down`, if you are done trying out the application. | ||||||
| 8. You can now delete the resources by running `azd down`, if you are done trying out the application. | ||||||
| > **Note:** If you deployed with `enableRedundancy=true` and Log Analytics workspace replication is enabled, you must first disable replication before running `azd down`, else resource group delete will fail. Follow the steps in [Handling Log Analytics Workspace Deletion with Replication Enabled](./LogAnalyticsReplicationDisable.md), wait until replication returns `false`, then run `azd down`. | ||||||
|
||||||
| > **Note:** If you deployed with `enableRedundancy=true` and Log Analytics workspace replication is enabled, you must first disable replication before running `azd down`, else resource group delete will fail. Follow the steps in [Handling Log Analytics Workspace Deletion with Replication Enabled](./LogAnalyticsReplicationDisable.md), wait until replication returns `false`, then run `azd down`. | |
| > **Note:** If you deployed with `enableRedundancy=true` and Log Analytics workspace replication is enabled, you must first disable replication before running `azd down`, otherwise resource group deletion will fail. Follow the steps in [Handling Log Analytics Workspace Deletion with Replication Enabled](./LogAnalyticsReplicationDisable.md), wait until replication returns `false`, then run `azd down`. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # 🛠 Handling Log Analytics Workspace Deletion with Replication Enabled | ||
|
|
||
| If redundancy (replication) is enabled for your Log Analytics workspace, you must disable it before deleting the workspace or resource group. Otherwise, deletion will fail. | ||
|
|
||
| ## ✅ Steps to Disable Replication Before Deletion | ||
| Run the following Azure CLI command. Note: This operation may take about 5 minutes to complete. | ||
|
|
||
| ```bash | ||
| az resource update --ids "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{logAnalyticsName}" --set properties.replication.enabled=false | ||
| ``` | ||
|
|
||
| Replace: | ||
| - `{subscriptionId}` → Your Azure subscription ID | ||
| - `{resourceGroupName}` → The name of your resource group | ||
| - `{logAnalyticsName}` → The name of your Log Analytics workspace | ||
|
|
||
| Optional: Verify replication is disabled (should output `false`): | ||
| ```bash | ||
| az resource show --ids "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{logAnalyticsName}" --query properties.replication.enabled -o tsv | ||
| ``` | ||
|
Comment on lines
+8
to
+20
|
||
|
|
||
| ## ✅ After Disabling Replication | ||
| You can safely delete: | ||
| - The Log Analytics workspace (manual) | ||
| - The resource group (manual), or | ||
| - All provisioned resources via `azd down` | ||
|
|
||
| Return to: [Deployment Guide](./DeploymentGuide.md) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The documentation correctly describes the new
AZURE_ENV_COSMOS_SECONDARY_LOCATIONparameter, but there's a minor inconsistency:Line 13 states the primary Cosmos location defaults to "Same as resource group location", but the actual Bicep code (infra/main.bicep:13) uses
resourceGroup().locationwhich is the same thing. However, the description could be clearer by stating it explicitly matches theAZURE_LOCATIONvalue when not specified, since users setAZURE_LOCATIONto determine the resource group location.Also consider clarifying that both locations should support zone redundancy when
enableRedundancy=true, as mentioned in the link provided.