Skip to content

fix(grafana): pin STG-global V2 Grafana major version to 13 (AROSLSRE-1362) #5852

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.

Sign up for GitHub

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

Closed
raelga wants to merge 1 commit into from
Closed

fix(grafana): pin STG-global V2 Grafana major version to 13 (AROSLSRE-1362) #5852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/config.msft.clouds-overlay.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ clouds:
# New Grafana workspace (live stg is arohcp-stg; this is the V2 one).
# Globally unique — must differ from the live name to avoid NameNotUnique.
grafanaName: "arohcp-{{ .ctx.environment }}2"
# V2-only Grafana major version. Azure Managed Grafana retired v11 for
# new Standard-SKU workspace creation on 2026-06-15 (valid: 12, 13), so
# the brand-new V2 workspace must be born on 13. Kept separate from the
# shared monitoring config so the live fleet stays grandfathered.
grafanaMajorVersion: "13"
# E2E
e2e:
regionTest:
Expand Down
6 changes: 5 additions & 1 deletion config/config.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3342,6 +3342,9 @@
},
"grafanaName": {
"type": "string"
},
"grafanaMajorVersion": {
"type": "string"
}
},
"additionalProperties": false,
Expand All @@ -3356,7 +3359,8 @@
"svcParentZoneName",
"cxParentZoneName",
"kustoName",
"grafanaName"
"grafanaName",
"grafanaMajorVersion"
]
},
"releaseApprover": {
Expand Down
1 change: 1 addition & 0 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ defaults:
cxParentZoneName: "empty-sentinel"
kustoName: "empty-sentinel"
grafanaName: "empty-sentinel"
grafanaMajorVersion: "empty-sentinel"
# Image Registry Policy
imageRegistryPolicy:
extraAllowedRegistries: ""
Expand Down
1 change: 1 addition & 0 deletions config/rendered/dev/ci00/centralus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@ stgGlobalV2:
frontDoorName: empty-sentinel
genevaKeyVaultName: empty-sentinel
globalKeyVaultName: empty-sentinel
grafanaMajorVersion: empty-sentinel
grafanaName: empty-sentinel
kustoName: empty-sentinel
oidcStorageAccountName: empty-sentinel
Expand Down
1 change: 1 addition & 0 deletions config/rendered/dev/ci01/centralus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@ stgGlobalV2:
frontDoorName: empty-sentinel
genevaKeyVaultName: empty-sentinel
globalKeyVaultName: empty-sentinel
grafanaMajorVersion: empty-sentinel
grafanaName: empty-sentinel
kustoName: empty-sentinel
oidcStorageAccountName: empty-sentinel
Expand Down
1 change: 1 addition & 0 deletions config/rendered/dev/cspr/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ stgGlobalV2:
frontDoorName: empty-sentinel
genevaKeyVaultName: empty-sentinel
globalKeyVaultName: empty-sentinel
grafanaMajorVersion: empty-sentinel
grafanaName: empty-sentinel
kustoName: empty-sentinel
oidcStorageAccountName: empty-sentinel
Expand Down
1 change: 1 addition & 0 deletions config/rendered/dev/dev/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ stgGlobalV2:
frontDoorName: empty-sentinel
genevaKeyVaultName: empty-sentinel
globalKeyVaultName: empty-sentinel
grafanaMajorVersion: empty-sentinel
grafanaName: empty-sentinel
kustoName: empty-sentinel
oidcStorageAccountName: empty-sentinel
Expand Down
1 change: 1 addition & 0 deletions config/rendered/dev/perf/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ stgGlobalV2:
frontDoorName: empty-sentinel
genevaKeyVaultName: empty-sentinel
globalKeyVaultName: empty-sentinel
grafanaMajorVersion: empty-sentinel
grafanaName: empty-sentinel
kustoName: empty-sentinel
oidcStorageAccountName: empty-sentinel
Expand Down
1 change: 1 addition & 0 deletions config/rendered/dev/pers/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@ stgGlobalV2:
frontDoorName: empty-sentinel
genevaKeyVaultName: empty-sentinel
globalKeyVaultName: empty-sentinel
grafanaMajorVersion: empty-sentinel
grafanaName: empty-sentinel
kustoName: empty-sentinel
oidcStorageAccountName: empty-sentinel
Expand Down
9 changes: 6 additions & 3 deletions dev-infrastructure/configurations/global-infra-stg.tmpl.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ param keyVaultTagKey = '{{ .global.keyVault.tagKey }}'
param keyVaultTagValue = '{{ .global.keyVault.tagValue }}'
param keyVaultEncryptionKeyName = '{{ .global.keyVault.encryptionKeyName }}'

// V2 grafana name from stgGlobalV2 (not monitoring.grafanaName) so the parallel
// STG-global stack does not collide with the live arohcp-stg Grafana workspace.
// V2 grafana name and major version from stgGlobalV2 (not monitoring.*) so the
// parallel STG-global stack does not collide with the live arohcp-stg Grafana
// workspace, and so the brand-new V2 workspace is created on a Grafana major
// version Azure still accepts for new Standard-SKU workspaces (v11 retired
// 2026-06-15; valid: 12, 13). The live fleet stays grandfathered on monitoring.*.
param grafanaName = '{{ .stgGlobalV2.grafanaName }}'
param grafanaMajorVersion = '{{ .monitoring.grafanaMajorVersion }}'
param grafanaMajorVersion = '{{ .stgGlobalV2.grafanaMajorVersion }}'
param grafanaZoneRedundantMode = '{{ .monitoring.grafanaZoneRedundantMode }}'
param grafanaRoles = '{{ .monitoring.grafanaRoles }}'
param crossTenantSecurityGroup = '{{ .monitoring.crossTenantSecurityGroup }}'
Expand Down