Skip to content
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.

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

[v11.2.x] Azure Monitor: Add a feature flag to toggle user auth for Azure Monitor only #97565

Merged
merged 3 commits into from
Dec 10, 2024

Conversation

aangelisc
Copy link
Contributor

Backport b898a45 from #96858


What is this feature?

This PR allows Grafana operators to enable or disable Azure Monitor user-based authentication independently from other Azure data sources.

A new feature toggle azureMonitorEnableUserAuth has been introduced within the config.featureToggles object.

The feature toggle is checked alongside the existing configuration options (config.azure.userIdentityEnabled) to determine if user-based authentication for Azure Monitor is available.

Which issue(s) does this PR fix?:

Fixes #96650.

…or only (#96858)

* Azure Monitor: Add a feature flag to toggle user auth for Azure Monitor only

* Fix condition for userIdentityEnabled

* Re-add removed test

* Remove unused prop

* Refactor onAuthTypeChange in AzureCredentialsForm

* Add frontend unit tests

* Lint

(cherry picked from commit b898a45)

# Conflicts:
#	docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
#	packages/grafana-data/src/types/featureToggles.gen.ts
#	pkg/services/featuremgmt/registry.go
#	pkg/services/featuremgmt/toggles_gen.csv
#	pkg/services/featuremgmt/toggles_gen.go
#	pkg/services/featuremgmt/toggles_gen.json
@aangelisc aangelisc added type/docs Flags the technical writing team for documentation support; auto adds to org-wide docs project area/backend area/frontend datasource/Azure Azure Monitor Datasource add to changelog backport A backport PR labels Dec 6, 2024
@aangelisc aangelisc added this to the 11.2.x milestone Dec 6, 2024
@aangelisc aangelisc requested review from grafanabot and a team as code owners December 6, 2024 14:38
@aangelisc aangelisc requested review from bossinc, adamyeats, katebrenner and alyssabull and removed request for a team December 6, 2024 14:38
@aangelisc aangelisc enabled auto-merge (squash) December 6, 2024 19:54
@aangelisc aangelisc merged commit 7693dde into v11.2.x Dec 10, 2024
11 checks passed
@aangelisc aangelisc deleted the backport-96858-to-v11.2.x branch December 10, 2024 11:20
@zserge zserge modified the milestones: 11.2.x, 11.2.6 Jan 24, 2025
@baldm0mma baldm0mma mentioned this pull request Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/backend area/frontend backport A backport PR datasource/Azure Azure Monitor Datasource type/docs Flags the technical writing team for documentation support; auto adds to org-wide docs project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants