Merge branch 'main' into remove-style

joshuali925 · Feb 29, 2024 · 46cd3f7 · 46cd3f7
2 parents 937d9e3 + 187b112
commit 46cd3f7
Show file tree

Hide file tree

Showing 19 changed files with 520 additions and 73 deletions.
diff --git a/.github/workflows/dashboards-observability-test-and-build-workflow.yml b/.github/workflows/dashboards-observability-test-and-build-workflow.yml
@@ -49,15 +49,15 @@ jobs:
             cd ./OpenSearch-Dashboards/
             su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v &&
                                  yarn config set network-timeout 1000000 -g &&
-                                 yarn osd bootstrap"
+                                 yarn osd bootstrap --single-version=loose"
 
       - name: Test all dashboards-observability modules
         run: |
             chown -R 1000:1000 `pwd`
             cd ./OpenSearch-Dashboards/
             su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v &&
                                  cd plugins/dashboards-observability &&
-                                 yarn osd bootstrap && yarn test --coverage --maxWorkers=100%"
+                                 yarn osd bootstrap --single-version=loose && yarn test --coverage --maxWorkers=100%"
 
       - name: Upload coverage
         uses: codecov/codecov-action@v1
@@ -131,7 +131,7 @@ jobs:
           command: |
             cd OpenSearch-Dashboards
             yarn config set network-timeout 1000000 -g
-            yarn osd bootstrap
+            yarn osd bootstrap --single-version=loose
 
       - name: Test all dashboards-observability modules
         run: |

diff --git a/.github/workflows/ftr-e2e-dashboards-observability-test.yml b/.github/workflows/ftr-e2e-dashboards-observability-test.yml
@@ -105,7 +105,7 @@ jobs:
       - name: Bootstrap the plugin
         run: |
           cd OpenSearch-Dashboards/plugins/dashboards-observability
-          yarn osd bootstrap
+          yarn osd bootstrap --single-version=loose
 
       - name: Run OpenSearch Dashboards server
         run: |

diff --git a/.github/workflows/integration-tests-workflow.yml b/.github/workflows/integration-tests-workflow.yml
@@ -128,7 +128,7 @@ jobs:
       - name: Bootstrap the plugin
         run: |
           cd OpenSearch-Dashboards/plugins/dashboards-observability
-          yarn osd bootstrap
+          yarn osd bootstrap --single-version=loose
 
       - name: Run OpenSearch Dashboards server
         run: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Bootstrap the plugin
         working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
-        run: yarn osd bootstrap
+        run: yarn osd bootstrap --single-version=loose
 
       - name: Get list of changed files using GitHub Action
         uses: lots0logs/[email protected]

diff --git a/common/types/data_connections.ts b/common/types/data_connections.ts
@@ -13,6 +13,15 @@ export interface PermissionsConfigurationProps {
   hasSecurityAccess: boolean;
 }
 
+export interface AssociatedObject {
+  id: string;
+  name: string;
+  database: string;
+  type: string;
+  createdByIntegration: string;
+  accelerations: string;
+}
+
 export type Role = EuiComboBoxOptionOption;
 
 export type DatasourceType = 'S3GLUE' | 'PROMETHEUS';
diff --git a/common/types/trace_analytics.ts b/common/types/trace_analytics.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export type SpanField =
+  | 'SPAN_ID'
+  | 'PARENT_SPAN_ID'
+  | 'SERVICE'
+  | 'OPERATION'
+  | 'DURATION'
+  | 'START_TIME'
+  | 'END_TIME'
+  | 'ERRORS';
diff --git a/package.json b/package.json
@@ -36,19 +36,19 @@
     "mime": "^3.0.0",
     "mocha": "10.1.0",
     "performance-now": "^2.1.0",
-    "plotly.js-dist": "^2.2.0",
+    "plotly.js-dist": "^2.29.1",
     "postinstall": "^0.7.4",
     "react-graph-vis": "^1.0.7",
     "react-paginate": "^8.1.3",
-    "react-plotly.js": "^2.5.1",
+    "react-plotly.js": "^2.6.0",
     "redux-persist": "^6.0.0",
     "sanitize-filename": "^1.6.3"
   },
   "devDependencies": {
     "@cypress/skip-test": "^2.6.1",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/mime": "^3.0.1",
-    "@types/react-plotly.js": "^2.5.0",
+    "@types/react-plotly.js": "^2.6.3",
     "@types/react-test-renderer": "^18.0.0",
     "@types/sanitize-filename": "^1.6.3",
     "antlr4ts-cli": "^0.5.0-alpha.4",
@@ -80,4 +80,4 @@
     "node_modules/*",
     "target/*"
   ]
-}
+}
diff --git a/...c/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap b/...c/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
@@ -241,6 +241,48 @@ exports[`Data Connection Page test Renders Prometheus data connection page with
               Connection configuration
             </span>
           </button>
+          <button
+            aria-controls="random_html_id"
+            aria-selected="false"
+            class="euiTab"
+            id="associated_objects"
+            role="tab"
+            type="button"
+          >
+            <span
+              class="euiTab__content"
+            >
+              Associated Objects
+            </span>
+          </button>
+          <button
+            aria-controls="random_html_id"
+            aria-selected="false"
+            class="euiTab"
+            id="accelerations"
+            role="tab"
+            type="button"
+          >
+            <span
+              class="euiTab__content"
+            >
+              Accelerations
+            </span>
+          </button>
+          <button
+            aria-controls="random_html_id"
+            aria-selected="false"
+            class="euiTab"
+            id="installed_integrations"
+            role="tab"
+            type="button"
+          >
+            <span
+              class="euiTab__content"
+            >
+              Installed integrations
+            </span>
+          </button>
         </div>
         <div
           aria-labelledby="access_control"
@@ -782,6 +824,48 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
               Connection configuration
             </span>
           </button>
+          <button
+            aria-controls="random_html_id"
+            aria-selected="false"
+            class="euiTab"
+            id="associated_objects"
+            role="tab"
+            type="button"
+          >
+            <span
+              class="euiTab__content"
+            >
+              Associated Objects
+            </span>
+          </button>
+          <button
+            aria-controls="random_html_id"
+            aria-selected="false"
+            class="euiTab"
+            id="accelerations"
+            role="tab"
+            type="button"
+          >
+            <span
+              class="euiTab__content"
+            >
+              Accelerations
+            </span>
+          </button>
+          <button
+            aria-controls="random_html_id"
+            aria-selected="false"
+            class="euiTab"
+            id="installed_integrations"
+            role="tab"
+            type="button"
+          >
+            <span
+              class="euiTab__content"
+            >
+              Installed integrations
+            </span>
+          </button>
         </div>
         <div
           aria-labelledby="access_control"

diff --git a/public/components/datasources/components/manage/accelerations_recommendation_callout.tsx b/public/components/datasources/components/manage/accelerations_recommendation_callout.tsx
@@ -0,0 +1,16 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EuiCallOut } from '@elastic/eui';
+import React from 'react';
+
+export const AccelerationsRecommendationCallout = () => {
+  return (
+    <EuiCallOut
+      title="Accelerations recommended for tables. Setup acceleration or configure integrations"
+      iconType="iInCircle"
+    />
+  );
+};