[8.x] [Stack Monitoring] Switch Logs Explorer locator for Discover lo…

…cator in Stack Monitoring (#200546) (#202137) # Backport This will backport the following commits from `main` to `8.x`: - [[Stack Monitoring] Switch Logs Explorer locator for Discover locator in Stack Monitoring (#200546)](#200546)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Kerry Gallagher <kerry.gallagher@elastic.co>
elastic · Nov 28, 2024 · dde108c · dde108c
1 parent ca3f5a2
commit dde108c
Show file tree

Hide file tree

Showing 85 changed files with 172 additions and 168 deletions.
diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -163,6 +163,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'monitoring.ui.enabled (boolean?)',
         'monitoring.ui.min_interval_seconds (number?)',
         'monitoring.ui.show_license_expiration (boolean?)',
+        'monitoring.ui.logs.index (string?)',
         'newsfeed.fetchInterval (duration?)',
         'newsfeed.mainInterval (duration?)',
         'newsfeed.service.pathTemplate (string?)',

diff --git a/x-pack/plugins/monitoring/common/constants.ts b/x-pack/plugins/monitoring/common/constants.ts
@@ -151,11 +151,6 @@ export const METRICBEAT_INDEX_NAME_UNIQUE_TOKEN = '-mb-';
 // We use this for metricbeat migration to identify specific products that we do not have constants for
 export const ELASTICSEARCH_SYSTEM_ID = 'elasticsearch';
 
-/**
- * The id of the infra source owned by the monitoring plugin.
- */
-export const INFRA_SOURCE_ID = 'internal-stack-monitoring';
-
 /*
  * These constants represent code paths within `getClustersFromRequest`
  * that an api call wants to invoke. This is meant as an optimization to

diff --git a/...er/lib/cluster/get_index_patterns.test.ts → ...itoring/common/get_index_patterns.test.ts b/...er/lib/cluster/get_index_patterns.test.ts → ...itoring/common/get_index_patterns.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DS_INDEX_PATTERN_TYPES } from '../../../common/constants';
-import { MonitoringConfig } from '../..';
+import { DS_INDEX_PATTERN_TYPES } from './constants';
+import { MonitoringConfig } from '../server';
 import {
   getElasticsearchDataset,
   getKibanaDataset,

diff --git a/.../server/lib/cluster/get_index_patterns.ts → ...s/monitoring/common/get_index_patterns.ts b/.../server/lib/cluster/get_index_patterns.ts → ...s/monitoring/common/get_index_patterns.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { prefixIndexPatternWithCcs } from '../../../common/ccs_utils';
+import { prefixIndexPatternWithCcs } from './ccs_utils';
 import {
   INDEX_PATTERN_ELASTICSEARCH,
   INDEX_PATTERN_ELASTICSEARCH_ECS,
@@ -16,8 +16,8 @@ import {
   DS_INDEX_PATTERN_METRICS,
   INDEX_PATTERN_TYPES,
   INDEX_PATTERN_ENTERPRISE_SEARCH,
-} from '../../../common/constants';
-import { MonitoringConfig } from '../../config';
+} from './constants';
+import type { MonitoringConfig } from '../server/config';
 
 interface CommonIndexPatternArgs {
   config: MonitoringConfig;

diff --git a/x-pack/plugins/monitoring/kibana.jsonc b/x-pack/plugins/monitoring/kibana.jsonc
@@ -26,7 +26,6 @@
     ],
     "optionalPlugins": [
       "infra",
-      "logsShared",
       "usageCollection",
       "home",
       "cloud",
@@ -41,7 +40,6 @@
       "kibanaUtils",
       "alerting",
       "kibanaReact",
-      "logsShared"
     ]
   }
 }
diff --git a/x-pack/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap b/x-pack/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap
diff --git a/x-pack/plugins/monitoring/public/components/logs/logs.js b/x-pack/plugins/monitoring/public/components/logs/logs.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { PureComponent } from 'react';
+import React, { PureComponent, useContext } from 'react';
 import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
 import { upperFirst } from 'lodash';
 import { Legacy } from '../../legacy_shims';
@@ -15,7 +15,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { Reason } from './reason';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import { getLogsLocatorsFromUrlService } from '@kbn/logs-shared-plugin/common';
+import { ExternalConfigContext } from '../../application/contexts/external_config_context';
 
 const getFormattedDateTimeLocal = (timestamp) => {
   const timezone = Legacy.shims.uiSettings?.get('dateFormat:tz');
@@ -111,7 +111,7 @@ const clusterColumns = [
   },
 ];
 
-function getLogsUiLink(clusterUuid, nodeId, indexUuid, sharePlugin) {
+function getLogsUiLink(clusterUuid, nodeId, indexUuid, sharePlugin, logsIndices) {
   const params = [];
   if (clusterUuid) {
     params.push(`elasticsearch.cluster.uuid:${clusterUuid}`);
@@ -124,10 +124,17 @@ function getLogsUiLink(clusterUuid, nodeId, indexUuid, sharePlugin) {
   }
 
   const filter = params.join(' and ');
-  const { logsLocator } = getLogsLocatorsFromUrlService(sharePlugin.url);
+  const discoverLocator = sharePlugin.url.locators.get('DISCOVER_APP_LOCATOR');
 
-  const base = logsLocator.getRedirectUrl({
-    filter,
+  const base = discoverLocator.getRedirectUrl({
+    dataViewSpec: {
+      id: logsIndices,
+      title: logsIndices,
+    },
+    query: {
+      language: 'kuery',
+      query: filter,
+    },
   });
 
   return base;
@@ -137,7 +144,8 @@ export const Logs = (props) => {
   const {
     services: { share },
   } = useKibana();
-  return <LogsContent sharePlugin={share} {...props} />;
+  const externalConfig = useContext(ExternalConfigContext);
+  return <LogsContent sharePlugin={share} logsIndices={externalConfig.logsIndices} {...props} />;
 };
 export class LogsContent extends PureComponent {
   renderLogs() {
@@ -168,13 +176,15 @@ export class LogsContent extends PureComponent {
 
   renderCallout() {
     const { capabilities: uiCapabilities, infra, kibanaServices } = Legacy.shims;
-    const show = uiCapabilities.logs && uiCapabilities.logs.show;
+    const show = uiCapabilities.discover && uiCapabilities.discover.show;
+
     const {
       logs: { enabled },
       nodeId,
       clusterUuid,
       indexUuid,
       sharePlugin,
+      logsIndices,
     } = this.props;
 
     if (!enabled || !show) {
@@ -195,9 +205,11 @@ export class LogsContent extends PureComponent {
             defaultMessage="Visit {link} to dive deeper."
             values={{
               link: (
-                <EuiLink href={getLogsUiLink(clusterUuid, nodeId, indexUuid, sharePlugin)}>
+                <EuiLink
+                  href={getLogsUiLink(clusterUuid, nodeId, indexUuid, sharePlugin, logsIndices)}
+                >
                   {i18n.translate('xpack.monitoring.logs.listing.calloutLinkText', {
-                    defaultMessage: 'Logs',
+                    defaultMessage: 'Discover',
                   })}
                 </EuiLink>
               ),

diff --git a/x-pack/plugins/monitoring/public/components/logs/logs.test.js b/x-pack/plugins/monitoring/public/components/logs/logs.test.js
@@ -10,32 +10,26 @@ import { shallow } from 'enzyme';
 import { LogsContent } from './logs';
 import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
-const sharePlugin = sharePluginMock.createStartContract();
-
-jest.mock('@kbn/logs-shared-plugin/common', () => {
-  return {
-    getLogsLocatorsFromUrlService: jest.fn().mockReturnValue({
-      logsLocator: { getRedirectUrl: jest.fn(() => '') },
-    }),
-  };
-});
-
 jest.mock('../../legacy_shims', () => ({
   Legacy: {
     shims: {
       getBasePath: () => '',
-      capabilities: { logs: { show: true } },
-      infra: {
-        locators: {
-          logsLocator: {
-            getRedirectUrl: () => '',
-          },
-        },
-      },
+      capabilities: { discover: { show: true } },
+      infra: {},
     },
   },
 }));
 
+const sharePlugin = {
+  url: {
+    locators: {
+      get: () => {
+        return sharePluginMock.createLocator();
+      },
+    },
+  },
+};
+
 const logs = {
   enabled: true,
   limit: 10,
@@ -134,39 +128,69 @@ const logs = {
 
 describe('Logs', () => {
   it('should render normally', () => {
-    const component = shallow(<LogsContent sharePlugin={sharePlugin} logs={logs} />);
+    const component = shallow(
+      <LogsContent sharePlugin={sharePlugin} logsIndices={'logs-*,*:logs-*'} logs={logs} />
+    );
     expect(component).toMatchSnapshot();
   });
 
   it('should render fewer columns for node or index view', () => {
-    const component = shallow(<LogsContent sharePlugin={sharePlugin} logs={logs} nodeId="12345" />);
+    const component = shallow(
+      <LogsContent
+        sharePlugin={sharePlugin}
+        logsIndices={'logs-*,*:logs-*'}
+        logs={logs}
+        nodeId="12345"
+      />
+    );
     expect(component.find('EuiBasicTable').prop('columns')).toMatchSnapshot();
   });
 
   it('should render a link to filter by cluster uuid', () => {
     const component = shallow(
-      <LogsContent sharePlugin={sharePlugin} logs={logs} clusterUuid="12345" />
+      <LogsContent
+        sharePlugin={sharePlugin}
+        logsIndices={'logs-*,*:logs-*'}
+        logs={logs}
+        clusterUuid="12345"
+      />
     );
     expect(component.find('EuiCallOut')).toMatchSnapshot();
   });
 
   it('should render a link to filter by cluster uuid and node uuid', () => {
     const component = shallow(
-      <LogsContent sharePlugin={sharePlugin} logs={logs} clusterUuid="12345" nodeId="6789" />
+      <LogsContent
+        sharePlugin={sharePlugin}
+        logsIndices={'logs-*,*:logs-*'}
+        logs={logs}
+        clusterUuid="12345"
+        nodeId="6789"
+      />
     );
     expect(component.find('EuiCallOut')).toMatchSnapshot();
   });
 
   it('should render a link to filter by cluster uuid and index uuid', () => {
     const component = shallow(
-      <LogsContent sharePlugin={sharePlugin} logs={logs} clusterUuid="12345" indexUuid="6789" />
+      <LogsContent
+        sharePlugin={sharePlugin}
+        logsIndices={'logs-*,*:logs-*'}
+        logs={logs}
+        clusterUuid="12345"
+        indexUuid="6789"
+      />
     );
     expect(component.find('EuiCallOut')).toMatchSnapshot();
   });
 
   it('should render a reason if the logs are disabled', () => {
     const component = shallow(
-      <LogsContent sharePlugin={sharePlugin} logs={{ enabled: false, limit: 15, reason: {} }} />
+      <LogsContent
+        sharePlugin={sharePlugin}
+        logsIndices={'logs-*,*:logs-*'}
+        logs={{ enabled: false, limit: 15, reason: {} }}
+      />
     );
     expect(component).toMatchSnapshot();
   });

diff --git a/x-pack/plugins/monitoring/public/plugin.ts b/x-pack/plugins/monitoring/public/plugin.ts
@@ -19,6 +19,7 @@ import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
 import {
+  CCS_REMOTE_PATTERN,
   RULE_DETAILS,
   RULE_THREAD_POOL_SEARCH_REJECTIONS,
   RULE_THREAD_POOL_WRITE_REJECTIONS,
@@ -38,6 +39,7 @@ import {
   MonitoringStartPluginDependencies,
   LegacyMonitoringStartPluginDependencies,
 } from './types';
+import { getIndexPatterns } from '../common/get_index_patterns';
 
 interface MonitoringSetupPluginDependencies {
   home?: HomePublicPluginSetup;
@@ -154,6 +156,7 @@ export class MonitoringPlugin
         monitoring.ui.kibana.reporting.stale_status_threshold_seconds,
       ],
       ['isCcsEnabled', monitoring.ui.ccs.enabled],
+      ['logsIndices', getLogsIndices(monitoring)],
     ];
   }
 
@@ -188,3 +191,11 @@ export class MonitoringPlugin
     }
   }
 }
+
+const getLogsIndices = (config: MonitoringConfig) => {
+  return getIndexPatterns({
+    config,
+    type: 'logs',
+    ccs: CCS_REMOTE_PATTERN,
+  });
+};
diff --git a/x-pack/plugins/monitoring/server/index.ts b/x-pack/plugins/monitoring/server/index.ts
@@ -35,6 +35,7 @@ export const config: PluginConfigDescriptor<TypeOf<typeof configSchema>> = {
           stale_status_threshold_seconds: true,
         },
       },
+      logs: true,
     },
     kibana: true,
   },

diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts
@@ -10,7 +10,7 @@ import { get } from 'lodash';
 import { isCCSRemoteIndexName } from '@kbn/es-query';
 import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 import { CCRReadExceptionsStats } from '../../../common/types/alerts';
-import { getIndexPatterns, getElasticsearchDataset } from '../cluster/get_index_patterns';
+import { getIndexPatterns, getElasticsearchDataset } from '../../../common/get_index_patterns';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
 

diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts
@@ -10,7 +10,7 @@ import { AlertCluster, AlertClusterHealth } from '../../../common/types/alerts';
 import { ElasticsearchSource } from '../../../common/types/es';
 import { createDatasetFilter } from './create_dataset_query_filter';
 import { Globals } from '../../static_globals';
-import { getIndexPatterns, getElasticsearchDataset } from '../cluster/get_index_patterns';
+import { getIndexPatterns, getElasticsearchDataset } from '../../../common/get_index_patterns';
 import { CCS_REMOTE_PATTERN } from '../../../common/constants';
 
 export async function fetchClusterHealth(
-Original file line number
+Diff line change
@@ Expand Up @@
               stale_status_threshold_seconds: true,
             },
           },
+          logs: true,
         },
         kibana: true,
       },
@@ Expand Down @@