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.

Sign up for GitHub

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

Jump to bottom

Add S3 integration for Nginx and VPC #1214

Merged
merged 2 commits into from
Oct 31, 2023
Merged

Add S3 integration for Nginx and VPC #1214

merged 2 commits into from
Oct 31, 2023

Conversation

Swiddis
Copy link
Collaborator

@Swiddis Swiddis commented Oct 30, 2023 •
edited
Loading

Description

Following the steps of the ELB integration, this adds S3 queries for the Nginx and VPC integrations.

Issues Resolved

N/A

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.

@Swiddis
Add nginx integration
fb011cf 
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
@codecov
Copy link

codecov bot commented Oct 30, 2023 •
edited
Loading

Codecov Report

Merging #1214 (fb011cf) into main (667bbb7) will increase coverage by 0.06%.
Report is 2 commits behind head on main.
The diff coverage is n/a.

❗ Current head fb011cf differs from pull request most recent head 882b441. Consider uploading reports for the commit 882b441 to get more accurate results

@@            Coverage Diff             @@
##             main    #1214      +/-   ##
==========================================
+ Coverage   44.00%   44.07%   +0.06%     
==========================================
  Files         328      329       +1     
  Lines       19648    19668      +20     
  Branches     4730     4735       +5     
==========================================
+ Hits         8647     8669      +22     
+ Misses      10424    10422       -2     
  Partials      577      577
Flag Coverage Δ
dashboards-observability 44.07% <ø> (+0.06%) ⬆️

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

see 4 files with indirect coverage changes

