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

Fix integration labeling to identify S3 integrations #1157

Merged
merged 9 commits into from
Oct 24, 2023

Conversation

Swiddis
Copy link
Collaborator

@Swiddis Swiddis commented Oct 23, 2023

Description

The last of this particular round of bug bashing: depends on #1155 and #1156, this PR swaps out the labels to help find useful integrations faster. In particular it adds a Flint S3 label to identify flint-compatible 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.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
@Swiddis Swiddis changed the title Switch from toast to callout for set up failures Fix integration labeling to identify S3 integrations Oct 23, 2023
@codecov
Copy link

codecov bot commented Oct 23, 2023

Codecov Report

Merging #1157 (f9a397d) into main (3aefc10) will increase coverage by 0.00%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1157   +/-   ##
=======================================
  Coverage   44.22%   44.23%           
=======================================
  Files         329      329           
  Lines       19552    19545    -7     
  Branches     4723     4722    -1     
=======================================
- Hits         8647     8645    -2     
+ Misses      10337    10332    -5     
  Partials      568      568           
Flag Coverage Δ
dashboards-observability 44.23% <ø> (+<0.01%) ⬆️

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

see 2 files with indirect coverage changes

@Swiddis Swiddis merged commit 562c3e0 into opensearch-project:main Oct 24, 2023
9 checks passed
@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-1157-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 562c3e044c8a0d2cfc4e9029d37b9b73a0d4cc92
# Push it to GitHub
git push --set-upstream origin backport/backport-1157-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-1157-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.11 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.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.11
# Create a new branch
git switch --create backport/backport-1157-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 562c3e044c8a0d2cfc4e9029d37b9b73a0d4cc92
# Push it to GitHub
git push --set-upstream origin backport/backport-1157-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.11

Then, create a pull request where the base branch is 2.11 and the compare/head branch is backport/backport-1157-to-2.11.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 24, 2023
* Switch from toast to callout for set up failures

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

* Fix label selection for truncated labels

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

* Fix button color

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

* Fix tests

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

* Remove loading progress bar

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

* Remove unused imports

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

* Refactor labels to make distinctions more semantically useful

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

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit 562c3e0)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 24, 2023
* Switch from toast to callout for set up failures

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

* Fix label selection for truncated labels

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

* Fix button color

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

* Fix tests

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

* Remove loading progress bar

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

* Remove unused imports

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

* Refactor labels to make distinctions more semantically useful

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

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit 562c3e0)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Swiddis pushed a commit that referenced this pull request Oct 24, 2023
* Switch from toast to callout for set up failures



* Fix label selection for truncated labels



* Fix button color



* Fix tests



* Remove loading progress bar



* Remove unused imports



* Refactor labels to make distinctions more semantically useful



---------


(cherry picked from commit 562c3e0)

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>
Swiddis pushed a commit that referenced this pull request Oct 24, 2023
* Switch from toast to callout for set up failures



* Fix label selection for truncated labels



* Fix button color



* Fix tests



* Remove loading progress bar



* Remove unused imports



* Refactor labels to make distinctions more semantically useful



---------


(cherry picked from commit 562c3e0)

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 added a commit to mengweieric/dashboards-observability that referenced this pull request Nov 8, 2023
mengweieric added a commit that referenced this pull request Nov 13, 2023
* 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>
amsiglan pushed a commit to amsiglan/dashboards-observability that referenced this pull request Jun 7, 2024
…ect#1157) (opensearch-project#1165)

* Switch from toast to callout for set up failures

* Fix label selection for truncated labels

* Fix button color

* Fix tests

* Remove loading progress bar

* Remove unused imports

* Refactor labels to make distinctions more semantically useful

---------

(cherry picked from commit 562c3e0)

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 5beb92c)
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.

3 participants