diff --git a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx index 80ab23accde..64403d5328d 100644 --- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx @@ -1,7 +1,12 @@ import React from 'react'; -import { DataSourcePluginOptionsEditorProps, DataSourceSettings } from '@grafana/data'; -import { AlertingSettings, DataSourceHttpSettings } from '@grafana/ui'; +import { + DataSourcePluginOptionsEditorProps, + DataSourceSettings, + onUpdateDatasourceJsonDataOptionChecked, +} from '@grafana/data'; +import { config } from '@grafana/runtime'; +import { AlertingSettings, DataSourceHttpSettings, InlineField, InlineSwitch } from '@grafana/ui'; import { LokiOptions } from '../types'; @@ -27,6 +32,7 @@ const setDerivedFields = makeJsonUpdater('derivedFields'); export const ConfigEditor = (props: Props) => { const { options, onOptionsChange } = props; + const socksProxy = config.featureToggles.secureSocksDatasourceProxy; return ( <> @@ -37,6 +43,25 @@ export const ConfigEditor = (props: Props) => { onChange={onOptionsChange} /> + {socksProxy && ( + <> +