mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Chore: Remove prometheusConfigOverhaulAuth feature toggle (#98460)
* remove toggle * remove toggle from code
This commit is contained in:
ismail simsek
GitHub
parent
83bcd86d18
commit
5be4dfd8c8
@ -40,7 +40,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
|
||||
| `transformationsRedesign` | Enables the transformations redesign | Yes |
|
||||
| `traceQLStreaming` | Enables response streaming of TraceQL queries of the Tempo data source | |
|
||||
| `awsAsyncQueryCaching` | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled | Yes |
|
||||
| `prometheusConfigOverhaulAuth` | Update the Prometheus configuration page with the new auth component | Yes |
|
||||
| `alertingNoDataErrorExecution` | Changes how Alerting state manager handles execution of NoData/Error | Yes |
|
||||
| `angularDeprecationUI` | Display Angular warnings in dashboards and panels | Yes |
|
||||
| `dashgpt` | Enable AI powered features in dashboards | Yes |
|
||||
|
||||
@ -88,7 +88,6 @@ export interface FeatureToggles {
|
||||
featureToggleAdminPage?: boolean;
|
||||
awsAsyncQueryCaching?: boolean;
|
||||
permissionsFilterRemoveSubquery?: boolean;
|
||||
prometheusConfigOverhaulAuth?: boolean;
|
||||
configurableSchedulerTick?: boolean;
|
||||
alertingNoDataErrorExecution?: boolean;
|
||||
angularDeprecationUI?: boolean;
|
||||
|
||||
@ -523,14 +523,6 @@ var (
|
||||
Stage: FeatureStageExperimental,
|
||||
Owner: grafanaBackendGroup,
|
||||
},
|
||||
{
|
||||
Name: "prometheusConfigOverhaulAuth",
|
||||
Description: "Update the Prometheus configuration page with the new auth component",
|
||||
Owner: grafanaObservabilityMetricsSquad,
|
||||
Stage: FeatureStageGeneralAvailability,
|
||||
Expression: "true", // on by default
|
||||
AllowSelfServe: false,
|
||||
},
|
||||
{
|
||||
Name: "configurableSchedulerTick",
|
||||
Description: "Enable changing the scheduler base interval via configuration option unified_alerting.scheduler_tick_interval",
|
||||
|
||||
@ -69,7 +69,6 @@ grafanaAPIServerEnsureKubectlAccess,experimental,@grafana/grafana-app-platform-s
|
||||
featureToggleAdminPage,experimental,@grafana/grafana-operator-experience-squad,false,true,false
|
||||
awsAsyncQueryCaching,GA,@grafana/aws-datasources,false,false,false
|
||||
permissionsFilterRemoveSubquery,experimental,@grafana/grafana-backend-group,false,false,false
|
||||
prometheusConfigOverhaulAuth,GA,@grafana/observability-metrics,false,false,false
|
||||
configurableSchedulerTick,experimental,@grafana/alerting-squad,false,true,false
|
||||
alertingNoDataErrorExecution,GA,@grafana/alerting-squad,false,true,false
|
||||
angularDeprecationUI,GA,@grafana/plugins-platform-backend,false,false,true
|
||||
|
||||
|
@ -287,10 +287,6 @@ const (
|
||||
// Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder
|
||||
FlagPermissionsFilterRemoveSubquery = "permissionsFilterRemoveSubquery"
|
||||
|
||||
// FlagPrometheusConfigOverhaulAuth
|
||||
// Update the Prometheus configuration page with the new auth component
|
||||
FlagPrometheusConfigOverhaulAuth = "prometheusConfigOverhaulAuth"
|
||||
|
||||
// FlagConfigurableSchedulerTick
|
||||
// Enable changing the scheduler base interval via configuration option unified_alerting.scheduler_tick_interval
|
||||
FlagConfigurableSchedulerTick = "configurableSchedulerTick"
|
||||
|
||||
@ -2904,6 +2904,7 @@
|
||||
"name": "prometheusConfigOverhaulAuth",
|
||||
"resourceVersion": "1720021873452",
|
||||
"creationTimestamp": "2023-07-26T16:09:53Z",
|
||||
"deletionTimestamp": "2025-01-02T20:43:41Z",
|
||||
"annotations": {
|
||||
"grafana.app/updatedTimestamp": "2024-07-03 15:51:13.452477 +0000 UTC"
|
||||
}
|
||||
|
||||
@ -43,10 +43,6 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
|
||||
}
|
||||
};
|
||||
|
||||
const prometheusConfigOverhaulAuth = config.featureToggles.prometheusConfigOverhaulAuth;
|
||||
|
||||
const labelWidth = prometheusConfigOverhaulAuth ? 24 : 26;
|
||||
|
||||
// The auth type needs to be set on the first load of the data source
|
||||
useEffectOnce(() => {
|
||||
if (!dataSourceConfig.jsonData.authType) {
|
||||
@ -70,15 +66,15 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
|
||||
<h6>Azure configuration</h6>
|
||||
<div className="gf-form-group">
|
||||
<InlineFieldRow>
|
||||
<InlineField labelWidth={labelWidth} label="Override AAD audience" disabled={dataSourceConfig.readOnly}>
|
||||
<InlineField labelWidth={24} label="Override AAD audience" disabled={dataSourceConfig.readOnly}>
|
||||
<InlineSwitch value={overrideAudienceChecked} onChange={onOverrideAudienceChange} />
|
||||
</InlineField>
|
||||
</InlineFieldRow>
|
||||
{overrideAudienceChecked && (
|
||||
<InlineFieldRow>
|
||||
<InlineField labelWidth={labelWidth} label="Resource ID" disabled={dataSourceConfig.readOnly}>
|
||||
<InlineField labelWidth={24} label="Resource ID" disabled={dataSourceConfig.readOnly}>
|
||||
<Input
|
||||
className={cx(prometheusConfigOverhaulAuth ? 'width-20' : 'width-30')}
|
||||
className={cx('width-20')}
|
||||
value={dataSourceConfig.jsonData.azureEndpointResourceId || ''}
|
||||
onChange={onResourceIdChange}
|
||||
/>
|
||||
|
||||
@ -3,7 +3,6 @@ import { ChangeEvent, useMemo } from 'react';
|
||||
|
||||
import { AzureAuthType, AzureCredentials } from '@grafana/azure-sdk';
|
||||
import { SelectableValue } from '@grafana/data';
|
||||
import { config } from '@grafana/runtime';
|
||||
import { InlineFormLabel, Button, Select, Input } from '@grafana/ui';
|
||||
|
||||
export interface Props {
|
||||
@ -113,8 +112,6 @@ export const AzureCredentialsForm = (props: Props) => {
|
||||
}
|
||||
};
|
||||
|
||||
const prometheusConfigOverhaulAuth = config.featureToggles.prometheusConfigOverhaulAuth;
|
||||
|
||||
return (
|
||||
<div className="gf-form-group">
|
||||
{authTypeOptions.length > 1 && (
|
||||
@ -156,7 +153,7 @@ export const AzureCredentialsForm = (props: Props) => {
|
||||
<InlineFormLabel className="width-12">Directory (tenant) ID</InlineFormLabel>
|
||||
<div className="width-15">
|
||||
<Input
|
||||
className={cx(prometheusConfigOverhaulAuth ? 'width-20' : 'width-30')}
|
||||
className={cx('width-20')}
|
||||
placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
|
||||
value={credentials.tenantId || ''}
|
||||
onChange={onTenantIdChange}
|
||||
@ -170,7 +167,7 @@ export const AzureCredentialsForm = (props: Props) => {
|
||||
<InlineFormLabel className="width-12">Application (client) ID</InlineFormLabel>
|
||||
<div className="width-15">
|
||||
<Input
|
||||
className={cx(prometheusConfigOverhaulAuth ? 'width-20' : 'width-30')}
|
||||
className={cx('width-20')}
|
||||
placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
|
||||
value={credentials.clientId || ''}
|
||||
onChange={onClientIdChange}
|
||||
@ -185,20 +182,11 @@ export const AzureCredentialsForm = (props: Props) => {
|
||||
<InlineFormLabel htmlFor="azure-client-secret" className="width-12">
|
||||
Client Secret
|
||||
</InlineFormLabel>
|
||||
<Input
|
||||
id="azure-client-secret"
|
||||
className={cx(prometheusConfigOverhaulAuth ? 'width-20' : 'width-25')}
|
||||
placeholder="configured"
|
||||
disabled
|
||||
/>
|
||||
<Input id="azure-client-secret" className={cx('width-20')} placeholder="configured" disabled />
|
||||
</div>
|
||||
{!disabled && (
|
||||
<div className="gf-form">
|
||||
<div
|
||||
className={cx(
|
||||
prometheusConfigOverhaulAuth ? 'max-width-20 gf-form-inline' : 'max-width-30 gf-form-inline'
|
||||
)}
|
||||
>
|
||||
<div className={cx('max-width-20 gf-form-inline')}>
|
||||
<Button variant="secondary" type="button" onClick={onClientSecretReset}>
|
||||
reset
|
||||
</Button>
|
||||
@ -212,7 +200,7 @@ export const AzureCredentialsForm = (props: Props) => {
|
||||
<InlineFormLabel className="width-12">Client Secret</InlineFormLabel>
|
||||
<div className="width-15">
|
||||
<Input
|
||||
className={cx(prometheusConfigOverhaulAuth ? 'width-20' : 'width-30')}
|
||||
className={cx('width-20')}
|
||||
placeholder="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
|
||||
value={credentials.clientSecret || ''}
|
||||
onChange={onClientSecretChange}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user