Skip to content

Commit

Permalink
Data sources copy updates (#1090) (#1091)
Browse files Browse the repository at this point in the history
* Data sources copy updates



* Fix naming



* Update snapshot due to copy changes



---------


(cherry picked from commit 849b953)

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
1 parent 48bd609 commit 33c6bf0
Show file tree
Hide file tree
Showing 18 changed files with 65 additions and 64 deletions.
2 changes: 1 addition & 1 deletion common/constants/data_connections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const QUERY_ALL = 'query-all';

export const DatasourceTypeToDisplayName: { [key in DatasourceType]: string } = {
PROMETHEUS: 'Prometheus',
S3GLUE: 'S3',
S3GLUE: 'Amazon S3',
};

export type AuthMethod = 'noauth' | 'basicauth' | 'awssigv4';
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ exports[`Connection Details test Renders connection details for prometheus datas
<div
className="euiTextColor euiTextColor--default"
>
Access to data can be managed in other systems outside of OpenSearch. Check with your administrator for additional configurations.
Access to data may be managed in other systems outside of OpenSearch. Check with your administrator for additional configurations.
</div>
</EuiTextColor>
</div>
Expand Down Expand Up @@ -338,7 +338,7 @@ exports[`Connection Details test Renders connection details for s3 datasource 1`
<div
className="euiTextColor euiTextColor--default"
>
Access to data can be managed in other systems outside of OpenSearch. Check with your administrator for additional configurations.
Access to data may be managed in other systems outside of OpenSearch. Check with your administrator for additional configurations.
</div>
</EuiTextColor>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ exports[`Data Connection Page test Renders Prometheus data connection page with
<span
class="euiIEFlexWrapFix"
>
Ways to use in Dashboards
Use cases for Prometheus in OpenSearch Dashboards
</span>
</button>
</div>
Expand Down Expand Up @@ -270,7 +270,7 @@ exports[`Data Connection Page test Renders Prometheus data connection page with
<div
class="euiTextColor euiTextColor--default"
>
Access to data can be managed in other systems outside of OpenSearch. Check with your administrator for additional configurations.
Access to data may be managed in other systems outside of OpenSearch. Check with your administrator for additional configurations.
</div>
</div>
</div>
Expand All @@ -292,7 +292,7 @@ exports[`Data Connection Page test Renders Prometheus data connection page with
<h2
class="panel-title"
>
Access Control
Access control
</h2>
Control which OpenSearch users have access to this data source.
</div>
Expand Down Expand Up @@ -495,7 +495,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
<span
class="euiIEFlexWrapFix"
>
Ways to use in Dashboards
Use cases for Amazon S3 in OpenSearch Dashboards
</span>
</button>
</div>
Expand Down Expand Up @@ -560,7 +560,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
id="random_html_idDescription"
>
<p>
Query your data in Data Explorer or Observability Logs.
Query your data in Data Explorer or Observability Logs
</p>
</div>
</div>
Expand Down Expand Up @@ -605,7 +605,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
id="random_html_idDescription"
>
<p>
Accelerate performance through OpenSearch indexing.
Accelerate performance by using OpenSearch indexing
</p>
</div>
</div>
Expand Down Expand Up @@ -642,15 +642,15 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
aria-describedby=" random_html_idDescription"
class="euiCard__titleButton"
>
Tables
Define tables
</button>
</span>
<div
class="euiText euiText--small euiCard__description"
id="random_html_idDescription"
>
<p>
Manually Define Tables
Manually define tables
</p>
</div>
</div>
Expand Down Expand Up @@ -687,7 +687,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
aria-describedby=" random_html_idDescription"
class="euiCard__titleButton"
>
Integrations data
Integrate data
</button>
</span>
<div
Expand Down Expand Up @@ -781,7 +781,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
<div
class="euiTextColor euiTextColor--default"
>
Access to data can be managed in other systems outside of OpenSearch. Check with your administrator for additional configurations.
Access to data may be managed in other systems outside of OpenSearch. Check with your administrator for additional configurations.
</div>
</div>
</div>
Expand All @@ -803,7 +803,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
<h2
class="panel-title"
>
Access Control
Access control
</h2>
Control which OpenSearch users have access to this data source.
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ exports[`Manage Data Connections Description test Renders manage data connection
<h2
className="euiTitle euiTitle--small"
>
Manage existing data sources
Manage data sources
</h2>
</EuiTitle>
<EuiSpacer
Expand All @@ -47,7 +47,7 @@ exports[`Manage Data Connections Description test Renders manage data connection
<div
className="euiTextColor euiTextColor--subdued"
>
Manage already created data sources or
Manage existing data sources or
<EuiLink
href="#/new"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
<div
class="euiTextColor euiTextColor--subdued"
>
Connect and manage compatible OpenSearch and OpenSearch Dashboard data sources.
Connect and manage compatible OpenSearch and OpenSearch Dashboards data sources.
<a
class="euiLink euiLink--primary"
Expand Down Expand Up @@ -72,7 +72,7 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
<span
class="euiTab__content"
>
Manage data source
Manage data sources
</span>
</button>
<button
Expand Down Expand Up @@ -108,7 +108,7 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
<h2
class="euiTitle euiTitle--small"
>
Manage existing data sources
Manage data sources
</h2>
<div
class="euiSpacer euiSpacer--s"
Expand All @@ -119,7 +119,7 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
<div
class="euiTextColor euiTextColor--subdued"
>
Manage already created data sources or
Manage existing data sources or
<a
class="euiLink euiLink--primary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { OPENSEARCH_DOCUMENTATION_URL } from '../../../../common/constants/data_
const tabs = [
{
id: 'manage',
name: 'Manage data source',
name: 'Manage data sources',
disabled: false,
},
{
Expand Down Expand Up @@ -65,7 +65,7 @@ export const DataConnectionsHeader = () => {
</EuiPageHeader>
<EuiSpacer size="s" />
<EuiText size="s" color="subdued">
Connect and manage compatible OpenSearch and OpenSearch Dashboard data sources.{' '}
Connect and manage compatible OpenSearch and OpenSearch Dashboards data sources.{' '}
<EuiLink external={true} href={OPENSEARCH_DOCUMENTATION_URL} target="blank">
Learn more
</EuiLink>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const AccessControlTab = (props: AccessControlTabProps) => {
<EuiFlexGroup direction="row">
<EuiFlexItem>
<EuiText size="m">
<h2 className="panel-title">Access Control</h2>
<h2 className="panel-title">Access control</h2>
Control which OpenSearch users have access to this data source.
</EuiText>
</EuiFlexItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import React from 'react';
export const ConnectionManagementCallout = () => {
return (
<EuiCallOut title="Configurations may be managed elsewhere." iconType="iInCircle">
Access to data can be managed in other systems outside of OpenSearch. Check with your
Access to data may be managed in other systems outside of OpenSearch. Check with your
administrator for additional configurations.
</EuiCallOut>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { NoAccess } from '../no_access';
import { AccessControlTab } from './access_control_tab';
import { ConnectionDetails } from './connection_details';
import { DatasourceType } from '../../../../../common/types/data_connections';
import { DatasourceTypeToDisplayName } from '../../../../../common/constants/data_connections';

interface DatasourceDetails {
allowedRoles: string[];
Expand Down Expand Up @@ -69,15 +70,15 @@ export const DataConnection = (props: any) => {
<EuiCard
icon={<EuiIcon size="xxl" type="discoverApp" />}
title={'Query data'}
description="Query your data in Data Explorer or Observability Logs."
description="Query your data in Data Explorer or Observability Logs"
onClick={() => application!.navigateToApp(observabilityLogsID)}
/>
</EuiFlexItem>
<EuiFlexItem>
<EuiCard
icon={<EuiIcon size="xxl" type="bolt" />}
title={'Accelerate performance'}
description="Accelerate performance through OpenSearch indexing."
description="Accelerate performance by using OpenSearch indexing"
onClick={() =>
application!.navigateToApp(queryWorkbenchPluginID, {
path: `#/accelerate/${dataSource}`,
Expand All @@ -88,8 +89,8 @@ export const DataConnection = (props: any) => {
<EuiFlexItem>
<EuiCard
icon={<EuiIcon size="xxl" type="database" />}
title={'Tables'}
description="Manually Define Tables"
title={'Define tables'}
description="Manually define tables"
onClick={() =>
application!.navigateToApp(queryWorkbenchPluginID, {
path: `#/${dataSource}`,
Expand All @@ -100,7 +101,7 @@ export const DataConnection = (props: any) => {
<EuiFlexItem>
<EuiCard
icon={<EuiIcon size="xxl" type="integrationGeneral" />}
title={'Integrations data'}
title={'Integrate data'}
description="Explore data faster through integrations"
onClick={() => application!.navigateToApp(observabilityIntegrationsID)}
/>
Expand Down Expand Up @@ -303,7 +304,9 @@ export const DataConnection = (props: any) => {
<EuiSpacer />
<EuiAccordion
id="queryOrAccelerateAccordion"
buttonContent="Ways to use in Dashboards"
buttonContent={`Use cases for ${
DatasourceTypeToDisplayName[datasourceDetails.connector]
} in OpenSearch Dashboards`}
initialIsOpen={true}
>
<QueryOrAccelerateData />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ export const DataConnectionsDescription = (props: DataConnectionsDescriptionProp
<EuiFlexItem grow={false}>
<>
<EuiTitle size="s">
<h2>Manage existing data sources</h2>
<h2>Manage data sources</h2>
</EuiTitle>

<EuiSpacer size="s" />
<EuiText size="s" color="subdued">
Manage already created data sources or{' '}
Manage existing data sources or{' '}
<EuiLink href="#/new">create a new data source</EuiLink>
</EuiText>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const AuthDetails = (props: AuthDetailProps) => {
<>
<EuiFormRow label="Username">
<EuiFieldText
placeholder={'Username placeholder'}
placeholder={'Username'}
value={username}
onChange={(e) => setUsername(e.target.value)}
onBlur={(e) => setUsernameForRequest(e.target.value)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ export function Configure(props: ConfigureDatasourceProps) {
const [page, setPage] = useState<'configure' | 'review'>('configure');
const ConfigureDatasourceSteps = [
{
title: 'Configure Data Source',
title: 'Configure data source',
status: page === 'review' ? 'complete' : undefined,
},
{
title: 'Review Configuration',
title: 'Review configuration',
},
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ export const ConfigurePrometheusDatasource = (props: ConfigurePrometheusDatasour
<div>
<EuiPanel>
<EuiTitle>
<h4>{`Configure Prometheus Data Source`}</h4>
<h4>{`Configure Prometheus data source`}</h4>
</EuiTitle>
<EuiSpacer size="s" />
<EuiText size="s" color="subdued">
{`Connect to Prometheus with OpenSearch and OpenSearch Dashboards `}
{`Connect to Prometheus with OpenSearch and OpenSearch Dashboards. `}
<EuiLink external={true} href={OPENSEARCH_DOCUMENTATION_URL} target="_blank">
Learn more
</EuiLink>
Expand All @@ -105,9 +105,8 @@ export const ConfigurePrometheusDatasource = (props: ConfigurePrometheusDatasour
<>
<EuiText size="xs">
<p>
This is the name the connection will be referenced by in OpenSearch Dashboards. It
is recommended to make this short yet descriptive to help users when selecting a
connection.
Connection name that OpenSearch Dashboards references. This name should be
descriptive and concise.
</p>
</EuiText>
<EuiFieldText
Expand Down Expand Up @@ -146,7 +145,7 @@ export const ConfigurePrometheusDatasource = (props: ConfigurePrometheusDatasour
<EuiFormRow label="Prometheus URI">
<>
<EuiText size="xs">
<p>Provide the Prometheus URI endpoint to connect to.</p>
<p>Enter the Prometheus URI endpoint.</p>
</EuiText>
<EuiFieldText
data-test-subj="Prometheus-URI"
Expand All @@ -168,7 +167,7 @@ export const ConfigurePrometheusDatasource = (props: ConfigurePrometheusDatasour
</EuiText>
<EuiSpacer />

<EuiFormRow label="Authentication Method">
<EuiFormRow label="Authentication method">
<EuiSelect
id="selectAuthMethod"
options={authOptions}
Expand Down
Loading

0 comments on commit 33c6bf0

Please sign in to comment.