Merge branch 'main' into integrations-mds

opensearch-project · Aug 9, 2024 · 029c0ca · 029c0ca
2 parents 93eab4e + df6266a
commit 029c0ca
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 24 deletions.
diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/csv_file-1.0.0.json b/public/components/getting_started/getting_started_artifacts/csv_file/csv_file-1.0.0.json
@@ -76,8 +76,8 @@
                 "type": "host-name"
               }
             ],
-            "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/getting-started/fluent-bit/.env"],
-            "content": "wget https://raw.githubusercontent.com/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/fluent-bit/.env",
+            "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file/getting-started/.env"],
+            "content": "wget https://raw.githubusercontent.com/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/.env",
             "description": "Setup docker-compose env variables "
           },
           {
@@ -96,7 +96,7 @@
             "label": "live container",
             "type": "file-url",
             "phase": "docker",
-            "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file/getting-started/fluent-bit/fluent-bit.yml"],
+            "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file/getting-started/docker-compose.yml"],
             "description": "Run docker-compose for the nginx live example and see the generated index",
             "content": "wget -O docker-compose.yml https://raw.githubusercontent.com/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/docker-compose.yml && docker-compose up -d fluent-bit \n"
           }

diff --git a/public/components/trace_analytics/components/services/service_view.tsx b/public/components/trace_analytics/components/services/service_view.tsx
@@ -104,12 +104,14 @@ export function ServiceView(props: ServiceViewProps) {
   useEffect(() => {
     if (page !== 'serviceFlyout')
       setNavBreadCrumbs(
-        [props.parentBreadcrumb],
         [
+          props.parentBreadcrumb,
           {
             text: 'Trace analytics',
-            href: '#/',
+            href: '#/services',
           },
+        ],
+        [
           {
             text: 'Services',
             href: '#/services',

diff --git a/public/components/trace_analytics/components/traces/trace_view.tsx b/public/components/trace_analytics/components/traces/trace_view.tsx
@@ -233,12 +233,14 @@ export function TraceView(props: TraceViewProps) {
 
   useEffect(() => {
     setNavBreadCrumbs(
-      [props.parentBreadcrumb],
       [
+        props.parentBreadcrumb,
         {
           text: 'Trace analytics',
-          href: '#/',
+          href: '#/services',
         },
+      ],
+      [
         {
           text: 'Traces',
           href: '#/traces',

diff --git a/public/components/trace_analytics/home.tsx b/public/components/trace_analytics/home.tsx
@@ -120,7 +120,13 @@ export const Home = (props: HomeProps) => {
 
   const [dataSourceMDSId, setDataSourceMDSId] = useState([{ id: '', label: '' }]);
   const [currentSelectedService, setCurrentSelectedService] = useState('');
-  const { defaultRoute = '/services' } = props;
+  let defaultRoute = props.defaultRoute ?? '/services';
+  const currentHash = window.location.hash.split('#')[1] || '';
+
+  if (currentHash.startsWith('/traces') || currentHash.startsWith('/services')) {
+    defaultRoute = currentHash;
+  }
+
   const { chrome } = props;
   const isNavGroupEnabled = chrome.navGroup.getNavGroupEnabled();
 
@@ -190,21 +196,29 @@ export const Home = (props: HomeProps) => {
   }, [mode]);
 
   const serviceBreadcrumbs = [
-    {
-      text: 'Trace analytics',
-      href: '#/services',
-    },
+    ...(!isNavGroupEnabled
+      ? [
+          {
+            text: 'Trace analytics',
+            href: '#/services',
+          },
+        ]
+      : []),
     {
       text: 'Services',
       href: '#/services',
     },
   ];
 
   const traceBreadcrumbs = [
-    {
-      text: 'Trace analytics',
-      href: '#/services',
-    },
+    ...(!isNavGroupEnabled
+      ? [
+          {
+            text: 'Trace analytics',
+            href: '#/services',
+          },
+        ]
+      : []),
     {
       text: 'Traces',
       href: '#/traces',

diff --git a/public/components/trace_analytics/trace_side_nav.tsx b/public/components/trace_analytics/trace_side_nav.tsx
@@ -30,7 +30,7 @@ export function TraceSideBar(props: { children: React.ReactNode }) {
     {
       name: 'Trace analytics',
       id: 1,
-      href: '#/',
+      href: '#/services',
       items: [
         {
           name: 'Services',

diff --git a/public/plugin_nav.tsx b/public/plugin_nav.tsx
@@ -71,13 +71,6 @@ export function registerAllPluginNavGroups(core: CoreSetup<AppPluginStartDepende
       order: 400,
     },
   ]);
-  core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.analytics, [
-    {
-      id: observabilityNotebookID,
-      category: DEFAULT_APP_CATEGORIES.visualizeAndReport,
-      order: 400,
-    },
-  ]);
 
   core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
     {