[Integration] Integration enhancements #1860
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RyanL1997
requested review from
ps48,
kavithacm,
derek-ho,
joshuali925,
dai-chen,
YANG-DB,
rupal-bq,
mengweieric,
vamsi-amazon,
Swiddis,
penghuo,
seankao-az,
anirudha,
paulstn and
sumukhswamy
as code owners
RyanL1997
commented
May 31, 2024
There was a problem hiding this comment.
I just noticed that, for the catalog repo, it is using amazon as the name branding for waf and cloudtrail. Based on the previous conversation we had here: #1494, we should keep the AWS branding. I also made a change in catalog repo: opensearch-project/opensearch-catalog#154.
cc: @Swiddis , @YANG-DB .
server/adaptors/integrations/__data__/repository/aws_waf/aws_waf-1.1.0.json
Outdated
Show resolved
Hide resolved
server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.1.0.json
Outdated
Show resolved
Hide resolved
RyanL1997
commented
Jun 1, 2024
| @@ -0,0 +1,52 @@ | |||
| { | |||
| "name": "apache", | |||
There was a problem hiding this comment.
Fixed the issue of
Property keys must be doublequoted json(528)
| @@ -0,0 +1,56 @@ | |||
| { | |||
| "name": "nginx", | |||
There was a problem hiding this comment.
same fix for Nginx.
RyanL1997
changed the title
YANG-DB
requested changes
Jun 3, 2024
server/adaptors/integrations/__data__/repository/amazon_elb/amazon_elb-1.1.0.json
Outdated
Show resolved
Hide resolved
...rs/integrations/__data__/repository/amazon_vpc_flow/assets/create_table_vpc_schema-1.0.0.sql
Outdated
Show resolved
Hide resolved
server/adaptors/integrations/__data__/repository/apache/apache-1.1.0.json
Outdated
Show resolved
Hide resolved
server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json
Outdated
Show resolved
Hide resolved
Swiddis
added
enhancement
Swiddis
approved these changes
Jun 3, 2024
|
While we're at it: some of the failures in Link Checker are due to integrations, we could stand to fix those. https://github.com/opensearch-project/dashboards-observability/actions/runs/9327199028/job/25676769475?pr=1860 |
Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: Ryan Liang <jiallian@amazon.com>
… for apache and nginx Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: Ryan Liang <jiallian@amazon.com>
RyanL1997
force-pushed
the
integrations-recursive-file-fix
branch
from
a025510
to
2080de8
Compare
YANG-DB
approved these changes
Jun 3, 2024
|
The backport to 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-1860-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1944d0b7de350de01b31c894868ab05165ad25bc
# Push it to GitHub
git push --set-upstream origin backport/backport-1860-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.xThen, create a pull request where the |
|
The backport to 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.13 2.13
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.13
# Create a new branch
git switch --create backport/backport-1860-to-2.13
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1944d0b7de350de01b31c894868ab05165ad25bc
# Push it to GitHub
git push --set-upstream origin backport/backport-1860-to-2.13
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.13Then, create a pull request where the |
|
manual backports will be added |
RyanL1997
added a commit
to RyanL1997/dashboards-observability
that referenced
this pull request
Jun 3, 2024
* Add recursive file lookup for all table creation queries Signed-off-by: Ryan Liang <jiallian@amazon.com> * Change the versions and source urls Signed-off-by: Ryan Liang <jiallian@amazon.com> * Change the source url to release of catalog repo, and fix the formats for apache and nginx Signed-off-by: Ryan Liang <jiallian@amazon.com> * Reverted some version changes on integrations with only doc link changes Signed-off-by: Ryan Liang <jiallian@amazon.com> --------- Signed-off-by: Ryan Liang <jiallian@amazon.com>
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
sourceURLto catalog repo's releasesApacheandNginxCheck List
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.