Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Add callout and modify content for S3 datasource #1112

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions common/constants/data_connections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import { DatasourceType } from '../../common/types/data_connections';
export const OPENSEARCH_DOCUMENTATION_URL =
'https://opensearch.org/docs/latest/dashboards/management/data-sources/';

export const OPENSEARCH_S3_DOCUMENTATION_URL =
'https://opensearch.org/docs/latest/dashboards/management/S3-data-source/';

export const OPENSEARCH_ACC_DOCUMENTATION_URL =
'https://opensearch.org/docs/latest/data-acceleration/index';
export const QUERY_RESTRICTED = 'query-restricted';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ import {
EuiFieldText,
EuiTextArea,
EuiSelect,
EuiCallOut,
} from '@elastic/eui';
import React, { useState } from 'react';
import {
AuthMethod,
OPENSEARCH_DOCUMENTATION_URL,
OPENSEARCH_S3_DOCUMENTATION_URL,
} from '../../../../../common/constants/data_connections';
import { QueryPermissionsConfiguration } from './query_permissions';
import { Role } from '../../../../../common/types/data_connections';
Expand Down Expand Up @@ -87,11 +88,20 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
</EuiTitle>
<EuiSpacer size="s" />
<EuiText size="s" color="subdued">
{`Connect to S3 with OpenSearch and OpenSearch Dashboards. `}
<EuiLink external={true} href={OPENSEARCH_DOCUMENTATION_URL} target="blank">
{`Connect to Amazon S3 via AWS Glue with Amazon EMR as an execution engine. `}
<EuiLink external={true} href={OPENSEARCH_S3_DOCUMENTATION_URL} target="blank">
Learn more
</EuiLink>
</EuiText>
<EuiSpacer size="s" />
<EuiCallOut title="Setup Amazon EMR as execution engine first" iconType="iInCircle">
<EuiText size="s" color="subdued">
{`Connect to Amazon S3 via AWS Glue with Amazon EMR as an execution engine. `}
<EuiLink external={true} href={OPENSEARCH_S3_DOCUMENTATION_URL} target="blank">
Learn more
</EuiLink>
</EuiText>
</EuiCallOut>
<EuiSpacer />
<EuiText>
<h3>Data source details</h3>
Expand Down
Loading