Skip to content

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

Closed
raelga wants to merge 1 commit into
Azure:mainfrom
raelga:fix/grafana-v2-major-version-AROSLSRE-1362
Closed

fix(grafana): pin STG-global V2 Grafana major version to 13 (AROSLSRE-1362)#5852
raelga wants to merge 1 commit into
Azure:mainfrom
raelga:fix/grafana-v2-major-version-AROSLSRE-1362

Conversation

@raelga

@raelga raelga commented Jun 30, 2026

Copy link
Copy Markdown
Collaborator

What

Pin the STG-global V2 Grafana workspace to major version 13, decoupled from the shared monitoring.grafanaMajorVersion.

  • New transient stgGlobalV2.grafanaMajorVersion config field: empty-sentinel default in config.yaml, 13 in the stg overlay, added to the schema (properties + required).
  • global-infra-stg.tmpl.bicepparam now sources grafanaMajorVersion from stgGlobalV2.grafanaMajorVersion instead of monitoring.grafanaMajorVersion.
  • Re-materialized rendered configs.

Why

Azure Managed Grafana retired Grafana 11 for new Standard-SKU workspace creation on 2026-06-15 (valid: 12, 13). The STG-global V2 workspace is created fresh in the dedicated subscription, so it must be born on a supported version, otherwise:

GrafanaMajorVersionNotSupported: major version '11' not valid for sku Standard. Valid: 12, 13

Keeping this as a V2-only override (mirroring the existing stgGlobalV2.grafanaName pattern) leaves the live fleet grandfathered on monitoring.* and untouched.

Testing

  • cd config && make materialize — rendered configs updated, no unexpected drift.
  • make validate and make validate-config-pipelines — pass.
  • make yamlfmt — no changes.
  • Rendered stg config resolves stgGlobalV2.grafanaMajorVersion: "13"; dev clouds resolve the empty-sentinel default (never consumed; V2 pipelines are stg/uksouth-only).

Special notes for your reviewer

  • Scope is intentionally V2-only. The canonical global-infra.tmpl.bicepparam (int/stg/prod) still sources grafanaMajorVersion from monitoring.grafanaMajorVersion, which is currently undefined for public envs — a separate pre-existing gap to address when Grafana creation is re-enabled (it is presently commented out in global-infra.bicep).
  • empty-sentinel follows the established stgGlobalV2.* convention; the value is only consumed for stg/uksouth.

PR Checklist

  • Documented in commit/PR description
  • Rendered configs regenerated and committed
  • Schema updated for the new config field

…-1362)

Azure Managed Grafana retired major version 11 for new Standard-SKU
workspace creation on 2026-06-15 (valid: 12, 13). The STG-global V2
workspace is created fresh, so it must be born on a supported version.

Add a V2-only stgGlobalV2.grafanaMajorVersion field (empty-sentinel
default, 13 in the stg overlay) and source the V2 global-infra
grafanaMajorVersion param from it instead of monitoring.grafanaMajorVersion.
This keeps the live fleet grandfathered and untouched.
Copilot AI review requested due to automatic review settings June 30, 2026 07:36
@openshift-ci

openshift-ci Bot commented Jun 30, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: raelga

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Pins the STG-global V2 Azure Managed Grafana workspace to Grafana major version 13 by introducing a dedicated stgGlobalV2.grafanaMajorVersion config field and wiring the STG V2 global-infra parameters to consume it (decoupled from monitoring.*), ensuring new Standard-SKU workspace creation remains supported after Azure’s v11 retirement.

Changes:

  • Switched global-infra-stg.tmpl.bicepparam to source grafanaMajorVersion from stgGlobalV2.grafanaMajorVersion (instead of monitoring.grafanaMajorVersion).
  • Added stgGlobalV2.grafanaMajorVersion to config defaults, schema, STG overlay (set to "13"), and re-materialized rendered dev configs with the new field.

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated no comments.

Show a summary per file
File Description
dev-infrastructure/configurations/global-infra-stg.tmpl.bicepparam Uses stgGlobalV2.grafanaMajorVersion for the STG-global V2 Grafana parameter wiring.
config/rendered/dev/pers/westus3.yaml Materialized stgGlobalV2.grafanaMajorVersion: empty-sentinel in rendered dev config.
config/rendered/dev/perf/westus3.yaml Materialized stgGlobalV2.grafanaMajorVersion: empty-sentinel in rendered dev config.
config/rendered/dev/dev/westus3.yaml Materialized stgGlobalV2.grafanaMajorVersion: empty-sentinel in rendered dev config.
config/rendered/dev/cspr/westus3.yaml Materialized stgGlobalV2.grafanaMajorVersion: empty-sentinel in rendered dev config.
config/rendered/dev/ci01/centralus.yaml Materialized stgGlobalV2.grafanaMajorVersion: empty-sentinel in rendered dev config.
config/rendered/dev/ci00/centralus.yaml Materialized stgGlobalV2.grafanaMajorVersion: empty-sentinel in rendered dev config.
config/config.yaml Adds default stgGlobalV2.grafanaMajorVersion: "empty-sentinel".
config/config.schema.json Extends stgGlobalV2 schema with grafanaMajorVersion and marks it required.
config/config.msft.clouds-overlay.yaml Sets STG stgGlobalV2.grafanaMajorVersion: "13" with supporting rationale.

@raelga

raelga commented Jun 30, 2026

Copy link
Copy Markdown
Collaborator Author

Closing as a duplicate of #5847, which implements the identical stgGlobalV2.grafanaMajorVersion pin (same 10 files, same approach) and was opened first by the AROSLSRE-1362 owner. Tracking the fix there.

@raelga raelga closed this Jun 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants