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] MultiDataSource feature merge (#2334) #2409

Merged
merged 2 commits into from
Sep 29, 2022

Conversation

mpabba3003
Copy link
Contributor

@mpabba3003 mpabba3003 commented Sep 23, 2022

Signed-off-by: mpabba3003 amazonmanideep@gmail.com

Description

[Backport 2.x] MultiDataSource feature merge (#2334)

Backport 890a4b6 from #2334

Signed-off-by: mpabba3003 <amazonmanideep@gmail.com>
@ananzh
Copy link
Member

ananzh commented Sep 23, 2022

Hey @mpabba3003 is this a duplicate backport PR of #2399?

If not, what is changed? pls add the changes in the description. It seems to me just a backport which is confusing.
If it is duplicate, pls close this one. Thx.

@seraphjiang
Copy link
Member

Hey @mpabba3003 is this a duplicate backport PR of #2399?

If so, pls close this one. Thx.

@ananzh we should close #2399 .
@mpabba3003 is from original contributors for the feature

@ananzh
Copy link
Member

ananzh commented Sep 23, 2022

I see the previous backport PR (#2399) is closed. Please make sure to solve all the review comments from #2399 via following fix PR and merge to main first. Thx

const WRAPPING_KEY_SIZE: number = 32;

export const configSchema = schema.object({
enabled: schema.boolean({ defaultValue: false }),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add this examples in the config/opensearch_dashboards.yml. It makes it a little bit easier for community members to use.

For example: https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/config/opensearch_dashboards.yml#L225

we could add

# data_source.enabled: false

and a some quick notes about feature

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in this PR ##2428

Copy link
Member

@kavilla kavilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clientPool: schema.object({
size: schema.number({ defaultValue: 5 }),
}),
audit: schema.object({
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: how come we want enable multiple log files? would there be a reason to just utilize existing auditing functionality?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

audit log is different with service log, for data source we'll have both. You can check #1986 for more discussion. cc @kristenTian

@@ -116,13 +126,16 @@ export class StepIndexPattern extends Component<StepIndexPatternProps, StepIndex

ILLEGAL_CHARACTERS = [...indexPatterns.ILLEGAL_CHARACTERS];

dataSrouceEnabled: boolean;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch

@kavilla kavilla merged commit 6146663 into opensearch-project:2.x Sep 29, 2022
ananzh added a commit to ananzh/OpenSearch-Dashboards that referenced this pull request Nov 1, 2022
geckodriver - only used in running functional tests. It got bumped
to 11.8.5 on 2022-06-02.

geckodriver has been bumped to 3.0.2 before and backported to 2.x
PR: opensearch-project#2397

However, due to this PR:
opensearch-project#2409
geckodriver is set back to 3.0.1. Therefore, we will reset it to 3.0.2.

Signed-off-by: Anan Zhuang <ananzh@amazon.com>
ananzh added a commit to ananzh/OpenSearch-Dashboards that referenced this pull request Nov 1, 2022
geckodriver - only used in running functional tests. It got bumped
to 11.8.5 on 2022-06-02.

geckodriver has been bumped to 3.0.2 before and backported to 2.x
PR: opensearch-project#2397

However, due to this PR:
opensearch-project#2409
geckodriver is set back to 3.0.1. Therefore, we will reset it to 3.0.2.

Issue Resolved:
opensearch-project#1764

Signed-off-by: Anan Zhuang <ananzh@amazon.com>
ananzh added a commit to ananzh/OpenSearch-Dashboards that referenced this pull request Nov 1, 2022
geckodriver - only used in running functional tests. It got bumped
to 11.8.5 on 2022-06-02.

geckodriver has been bumped to 3.0.2 before and backported to 2.x
PR: opensearch-project#2397

However, due to this PR:
opensearch-project#2409
geckodriver is set back to 3.0.1. Therefore, we will reset it to 3.0.2.

Issue Resolved:
opensearch-project#1764

Signed-off-by: Anan Zhuang <ananzh@amazon.com>
ananzh added a commit that referenced this pull request Nov 1, 2022
geckodriver - only used in running functional tests. It got bumped
to 11.8.5 on 2022-06-02.

geckodriver has been bumped to 3.0.2 before and backported to 2.x
PR: #2397

However, due to this PR:
#2409
geckodriver is set back to 3.0.1. Therefore, we will reset it to 3.0.2.

Issue Resolved:
#1764

Signed-off-by: Anan Zhuang <ananzh@amazon.com>

Signed-off-by: Anan Zhuang <ananzh@amazon.com>
pjfitzgibbons pushed a commit to pjfitzgibbons/OpenSearch-Dashboards that referenced this pull request Dec 1, 2022
opensearch-project#2409)

Signed-off-by: mpabba3003 <amazonmanideep@gmail.com>

Co-authored-by: Kristen Tian <105667444+kristenTian@users.noreply.github.com>
pjfitzgibbons pushed a commit to pjfitzgibbons/OpenSearch-Dashboards that referenced this pull request Dec 1, 2022
opensearch-project#2409)

Signed-off-by: mpabba3003 <amazonmanideep@gmail.com>

Co-authored-by: Kristen Tian <105667444+kristenTian@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
multiple datasource multiple datasource project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants