diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index 179b879be62..4a442782435 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -46,6 +46,7 @@ Some features are enabled by default. You can disable these feature by setting t | `transformationsRedesign` | Enables the transformations redesign | Yes | | `toggleLabelsInLogsUI` | Enable toggleable filters in log details view | Yes | | `azureMonitorDataplane` | Adds dataplane compliant frame metadata in the Azure Monitor datasource | Yes | +| `prometheusConfigOverhaulAuth` | Update the Prometheus configuration page with the new auth component | Yes | ## Preview feature toggles @@ -128,7 +129,6 @@ Experimental features might be changed or removed without prior notice. | `grafanaAPIServer` | Enable Kubernetes API Server for Grafana resources | | `featureToggleAdminPage` | Enable admin page for managing feature toggles from the Grafana front-end | | `permissionsFilterRemoveSubquery` | Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder | -| `prometheusConfigOverhaulAuth` | Update the Prometheus configuration page with the new auth component | | `influxdbSqlSupport` | Enable InfluxDB SQL query language support with new querying UI | | `noBasicRole` | Enables a new role that has no permissions by default | | `angularDeprecationUI` | Display new Angular deprecation-related UI features | diff --git a/e2e/various-suite/exemplars.spec.ts b/e2e/various-suite/exemplars.spec.ts index 9a47163e17c..221aa30aee0 100644 --- a/e2e/various-suite/exemplars.spec.ts +++ b/e2e/various-suite/exemplars.spec.ts @@ -9,7 +9,7 @@ const addDataSource = () => { form: () => { e2e.components.DataSource.Prometheus.configPage.exemplarsAddButton().click(); e2e.components.DataSource.Prometheus.configPage.internalLinkSwitch().check({ force: true }); - e2e.components.DataSource.DataSourceHttpSettings.urlInput().type('http://prom-url:9090'); + e2e.components.DataSource.Prometheus.configPage.connectionSettings().type('http://prom-url:9090'); e2e.components.DataSourcePicker.inputV2().click({ force: true }).should('have.focus'); cy.contains('gdev-tempo').scrollIntoView().should('be.visible').click(); diff --git a/packages/grafana-e2e-selectors/src/selectors/components.ts b/packages/grafana-e2e-selectors/src/selectors/components.ts index 318446188a9..4086948debf 100644 --- a/packages/grafana-e2e-selectors/src/selectors/components.ts +++ b/packages/grafana-e2e-selectors/src/selectors/components.ts @@ -53,6 +53,7 @@ export const Components = { }, Prometheus: { configPage: { + connectionSettings: 'Data source connection URL', exemplarsAddButton: 'Add exemplar config button', internalLinkSwitch: 'Internal link switch', }, diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index a066286bd0e..3fab74be7f6 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -666,8 +666,9 @@ var ( { Name: "prometheusConfigOverhaulAuth", Description: "Update the Prometheus configuration page with the new auth component", - Stage: FeatureStageExperimental, Owner: grafanaObservabilityMetricsSquad, + Stage: FeatureStageGeneralAvailability, + Expression: "true", // on by default }, { Name: "configurableSchedulerTick", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 2066b2a47f0..a0c338020a1 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -95,7 +95,7 @@ awsAsyncQueryCaching,preview,@grafana/aws-datasources,false,false,false,false splitScopes,preview,@grafana/grafana-authnz-team,false,false,true,false azureMonitorDataplane,GA,@grafana/partner-datasources,false,false,false,false permissionsFilterRemoveSubquery,experimental,@grafana/backend-platform,false,false,false,false -prometheusConfigOverhaulAuth,experimental,@grafana/observability-metrics,false,false,false,false +prometheusConfigOverhaulAuth,GA,@grafana/observability-metrics,false,false,false,false configurableSchedulerTick,experimental,@grafana/alerting-squad,false,false,true,false influxdbSqlSupport,experimental,@grafana/observability-metrics,false,false,false,false noBasicRole,experimental,@grafana/grafana-authnz-team,false,false,true,true