add button link to ingest

x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/home/index.tsx

@@ -5,7 +5,7 @@
  */
 
 import React, { useState } from 'react';
-import { useRouteMatch, Switch, Route } from 'react-router-dom';
+import { useRouteMatch, Switch, Route, useLocation, useHistory } from 'react-router-dom';
 import { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
 import { i18n } from '@kbn/i18n';
 import { PAGE_ROUTING_PATHS } from '../../../../constants';
@@ -114,7 +114,11 @@ function InstalledPackages() {
 
 function AvailablePackages() {
   useBreadcrumbs('integrations_all');
-  const [selectedCategory, setSelectedCategory] = useState('');
+  const history = useHistory();
+  const queryParams = new URLSearchParams(useLocation().search);
+  const initialCategory =
+    queryParams.get('category') !== null ? (queryParams.get('category') as string) : '';
+  const [selectedCategory, setSelectedCategory] = useState(initialCategory);
   const { data: categoryPackagesRes, isLoading: isLoadingPackages } = useGetPackages({
     category: selectedCategory,
   });
@@ -141,7 +145,13 @@ function AvailablePackages() {
       isLoading={isLoadingCategories}
       categories={categories}
       selectedCategory={selectedCategory}
-      onCategoryChange={({ id }: CategorySummaryItem) => setSelectedCategory(id)}
+      onCategoryChange={({ id }: CategorySummaryItem) => {
+        // clear category query param in the url
+        if (queryParams.get('category') !== null) {
+          history.push({});
+        }
+        setSelectedCategory(id);
+      }}
     />
   ) : null;
 

x-pack/plugins/security_solution/public/common/components/empty_page/index.tsx

@@ -5,7 +5,7 @@
  */
 
 import { EuiButton, EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, IconType } from '@elastic/eui';
-import React from 'react';
+import React, { MouseEventHandler } from 'react';
 import styled from 'styled-components';
 
 const EmptyPrompt = styled(EuiEmptyPrompt)`
@@ -23,6 +23,12 @@ interface EmptyPageProps {
   actionSecondaryLabel?: string;
   actionSecondaryTarget?: string;
   actionSecondaryUrl?: string;
+  actionTertiaryIcon?: IconType;
+  actionTertiaryLabel?: string;
+  actionTertiaryTarget?: string;
+  actionTertiaryUrl?: string;
+  actionTertiaryOnClick?: MouseEventHandler<HTMLButtonElement | HTMLAnchorElement>;
+  actionTertiaryFill?: boolean;
   'data-test-subj'?: string;
   message?: string;
   title: string;
@@ -38,6 +44,12 @@ export const EmptyPage = React.memo<EmptyPageProps>(
     actionSecondaryLabel,
     actionSecondaryTarget,
     actionSecondaryUrl,
+    actionTertiaryIcon,
+    actionTertiaryLabel,
+    actionTertiaryTarget,
+    actionTertiaryUrl,
+    actionTertiaryOnClick,
+    actionTertiaryFill = false,
     message,
     title,
     ...rest
@@ -48,6 +60,21 @@ export const EmptyPage = React.memo<EmptyPageProps>(
       body={message && <p>{message}</p>}
       actions={
         <EuiFlexGroup justifyContent="center">
+          {actionTertiaryLabel && actionTertiaryOnClick && (
+            <EuiFlexItem grow={false}>
+              {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
+              <EuiButton
+                data-test-subj="empty-page-tertiary-action"
+                fill={actionTertiaryFill}
+                onClick={actionTertiaryOnClick}
+                href={actionTertiaryUrl}
+                iconType={actionTertiaryIcon}
+                target={actionTertiaryTarget}
+              >
+                {actionTertiaryLabel}
+              </EuiButton>
+            </EuiFlexItem>
+          )}
           <EuiFlexItem grow={false}>
             <EuiButton
               fill

x-pack/plugins/security_solution/public/common/hooks/endpoint/ingest_enabled.ts

@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+
+/**
+ * Returns an object which ingest permissions are allowed
+ */
+export const useIngestEnabledCheck = (): {
+  allEnabled: boolean;
+  show: boolean;
+  write: boolean;
+  read: boolean;
+} => {
+  const { services } = useKibana();
+
+  // Check if Ingest Manager is present in the configuration
+  const show = services.application.capabilities.ingestManager?.show ?? false;
+  const write = services.application.capabilities.ingestManager?.write ?? false;
+  const read = services.application.capabilities.ingestManager?.read ?? false;
+
+  // Check if all Ingest Manager permissions are enabled
+  const allEnabled = show && read && write ? true : false;
+
+  return {
+    allEnabled,
+    show,
+    write,
+    read,
+  };
+};

x-pack/plugins/security_solution/public/common/translations.ts

@@ -28,3 +28,10 @@ export const EMPTY_ACTION_SECONDARY = i18n.translate(
     defaultMessage: 'View getting started guide',
   }
 );
+
+export const EMPTY_ACTION_ENDPOINT = i18n.translate(
+  'xpack.securitySolution.pages.common.emptyActionEndpoint',
+  {
+    defaultMessage: 'Add data with Elastic Agent (Beta)',
+  }
+);

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks.ts

@@ -24,16 +24,16 @@ export function useHostSelector<TSelected>(selector: (state: HostState) => TSele
 /**
  * Returns an object that contains Ingest app and URL information
  */
-export const useHostIngestUrl = (): { url: string; appId: string; appPath: string } => {
+export const useIngestUrl = (subpath: string): { url: string; appId: string; appPath: string } => {
   const { services } = useKibana();
   return useMemo(() => {
-    const appPath = `#/fleet`;
+    const appPath = `#/${subpath}`;
     return {
       url: `${services.application.getUrlForApp('ingestManager')}${appPath}`,
       appId: 'ingestManager',
       appPath,
     };
-  }, [services.application]);
+  }, [services.application, subpath]);
 };
 
 /**

x-pack/plugins/security_solution/public/overview/components/overview_empty/index.tsx

@@ -10,12 +10,38 @@ import * as i18nCommon from '../../../common/translations';
 import { EmptyPage } from '../../../common/components/empty_page';
 import { useKibana } from '../../../common/lib/kibana';
 import { ADD_DATA_PATH } from '../../../../common/constants';
+import { useIngestUrl } from '../../../management/pages/endpoint_hosts/view/hooks';
+import { useNavigateToAppEventHandler } from '../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
+import { useIngestEnabledCheck } from '../../../common/hooks/endpoint/ingest_enabled';
 
 const OverviewEmptyComponent: React.FC = () => {
   const { http, docLinks } = useKibana().services;
   const basePath = http.basePath.get();
+  const { appId: ingestAppId, appPath: ingestPath, url: ingestUrl } = useIngestUrl(
+    'integrations?category=security'
+  );
+  const handleOnClick = useNavigateToAppEventHandler(ingestAppId, { path: ingestPath });
+  const { allEnabled: isIngestEnabled } = useIngestEnabledCheck();
 
-  return (
+  return isIngestEnabled === true ? (
+    <EmptyPage
+      actionPrimaryIcon="gear"
+      actionPrimaryLabel={i18nCommon.EMPTY_ACTION_PRIMARY}
+      actionPrimaryUrl={`${basePath}${ADD_DATA_PATH}`}
+      actionSecondaryIcon="popout"
+      actionSecondaryLabel={i18nCommon.EMPTY_ACTION_SECONDARY}
+      actionSecondaryTarget="_blank"
+      actionSecondaryUrl={docLinks.links.siem.gettingStarted}
+      actionTertiaryIcon="gear"
+      actionTertiaryLabel={i18nCommon.EMPTY_ACTION_ENDPOINT}
+      actionTertiaryUrl={ingestUrl}
+      actionTertiaryOnClick={handleOnClick}
+      actionTertiaryFill={true}
+      data-test-subj="empty-page"
+      message={i18nCommon.EMPTY_MESSAGE}
+      title={i18nCommon.EMPTY_TITLE}
+    />
+  ) : (
     <EmptyPage
       actionPrimaryIcon="gear"
       actionPrimaryLabel={i18nCommon.EMPTY_ACTION_PRIMARY}

x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx

@@ -16,6 +16,7 @@ import {
   UseMessagesStorage,
 } from '../../common/containers/local_storage/use_messages_storage';
 import { Overview } from './index';
+import { useIngestEnabledCheck } from '../../common/hooks/endpoint/ingest_enabled';
 
 jest.mock('../../common/lib/kibana');
 jest.mock('../../common/containers/source');
@@ -28,6 +29,7 @@ jest.mock('../../common/components/search_bar', () => ({
 jest.mock('../../common/components/query_bar', () => ({
   QueryBar: () => null,
 }));
+jest.mock('../../common/hooks/endpoint/ingest_enabled');
 jest.mock('../../common/containers/local_storage/use_messages_storage');
 
 const endpointNoticeMessage = (hasMessageValue: boolean) => {
@@ -42,26 +44,54 @@ const endpointNoticeMessage = (hasMessageValue: boolean) => {
 
 describe('Overview', () => {
   describe('rendering', () => {
-    test('it renders the Setup Instructions text when no index is available', async () => {
-      (useWithSource as jest.Mock).mockReturnValue({
-        indicesExist: false,
+    describe('when no index is available', () => {
+      beforeEach(() => {
+        (useWithSource as jest.Mock).mockReturnValue({
+          indicesExist: false,
+        });
+        (useIngestEnabledCheck as jest.Mock).mockReturnValue({ allEnabled: false });
+        const mockuseMessagesStorage: jest.Mock = useMessagesStorage as jest.Mock<
+          UseMessagesStorage
+        >;
+        mockuseMessagesStorage.mockImplementation(() => endpointNoticeMessage(false));
       });
 
-      const mockuseMessagesStorage: jest.Mock = useMessagesStorage as jest.Mock<UseMessagesStorage>;
-      mockuseMessagesStorage.mockImplementation(() => endpointNoticeMessage(false));
+      it('renders the Setup Instructions text', () => {
+        const wrapper = mount(
+          <TestProviders>
+            <MemoryRouter>
+              <Overview />
+            </MemoryRouter>
+          </TestProviders>
+        );
+        expect(wrapper.find('[data-test-subj="empty-page"]').exists()).toBe(true);
+      });
 
-      const wrapper = mount(
-        <TestProviders>
-          <MemoryRouter>
-            <Overview />
-          </MemoryRouter>
-        </TestProviders>
-      );
+      it('does not show Endpoint get ready button when ingest is not enabled', () => {
+        const wrapper = mount(
+          <TestProviders>
+            <MemoryRouter>
+              <Overview />
+            </MemoryRouter>
+          </TestProviders>
+        );
+        expect(wrapper.find('[data-test-subj="empty-page-tertiary-action"]').exists()).toBe(false);
+      });
 
-      expect(wrapper.find('[data-test-subj="empty-page"]').exists()).toBe(true);
+      it('shows Endpoint get ready button when ingest is enabled', () => {
+        (useIngestEnabledCheck as jest.Mock).mockReturnValue({ allEnabled: true });
+        const wrapper = mount(
+          <TestProviders>
+            <MemoryRouter>
+              <Overview />
+            </MemoryRouter>
+          </TestProviders>
+        );
+        expect(wrapper.find('[data-test-subj="empty-page-tertiary-action"]').exists()).toBe(true);
+      });
     });
 
-    test('it DOES NOT render the Getting started text when an index is available', async () => {
+    it('it DOES NOT render the Getting started text when an index is available', () => {
       (useWithSource as jest.Mock).mockReturnValue({
         indicesExist: true,
         indexPattern: {},
@@ -80,7 +110,7 @@ describe('Overview', () => {
       expect(wrapper.find('[data-test-subj="empty-page"]').exists()).toBe(false);
     });
 
-    test('it DOES render the Endpoint banner when the endpoint index is NOT available AND storage is NOT set', async () => {
+    test('it DOES render the Endpoint banner when the endpoint index is NOT available AND storage is NOT set', () => {
       (useWithSource as jest.Mock).mockReturnValueOnce({
         indicesExist: true,
         indexPattern: {},
@@ -104,7 +134,7 @@ describe('Overview', () => {
       expect(wrapper.find('[data-test-subj="endpoint-prompt-banner"]').exists()).toBe(true);
     });
 
-    test('it does NOT render the Endpoint banner when the endpoint index is NOT available but storage is set', async () => {
+    test('it does NOT render the Endpoint banner when the endpoint index is NOT available but storage is set', () => {
       (useWithSource as jest.Mock).mockReturnValueOnce({
         indicesExist: true,
         indexPattern: {},
@@ -128,7 +158,7 @@ describe('Overview', () => {
       expect(wrapper.find('[data-test-subj="endpoint-prompt-banner"]').exists()).toBe(false);
     });
 
-    test('it does NOT render the Endpoint banner when the endpoint index is available AND storage is set', async () => {
+    test('it does NOT render the Endpoint banner when the endpoint index is available AND storage is set', () => {
       (useWithSource as jest.Mock).mockReturnValue({
         indicesExist: true,
         indexPattern: {},
@@ -147,7 +177,7 @@ describe('Overview', () => {
       expect(wrapper.find('[data-test-subj="endpoint-prompt-banner"]').exists()).toBe(false);
     });
 
-    test('it does NOT render the Endpoint banner when an index IS available but storage is NOT set', async () => {
+    test('it does NOT render the Endpoint banner when an index IS available but storage is NOT set', () => {
       (useWithSource as jest.Mock).mockReturnValue({
         indicesExist: true,
         indexPattern: {},

x-pack/plugins/security_solution/server/lib/source_status/elasticsearch_adapter.ts

@@ -8,6 +8,7 @@ import { FrameworkAdapter, FrameworkRequest } from '../framework';
 import { SourceStatusAdapter } from './index';
 import { buildQuery } from './query.dsl';
 import { ApmServiceNameAgg } from './types';
+import { ENDPOINT_METADATA_INDEX } from '../../../common/constants';
 
 const APM_INDEX_NAME = 'apm-*-transaction*';
 
@@ -18,6 +19,8 @@ export class ElasticsearchSourceStatusAdapter implements SourceStatusAdapter {
     // Intended flow to determine app-empty state is to first check siem indices (as this is a quick shard count), and
     // if no shards exist only then perform the heavier APM query. This optimizes for normal use when siem data exists
     try {
+      // Add endpoint metadata index to indices to check
+      indexNames.push(ENDPOINT_METADATA_INDEX);
       // Remove APM index if exists, and only query if length > 0 in case it's the only index provided
       const nonApmIndexNames = indexNames.filter((name) => name !== APM_INDEX_NAME);
       const indexCheckResponse = await (nonApmIndexNames.length > 0