[Fleet] Use Fleet Server indices in the search bar (elastic#90835)

gmmorris · Feb 10, 2021 · f95bfe8 · f95bfe8
1 parent 7e80bb3
commit f95bfe8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
@@ -14,20 +14,22 @@ import {
 import { useStartServices } from '../hooks';
 import { INDEX_NAME, AGENT_SAVED_OBJECT_TYPE } from '../constants';
 
-const HIDDEN_FIELDS = [`${AGENT_SAVED_OBJECT_TYPE}.actions`];
+const HIDDEN_FIELDS = [`${AGENT_SAVED_OBJECT_TYPE}.actions`, '_id', '_index'];
 
 interface Props {
   value: string;
-  fieldPrefix: string;
+  fieldPrefix?: string;
   onChange: (newValue: string, submit?: boolean) => void;
   placeholder?: string;
+  indexPattern?: string;
 }
 
 export const SearchBar: React.FunctionComponent<Props> = ({
   value,
   fieldPrefix,
   onChange,
   placeholder,
+  indexPattern = INDEX_NAME,
 }) => {
   const { data } = useStartServices();
   const [indexPatternFields, setIndexPatternFields] = useState<IFieldType[]>();
@@ -49,10 +51,10 @@ export const SearchBar: React.FunctionComponent<Props> = ({
     const fetchFields = async () => {
       try {
         const _fields: IFieldType[] = await data.indexPatterns.getFieldsForWildcard({
-          pattern: INDEX_NAME,
+          pattern: indexPattern,
         });
         const fields = (_fields || []).filter((field) => {
-          if (fieldPrefix && field.name.startsWith(fieldPrefix)) {
+          if (!fieldPrefix || field.name.startsWith(fieldPrefix)) {
             for (const hiddenField of HIDDEN_FIELDS) {
               if (field.name.startsWith(hiddenField)) {
                 return false;
@@ -67,7 +69,7 @@ export const SearchBar: React.FunctionComponent<Props> = ({
       }
     };
     fetchFields();
-  }, [data.indexPatterns, fieldPrefix]);
+  }, [data.indexPatterns, fieldPrefix, indexPattern]);
 
   return (
     <QueryStringInput
@@ -77,7 +79,7 @@ export const SearchBar: React.FunctionComponent<Props> = ({
         indexPatternFields
           ? [
               {
-                title: INDEX_NAME,
+                title: indexPattern,
                 fields: indexPatternFields,
               },
             ]

diff --git a/x-pack/plugins/fleet/public/applications/fleet/constants/index.ts b/x-pack/plugins/fleet/public/applications/fleet/constants/index.ts
@@ -15,6 +15,9 @@ export {
   AGENT_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
+  // Fleet Server index
+  AGENTS_INDEX,
+  ENROLLMENT_API_KEYS_INDEX,
 } from '../../../../common';
 
 export * from './page_paths';

diff --git a/...c/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx b/...c/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
@@ -18,7 +18,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { AgentPolicy } from '../../../../types';
 import { SearchBar } from '../../../../components';
-import { AGENT_SAVED_OBJECT_TYPE } from '../../../../constants';
+import { AGENTS_INDEX, AGENT_SAVED_OBJECT_TYPE } from '../../../../constants';
+import { useConfig } from '../../../../hooks';
 
 const statusFilters = [
   {
@@ -76,6 +77,7 @@ export const SearchAndFilterBar: React.FunctionComponent<{
   showUpgradeable,
   onShowUpgradeableChange,
 }) => {
+  const config = useConfig();
   // Policies state for filtering
   const [isAgentPoliciesFilterOpen, setIsAgentPoliciesFilterOpen] = useState<boolean>(false);
 
@@ -109,7 +111,13 @@ export const SearchAndFilterBar: React.FunctionComponent<{
                     onSubmitSearch(newSearch);
                   }
                 }}
-                fieldPrefix={AGENT_SAVED_OBJECT_TYPE}
+                {...(config.agents.fleetServerEnabled
+                  ? {
+                      indexPattern: AGENTS_INDEX,
+                    }
+                  : {
+                      fieldPrefix: AGENT_SAVED_OBJECT_TYPE,
+                    })}
               />
             </EuiFlexItem>
             <EuiFlexItem grow={2}>

diff --git a/...gins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx b/...gins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
@@ -20,7 +20,10 @@ import {
   HorizontalAlignment,
 } from '@elastic/eui';
 import { FormattedMessage, FormattedDate } from '@kbn/i18n/react';
-import { ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE } from '../../../constants';
+import {
+  ENROLLMENT_API_KEYS_INDEX,
+  ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
+} from '../../../constants';
 import {
   useBreadcrumbs,
   usePagination,
@@ -29,6 +32,7 @@ import {
   sendGetOneEnrollmentAPIKey,
   useStartServices,
   sendDeleteOneEnrollmentAPIKey,
+  useConfig,
 } from '../../../hooks';
 import { EnrollmentAPIKey } from '../../../types';
 import { SearchBar } from '../../../components/search_bar';
@@ -154,6 +158,7 @@ const DeleteButton: React.FunctionComponent<{ apiKey: EnrollmentAPIKey; refresh:
 
 export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
   useBreadcrumbs('fleet_enrollment_tokens');
+  const config = useConfig();
   const [flyoutOpen, setFlyoutOpen] = useState(false);
   const [search, setSearch] = useState('');
   const { pagination, setPagination, pageSizeOptions } = usePagination();
@@ -281,7 +286,13 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
               });
               setSearch(newSearch);
             }}
-            fieldPrefix={ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE}
+            {...(config.agents.fleetServerEnabled
+              ? {
+                  indexPattern: ENROLLMENT_API_KEYS_INDEX,
+                }
+              : {
+                  fieldPrefix: ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
+                })}
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>