Skip to content

Commit

Permalink
feat: Adjusted telemetry 'deployments' suppression (letters E-N-1) (A…
Browse files Browse the repository at this point in the history
…zure#2354)

## Description

> This PR only covers the modules starting with letters E-N (excluding
networking)

- Added deployments suppression to module instead of just bicepconfig to
also apply to anybody using our modules without a likewise configure
bicepconfig locally
- Updated used deployment RP API version
- Formatted all templates
- Regenerated all templates & readmes (due to API update)

> New attempt after Azure#1480

## Pipeline Reference

<!-- Insert your Pipeline Status Badge below -->

| Pipeline |
| -------- |
|
[![avm.res.analysis-services.server](https://github.com/AlexanderSehr/bicep-registry-modules/actions/workflows/avm.res.analysis-services.server.yml/badge.svg?branch=users%2Falsehr%2FtelemetryModuleTest_attempt2&event=workflow_dispatch)](https://github.com/AlexanderSehr/bicep-registry-modules/actions/workflows/avm.res.analysis-services.server.yml)
|

## Type of Change

<!-- Use the check-boxes [x] on the options that are relevant. -->

- [ ] Update to CI Environment or utlities (Non-module effecting
changes)
- [x] Azure Verified Module updates:
- [ ] Bugfix containing backwards compatible bug fixes, and I have NOT
bumped the MAJOR or MINOR version in `version.json`:
- [ ] Someone has opened a bug report issue, and I have included "Closes
#{bug_report_issue_number}" in the PR description.
- [ ] The bug was found by the module author, and no one has opened an
issue to report it yet.
- [x] Feature update backwards compatible feature updates, and I have
bumped the MINOR version in `version.json`.
- [ ] Breaking changes and I have bumped the MAJOR version in
`version.json`.
  - [ ] Update to documentation

---------

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
Co-authored-by: ChrisSidebotham-MSFT <48600046+ChrisSidebotham@users.noreply.github.com>
  • Loading branch information
3 people authored Jun 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 9995802 commit c2d2256
Showing 88 changed files with 948 additions and 927 deletions.
53 changes: 26 additions & 27 deletions avm/res/event-grid/domain/main.bicep
Original file line number Diff line number Diff line change
@@ -97,27 +97,27 @@ var builtInRoleNames = {
)
}

resource avmTelemetry 'Microsoft.Resources/deployments@2023-07-01' =
if (enableTelemetry) {
name: take(
'46d3xbcp.res.eventgrid-domain.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}',
64
)
properties: {
mode: 'Incremental'
template: {
'$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#'
contentVersion: '1.0.0.0'
resources: []
outputs: {
telemetry: {
type: 'String'
value: 'For more information, see https://aka.ms/avm/TelemetryInfo'
}
#disable-next-line no-deployments-resources
resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
name: take(
'46d3xbcp.res.eventgrid-domain.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}',
64
)
properties: {
mode: 'Incremental'
template: {
'$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#'
contentVersion: '1.0.0.0'
resources: []
outputs: {
telemetry: {
type: 'String'
value: 'For more information, see https://aka.ms/avm/TelemetryInfo'
}
}
}
}
}

resource domain 'Microsoft.EventGrid/domains@2023-06-01-preview' = {
name: name
@@ -145,17 +145,16 @@ module domain_topics 'topic/main.bicep' = [
}
]

resource domain_lock 'Microsoft.Authorization/locks@2020-05-01' =
if (!empty(lock ?? {}) && lock.?kind != 'None') {
name: lock.?name ?? 'lock-${name}'
properties: {
level: lock.?kind ?? ''
notes: lock.?kind == 'CanNotDelete'
? 'Cannot delete resource or child resources.'
: 'Cannot delete or modify the resource or child resources.'
}
scope: domain
resource domain_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock ?? {}) && lock.?kind != 'None') {
name: lock.?name ?? 'lock-${name}'
properties: {
level: lock.?kind ?? ''
notes: lock.?kind == 'CanNotDelete'
? 'Cannot delete resource or child resources.'
: 'Cannot delete or modify the resource or child resources.'
}
scope: domain
}

resource domain_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = [
for (diagnosticSetting, index) in (diagnosticSettings ?? []): {
10 changes: 5 additions & 5 deletions avm/res/event-grid/domain/main.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "17171097905179773848"
"version": "0.28.1.47646",
"templateHash": "17426938291126651589"
},
"name": "Event Grid Domains",
"description": "This module deploys an Event Grid Domain.",
@@ -570,7 +570,7 @@
"avmTelemetry": {
"condition": "[parameters('enableTelemetry')]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2023-07-01",
"apiVersion": "2024-03-01",
"name": "[take(format('46d3xbcp.res.eventgrid-domain.{0}.{1}', replace('-..--..-', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4)), 64)]",
"properties": {
"mode": "Incremental",
@@ -706,8 +706,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "11448955001407567896"
"version": "0.28.1.47646",
"templateHash": "3734443194724604904"
},
"name": "Event Grid Domain Topics",
"description": "This module deploys an Event Grid Domain Topic.",
4 changes: 2 additions & 2 deletions avm/res/event-grid/domain/topic/main.json
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "11448955001407567896"
"version": "0.28.1.47646",
"templateHash": "3734443194724604904"
},
"name": "Event Grid Domain Topics",
"description": "This module deploys an Event Grid Domain Topic.",
4 changes: 2 additions & 2 deletions avm/res/event-grid/namespace/ca-certificate/main.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "1062917273000341959"
"version": "0.28.1.47646",
"templateHash": "12117465982320735659"
},
"name": "Eventgrid Namespace CA Certificates",
"description": "This module deploys an Eventgrid Namespace CA Certificate.",
4 changes: 2 additions & 2 deletions avm/res/event-grid/namespace/client-group/main.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "7182498673501513186"
"version": "0.28.1.47646",
"templateHash": "8957170895657751475"
},
"name": "Eventgrid Namespace Client Groups",
"description": "This module deploys an Eventgrid Namespace Client Group.",
4 changes: 2 additions & 2 deletions avm/res/event-grid/namespace/client/main.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "11296609826875033958"
"version": "0.28.1.47646",
"templateHash": "9304498064315745543"
},
"name": "Eventgrid Namespace Clients",
"description": "This module deploys an Eventgrid Namespace Client.",
47 changes: 23 additions & 24 deletions avm/res/event-grid/namespace/main.bicep
Original file line number Diff line number Diff line change
@@ -164,24 +164,24 @@ var builtInRoleNames = {
// Resources //
// ============== //

resource avmTelemetry 'Microsoft.Resources/deployments@2023-07-01' =
if (enableTelemetry) {
name: '46d3xbcp.res.eventgrid-namespace.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'
properties: {
mode: 'Incremental'
template: {
'$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#'
contentVersion: '1.0.0.0'
resources: []
outputs: {
telemetry: {
type: 'String'
value: 'For more information, see https://aka.ms/avm/TelemetryInfo'
}
#disable-next-line no-deployments-resources
resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
name: '46d3xbcp.res.eventgrid-namespace.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'
properties: {
mode: 'Incremental'
template: {
'$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#'
contentVersion: '1.0.0.0'
resources: []
outputs: {
telemetry: {
type: 'String'
value: 'For more information, see https://aka.ms/avm/TelemetryInfo'
}
}
}
}
}

resource namespace 'Microsoft.EventGrid/namespaces@2023-12-15-preview' = {
name: name
@@ -217,17 +217,16 @@ resource namespace 'Microsoft.EventGrid/namespaces@2023-12-15-preview' = {
}
}

resource namespace_lock 'Microsoft.Authorization/locks@2020-05-01' =
if (!empty(lock ?? {}) && lock.?kind != 'None') {
name: lock.?name ?? 'lock-${name}'
properties: {
level: lock.?kind ?? ''
notes: lock.?kind == 'CanNotDelete'
? 'Cannot delete resource or child resources.'
: 'Cannot delete or modify the resource or child resources.'
}
scope: namespace
resource namespace_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock ?? {}) && lock.?kind != 'None') {
name: lock.?name ?? 'lock-${name}'
properties: {
level: lock.?kind ?? ''
notes: lock.?kind == 'CanNotDelete'
? 'Cannot delete resource or child resources.'
: 'Cannot delete or modify the resource or child resources.'
}
scope: namespace
}

resource namespace_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = [
for (diagnosticSetting, index) in (diagnosticSettings ?? []): {
34 changes: 17 additions & 17 deletions avm/res/event-grid/namespace/main.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "18358017202196196766"
"version": "0.28.1.47646",
"templateHash": "10205244849642221535"
},
"name": "Event Grid Namespaces",
"description": "This module deploys an Event Grid Namespace.",
@@ -660,7 +660,7 @@
"avmTelemetry": {
"condition": "[parameters('enableTelemetry')]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2023-07-01",
"apiVersion": "2024-03-01",
"name": "[format('46d3xbcp.res.eventgrid-namespace.{0}.{1}', replace('-..--..-', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]",
"properties": {
"mode": "Incremental",
@@ -1473,8 +1473,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "4459336414537252998"
"version": "0.28.1.47646",
"templateHash": "1744917828950358230"
},
"name": "Eventgrid Namespace Topics",
"description": "This module deploys an Eventgrid Namespace Topic.",
@@ -1745,8 +1745,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "18248314164362964337"
"version": "0.28.1.47646",
"templateHash": "16670830960405846481"
},
"name": "Event Subscriptions",
"description": "This module deploys an Event Subscription.",
@@ -2031,8 +2031,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "1062917273000341959"
"version": "0.28.1.47646",
"templateHash": "12117465982320735659"
},
"name": "Eventgrid Namespace CA Certificates",
"description": "This module deploys an Eventgrid Namespace CA Certificate.",
@@ -2161,8 +2161,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "11296609826875033958"
"version": "0.28.1.47646",
"templateHash": "9304498064315745543"
},
"name": "Eventgrid Namespace Clients",
"description": "This module deploys an Eventgrid Namespace Client.",
@@ -2327,8 +2327,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "7182498673501513186"
"version": "0.28.1.47646",
"templateHash": "8957170895657751475"
},
"name": "Eventgrid Namespace Client Groups",
"description": "This module deploys an Eventgrid Namespace Client Group.",
@@ -2448,8 +2448,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "4931718668767892926"
"version": "0.28.1.47646",
"templateHash": "16208314286026284609"
},
"name": "Eventgrid Namespace Topic Spaces",
"description": "This module deploys an Eventgrid Namespace Topic Space.",
@@ -2686,8 +2686,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "353917243244046230"
"version": "0.28.1.47646",
"templateHash": "17753700427881740340"
},
"name": "Eventgrid Namespace Permissions Bindings",
"description": "This module deploys an Eventgrid Namespace Permission Binding.",
4 changes: 2 additions & 2 deletions avm/res/event-grid/namespace/permission-binding/main.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "353917243244046230"
"version": "0.28.1.47646",
"templateHash": "17753700427881740340"
},
"name": "Eventgrid Namespace Permissions Bindings",
"description": "This module deploys an Eventgrid Namespace Permission Binding.",
4 changes: 2 additions & 2 deletions avm/res/event-grid/namespace/topic-space/main.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "4931718668767892926"
"version": "0.28.1.47646",
"templateHash": "16208314286026284609"
},
"name": "Eventgrid Namespace Topic Spaces",
"description": "This module deploys an Eventgrid Namespace Topic Space.",
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "18248314164362964337"
"version": "0.28.1.47646",
"templateHash": "16670830960405846481"
},
"name": "Event Subscriptions",
"description": "This module deploys an Event Subscription.",
19 changes: 9 additions & 10 deletions avm/res/event-grid/namespace/topic/main.bicep
Original file line number Diff line number Diff line change
@@ -92,17 +92,16 @@ resource topic 'Microsoft.EventGrid/namespaces/topics@2023-12-15-preview' = {
}
}

resource topic_lock 'Microsoft.Authorization/locks@2020-05-01' =
if (!empty(lock ?? {}) && lock.?kind != 'None') {
name: lock.?name ?? 'lock-${name}'
properties: {
level: lock.?kind ?? ''
notes: lock.?kind == 'CanNotDelete'
? 'Cannot delete resource or child resources.'
: 'Cannot delete or modify the resource or child resources.'
}
scope: topic
resource topic_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock ?? {}) && lock.?kind != 'None') {
name: lock.?name ?? 'lock-${name}'
properties: {
level: lock.?kind ?? ''
notes: lock.?kind == 'CanNotDelete'
? 'Cannot delete resource or child resources.'
: 'Cannot delete or modify the resource or child resources.'
}
scope: topic
}

resource topic_roleAssignments 'Microsoft.Authorization/roleAssignments@2022-04-01' = [
for (roleAssignment, index) in (roleAssignments ?? []): {
8 changes: 4 additions & 4 deletions avm/res/event-grid/namespace/topic/main.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "4459336414537252998"
"version": "0.28.1.47646",
"templateHash": "1744917828950358230"
},
"name": "Eventgrid Namespace Topics",
"description": "This module deploys an Eventgrid Namespace Topic.",
@@ -277,8 +277,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "18248314164362964337"
"version": "0.28.1.47646",
"templateHash": "16670830960405846481"
},
"name": "Event Subscriptions",
"description": "This module deploys an Event Subscription.",
Loading

0 comments on commit c2d2256

Please sign in to comment.