diff --git a/docs/sources/dashboards/build-dashboards/create-dashboard/index.md b/docs/sources/dashboards/build-dashboards/create-dashboard/index.md index b534a44ae6b..62e4fd98794 100644 --- a/docs/sources/dashboards/build-dashboards/create-dashboard/index.md +++ b/docs/sources/dashboards/build-dashboards/create-dashboard/index.md @@ -38,7 +38,7 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee - Select one of your existing data sources. - Select one of the Grafana's [built-in special data sources]({{< relref "../../../datasources/#special-data-sources" >}}). - - Click **Connect data** to set up a new one (Admins only). + - Click **Configure a new data source** to set up a new one (Admins only). {{< figure class="float-right" src="/media/docs/grafana/dashboards/screenshot-data-source-selector-10.0.png" max-width="800px" alt="Select data source modal" >}} diff --git a/public/app/features/datasources/components/picker/AddNewDataSourceButton.tsx b/public/app/features/datasources/components/picker/AddNewDataSourceButton.tsx index 247be0b21c3..d7da861e361 100644 --- a/public/app/features/datasources/components/picker/AddNewDataSourceButton.tsx +++ b/public/app/features/datasources/components/picker/AddNewDataSourceButton.tsx @@ -19,11 +19,11 @@ export function AddNewDataSourceButton({ variant, onClick }: AddNewDataSourceBut variant={variant || 'primary'} href={newDataSourceURL} disabled={!hasCreateRights} - tooltip={!hasCreateRights ? 'You do not have permission to add a new connection' : undefined} + tooltip={!hasCreateRights ? 'You do not have permission to configure new data sources' : undefined} onClick={onClick} target="_blank" > - Connect data + Configure a new data source ); } diff --git a/public/app/features/datasources/components/picker/DataSourceDropdown.test.tsx b/public/app/features/datasources/components/picker/DataSourceDropdown.test.tsx index 76911219a4b..5b9ba51f778 100644 --- a/public/app/features/datasources/components/picker/DataSourceDropdown.test.tsx +++ b/public/app/features/datasources/components/picker/DataSourceDropdown.test.tsx @@ -281,7 +281,7 @@ describe('DataSourceDropdown', () => { await user.keyboard('foobarbaz'); //Search for a DS that should not exist - expect(await screen.findByText('Connect data')).toBeInTheDocument(); + expect(await screen.findByText('Configure a new data source')).toBeInTheDocument(); }); it('should call onChange with the default query when add csv is clicked', async () => { diff --git a/public/app/features/datasources/components/picker/DataSourceModal.test.tsx b/public/app/features/datasources/components/picker/DataSourceModal.test.tsx index fa7a0f1bfde..7d95388e3d7 100644 --- a/public/app/features/datasources/components/picker/DataSourceModal.test.tsx +++ b/public/app/features/datasources/components/picker/DataSourceModal.test.tsx @@ -95,7 +95,7 @@ describe('DataSourceDropdown', () => { await user.click(searchBox!); await user.keyboard('foobarbaz'); //Search for a DS that should not exist - expect(screen.queryAllByText('Connect data')).toHaveLength(2); + expect(screen.queryAllByText('Configure a new data source')).toHaveLength(2); }); it('only displays the file drop area when the the ff is enabled', async () => { diff --git a/public/app/features/datasources/components/picker/DataSourceModal.tsx b/public/app/features/datasources/components/picker/DataSourceModal.tsx index 24cd7b9cbe9..b1caf35835d 100644 --- a/public/app/features/datasources/components/picker/DataSourceModal.tsx +++ b/public/app/features/datasources/components/picker/DataSourceModal.tsx @@ -167,7 +167,6 @@ export function DataSourceModal({ /> @@ -212,7 +211,7 @@ export function DataSourceModal({ )}
- Open a new tab and configure a new connection + Open a new tab and configure a data source { @@ -266,10 +265,6 @@ function getDataSourceModalStyles(theme: GrafanaTheme2) { overflow-y: auto; } `, - dataSourceList: css` - flex: 1 1; - height: 100%; - }`, rightColumn: css` display: flex; flex-direction: column;