Merge branch 'main' into feature/multitenancy

Signed-off-by: Julian Quispel <[email protected]>
JulianQuispel · Feb 20, 2024 · 867ef53 · 867ef53
2 parents 0f4fb09 + 7e2d951
commit 867ef53
Show file tree

Hide file tree

Showing 12 changed files with 131 additions and 40 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/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/...grations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap b/...grations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
@@ -271,6 +271,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                 className="euiButtonContent__icon"
                                 color="inherit"
                                 size="m"
+                                title="list"
                                 type="list"
                               >
                                 <EuiIconBeaker
@@ -279,9 +280,12 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                   focusable="false"
                                   role="img"
                                   style={null}
+                                  title="list"
+                                  titleId="random_html_id"
                                 >
                                   <svg
                                     aria-hidden={true}
+                                    aria-labelledby="random_html_id"
                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                     focusable="false"
                                     height={16}
@@ -291,6 +295,11 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
                                   >
+                                    <title
+                                      id="random_html_id"
+                                    >
+                                      list
+                                    </title>
                                     <path
                                       d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
                                     />
@@ -384,6 +393,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                 className="euiButtonContent__icon"
                                 color="inherit"
                                 size="m"
+                                title="grid"
                                 type="grid"
                               >
                                 <EuiIconBeaker
@@ -392,9 +402,12 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                   focusable="false"
                                   role="img"
                                   style={null}
+                                  title="grid"
+                                  titleId="random_html_id"
                                 >
                                   <svg
                                     aria-hidden={true}
+                                    aria-labelledby="random_html_id"
                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                     focusable="false"
                                     height={16}
@@ -404,6 +417,11 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
                                   >
+                                    <title
+                                      id="random_html_id"
+                                    >
+                                      grid
+                                    </title>
                                     <path
                                       d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
                                     />

diff --git a/...rations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap b/...rations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap
@@ -473,6 +473,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                 className="euiButtonContent__icon"
                                                 color="inherit"
                                                 size="m"
+                                                title="list"
                                                 type="list"
                                               >
                                                 <EuiIconBeaker
@@ -481,9 +482,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                   focusable="false"
                                                   role="img"
                                                   style={null}
+                                                  title="list"
+                                                  titleId="random_html_id"
                                                 >
                                                   <svg
                                                     aria-hidden={true}
+                                                    aria-labelledby="random_html_id"
                                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                     focusable="false"
                                                     height={16}
@@ -493,6 +497,11 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
                                                   >
+                                                    <title
+                                                      id="random_html_id"
+                                                    >
+                                                      list
+                                                    </title>
                                                     <path
                                                       d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
                                                     />
@@ -586,6 +595,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                 className="euiButtonContent__icon"
                                                 color="inherit"
                                                 size="m"
+                                                title="grid"
                                                 type="grid"
                                               >
                                                 <EuiIconBeaker
@@ -594,9 +604,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                   focusable="false"
                                                   role="img"
                                                   style={null}
+                                                  title="grid"
+                                                  titleId="random_html_id"
                                                 >
                                                   <svg
                                                     aria-hidden={true}
+                                                    aria-labelledby="random_html_id"
                                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                     focusable="false"
                                                     height={16}
@@ -606,6 +619,11 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
                                                   >
+                                                    <title
+                                                      id="random_html_id"
+                                                    >
+                                                      grid
+                                                    </title>
                                                     <path
                                                       d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
                                                     />

diff --git a/public/components/trace_analytics/components/traces/flyout_list_item.tsx b/public/components/trace_analytics/components/traces/flyout_list_item.tsx
@@ -17,7 +17,7 @@ import React, { useState } from 'react';
 interface FlyoutListItemProps {
   title: React.ReactNode;
   description: React.ReactNode;
-  addSpanFilter: () => void;
+  addSpanFilter?: () => void;
 }
 
 export function FlyoutListItem(props: FlyoutListItemProps) {
@@ -27,12 +27,15 @@ export function FlyoutListItem(props: FlyoutListItemProps) {
     props.description !== '-' ? (
       <EuiFlexGroup gutterSize="none">
         <EuiFlexItem>
-          <EuiText size="s" style={{ wordBreak: 'break-all', wordWrap: 'break-word', whiteSpace: 'pre-line' }}>
+          <EuiText
+            size="s"
+            style={{ wordBreak: 'break-all', wordWrap: 'break-word', whiteSpace: 'pre-line' }}
+          >
             <b>{props.description}</b>
           </EuiText>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          {hover && (
+          {hover && props.addSpanFilter && (
             <EuiToolTip position="top" content="Filter spans on this value">
               <EuiButtonIcon
                 aria-label="span-flyout-filter-icon"