Update URL of create datasources, fix spacing #1149

derek-ho · 2023-10-23T15:10:54Z

Description

Edits spacing between headers and form in configure workflows
Updates URL of create datasources

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.

Signed-off-by: Derek Ho <[email protected]>

codecov · 2023-10-23T16:09:42Z

Codecov Report

Merging #1149 (1937609) into main (ddb697a) will increase coverage by 0.01%.
The diff coverage is n/a.

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

@@            Coverage Diff             @@
##             main    #1149      +/-   ##
==========================================
+ Coverage   44.21%   44.22%   +0.01%     
==========================================
  Files         329      329              
  Lines       19542    19544       +2     
  Branches     4719     4718       -1     
==========================================
+ Hits         8640     8643       +3     
+ Misses      10335    10334       -1     
  Partials      567      567

Flag	Coverage Δ
dashboards-observability	`44.22% <ø> (+0.01%)`	⬆️

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

see 3 files with indirect coverage changes

Swiddis

Minor nits about naming things

Swiddis · 2023-10-23T16:53:20Z

common/constants/data_connections.ts

@@ -21,4 +21,12 @@ export const DatasourceTypeToDisplayName: { [key in DatasourceType]: string } =
  S3GLUE: 'Amazon S3',
 };

+export const PrometheusURL = 'Prometheus';
+export const AmazonS3URL = 'AmazonS3AWSGlue';


Nit: These aren't URLs, but paths.

Swiddis · 2023-10-23T16:54:00Z

public/components/datasources/components/manage/access_control_tab.tsx

