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

feat: enable data grid in Chatbot #1341

Merged
merged 8 commits into from
Jan 17, 2024

Conversation

SuZhou-Joe
Copy link
Member

@SuZhou-Joe SuZhou-Joe commented Jan 8, 2024

Description

image

Issues Resolved

#1343

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Copy link

codecov bot commented Jan 8, 2024

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (6bd872c) 53.72% compared to head (2186667) 51.47%.

❗ Current head 2186667 differs from pull request most recent head 127b4be. Consider uploading reports for the commit 127b4be to get more accurate results

Files Patch % Lines
...vent_analytics/explorer/events_views/data_grid.tsx 80.00% 1 Missing ⚠️
public/components/event_analytics/utils/utils.tsx 75.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1341      +/-   ##
==========================================
- Coverage   53.72%   51.47%   -2.25%     
==========================================
  Files         314      305       -9     
  Lines       11267    10628     -639     
  Branches     2941     2792     -149     
==========================================
- Hits         6053     5471     -582     
+ Misses       5166     5111      -55     
+ Partials       48       46       -2     
Flag Coverage Δ
dashboards-observability 51.47% <94.59%> (-2.25%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


export const registerAsssitantDependencies = (setup?: AssistantSetup) => {
if (!setup) return;

setup.registerContentRenderer('ppl_visualization', (content) => {
Copy link
Member

Choose a reason for hiding this comment

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

we don't need ppl based visualizations in chat anymore?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, only data grid is needed.

SuZhou-Joe and others added 6 commits January 12, 2024 21:19
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
@SuZhou-Joe
Copy link
Member Author

@joshuali925 Could we have one more approval to get this PR merged? The registerContentRenderer method has been changed to registerMessageRenderer and we need this PR to get merged.

Signed-off-by: SuZhou-Joe <[email protected]>
@SuZhou-Joe
Copy link
Member Author

@YANG-DB @joshuali925 Could you please help to merge this PR?

@YANG-DB YANG-DB merged commit 745b4c2 into opensearch-project:main Jan 17, 2024
6 of 18 checks passed
@SuZhou-Joe
Copy link
Member Author

@joshuali925 @joshuali925 , could you please add backport 2.x label after backport of #1304 get merged?

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1341-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 745b4c2643543e991157effc12390c16a128cf94
# Push it to GitHub
git push --set-upstream origin backport/backport-1341-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1341-to-2.x.

@joshuali925
Copy link
Member

sure #1374

paulstn pushed a commit to paulstn/dashboards-observability that referenced this pull request Jan 22, 2024
* feat: enable data grid in Chatbot

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: update payload

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: add unit test

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: Optimize code

Co-authored-by: Joshua Li <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>

* feat: optimize code

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: change to MessageRenderer

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: change to fullWidth

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1341-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 745b4c2643543e991157effc12390c16a128cf94
# Push it to GitHub
git push --set-upstream origin backport/backport-1341-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1341-to-2.x.

SuZhou-Joe added a commit to SuZhou-Joe/dashboards-observability that referenced this pull request Jan 24, 2024
* feat: enable data grid in Chatbot

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: update payload

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: add unit test

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: Optimize code

Co-authored-by: Joshua Li <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>

* feat: optimize code

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: change to MessageRenderer

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: change to fullWidth

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]>
(cherry picked from commit 745b4c2)
@SuZhou-Joe
Copy link
Member Author

SuZhou-Joe commented Jan 24, 2024

@joshuali925 @YANG-DB , as backport failed, I create backport PR manually here. #1383. Please help to approve.

BTW, a minor change(1 line change) in parser, could you please help to review?
#1382

joshuali925 pushed a commit that referenced this pull request Jan 25, 2024
RyanL1997 pushed a commit to RyanL1997/dashboards-observability that referenced this pull request Apr 18, 2024
…t#1333) (opensearch-project#1341)

We've noticed there are some permissions in OpenSearch that are not included in the UX dropdown of the security-dashboards-plugin

Signed-off-by: Peter Nied <[email protected]>
Co-authored-by: Craig Perkins <[email protected]>
(cherry picked from commit e5c058804b5983ea273299fffec638c590e02624)
amsiglan pushed a commit to amsiglan/dashboards-observability that referenced this pull request Jun 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants