[8.15] [Logs Explorer] Fix Privileges Accessibility (#193894) (#194580)

# Backport This will backport the following commits from `main` to `8.15`: - [[Logs Explorer] Fix Privileges Accessibility (#193894)](#193894)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) \n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n\n\nCo-authored-by: mohamedhamed-ahmed <[email protected]>"}}]}] BACKPORT-->
elastic · Oct 2, 2024 · 709bb75 · 709bb75
1 parent 3cf7ae4
commit 709bb75
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 20 deletions.
diff --git a/x-pack/plugins/observability_solution/infra/public/apps/logs_app.tsx b/x-pack/plugins/observability_solution/infra/public/apps/logs_app.tsx
@@ -57,7 +57,7 @@ const LogsApp: React.FC<{
   storage: Storage;
   theme$: AppMountParameters['theme$'];
 }> = ({ core, history, pluginStart, plugins, setHeaderActionMenu, storage, theme$ }) => {
-  const uiCapabilities = core.application.capabilities;
+  const { logs, discover, fleet } = core.application.capabilities;
 
   return (
     <CoreProviders core={core} pluginStart={pluginStart} plugins={plugins} theme$={theme$}>
@@ -74,17 +74,21 @@ const LogsApp: React.FC<{
             toastsService={core.notifications.toasts}
           >
             <Routes>
-              <Route
-                path="/"
-                exact
-                render={() =>
-                  plugins.share.url.locators
-                    .get<AllDatasetsLocatorParams>(ALL_DATASETS_LOCATOR_ID)
-                    ?.navigate({})
-                }
-              />
+              {Boolean(discover?.show && fleet?.read) && (
+                <Route
+                  path="/"
+                  exact
+                  render={() => {
+                    plugins.share.url.locators
+                      .get<AllDatasetsLocatorParams>(ALL_DATASETS_LOCATOR_ID)
+                      ?.navigate({});
+
+                    return null;
+                  }}
+                />
+              )}
               <Route path="/link-to" component={LinkToLogsPage} />
-              {uiCapabilities?.logs?.show && <Route path="/" component={LogsPage} />}
+              {logs?.show && <Route path="/" component={LogsPage} />}
             </Routes>
           </KbnUrlStateStorageFromRouterProvider>
         </Router>

diff --git a/x-pack/plugins/observability_solution/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/observability_solution/infra/public/pages/logs/page_content.tsx
@@ -107,6 +107,7 @@ export const LogsPageContent: React.FunctionComponent = () => {
         )}
         <RedirectWithQueryParams from={'/analysis'} to={anomaliesTab.pathname} exact />
         <RedirectWithQueryParams from={'/log-rate'} to={anomaliesTab.pathname} exact />
+        <RedirectWithQueryParams from={'/'} to={streamTab.pathname} exact />
         <Route
           render={() => (
             <NotFoundPage

diff --git a/x-pack/plugins/observability_solution/infra/public/plugin.ts b/x-pack/plugins/observability_solution/infra/public/plugin.ts
@@ -123,19 +123,24 @@ export class Plugin implements InfraClientPluginClass {
             ],
             isInfrastructureHostsViewEnabled,
           ]) => {
+            const { infrastructure, logs, discover, fleet } = capabilities;
             return [
-              ...(capabilities.logs.show
+              ...(logs.show
                 ? [
                     {
                       label: 'Logs',
                       sortKey: 200,
                       entries: [
-                        {
-                          label: 'Explorer',
-                          app: 'observability-logs-explorer',
-                          path: '/',
-                          isBetaFeature: true,
-                        },
+                        ...(discover?.show && fleet?.read
+                          ? [
+                              {
+                                label: 'Explorer',
+                                app: 'observability-logs-explorer',
+                                path: '/',
+                                isBetaFeature: true,
+                              },
+                            ]
+                          : []),
                         ...(this.config.featureFlags.logsUIEnabled
                           ? [
                               { label: 'Stream', app: 'logs', path: '/stream' },
@@ -147,7 +152,7 @@ export class Plugin implements InfraClientPluginClass {
                     },
                   ]
                 : []),
-              ...(capabilities.infrastructure.show
+              ...(infrastructure.show
                 ? [
                     {
                       label: 'Infrastructure',

diff --git a/x-pack/plugins/observability_solution/observability_logs_explorer/public/plugin.ts b/x-pack/plugins/observability_solution/observability_logs_explorer/public/plugin.ts
@@ -7,13 +7,16 @@
 
 import {
   AppMountParameters,
+  AppStatus,
+  AppUpdater,
   CoreSetup,
   CoreStart,
   DEFAULT_APP_CATEGORIES,
   Plugin,
   PluginInitializerContext,
 } from '@kbn/core/public';
 import { OBSERVABILITY_LOGS_EXPLORER_APP_ID } from '@kbn/deeplinks-observability';
+import { BehaviorSubject } from 'rxjs';
 import {
   AllDatasetsLocatorDefinition,
   ObservabilityLogsExplorerLocators,
@@ -35,6 +38,7 @@ export class ObservabilityLogsExplorerPlugin
 {
   private config: ObservabilityLogsExplorerConfig;
   private locators?: ObservabilityLogsExplorerLocators;
+  private appStateUpdater = new BehaviorSubject<AppUpdater>(() => ({}));
 
   constructor(context: PluginInitializerContext<ObservabilityLogsExplorerConfig>) {
     this.config = context.config.get();
@@ -56,6 +60,7 @@ export class ObservabilityLogsExplorerPlugin
         ? ['globalSearch', 'sideNav']
         : ['globalSearch'],
       keywords: ['logs', 'log', 'explorer', 'logs explorer'],
+      updater$: this.appStateUpdater,
       mount: async (appMountParams: ObservabilityLogsExplorerAppMountParameters) => {
         const [coreStart, pluginsStart, ownPluginStart] = await core.getStartServices();
         const { renderObservabilityLogsExplorer } = await import(
@@ -123,7 +128,16 @@ export class ObservabilityLogsExplorerPlugin
     };
   }
 
-  public start(_core: CoreStart, _pluginsStart: ObservabilityLogsExplorerStartDeps) {
+  public start(core: CoreStart, _pluginsStart: ObservabilityLogsExplorerStartDeps) {
+    const { discover, fleet, logs } = core.application.capabilities;
+
+    if (!(discover?.show && fleet?.read && logs?.show)) {
+      this.appStateUpdater.next(() => ({
+        status: AppStatus.inaccessible,
+        visibleIn: [],
+      }));
+    }
+
     return {};
   }
 }