[v10.4.x] Prometheus: Reintroduce Azure audience override feature flag (#90557)

Prometheus: Reintroduce Azure audience override feature flag (#90339)

* Re-add feature flag with deprecation note

* Hide the field in frontend if ff disabled

* Block scope overriding if ff is disabled in backend

- Update promlib to forward logger to extendOptions
- Add warning
- Update tests

* Default toggle to true for now

* Update description

* Update prom tests

* Fix lint

(cherry picked from commit 2616366a0a)

# Conflicts:
#	packages/grafana-data/src/types/featureToggles.gen.ts
#	pkg/promlib/library.go
#	pkg/promlib/library_test.go
#	pkg/services/featuremgmt/toggles_gen.csv
#	pkg/services/featuremgmt/toggles_gen.go
#	pkg/services/featuremgmt/toggles_gen.json
#	pkg/tsdb/prometheus/azureauth/azure.go
#	pkg/tsdb/prometheus/heuristics_test.go
#	pkg/tsdb/prometheus/prometheus.go
#	pkg/tsdb/prometheus/prometheus_test.go
This commit is contained in:
Andreas Christou
2024-07-23 11:31:15 +01:00
committed by GitHub
parent a71d083205
commit e1bd1f43da
9 changed files with 116 additions and 30 deletions
+7
View File
@@ -1223,6 +1223,13 @@ var (
RequiresRestart: true,
Expression: "true", // enabled by default
},
{
Name: "prometheusAzureOverrideAudience",
Description: "Deprecated. Allow override default AAD audience for Azure Prometheus endpoint. Enabled by default. This feature should no longer be used and will be removed in the future.",
Stage: FeatureStageDeprecated,
Owner: grafanaPartnerPluginsSquad,
Expression: "true", // Enabled by default for now
},
}
)
+1
View File
@@ -163,3 +163,4 @@ newPDFRendering,experimental,@grafana/sharing-squad,false,false,false
kubernetesAggregator,experimental,@grafana/grafana-app-platform-squad,false,true,false
groupByVariable,experimental,@grafana/dashboards-squad,false,false,false
alertingUpgradeDryrunOnStart,GA,@grafana/alerting-squad,false,true,false
prometheusAzureOverrideAudience,deprecated,@grafana/partner-datasources,false,false,false
1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
163 kubernetesAggregator experimental @grafana/grafana-app-platform-squad false true false
164 groupByVariable experimental @grafana/dashboards-squad false false false
165 alertingUpgradeDryrunOnStart GA @grafana/alerting-squad false true false
166 prometheusAzureOverrideAudience deprecated @grafana/partner-datasources false false false
+4
View File
@@ -662,4 +662,8 @@ const (
// FlagAlertingUpgradeDryrunOnStart
// When activated in legacy alerting mode, this initiates a dry-run of the Unified Alerting upgrade during each startup. It logs any issues detected without implementing any actual changes.
FlagAlertingUpgradeDryrunOnStart = "alertingUpgradeDryrunOnStart"
// FlagPrometheusAzureOverrideAudience
// Deprecated. Allow override default AAD audience for Azure Prometheus endpoint. Enabled by default. This feature should no longer be used and will be removed in the future.
FlagPrometheusAzureOverrideAudience = "prometheusAzureOverrideAudience"
)
+13 -1
View File
@@ -1291,7 +1291,7 @@
"name": "clientTokenRotation",
"resourceVersion": "1707928895402",
"creationTimestamp": "2024-02-14T16:41:35Z",
"deletionTimestamp": "2024-02-16T15:38:59Z"
"deletionTimestamp": "2024-07-17T19:01:22Z"
},
"spec": {
"description": "Replaces the current in-request token rotation so that the client initiates the rotation",
@@ -2140,6 +2140,18 @@
"codeowner": "@grafana/alerting-squad",
"requiresRestart": true
}
},
{
"metadata": {
"name": "prometheusAzureOverrideAudience",
"resourceVersion": "1721242859311",
"creationTimestamp": "2024-07-17T19:00:59Z"
},
"spec": {
"description": "Deprecated. Allow override default AAD audience for Azure Prometheus endpoint. Enabled by default. This feature should no longer be used and will be removed in the future.",
"stage": "deprecated",
"codeowner": "@grafana/partner-datasources"
}
}
]
}