remove promConfigOverhaul feature toggle logic

Author: bohandley

src/configuration/AlertingSettingsOverhaul.tsx

@@ -1,7 +1,6 @@
 import { cx } from '@emotion/css';
 import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { ConfigSubSection } from '@grafana/experimental';
-// import { config } from '@grafana/runtime';
 import { InlineField, Switch, useTheme2 } from '@grafana/ui';
 import React from 'react';
 
@@ -23,9 +22,6 @@ export function AlertingSettingsOverhaul<T extends AlertingConfig>({
   // @ts-ignore
   const styles = overhaulStyles(theme);
 
-  // turned on by default
-  // const prometheusConfigOverhaulAuth = config.featureToggles.prometheusConfigOverhaulAuth;
-
   return (
     <ConfigSubSection
       title="Alerting"

src/configuration/ConfigEditor.tsx

@@ -1,17 +1,14 @@
 import { css } from '@emotion/css';
 import { SIGV4ConnectionConfig } from '@grafana/aws-sdk';
-import { DataSourcePluginOptionsEditorProps, /*DataSourceSettings,*/ GrafanaTheme2 } from '@grafana/data';
+import { DataSourcePluginOptionsEditorProps, GrafanaTheme2 } from '@grafana/data';
 import { ConfigSection, DataSourceDescription } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
 import { Alert, DataSourceHttpSettings, FieldValidationMessage, useTheme2 } from '@grafana/ui';
-// import { config } from 'app/core/config';
 import React, { useRef } from 'react';
 
 import { PromOptions } from '../types';
 
 import { AlertingSettingsOverhaul } from './AlertingSettingsOverhaul';
-// import { AzureAuthSettings } from './AzureAuthSettings';
-// import { hasCredentials, resetCredentials, setDefaultCredentials } from './AzureCredentialsConfig';
 import { DataSourcehttpSettingsOverhaul } from './DataSourceHttpSettingsOverhaul';
 import { PromSettings } from './PromSettings';
 import { AdvancedHttpSettings } from './overhaul/AdvancedHttpSettings';
@@ -23,20 +20,6 @@ export type Props = DataSourcePluginOptionsEditorProps<PromOptions>;
 
 export const ConfigEditor = (props: Props) => {
   const { options, onOptionsChange } = props;
-
-  const prometheusConfigOverhaulAuth = true//config.featureToggles.prometheusConfigOverhaulAuth;
-
-  // use ref so this is evaluated only first time it renders and the select does not disappear suddenly.
-  const showAccessOptions = useRef(props.options.access === 'direct');
-
-  // const azureAuthSettings = {
-  //   azureAuthSupported: config.azureAuthEnabled,
-  //   getAzureAuthEnabled: (config: DataSourceSettings<any, any>): boolean => hasCredentials(config),
-  //   setAzureAuthEnabled: (config: DataSourceSettings<any, any>, enabled: boolean) =>
-  //     enabled ? setDefaultCredentials(config) : resetCredentials(config),
-  //   azureSettingsUI: AzureAuthSettings,
-  // };
-
   const theme = useTheme2();
   const styles = overhaulStyles(theme);
 
@@ -46,68 +29,33 @@ export const ConfigEditor = (props: Props) => {
         <Alert title="Error" severity="error">
           Browser access mode in the Prometheus data source is no longer available. Switch to server access mode.
         </Alert>
-      )}
-      {/* WRAP IN FEATURE TOGGLE */}
-      {prometheusConfigOverhaulAuth ? (
-        <>
-          <DataSourceDescription
-            dataSourceName="Prometheus"
-            docsLink="https://grafana.com/docs/grafana/latest/datasources/prometheus/configure-prometheus-data-source/"
-          />
-          <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
-          <DataSourcehttpSettingsOverhaul
-            options={options}
-            onOptionsChange={onOptionsChange}
-            // azureAuthSettings={azureAuthSettings}
-            sigV4AuthToggleEnabled={config.sigV4AuthEnabled}
-            renderSigV4Editor={<SIGV4ConnectionConfig {...props}></SIGV4ConnectionConfig>}
-            secureSocksDSProxyEnabled={true}//config.secureSocksDSProxyEnabled}
-          />
-        </>
-      ) : (
-        <DataSourceHttpSettings
-          defaultUrl="http://localhost:9090"
-          dataSourceConfig={options}
-          showAccessOptions={showAccessOptions.current}
+      )}  
+      <DataSourceDescription
+        dataSourceName="Prometheus"
+        docsLink="https://grafana.com/docs/grafana/latest/datasources/prometheus/configure-prometheus-data-source/"
+      />
+      <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
+      <DataSourcehttpSettingsOverhaul
+        options={options}
+        onOptionsChange={onOptionsChange}
+        sigV4AuthToggleEnabled={config.sigV4AuthEnabled}
+        renderSigV4Editor={<SIGV4ConnectionConfig {...props}></SIGV4ConnectionConfig>}
+        secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
+      />  
+      <hr />
+      <ConfigSection
+        className={styles.advancedSettings}
+        title="Advanced settings"
+        description="Additional settings are optional settings that can be configured for more control over your data source."
+      >
+        <AdvancedHttpSettings
+          className={styles.advancedHTTPSettingsMargin}
+          config={options}
           onChange={onOptionsChange}
-          sigV4AuthToggleEnabled={config.sigV4AuthEnabled}
-          // azureAuthSettings={azureAuthSettings}
-          renderSigV4Editor={<SIGV4ConnectionConfig {...props}></SIGV4ConnectionConfig>}
-          secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
-          urlLabel="Prometheus server URL"
-          urlDocs={docsTip()}
         />
-      )}
-      {prometheusConfigOverhaulAuth ? (
-        <>
-          <hr />
-          <ConfigSection
-            className={styles.advancedSettings}
-            title="Advanced settings"
-            description="Additional settings are optional settings that can be configured for more control over your data source."
-          >
-            <AdvancedHttpSettings
-              className={styles.advancedHTTPSettingsMargin}
-              config={options}
-              onChange={onOptionsChange}
-            />
-            <AlertingSettingsOverhaul<PromOptions> options={options} onOptionsChange={onOptionsChange} />
-            <PromSettings options={options} onOptionsChange={onOptionsChange} />
-          </ConfigSection>
-        </>
-      ) : (
-        <>
-          <hr className={styles.hrTopSpace} />
-          <h3 className={styles.sectionHeaderPadding}>Additional settings</h3>
-          <p className={`${styles.secondaryGrey} ${styles.subsectionText}`}>
-            Additional settings are optional settings that can be configured for more control over your data source.
-          </p>
-
-          <AlertingSettingsOverhaul<PromOptions> options={options} onOptionsChange={onOptionsChange} />
-
-          <PromSettings options={options} onOptionsChange={onOptionsChange} />
-        </>
-      )}
+        <AlertingSettingsOverhaul<PromOptions> options={options} onOptionsChange={onOptionsChange} />
+        <PromSettings options={options} onOptionsChange={onOptionsChange} />
+      </ConfigSection>
     </>
   );
 };