Skip to content

fix(stg-global): create V2 Grafana on supported major version via stgGlobalV2.grafanaMajorVersion (AROSLSRE-1362)#5847

Merged
openshift-merge-bot[bot] merged 2 commits into
Azure:mainfrom
hbhushan3:hbhushan/stg-global-v2-grafana-version
Jun 30, 2026
Merged

fix(stg-global): create V2 Grafana on supported major version via stgGlobalV2.grafanaMajorVersion (AROSLSRE-1362)#5847
openshift-merge-bot[bot] merged 2 commits into
Azure:mainfrom
hbhushan3:hbhushan/stg-global-v2-grafana-version

Conversation

@hbhushan3

@hbhushan3 hbhushan3 commented Jun 29, 2026

Copy link
Copy Markdown
Collaborator

What

Adds a transient, V2-only stgGlobalV2.grafanaMajorVersion config value (empty-sentinel default; 13 for stg in the MSFT overlay) and points the parallel STG-global "V2" Grafana deployment at it, instead of the shared monitoring.grafanaMajorVersion.

  • config/config.schema.json — new grafanaMajorVersion property + required entry on the stgGlobalV2 object.
  • config/config.yamlgrafanaMajorVersion: "empty-sentinel" default (so every cloud/env resolves under missingkey=error).
  • config/config.msft.clouds-overlay.yaml — real value grafanaMajorVersion: "13" for stg.
  • dev-infrastructure/configurations/global-infra-stg.tmpl.bicepparam — rewires param grafanaMajorVersion from {{ .monitoring.grafanaMajorVersion }}{{ .stgGlobalV2.grafanaMajorVersion }}.
  • config/rendered/** — regenerated via make -C config/ materialize.

This mirrors the existing stgGlobalV2.grafanaName pattern (added in #5813) one-for-one.

Why

Azure Managed Grafana retired Grafana 11 for new workspace creation on 2026-06-15 — new workspaces on the Standard SKU now only accept major version 12 or 13. The STG-global V2 migration creates a brand-new Grafana workspace in a dedicated subscription, so it hit:

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

The shared monitoring.grafanaMajorVersion is still "11", which is correct for the existing, grandfathered live fleet (Azure auto-upgrades those 11 → 12 in place). We must not bump the shared value just to unblock the new V2 workspace — that would force an irreversible, breaking 11 → 12 upgrade on the live fleet.

A V2-only override keeps the two concerns separate:

  • Live fleet stays on the shared monitoring.grafanaMajorVersion (11, grandfathered).
  • New V2 workspace is born on 13 via stgGlobalV2.grafanaMajorVersion.

(The broader "keep the shared value on a supported release" hygiene is tracked separately in AROSLSRE-1364.)

Testing

  • Direct Azure validation — created a throwaway workspace on the exact SKU the bicep hardcodes (Standard) at major version 13; provisioning succeeded:
    az grafana create -n arohcp-g13-test -g hbhushan-test -l uksouth \
      --grafana-major-version 13 --sku Standard
    # -> provisioningState: Succeeded, grafanaVersion: 13.0.2, sku: Standard
    
    Confirms a fresh STG-global V2 workspace can be created on 13. (11 → 13 in-place upgrade is not a documented path, but fresh creation on 13 is — which is what V2 does.)
  • make -C config/ materialize passes; schema is valid JSON.
  • Render checkstgGlobalV2.grafanaMajorVersion resolves to empty-sentinel in all dev renders (dev gets no stg overlay); the real 13 is supplied by the MSFT overlay and surfaces in the downstream (sdp-pipelines) stg render, exactly like stgGlobalV2.grafanaName.
  • All stgGlobalV2.* values remain consumed only by the stg/uksouth-only V2 pipelines; empty-sentinel is never deployed.

Notes / follow-up

Refs: AROSLSRE-1362. Follows #5813 (stgGlobalV2.grafanaName).

… (AROSLSRE-1362)

Azure Managed Grafana retired v11 for NEW workspace creation on 2026-06-15 (only 12/13 accepted on Standard SKU). The parallel STG-global V2 workspace is newly created, so it must be born on 13; shared monitoring.grafanaMajorVersion stays 11 for the grandfathered live fleet. Adds a V2-only stgGlobalV2.grafanaMajorVersion (empty-sentinel default, stg=13) and points the V2 global-infra-stg bicepparam at it, mirroring stgGlobalV2.grafanaName.
Copilot AI review requested due to automatic review settings June 29, 2026 20:55

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

This PR introduces a V2-only override for Azure Managed Grafana major version in the transient stgGlobalV2 config block, so the STG-global V2 deployment can create a new Grafana workspace on a supported major version without changing the shared monitoring.grafanaMajorVersion used by the existing fleet.

Changes:

  • Add stgGlobalV2.grafanaMajorVersion to config schema + defaults (empty-sentinel) and set it to "13" in the MSFT stg overlay.
  • Rewire the STG-global V2 bicepparam (global-infra-stg.tmpl.bicepparam) to use stgGlobalV2.grafanaMajorVersion instead of monitoring.grafanaMajorVersion.
  • Regenerate rendered dev config outputs to include the new key under stgGlobalV2.

Reviewed changes

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

Show a summary per file
File Description
dev-infrastructure/configurations/global-infra-stg.tmpl.bicepparam Points V2 STG global-infra deployment at stgGlobalV2.grafanaMajorVersion for workspace creation.
config/config.schema.json Adds grafanaMajorVersion to stgGlobalV2 schema and marks it required.
config/config.yaml Adds stgGlobalV2.grafanaMajorVersion: empty-sentinel default to satisfy missingkey=error rendering.
config/config.msft.clouds-overlay.yaml Supplies the real stg value ("13") for stgGlobalV2.grafanaMajorVersion.
config/rendered/dev/pers/westus3.yaml Materialized dev render updated with stgGlobalV2.grafanaMajorVersion.
config/rendered/dev/perf/westus3.yaml Materialized dev render updated with stgGlobalV2.grafanaMajorVersion.
config/rendered/dev/dev/westus3.yaml Materialized dev render updated with stgGlobalV2.grafanaMajorVersion.
config/rendered/dev/cspr/westus3.yaml Materialized dev render updated with stgGlobalV2.grafanaMajorVersion.
config/rendered/dev/ci01/centralus.yaml Materialized dev render updated with stgGlobalV2.grafanaMajorVersion.
config/rendered/dev/ci00/centralus.yaml Materialized dev render updated with stgGlobalV2.grafanaMajorVersion.

Comment thread dev-infrastructure/configurations/global-infra-stg.tmpl.bicepparam
Comment thread config/config.msft.clouds-overlay.yaml

@raelga raelga left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

/lgtm
/approve

@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: hbhushan3, 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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD e4ba38e and 2 for PR HEAD 1073b00 in total

@openshift-merge-bot openshift-merge-bot Bot merged commit bccd18a into Azure:main Jun 30, 2026
17 checks passed
@raelga raelga mentioned this pull request Jul 1, 2026
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants