fix(config): set grafanaZoneRedundantMode for public clouds (AROSLSRE-1379)#5886
fix(config): set grafanaZoneRedundantMode for public clouds (AROSLSRE-1379)#5886raelga wants to merge 1 commit into
Conversation
…-1379)
The GrafanaManage pipeline step renders
zoneRedundancy: "{{ .monitoring.grafanaZoneRedundantMode }}", but the base
defaults.monitoring block never defined grafanaZoneRedundantMode (only the
dev-cloud block did). For public clouds (int/stg/prod) the required field was
absent, rendered to an empty string, and failed EV2 pipeline-schema validation:
at '/resourceGroups/0/steps/1/zoneRedundancy': value must be one of
'Enabled', 'Disabled'
Add grafanaZoneRedundantMode: Disabled to the base defaults. Disabled matches
the dev override, Azure Managed Grafana's default, and existing grandfathered
instances (zone redundancy is immutable at creation).
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Pull request overview
This PR fixes EV2 pipeline-schema validation for public-cloud environments by ensuring the required monitoring.grafanaZoneRedundantMode config value is always present in the base defaults, so GrafanaManage.zoneRedundancy does not render as an empty string.
Changes:
- Add
defaults.monitoring.grafanaZoneRedundantMode: Disabledtoconfig/config.yaml, with explanatory comments.
|
Closing — wrong diagnosis. This is not a missing-default problem. The EV2
Real root cause: PR #5843 moved Grafana provisioning to a Superseded by #5887. |
AROSLSRE-1379
What
Adds
grafanaZoneRedundantMode: Disabledto the basedefaults.monitoringblock inconfig/config.yaml, alongside the existinggrafanaName.Why
The
GrafanaManagestep indev-infrastructure/global-pipeline.yamlrenderszoneRedundancy: "{{ .monitoring.grafanaZoneRedundantMode }}".monitoring.grafanaZoneRedundantModeis a required config field, but only the dev-cloud block defined it — the base defaults never did. For public clouds (int/stg/prod) the value was absent, rendered to an empty string, and failed EV2 pipeline-schema validation downstream in sdp-pipelines:This surfaced in sdp-pipelines build 170669006. The step was re-enabled in
448930dc8("Re-enable grafana with refactoring"); while grafana pipeline steps were disabled the missing base value was dormant. ARO-HCP CI only validates dev/pers rendered configs (which have the value via the dev override), so the gap only appears in the public int/stg/prod EV2 generation.Disabledmatches the dev override, Azure Managed Grafana's default, and the existing grandfathered instances. Zone redundancy is immutable at creation, so a mismatched value would risk a reconcile conflict.Testing
Config-only change; validated by rendering and materialization:
intconfig locally (templatize configuration render ... --cloud public --environment int) and confirmedmonitoring.grafanaZoneRedundantMode: Disablednow resolves (was previously absent).make -C config materializeproduces no change to dev/pers rendered outputs (dev already overrides toDisabled), confirming the base default is consistent.global-pipeline.yamlline 48) now resolveszoneRedundancy: Disabledinstead of an empty string.Special notes for your reviewer
monitoring.grafanaMajorVersionis also empty for public clouds but is optional in the schema, so it does not block validation and is out of scope here.Enabledfor prod) is made — that can be a follow-up if desired.PR Checklist