Skip to content
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

feat: merging from upstream changes #13

Merged
merged 25 commits into from
Mar 4, 2022
Merged

feat: merging from upstream changes #13

merged 25 commits into from
Mar 4, 2022

Conversation

wanpengyang
Copy link
Member

Overview/Summary

merging from upstream changes

* Add diagnostic settings policies for data services

* Add branch config for testing

* Add missing types for auditing

* Add diagnostic setting policies for compute services

* Add diagnostic setting policies for integration services

* Add diagnostic setting policies for network services

* Remove policy for ACI since it doesn't have logs to collect

* Remove extra resource type

* Set region to 'global' for edge services

* Remove branch config. used for testing

* Updated App Service log categories

* Add branch config

* Remove branch config
* Add deployment scope for policy assignment

* Add branch test config

* Set new parameter for policy assignment scope:  var-policyAssignmentManagementGroupId

* Update pipeline for new var

* Add separate scope for testing

* Update pipeline parameter name

* Ensure new temp file is created to populate the parameters.

* Remove test job

* Remove branch config

* Update readme

* Update authoring guide with new parameter
…Azure#156)

Ensure diagnostic settings policy only checks for logs
Update scripts documentation (Issue Azure#157)
Update docs/onboarding/azure-devops-scripts.md
Co-authored-by: Senthuran Sivananthan <senthuran.sivananthan@microsoft.com>
* Remove obsolete directory

* Rotate resource group names for E2E deployments

* Fix typo

* Add branch config for testing

* Fix typo

* Remove branch configs

* Remove timestamp from sample JSON templates.  Timestamps are kept for E2E testing.

* Remove date stamp
* Update linter rules for location parameter

* Add location parameter with default value based on resourceGroup() or deployment()

* Update archetype schema and docs for location

* Add branch config for testing

* Update AKS version

* Update branch config

* Remove branch configs
…e#161)

* Add policy and policy set to inherit tags from subscription to resource group

* Add branch config for testing

* Remove policy type as it's not built in

* Updated resource type for resource group

* Update policy assignment

* Ensure assignment name is <= 24 chars

* Revert resource group type

* Setting mode to all

* Update documentation

* Add branch config

* Add explicit dependsOn for subscription scaffolding to complete

* Update test deployment parameters

* Remove explicit dependsOn for subscription scaffolding to complete

* Update doc to describe approaches for adding tags to RGs

* Reduce the options for tagging resources given subscripton to RG tagging is available

* Add example scenarios for tag inheritence

* Fix typo

* Remove branch configs

* Resolve linter error: no-loc-expr-outside-params
* Instructions for creating ADO pipeline environments

* Fix formatting
…ngs (Azure#177)

* Fix markdown linter warnings
* Add instruction for logging and networking MGs
Co-authored-by: Preston K. Parsard <autocloudarc@noreply.github.com>
Implement configurable management group hierarchy
* Add instructions for backfilling management group hierarchy

* Update section titles, links and reference backfill instruction as part of MG setup

* Instructions for installing AzCLI and jq

* Clearfy that Tenant Root Group could have been renamed in the organization

* Windows Shell example

* Update instructions to delete pipeline variables that will be automatically created when MG heirarchy is used

* Note on YAML indentation
* Redirect subscriptoin configuration guidance to archetype authoring guide doc
* Revise instructions for creating ARM parameter files & management group id selection
Print multi-line environment variables (typically JSON objects) in Show Variables step
…Azure-main

Co-authored-by: Calvin Rodo  <calvin.rodo@cds-snc.ca>
Copy link
Member

@CalvinRodo CalvinRodo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🌮🐱

@wanpengyang wanpengyang merged commit df8d2b8 into main Mar 4, 2022
@wanpengyang wanpengyang deleted the Azure-main branch May 25, 2022 15:36
wanpengyang pushed a commit that referenced this pull request May 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants