[Discuss] Enhancement/saved object search

src/core_plugins/elasticsearch/lib/kibana_index_patches/patch_missing_properties.js

@@ -0,0 +1,25 @@
+import { getRootProperties } from '../../../../server/mappings';
+
+export const patchMissingProperties = {
+  id: 'missing_properties',
+
+  async getUpdatedPatchMappings(context) {
+    const {
+      kibanaIndexMappingsDsl,
+      currentMappingsDsl
+    } = context;
+
+    const expectedProps = getRootProperties(kibanaIndexMappingsDsl);
+    const existingProps = getRootProperties(currentMappingsDsl);
+
+    return Object.keys(expectedProps)
+      .reduce((acc, prop) => {
+        if (existingProps[prop]) {
+          return acc;
+        } else {
+          console.log('missing');
+          return { ...acc || {}, [prop]: expectedProps[prop] };
+        }
+      }, null);
+  }
+};

src/core_plugins/elasticsearch/lib/kibana_index_patches/patch_missing_title_keyword_fields.js

@@ -0,0 +1,82 @@
+import {
+  getRootProperties,
+  getProperty
+} from '../../../../server/mappings';
+
+import { get } from 'lodash';
+
+
+export const patchMissingTitleKeywordFields = {
+  id: 'missing_title_keyword_fields',
+
+  async getUpdatedPatchMappings(context) {
+    const {
+      currentMappingsDsl,
+      kibanaIndexMappingsDsl,
+    } = context;
+
+    const properties = getRootProperties(currentMappingsDsl);
+    const propertiesWithTitleKeyword = Object.keys(getRootProperties(kibanaIndexMappingsDsl))
+      .filter(property => Boolean(getProperty(kibanaIndexMappingsDsl, [property, 'title', 'keyword'])));
+    const mappings = {};
+
+    for (const property of propertiesWithTitleKeyword) {
+      const hasKeyword = !!get(properties, `${property}.properties.title.fields.keyword`);
+      if (hasKeyword) {
+        continue;
+      }
+
+      const titleMapping = get(properties, `${property}.properties.title`);
+      mappings[property] = {
+        properties: {
+          title: {
+            ...titleMapping,
+            fields: {
+              keyword: {
+                type: 'keyword',
+              }
+            }
+          }
+        }
+      };
+    }
+
+    // Make sure we return a falsy value
+    if (!Object.keys(mappings).length) {
+      return;
+    }
+
+    return mappings;
+  },
+
+  async applyChanges(context) {
+    const {
+      patchMappings,
+      callCluster,
+      indexName,
+      rootEsType,
+      log,
+    } = context;
+
+    const properties = Object.keys(patchMappings);
+    const types = properties.map(type => ({ match: { type } }));
+
+    log(['info', 'elasticsearch'], {
+      tmpl: `Updating by query for Saved Object types "<%= names.join('", "') %>"`,
+      names: properties,
+    });
+
+    await callCluster('updateByQuery', {
+      conflicts: 'proceed',
+      index: indexName,
+      type: rootEsType,
+      body: {
+        query: {
+          bool: {
+            should: types,
+          },
+        },
+      },
+    });
+  }
+};

src/core_plugins/elasticsearch/lib/patch_kibana_index.js

@@ -1,9 +1,11 @@
 import {
   getTypes,
   getRootType,
-  getRootProperties
 } from '../../../server/mappings';
 
+import { patchMissingProperties } from './kibana_index_patches/patch_missing_properties';
+import { patchMissingTitleKeywordFields } from './kibana_index_patches/patch_missing_title_keyword_fields';
+
 /**
  *  Checks that the root type in the kibana index has all of the
  *  root properties specified by the kibanaIndexMappings.
@@ -17,10 +19,10 @@ import {
  */
 export async function patchKibanaIndex(options) {
   const {
-    log,
     indexName,
     callCluster,
-    kibanaIndexMappingsDsl
+    kibanaIndexMappingsDsl,
+    log,
   } = options;
 
   const rootEsType = getRootType(kibanaIndexMappingsDsl);
@@ -31,29 +33,61 @@ export async function patchKibanaIndex(options) {
     return;
   }
 
-  const missingProperties = await getMissingRootProperties(currentMappingsDsl, kibanaIndexMappingsDsl);
+  const context = {
+    ...options,
+    currentMappingsDsl,
+    rootEsType,
+  };
 
-  const missingPropertyNames = Object.keys(missingProperties);
-  if (!missingPropertyNames.length) {
-    // all expected properties are in current mapping
-    return;
-  }
+  const patchesToApply = [
+    patchMissingProperties,
+    patchMissingTitleKeywordFields,
+  ];
 
-  // log about new properties
-  log(['info', 'elasticsearch'], {
-    tmpl: `Adding mappings to kibana index for SavedObject types "<%= names.join('", "') %>"`,
-    names: missingPropertyNames
-  });
+  for (const patch of patchesToApply) {
+    const patchMappings = await patch.getUpdatedPatchMappings(context);
+    if (!patchMappings) {
+      continue;
+    }
 
-  // add the new properties to the index mapping
-  await callCluster('indices.putMapping', {
-    index: indexName,
-    type: rootEsType,
-    body: {
-      properties: missingProperties
-    },
-    update_all_types: true
-  });
+    try {
+      // log about new properties
+      log(['info', 'elasticsearch'], {
+        tmpl: `Adding mappings to kibana index for SavedObject types "<%= names.join('", "') %>"`,
+        names: Object.keys(patchMappings),
+      });
+
+      // add the new properties to the index mapping
+      await callCluster('indices.putMapping', {
+        index: indexName,
+        type: rootEsType,
+        body: {
+          properties: patchMappings,
+        },
+        update_all_types: true
+      });
+    }
+    catch (e) {
+      log(['error', 'elasticsearch'], {
+        tmpl: `Unable to patch mappings for "<%= cls %>"`,
+        cls: patch.id,
+      });
+      continue;
+    }
+
+    try {
+      await patch.applyChanges({
+        ...context,
+        patchMappings,
+      });
+    }
+    catch (e) {
+      log(['error', 'elasticsearch'], {
+        tmpl: `Unable to apply patch changes for "<%= cls %>"`,
+        cls: patch.id,
+      });
+    }
+  }
 }
 
 /**
@@ -88,26 +122,3 @@ async function getCurrentMappings(callCluster, indexName, rootEsType) {
 
   return currentMappingsDsl;
 }
-
-/**
- *  Get the properties that are in the expectedMappingsDsl but not the
- *  currentMappingsDsl. Properties will be an object of properties normally
- *  found at `[index]mappings[typeName].properties` is es mapping responses
- *
- *  @param  {EsMappingsDsl} currentMappingsDsl
- *  @param  {EsMappingsDsl} expectedMappingsDsl
- *  @return {PropertyMappings}
- */
-async function getMissingRootProperties(currentMappingsDsl, expectedMappingsDsl) {
-  const expectedProps = getRootProperties(expectedMappingsDsl);
-  const existingProps = getRootProperties(currentMappingsDsl);
-
-  return Object.keys(expectedProps)
-    .reduce((acc, prop) => {
-      if (existingProps[prop]) {
-        return acc;
-      } else {
-        return { ...acc, [prop]: expectedProps[prop] };
-      }
-    }, {});
-}

src/core_plugins/kibana/mappings.json

@@ -20,7 +20,12 @@
         "type": "keyword"
       },
       "title": {
-        "type": "text"
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
       }
     }
   },
@@ -40,7 +45,12 @@
         "type": "keyword"
       },
       "title": {
-        "type": "text"
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
       },
       "uiStateJSON": {
         "type": "text"
@@ -75,7 +85,12 @@
         "type": "keyword"
       },
       "title": {
-        "type": "text"
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
       },
       "version": {
         "type": "integer"
@@ -129,7 +144,12 @@
         "type": "keyword"
       },
       "title": {
-        "type": "text"
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
       },
       "uiStateJSON": {
         "type": "text"

src/server/saved_objects/client/lib/search_dsl/query_params.js

@@ -45,8 +45,9 @@ export function getQueryParams(mappings, type, search, searchFields) {
   if (search) {
     bool.must = [
       {
-        simple_query_string: {
+        query_string: {
           query: search,
+          default_operator: 'AND',
           ...getFieldsForTypes(
             searchFields,
             type ? [type] : Object.keys(getRootProperties(mappings))

src/ui/public/courier/saved_object/saved_object_loader.js

@@ -96,7 +96,7 @@ export class SavedObjectLoader {
         search: search ? `${search}*` : undefined,
         perPage: size,
         page: 1,
-        searchFields: ['title^3', 'description']
+        searchFields: ['title^3', 'title.keyword^2', 'description']
       }).then((resp) => {
       return {
         total: resp.total,