diff --git a/public/app/core/components/ConfigDescriptionLink.tsx b/public/app/core/components/ConfigDescriptionLink.tsx deleted file mode 100644 index c2cecc84cd9..00000000000 --- a/public/app/core/components/ConfigDescriptionLink.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import { css } from '@emotion/css'; -import React from 'react'; - -import { GrafanaTheme2 } from '@grafana/data'; -import { useStyles2 } from '@grafana/ui'; - -type Props = { - description: string; - suffix: string; - feature: string; -}; - -export function ConfigDescriptionLink(props: Props) { - const { description, suffix, feature } = props; - const text = `Learn more about ${feature}`; - const styles = useStyles2(getStyles); - - return ( - - {description} - - {text} - - - ); -} - -const getStyles = (theme: GrafanaTheme2) => { - return { - container: css({ - color: theme.colors.text.secondary, - a: css({ - color: theme.colors.text.link, - textDecoration: 'underline', - marginLeft: '5px', - '&:hover': { - textDecoration: 'none', - }, - }), - }), - }; -}; diff --git a/public/app/core/components/NodeGraphSettings.tsx b/public/app/core/components/NodeGraphSettings.tsx index 5fb7dcb3eb1..6544b333869 100644 --- a/public/app/core/components/NodeGraphSettings.tsx +++ b/public/app/core/components/NodeGraphSettings.tsx @@ -7,11 +7,9 @@ import { GrafanaTheme2, updateDatasourcePluginJsonDataOption, } from '@grafana/data'; -import { ConfigSubSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental'; import { InlineField, InlineFieldRow, InlineSwitch, useStyles2 } from '@grafana/ui'; -import { ConfigDescriptionLink } from './ConfigDescriptionLink'; - export interface NodeGraphOptions { enabled?: boolean; } diff --git a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx b/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx index 5a4b605faf1..1ad52864719 100644 --- a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx +++ b/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx @@ -2,9 +2,8 @@ import { css } from '@emotion/css'; import React, { useCallback, useMemo } from 'react'; import { DataSourceJsonData, DataSourceInstanceSettings, DataSourcePluginOptionsEditorProps } from '@grafana/data'; -import { ConfigSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSection } from '@grafana/experimental'; import { InlineField, InlineFieldRow, Input, InlineSwitch } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker'; import { IntervalInput } from '../IntervalInput/IntervalInput'; diff --git a/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx b/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx index a5fdc088962..3168f8a8692 100644 --- a/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx +++ b/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx @@ -8,11 +8,10 @@ import { GrafanaTheme2, updateDatasourcePluginJsonDataOption, } from '@grafana/data'; -import { ConfigSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSection } from '@grafana/experimental'; import { Button, InlineField, InlineFieldRow, Input, useStyles2 } from '@grafana/ui'; import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker'; -import { ConfigDescriptionLink } from '../ConfigDescriptionLink'; import { IntervalInput } from '../IntervalInput/IntervalInput'; import { TagMappingInput } from '../TraceToLogs/TagMappingInput'; import { getTimeShiftLabel, getTimeShiftTooltip, invalidTimeShiftError } from '../TraceToLogs/TraceToLogsSettings'; diff --git a/public/app/core/components/TraceToProfiles/TraceToProfilesSettings.tsx b/public/app/core/components/TraceToProfiles/TraceToProfilesSettings.tsx index 0dae1382481..6964fe94e95 100644 --- a/public/app/core/components/TraceToProfiles/TraceToProfilesSettings.tsx +++ b/public/app/core/components/TraceToProfiles/TraceToProfilesSettings.tsx @@ -8,10 +8,9 @@ import { DataSourcePluginOptionsEditorProps, updateDatasourcePluginJsonDataOption, } from '@grafana/data'; -import { ConfigSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSection } from '@grafana/experimental'; import { getDataSourceSrv } from '@grafana/runtime'; import { InlineField, InlineFieldRow, Input, InlineSwitch } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker'; import { ProfileTypesCascader } from 'app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/ProfileTypesCascader'; import { PyroscopeDataSource } from 'app/plugins/datasource/grafana-pyroscope-datasource/datasource'; diff --git a/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx b/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx index 41670d21442..4c8ac4a99d0 100644 --- a/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx +++ b/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx @@ -8,9 +8,8 @@ import { toOption, updateDatasourcePluginJsonDataOption, } from '@grafana/data'; -import { ConfigSubSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental'; import { InlineField, InlineFieldRow, Input, Select, useStyles2 } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; export interface SpanBarOptions { type?: string; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx index f6ee3b1a6d3..ed340f5c044 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx @@ -2,9 +2,8 @@ import { css } from '@emotion/css'; import React from 'react'; import { GrafanaTheme2, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data'; -import { ConfigSubSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental'; import { Button, useStyles2 } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; import { DataLinkConfig } from '../types'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx index f0d51d209e3..cafaacf2283 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx @@ -1,9 +1,8 @@ import React from 'react'; import { DataSourceSettings, SelectableValue } from '@grafana/data'; -import { ConfigSubSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental'; import { InlineField, Input, Select, InlineSwitch } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; import { ElasticsearchOptions, Interval } from '../types'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx index efaa9300e86..3289d2fd90a 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.tsx @@ -1,8 +1,7 @@ import React from 'react'; -import { ConfigSubSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental'; import { Input, InlineField } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; import { ElasticsearchOptions } from '../types'; diff --git a/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx b/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx index 5bc969d00f8..d9c4c439ed2 100644 --- a/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx +++ b/public/app/plugins/datasource/loki/configuration/AlertingSettings.tsx @@ -1,9 +1,8 @@ import React from 'react'; import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; -import { ConfigSubSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental'; import { InlineField, InlineSwitch } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; export function AlertingSettings({ options, diff --git a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx index 77019368db1..a8c28adb780 100644 --- a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx +++ b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx @@ -2,9 +2,8 @@ import { css } from '@emotion/css'; import React, { useCallback, useState } from 'react'; import { GrafanaTheme2, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data'; -import { ConfigSubSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental'; import { Button, useTheme2 } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; import { DerivedFieldConfig } from '../types'; diff --git a/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx b/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx index 27b2265c7c1..7cdbc8a2777 100644 --- a/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx +++ b/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx @@ -1,9 +1,8 @@ import React from 'react'; -import { ConfigSubSection } from '@grafana/experimental'; +import { ConfigDescriptionLink, ConfigSubSection } from '@grafana/experimental'; import { config } from '@grafana/runtime'; import { Badge, InlineField, InlineFieldRow, Input } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; type Props = { maxLines: string; diff --git a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx index 5b02f520b87..16b7c2c2890 100644 --- a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx @@ -5,6 +5,7 @@ import { DataSourcePluginOptionsEditorProps, GrafanaTheme2 } from '@grafana/data import { AdvancedHttpSettings, Auth, + ConfigDescriptionLink, ConfigSection, ConfigSubSection, ConnectionSettings, @@ -13,7 +14,6 @@ import { } from '@grafana/experimental'; import { config } from '@grafana/runtime'; import { SecureSocksProxySettings, useStyles2 } from '@grafana/ui'; -import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink'; import { Divider } from 'app/core/components/Divider'; import { NodeGraphSection } from 'app/core/components/NodeGraphSettings'; import { TraceToLogsSection } from 'app/core/components/TraceToLogs/TraceToLogsSettings';