@@ -110,7 +110,7 @@ export const AccessControlTab = (props: AccessControlTabProps) => {
          <EuiButton
            data-test-subj="createButton"
            onClick={() => setMode(mode === 'view' ? 'edit' : 'view')}
-            fill={mode === 'view' ? true : false}
+            fill={false}


Nit: Fill is false by default

Swiddis · 2023-10-23T16:56:38Z

public/components/datasources/home.tsx

@@ -59,7 +59,7 @@ export const Home = (props: HomeProps) => {
          exact
          path={['/configure/:id+']}
          render={(routerProps) => (
-            <Configure {...commonProps} type={decodeURIComponent(routerProps.match.params.id)} />
+            <Configure {...commonProps} urlType={decodeURIComponent(routerProps.match.params.id)} />


Naming nit: we get this type from the URL but that doesn't tell us anything about its semantic meaning. If type isn't a good enough name we should describe it as configurationType or similar.

Signed-off-by: Derek Ho <[email protected]>

opensearch-trigger-bot · 2023-10-23T18:23:32Z

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-1149-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2c94e9ed04870e5c6113920b3ffd00d7df7a391c
# Push it to GitHub
git push --set-upstream origin backport/backport-1149-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-1149-to-2.x.

opensearch-trigger-bot · 2023-10-23T18:23:34Z

The backport to 2.11 failed:

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

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-1149-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2c94e9ed04870e5c6113920b3ffd00d7df7a391c
# Push it to GitHub
git push --set-upstream origin backport/backport-1149-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-1149-to-2.11.

* Update some bug bash items Signed-off-by: Derek Ho <[email protected]> * Make button not primary, update snapshot Signed-off-by: Derek Ho <[email protected]> * False as default Signed-off-by: Derek Ho <[email protected]> --------- Signed-off-by: Derek Ho <[email protected]> (cherry picked from commit 2c94e9e) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…ject#1149) (opensearch-project#1154)" This reverts commit 0b66d83.

…ject#1149) (opensearch-project#1154)" This reverts commit 0b66d83. Signed-off-by: Eric <[email protected]>

* Revert "Update empty allowed roles to admin only (#1217) (#1220)" This reverts commit 4288504. Signed-off-by: Eric <[email protected]> * Revert "Increment version to 2.11.1.0 (#1190)" This reverts commit ccd5fb8. Signed-off-by: Eric <[email protected]> * Revert "Add S3 integration for Nginx and VPC (#1214) (#1216)" This reverts commit e0a509c. Signed-off-by: Eric <[email protected]> * Revert "disabling inspect and default pattern/timestamp buttons when using async data sources (#1205) (#1212)" This reverts commit ca5ad02. Signed-off-by: Eric <[email protected]> * Revert "Saved object datasource backward compatibility fixes (#1208) (#1210)" This reverts commit 467a0b3. Signed-off-by: Eric <[email protected]> * Revert "Link integrations from datasources UI (#1203) (#1207)" This reverts commit 8e9fe5e. Signed-off-by: Eric <[email protected]> * Revert "[Explorer] Fixes for cancel button and saved object loading (#1197) (#1201)" This reverts commit f0e7a9d. Signed-off-by: Eric <[email protected]> * Revert "Correct query schema for ELB mview generation (#1196) (#1199)" This reverts commit 0b7be95. Signed-off-by: Eric <[email protected]> * Revert "[Backport 2.11] Add integrations queries for Flint (#1195)" This reverts commit 97f46ba. Signed-off-by: Eric <[email protected]> * Revert "remove husky pre-commit checks (#1192) (#1193)" This reverts commit 25d52f3. Signed-off-by: Eric <[email protected]> * Revert "Bug fixes for observability count distribution and application analytics (#1187) (#1189)" This reverts commit e2440d2. Signed-off-by: Eric <[email protected]> * Revert "Support cancellation of async queries (#1177) (#1186)" This reverts commit 6b495f3. Signed-off-by: Eric <[email protected]> * Revert "[Explorer] Supports session for s3 direct query (#1178) (#1183)" This reverts commit d50047f. Signed-off-by: Eric <[email protected]> * Revert "[Explorer] Modify text in empty prompt (#1172) (#1182)" This reverts commit 95a60cc. Signed-off-by: Eric <[email protected]> * Revert "[Feature] Match discover look and feel (#1135) (#1179)" This reverts commit b69801e. Signed-off-by: Eric <[email protected]> * Revert "config panel dark mode fix (#1169) (#1176)" This reverts commit 34696b3. Signed-off-by: Eric <[email protected]> * Revert "Fix events home table and toast life time (#1170)" This reverts commit a9b36fc. Signed-off-by: Eric <[email protected]> * Revert "Quiet react-dnd draggableId/droppableId warnings. (#1147) (#1166)" This reverts commit a2f9a00. Signed-off-by: Eric <[email protected]> * Revert "Fix integration labeling to identify S3 integrations (#1157) (#1164)" This reverts commit 9de9aea. Signed-off-by: Eric <[email protected]> * Revert "Remove loading progress for integration setup (#1156) (#1162)" This reverts commit a08721b. Signed-off-by: Eric <[email protected]> * Revert "Switch from toast to callout for integration set up failures (#1155) (#1159)" This reverts commit e6a474a. Signed-off-by: Eric <[email protected]> * Revert "Disable integration set up button if invalid (#1152) (#1161)" This reverts commit 74aae17. Signed-off-by: Eric <[email protected]> * Revert "Update URL of create datasources, fix spacing (#1149) (#1154)" This reverts commit 0b66d83. Signed-off-by: Eric <[email protected]> * Revert "Allow patch on allowedRoles (#1143) (#1145)" This reverts commit 0acc0f3. Signed-off-by: Eric <[email protected]> * Revert "fix for explorer data grid not paginating (#1139) (#1141)" This reverts commit c5ead50. Signed-off-by: Eric <[email protected]> --------- Signed-off-by: Eric <[email protected]>

… (opensearch-project#1153) (cherry picked from commit 54d125d)

Update some bug bash items

8308fe1

Signed-off-by: Derek Ho <[email protected]>

derek-ho changed the title ~~Update URL of create datsources, spacing~~ Update URL of create datsources, fix spacing Oct 23, 2023

derek-ho added backport 2.x backport 2.11 labels Oct 23, 2023

derek-ho changed the title ~~Update URL of create datsources, fix spacing~~ Update URL of create datasources, fix spacing Oct 23, 2023

derek-ho marked this pull request as ready for review October 23, 2023 15:41

derek-ho requested review from pjfitzgibbons, ps48, kavithacm, joshuali925, dai-chen, YANG-DB, rupal-bq, mengweieric, vamsimanohar, Swiddis, penghuo, seankao-az and anirudha as code owners October 23, 2023 15:41

Make button not primary, update snapshot

1937609

Signed-off-by: Derek Ho <[email protected]>

Swiddis approved these changes Oct 23, 2023

View reviewed changes

ps48 approved these changes Oct 23, 2023

View reviewed changes

False as default

a738e07

Signed-off-by: Derek Ho <[email protected]>

derek-ho merged commit 2c94e9e into opensearch-project:main Oct 23, 2023

opensearch-trigger-bot bot added the backport-failed label Oct 23, 2023

derek-ho removed backport 2.x backport 2.11 labels Oct 23, 2023

derek-ho added backport 2.x backport 2.11 labels Oct 23, 2023

This was referenced Oct 23, 2023

[Backport 2.x] Update URL of create datasources, fix spacing #1153

Merged

[Backport 2.11] Update URL of create datasources, fix spacing #1154

Merged

derek-ho pushed a commit that referenced this pull request Oct 23, 2023

Update URL of create datasources, fix spacing (#1149) (#1153)

54d125d

derek-ho pushed a commit that referenced this pull request Oct 23, 2023

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

0b66d83

joshuali925 removed the backport-failed label Oct 30, 2023

mengweieric added a commit to mengweieric/dashboards-observability that referenced this pull request Nov 8, 2023

Revert "Update URL of create datasources, fix spacing (opensearch-pro…

3a524ee

…ject#1149) (opensearch-project#1154)" This reverts commit 0b66d83.

amsiglan pushed a commit to amsiglan/dashboards-observability that referenced this pull request Jun 7, 2024

Update URL of create datasources, fix spacing (opensearch-project#1149)…

fb1940c

… (opensearch-project#1153) (cherry picked from commit 54d125d)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update URL of create datasources, fix spacing #1149

Update URL of create datasources, fix spacing #1149

derek-ho commented Oct 23, 2023 •

edited

Loading

codecov bot commented Oct 23, 2023 •

edited

Loading

Swiddis left a comment

Swiddis Oct 23, 2023

Swiddis Oct 23, 2023

Swiddis Oct 23, 2023

opensearch-trigger-bot bot commented Oct 23, 2023

opensearch-trigger-bot bot commented Oct 23, 2023

Update URL of create datasources, fix spacing #1149

Update URL of create datasources, fix spacing #1149

Conversation

derek-ho commented Oct 23, 2023 • edited Loading

Description

Issues Resolved

Check List

codecov bot commented Oct 23, 2023 • edited Loading

Codecov Report

Swiddis left a comment

Choose a reason for hiding this comment

Swiddis Oct 23, 2023

Choose a reason for hiding this comment

Swiddis Oct 23, 2023

Choose a reason for hiding this comment

Swiddis Oct 23, 2023

Choose a reason for hiding this comment

opensearch-trigger-bot bot commented Oct 23, 2023

opensearch-trigger-bot bot commented Oct 23, 2023

derek-ho commented Oct 23, 2023 •

edited

Loading

codecov bot commented Oct 23, 2023 •

edited

Loading