diff --git a/public/app/features/alerting/unified/components/import-to-gma/ImportToGMARules.test.tsx b/public/app/features/alerting/unified/components/import-to-gma/ImportToGMARules.test.tsx index 40a66fd51aa..552efaa399c 100644 --- a/public/app/features/alerting/unified/components/import-to-gma/ImportToGMARules.test.tsx +++ b/public/app/features/alerting/unified/components/import-to-gma/ImportToGMARules.test.tsx @@ -22,7 +22,7 @@ const ui = { yaml: byRole('radio', { name: /Import rules from a Prometheus YAML file./ }), }, dsImport: { - dsPicker: byLabelText('Data source'), + dsPicker: byLabelText(/data source/i, { selector: '#datasource-picker' }), mimirDsOption: byRole('button', { name: /Mimir Prometheus$/ }), }, yamlImport: { diff --git a/public/app/features/alerting/unified/components/import-to-gma/ImportToGMARules.tsx b/public/app/features/alerting/unified/components/import-to-gma/ImportToGMARules.tsx index d1518a379a2..f330b65e99f 100644 --- a/public/app/features/alerting/unified/components/import-to-gma/ImportToGMARules.tsx +++ b/public/app/features/alerting/unified/components/import-to-gma/ImportToGMARules.tsx @@ -31,6 +31,7 @@ import { withPageErrorBoundary } from '../../withPageErrorBoundary'; import { AlertingPageWrapper } from '../AlertingPageWrapper'; import { CreateNewFolder } from '../create-folder/CreateNewFolder'; import { CloudRulesSourcePicker } from '../rule-editor/CloudRulesSourcePicker'; +import { NeedHelpInfo } from '../rule-editor/NeedHelpInfo'; import { ConfirmConversionModal } from './ConfirmConvertModal'; import { NamespaceAndGroupFilter } from './NamespaceAndGroupFilter'; @@ -449,7 +450,22 @@ function DataSourceField() { return ( + + {t('alerting.import-to-gma.datasource.label', 'Data source')} + + + + } invalid={!!errors.selectedDatasourceName} error={errors.selectedDatasourceName?.message} htmlFor="datasource-picker" diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index 1ad2e74501d..e12e7cc4270 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -1518,6 +1518,10 @@ "title": "Confirm import" }, "datasource": { + "help-info": { + "content": "The dropdown only displays Mimir or Loki data sources that have the ruler API available.", + "title": "Data source" + }, "label": "Data source", "required-message": "Please select a data source" },