apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Chore: Remove prometheusAzureOverrideAudience feature toggle (#71599)

Browse Source 
* Remove prometheusAzureOverrideAudience feature toggle

* Remove overrideAudienceAllowed flag
pull/71700/head
ismail simsek 3 years ago committed by GitHub
parent b346c9b283
commit a8819dedcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 39 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
  2. 1
      packages/grafana-data/src/types/featureToggles.gen.ts
  3. 6
      pkg/services/featuremgmt/registry.go
  4. 1
      pkg/services/featuremgmt/toggles_gen.csv
  5. 4
      pkg/services/featuremgmt/toggles_gen.go
  6. 45
      public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx

1
docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
Unescape View File

@ -49,7 +49,6 @@ Some features are enabled by default. You can disable these feature by setting t
| ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `trimDefaults` | Use cue schema to remove values that will be applied automatically |
| `panelTitleSearch` | Search for dashboards using panel title |
| `prometheusAzureOverrideAudience` | Experimental. Allow override default AAD audience for Azure Prometheus endpoint |
| `publicDashboards` | Enables public access to dashboards |
| `migrationLocking` | Lock database during migrations |
| `correlations` | Correlations page |

1
packages/grafana-data/src/types/featureToggles.gen.ts
Unescape View File

@ -23,7 +23,6 @@ export interface FeatureToggles {
['live-service-web-worker']?: boolean;
queryOverLive?: boolean;
panelTitleSearch?: boolean;
prometheusAzureOverrideAudience?: boolean;
publicDashboards?: boolean;
publicDashboardsEmailSharing?: boolean;
lokiExperimentalStreaming?: boolean;

6
pkg/services/featuremgmt/registry.go
Unescape View File

@ -41,12 +41,6 @@ var (
Stage: FeatureStagePublicPreview,
Owner: grafanaAppPlatformSquad,
},
{
Name: "prometheusAzureOverrideAudience",
Description: "Experimental. Allow override default AAD audience for Azure Prometheus endpoint",
Stage: FeatureStagePublicPreview,
Owner: grafanaObservabilityMetricsSquad,
},
{
Name: "publicDashboards",
Description: "Enables public access to dashboards",

1
pkg/services/featuremgmt/toggles_gen.csv
Unescape View File

@ -4,7 +4,6 @@ disableEnvelopeEncryption,GA,@grafana/grafana-as-code,false,false,false,false
live-service-web-worker,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
queryOverLive,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
panelTitleSearch,preview,@grafana/grafana-app-platform-squad,false,false,false,false
prometheusAzureOverrideAudience,preview,@grafana/observability-metrics,false,false,false,false
publicDashboards,preview,@grafana/dashboards-squad,false,false,false,false
publicDashboardsEmailSharing,preview,@grafana/dashboards-squad,false,true,false,false
lokiExperimentalStreaming,experimental,@grafana/observability-logs,false,false,false,false

1 Name Stage Owner requiresDevMode RequiresLicense RequiresRestart FrontendOnly
4 live-service-web-worker experimental @grafana/grafana-app-platform-squad false false false true
5 queryOverLive experimental @grafana/grafana-app-platform-squad false false false true
6 panelTitleSearch preview @grafana/grafana-app-platform-squad false false false false
prometheusAzureOverrideAudience preview @grafana/observability-metrics false false false false
7 publicDashboards preview @grafana/dashboards-squad false false false false
8 publicDashboardsEmailSharing preview @grafana/dashboards-squad false true false false
9 lokiExperimentalStreaming experimental @grafana/observability-logs false false false false

4
pkg/services/featuremgmt/toggles_gen.go
Unescape View File

@ -27,10 +27,6 @@ const (
// Search for dashboards using panel title
FlagPanelTitleSearch = "panelTitleSearch"
// FlagPrometheusAzureOverrideAudience
// Experimental. Allow override default AAD audience for Azure Prometheus endpoint
FlagPrometheusAzureOverrideAudience = "prometheusAzureOverrideAudience"
// FlagPublicDashboards
// Enables public access to dashboards
FlagPublicDashboards = "publicDashboards"

45
public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
Unescape View File

@ -11,9 +11,6 @@ import { AzureCredentialsForm } from './AzureCredentialsForm';
export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
const { dataSourceConfig, onChange } = props;
const [overrideAudienceAllowed] = useState<boolean>(
config.featureToggles.prometheusAzureOverrideAudience || !!dataSourceConfig.jsonData.azureEndpointResourceId
);
const [overrideAudienceChecked, setOverrideAudienceChecked] = useState<boolean>(
!!dataSourceConfig.jsonData.azureEndpointResourceId
);
@ -53,29 +50,25 @@ export const AzureAuthSettings = (props: HttpSettingsBaseProps) => {
onCredentialsChange={onCredentialsChange}
disabled={dataSourceConfig.readOnly}
/>
{overrideAudienceAllowed && (
<>
<h6>Azure configuration</h6>
<div className="gf-form-group">
<InlineFieldRow>
<InlineField labelWidth={26} label="Override AAD audience" disabled={dataSourceConfig.readOnly}>
<InlineSwitch value={overrideAudienceChecked} onChange={onOverrideAudienceChange} />
</InlineField>
</InlineFieldRow>
{overrideAudienceChecked && (
<InlineFieldRow>
<InlineField labelWidth={26} label="Resource ID" disabled={dataSourceConfig.readOnly}>
<Input
className="width-30"
value={dataSourceConfig.jsonData.azureEndpointResourceId || ''}
onChange={onResourceIdChange}
/>
</InlineField>
</InlineFieldRow>
)}
</div>
</>
)}
<h6>Azure configuration</h6>
<div className="gf-form-group">
<InlineFieldRow>
<InlineField labelWidth={26} label="Override AAD audience" disabled={dataSourceConfig.readOnly}>
<InlineSwitch value={overrideAudienceChecked} onChange={onOverrideAudienceChange} />
</InlineField>
</InlineFieldRow>
{overrideAudienceChecked && (
<InlineFieldRow>
<InlineField labelWidth={26} label="Resource ID" disabled={dataSourceConfig.readOnly}>
<Input
className="width-30"
value={dataSourceConfig.jsonData.azureEndpointResourceId || ''}
onChange={onResourceIdChange}
/>
</InlineField>
</InlineFieldRow>
)}
</div>
</>
);
};

Write Preview
Loading…
Cancel
Save