@Swiddis
Add VPC S3 integration
882b441 
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
@Swiddis Swiddis changed the title Add S3 integration for Nginx Add S3 integration for Nginx and VPC Oct 31, 2023
@Swiddis Swiddis marked this pull request as ready for review October 31, 2023 00:04
@YANG-DB YANG-DB merged commit e0155e8 into opensearch-project:main Oct 31, 2023
9 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 31, 2023
@github-actions
Add S3 integration for Nginx and VPC (#1214)
bba9b9e 
* Add nginx integration

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

* Add VPC S3 integration

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

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit e0155e8)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 31, 2023
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 31, 2023
@github-actions
Add S3 integration for Nginx and VPC (#1214)
3a2fae9 
* Add nginx integration

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

* Add VPC S3 integration

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

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit e0155e8)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 31, 2023
Merged
ps48 pushed a commit that referenced this pull request Oct 31, 2023
@opensearch-trigger-bot @github-actions
Add S3 integration for Nginx and VPC (#1214) (#1216)
e0a509c 
* Add nginx integration



* Add VPC S3 integration



---------


(cherry picked from commit e0155e8)

Signed-off-by: Simeon Widdis <sawiddis@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>
ps48 pushed a commit that referenced this pull request Oct 31, 2023
@opensearch-trigger-bot @github-actions
Add S3 integration for Nginx and VPC (#1214) (#1215)
79d4874 
* Add nginx integration



* Add VPC S3 integration



---------


(cherry picked from commit e0155e8)

Signed-off-by: Simeon Widdis <sawiddis@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>
mengweieric added a commit to mengweieric/dashboards-observability that referenced this pull request Nov 8, 2023
@mengweieric
Revert "Add S3 integration for Nginx and VPC (opensearch-project#1214) (
7bf4513 
opensearch-project#1216)"

This reverts commit e0a509c.
mengweieric added a commit to mengweieric/dashboards-observability that referenced this pull request Nov 8, 2023
@mengweieric
Revert "Add S3 integration for Nginx and VPC (opensearch-project#1214) (
a6516ed 
opensearch-project#1216)"

This reverts commit e0a509c.

Signed-off-by: Eric <menwe@amazon.com>
mengweieric added a commit that referenced this pull request Nov 13, 2023
@mengweieric
Revert commits back to after 2.11 release (#1231)
c170e58 
* Revert "Update empty allowed roles to admin only (#1217) (#1220)"

This reverts commit 4288504.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Increment version to 2.11.1.0 (#1190)"

This reverts commit ccd5fb8.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Add S3 integration for Nginx and VPC (#1214) (#1216)"

This reverts commit e0a509c.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "disabling inspect and default pattern/timestamp buttons when using async data sources (#1205) (#1212)"

This reverts commit ca5ad02.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Saved object datasource backward compatibility fixes (#1208) (#1210)"

This reverts commit 467a0b3.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Link integrations from datasources UI (#1203) (#1207)"

This reverts commit 8e9fe5e.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "[Explorer] Fixes for cancel button and saved object loading (#1197) (#1201)"

This reverts commit f0e7a9d.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Correct query schema for ELB mview generation (#1196) (#1199)"

This reverts commit 0b7be95.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "[Backport 2.11] Add integrations queries for Flint (#1195)"

This reverts commit 97f46ba.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "remove husky pre-commit checks (#1192) (#1193)"

This reverts commit 25d52f3.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Bug fixes for observability count distribution and application analytics (#1187) (#1189)"

This reverts commit e2440d2.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Support cancellation of async queries (#1177) (#1186)"

This reverts commit 6b495f3.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "[Explorer] Supports session for s3 direct query (#1178) (#1183)"

This reverts commit d50047f.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "[Explorer] Modify text in empty prompt (#1172) (#1182)"

This reverts commit 95a60cc.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "[Feature] Match discover look and feel (#1135) (#1179)"

This reverts commit b69801e.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "config panel dark mode fix (#1169) (#1176)"

This reverts commit 34696b3.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Fix events home table and toast life time (#1170)"

This reverts commit a9b36fc.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Quiet react-dnd draggableId/droppableId warnings. (#1147) (#1166)"

This reverts commit a2f9a00.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Fix integration labeling to identify S3 integrations (#1157) (#1164)"

This reverts commit 9de9aea.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Remove loading progress for integration setup (#1156) (#1162)"

This reverts commit a08721b.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Switch from toast to callout for integration set up failures (#1155) (#1159)"

This reverts commit e6a474a.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Disable integration set up button if invalid (#1152) (#1161)"

This reverts commit 74aae17.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Update URL of create datasources, fix spacing (#1149) (#1154)"

This reverts commit 0b66d83.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "Allow patch on allowedRoles (#1143) (#1145)"

This reverts commit 0acc0f3.

Signed-off-by: Eric <menwe@amazon.com>

* Revert "fix for explorer data grid not paginating (#1139) (#1141)"

This reverts commit c5ead50.

Signed-off-by: Eric <menwe@amazon.com>

---------

Signed-off-by: Eric <menwe@amazon.com>
RyanL1997 pushed a commit to RyanL1997/dashboards-observability that referenced this pull request Apr 18, 2024
@opensearch-trigger-bot @cwperks
Wait for tenant radio to be selected in flaky SAML integ test (opense…
4faf916 
…arch-project#1201) (opensearch-project#1214)

(cherry picked from commit 257325caaeb4810cdac8473f9a98120bda072bfa)

Co-authored-by: Craig Perkins <cwperx@amazon.com>
amsiglan pushed a commit to amsiglan/dashboards-observability that referenced this pull request Jun 7, 2024
@opensearch-trigger-bot
Add S3 integration for Nginx and VPC (opensearch-project#1214) (opens…
2b846de 
…earch-project#1215)

* Add nginx integration

* Add VPC S3 integration

---------

(cherry picked from commit e0155e8)

Signed-off-by: Simeon Widdis <sawiddis@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>
(cherry picked from commit 79d4874)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ps48 ps48 ps48 approved these changes

@YANG-DB YANG-DB YANG-DB approved these changes

@pjfitzgibbons pjfitzgibbons Awaiting requested review from pjfitzgibbons

@kavithacm kavithacm Awaiting requested review from kavithacm

@derek-ho derek-ho Awaiting requested review from derek-ho

@joshuali925 joshuali925 Awaiting requested review from joshuali925

@dai-chen dai-chen Awaiting requested review from dai-chen

@rupal-bq rupal-bq Awaiting requested review from rupal-bq

@mengweieric mengweieric Awaiting requested review from mengweieric

@vamsi-amazon vamsi-amazon Awaiting requested review from vamsi-amazon

@penghuo penghuo Awaiting requested review from penghuo

@seankao-az seankao-az Awaiting requested review from seankao-az

@anirudha anirudha Awaiting requested review from anirudha

Assignees
No one assigned
Labels
backport 2.x backport 2.11
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Swiddis @ps48 @YANG-DB