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] Router fix from 2.9 to 2.x #683

Merged
merged 2 commits into from
Jul 28, 2023

Conversation

Swiddis
Copy link
Collaborator

@Swiddis Swiddis commented Jul 14, 2023

Description

Backport of #680

Issues Resolved

[List any issues this PR will resolve]

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.

* Merge Kibana backend from osints/dev into main (opensearch-project#565)

* Merge in kibana backend from osints/dev

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add integration type to .kibana from osints/dev

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Re-add license header

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix integrations type

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove extra test files

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
@derek-ho
Copy link
Collaborator

@Swiddis can you rebase from 2.x, I just pulled in the typescript change so CI should pass after that

@codecov
Copy link

codecov bot commented Jul 20, 2023

Codecov Report

Merging #683 (89119ef) into 2.x (18ec9f3) will increase coverage by 0.46%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              2.x     #683      +/-   ##
==========================================
+ Coverage   43.05%   43.51%   +0.46%     
==========================================
  Files         309      313       +4     
  Lines       18386    18616     +230     
  Branches     4452     4489      +37     
==========================================
+ Hits         7916     8101     +185     
- Misses      10428    10473      +45     
  Partials       42       42              
Flag Coverage Δ
dashboards-observability 43.51% <ø> (+0.46%) ⬆️

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

see 6 files with indirect coverage changes

@ps48
Copy link
Member

ps48 commented Jul 28, 2023

Do we need this in main as well?

@Swiddis
Copy link
Collaborator Author

Swiddis commented Jul 28, 2023

Do we need this in main as well?

It's already in main, it was just dropped while backporting from main to 2.x. Not sure how, probably just a faulty rebase.

@Swiddis Swiddis merged commit ad2c5f5 into opensearch-project:2.x Jul 28, 2023
amsiglan pushed a commit to amsiglan/dashboards-observability that referenced this pull request Jun 7, 2024
…pensearch-project#683)

* Merge Kibana backend from osints/dev into main (opensearch-project#565)

* Merge in kibana backend from osints/dev

* Add integration type to .kibana from osints/dev

* Re-add license header

* Fix integrations type

---------

* Remove extra test files

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit ad2c5f5)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants