Merge branch 'master' into searchSource/serialize

.backportrc.json

@@ -25,7 +25,7 @@
   ],
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
-    "^v7.8.0$": "7.x",
+    "^v7.9.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   }
 }

docs/visualize/tsvb.asciidoc

@@ -122,3 +122,17 @@ Edit the source for the Markdown visualization.
 . To insert the mustache template variable into the editor, click the variable name.
 +
 The http://mustache.github.io/mustache.5.html[mustache syntax] uses the Handlebar.js processor, which is an extended version of the Mustache template language.
+
+[float]
+[[tsvb-style-markdown]]
+==== Style Markdown text
+
+Style your Markdown visualization using http://lesscss.org/features/[less syntax].
+
+. Select *Markdown*.
+
+. Select *Panel options*.
+
+. Enter styling rules in *Custom CSS* section
++
+Less in TSVB does not support custom plugins or inline JavaScript.

package.json

@@ -210,7 +210,7 @@
     "leaflet-responsive-popup": "0.6.4",
     "leaflet-vega": "^0.8.6",
     "leaflet.heat": "0.2.0",
-    "less": "^2.7.3",
+    "less": "npm:@elastic/less@2.7.3-kibana",
     "less-loader": "5.0.0",
     "lodash": "npm:@elastic/[email protected]",
     "lodash.clonedeep": "^4.5.0",

src/core/server/logging/README.md

@@ -167,7 +167,7 @@ logging:
     - context: plugins
       appenders: [custom]
       level: warn
-    - context: plugins.pid
+    - context: plugins.myPlugin
       level: info
     - context: server
       level: fatal
@@ -180,14 +180,14 @@ logging:
 
 Here is what we get with the config above:
 
-| Context       | Appenders                | Level |
-| ------------- |:------------------------:| -----:|
-| root          | console, file            | error |
-| plugins       | custom                   | warn  |
-| plugins.pid   | custom                   | info  |
-| server        | console, file            | fatal |
-| optimize      | console                  | error |
-| telemetry     | json-file-appender       | all   |
+| Context          | Appenders                | Level |
+| ---------------- |:------------------------:| -----:|
+| root             | console, file            | error |
+| plugins          | custom                   | warn  |
+| plugins.myPlugin | custom                   | info  |
+| server           | console, file            | fatal |
+| optimize         | console                  | error |
+| telemetry        | json-file-appender       | all   |
 
 
 The `root` logger has a dedicated configuration node since this context is special and should always exist. By 
@@ -259,7 +259,7 @@ define a custom one.
 ```yaml
 logging:
   loggers:
-    - context: your-plugin
+    - context: plugins.myPlugin
       appenders: [console]
 ```
 Logs in a *file* if given file path. You should define a custom appender with `kind: file` 
@@ -273,7 +273,7 @@ logging:
       layout:
         kind: pattern
   loggers:
-    - context: your-plugin
+    - context: plugins.myPlugin
       appenders: [file]
 ``` 
 #### logging.json
@@ -282,10 +282,10 @@ the output format with [layouts](#layouts).
 
 #### logging.quiet
 Suppresses all logging output other than error messages. With new logging, config can be achieved 
-with adjusting minimum required [logging level](#log-level)
+with adjusting minimum required [logging level](#log-level).
 ```yaml
   loggers:
-    - context: my-plugin
+    - context: plugins.myPlugin
       appenders: [console]
       level: error
 # or for all output

src/core/server/saved_objects/service/lib/repository.test.js

@@ -23,6 +23,7 @@ import { SavedObjectsErrorHelpers } from './errors';
 import { SavedObjectsSerializer } from '../../serialization';
 import { encodeHitVersion } from '../../version';
 import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry';
+import { DocumentMigrator } from '../../migrations/core/document_migrator';
 
 jest.mock('./search_dsl/search_dsl', () => ({ getSearchDsl: jest.fn() }));
 
@@ -115,6 +116,7 @@ describe('SavedObjectsRepository', () => {
   const createType = type => ({
     name: type,
     mappings: { properties: mappings.properties[type].properties },
+    migrations: { '1.1.1': doc => doc },
   });
 
   const registry = new SavedObjectTypeRegistry();
@@ -144,6 +146,13 @@ describe('SavedObjectsRepository', () => {
     namespaceType: 'agnostic',
   });
 
+  const documentMigrator = new DocumentMigrator({
+    typeRegistry: registry,
+    kibanaVersion: '2.0.0',
+    log: {},
+    validateDoc: jest.fn(),
+  });
+
   const getMockGetResponse = ({ type, id, references, namespace }) => ({
     // NOTE: Elasticsearch returns more fields (_index, _type) but the SavedObjectsRepository method ignores these
     found: true,
@@ -207,7 +216,7 @@ describe('SavedObjectsRepository', () => {
   beforeEach(() => {
     callAdminCluster = jest.fn();
     migrator = {
-      migrateDocument: jest.fn(doc => doc),
+      migrateDocument: jest.fn().mockImplementation(documentMigrator.migrate),
       runMigrations: async () => ({ status: 'skipped' }),
     };
 
@@ -424,9 +433,17 @@ describe('SavedObjectsRepository', () => {
 
     const getMockBulkCreateResponse = (objects, namespace) => {
       return {
-        items: objects.map(({ type, id }) => ({
+        items: objects.map(({ type, id, attributes, references, migrationVersion }) => ({
           create: {
             _id: `${namespace ? `${namespace}:` : ''}${type}:${id}`,
+            _source: {
+              [type]: attributes,
+              type,
+              namespace,
+              references,
+              ...mockTimestampFields,
+              migrationVersion: migrationVersion || { [type]: '1.1.1' },
+            },
             ...mockVersionProps,
           },
         })),
@@ -474,7 +491,7 @@ describe('SavedObjectsRepository', () => {
 
     const expectSuccessResult = obj => ({
       ...obj,
-      migrationVersion: undefined,
+      migrationVersion: { [obj.type]: '1.1.1' },
       version: mockVersion,
       ...mockTimestampFields,
     });
@@ -619,13 +636,16 @@ describe('SavedObjectsRepository', () => {
       };
 
       const bulkCreateError = async (obj, esError, expectedError) => {
-        const objects = [obj1, obj, obj2];
-        const response = getMockBulkCreateResponse(objects);
+        let response;
         if (esError) {
+          response = getMockBulkCreateResponse([obj1, obj, obj2]);
           response.items[1].create = { error: esError };
+        } else {
+          response = getMockBulkCreateResponse([obj1, obj2]);
         }
         callAdminCluster.mockResolvedValue(response); // this._writeToCluster('bulk', ...)
 
+        const objects = [obj1, obj, obj2];
         const result = await savedObjectsRepository.bulkCreate(objects);
         expectClusterCalls('bulk');
         const objCall = esError ? expectObjArgs(obj) : [];
@@ -781,14 +801,40 @@ describe('SavedObjectsRepository', () => {
           id: 'three',
         };
         const objects = [obj1, obj, obj2];
-        const response = getMockBulkCreateResponse(objects);
+        const response = getMockBulkCreateResponse([obj1, obj2]);
         callAdminCluster.mockResolvedValue(response); // this._writeToCluster('bulk', ...)
         const result = await savedObjectsRepository.bulkCreate(objects);
         expect(callAdminCluster).toHaveBeenCalledTimes(1);
         expect(result).toEqual({
           saved_objects: [expectSuccessResult(obj1), expectError(obj), expectSuccessResult(obj2)],
         });
       });
+
+      it(`a deserialized saved object`, async () => {
+        // Test for fix to https://github.com/elastic/kibana/issues/65088 where
+        // we returned raw ID's when an object without an id was created.
+        const namespace = 'myspace';
+        const response = getMockBulkCreateResponse([obj1, obj2], namespace);
+        callAdminCluster.mockResolvedValueOnce(response); // this._writeToCluster('bulk', ...)
+
+        // Bulk create one object with id unspecified, and one with id specified
+        const result = await savedObjectsRepository.bulkCreate([{ ...obj1, id: undefined }, obj2], {
+          namespace,
+        });
+
+        // Assert that both raw docs from the ES response are deserialized
+        expect(serializer.rawToSavedObject).toHaveBeenNthCalledWith(1, {
+          ...response.items[0].create,
+          _id: expect.stringMatching(/^myspace:config:[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/),
+        });
+        expect(serializer.rawToSavedObject).toHaveBeenNthCalledWith(2, response.items[1].create);
+
+        // Assert that ID's are deserialized to remove the type and namespace
+        expect(result.saved_objects[0].id).toEqual(
+          expect.stringMatching(/^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/)
+        );
+        expect(result.saved_objects[1].id).toEqual(obj2.id);
+      });
     });
   });
 
@@ -1604,6 +1650,7 @@ describe('SavedObjectsRepository', () => {
           version: mockVersion,
           attributes,
           references,
+          migrationVersion: { [type]: '1.1.1' },
         });
       });
     });

src/core/server/saved_objects/service/lib/repository.ts

@@ -18,6 +18,7 @@
  */
 
 import { omit } from 'lodash';
+import uuid from 'uuid';
 import { retryCallCluster } from '../../../elasticsearch/retry_call_cluster';
 import { APICaller } from '../../../elasticsearch/';
 
@@ -299,6 +300,8 @@ export class SavedObjectsRepository {
       const requiresNamespacesCheck =
         method === 'index' && this._registry.isMultiNamespace(object.type);
 
+      if (object.id == null) object.id = uuid.v1();
+
       return {
         tag: 'Right' as 'Right',
         value: {
@@ -404,35 +407,25 @@ export class SavedObjectsRepository {
         }
 
         const { requestedId, rawMigratedDoc, esRequestIndex } = expectedResult.value;
-        const response = bulkResponse.items[esRequestIndex];
-        const {
-          error,
-          _id: responseId,
-          _seq_no: seqNo,
-          _primary_term: primaryTerm,
-        } = Object.values(response)[0] as any;
-
-        const {
-          _source: { type, [type]: attributes, references = [], namespaces },
-        } = rawMigratedDoc;
-
-        const id = requestedId || responseId;
+        const { error, ...rawResponse } = Object.values(
+          bulkResponse.items[esRequestIndex]
+        )[0] as any;
+
         if (error) {
           return {
-            id,
-            type,
-            error: getBulkOperationError(error, type, id),
+            id: requestedId,
+            type: rawMigratedDoc._source.type,
+            error: getBulkOperationError(error, rawMigratedDoc._source.type, requestedId),
           };
         }
-        return {
-          id,
-          type,
-          ...(namespaces && { namespaces }),
-          updated_at: time,
-          version: encodeVersion(seqNo, primaryTerm),
-          attributes,
-          references,
-        };
+
+        // When method == 'index' the bulkResponse doesn't include the indexed
+        // _source so we return rawMigratedDoc but have to spread the latest
+        // _seq_no and _primary_term values from the rawResponse.
+        return this._serializer.rawToSavedObject({
+          ...rawMigratedDoc,
+          ...{ _seq_no: rawResponse._seq_no, _primary_term: rawResponse._primary_term },
+        });
       }),
     };
   }

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts

@@ -96,18 +96,21 @@ export function getTabs(
   tabs.push({
     name: getTitle('indexed', filteredCount, totalCount),
     id: TAB_INDEXED_FIELDS,
+    'data-test-subj': 'tab-indexedFields',
   });
 
   if (indexPatternListProvider.areScriptedFieldsEnabled(indexPattern)) {
     tabs.push({
       name: getTitle('scripted', filteredCount, totalCount),
       id: TAB_SCRIPTED_FIELDS,
+      'data-test-subj': 'tab-scriptedFields',
     });
   }
 
   tabs.push({
     name: getTitle('sourceFilters', filteredCount, totalCount),
     id: TAB_SOURCE_FILTERS,
+    'data-test-subj': 'tab-sourceFilters',
   });
 
   return tabs;

src/legacy/ui/public/new_platform/new_platform.test.ts

@@ -22,6 +22,7 @@ jest.mock('history');
 import { setRootControllerMock, historyMock } from './new_platform.test.mocks';
 import { legacyAppRegister, __reset__, __setup__, __start__ } from './new_platform';
 import { coreMock } from '../../../../core/public/mocks';
+import { AppMount } from '../../../../core/public';
 
 describe('ui/new_platform', () => {
   describe('legacyAppRegister', () => {
@@ -33,7 +34,7 @@ describe('ui/new_platform', () => {
 
     const registerApp = () => {
       const unmountMock = jest.fn();
-      const mountMock = jest.fn(() => unmountMock);
+      const mountMock = jest.fn<ReturnType<AppMount>, Parameters<AppMount>>(() => unmountMock);
       legacyAppRegister({
         id: 'test',
         title: 'Test',
@@ -62,13 +63,25 @@ describe('ui/new_platform', () => {
 
       controller(scopeMock, elementMock);
       expect(mountMock).toHaveBeenCalledWith({
-        element: elementMock[0],
+        element: expect.any(HTMLElement),
         appBasePath: '/test/base/path/app/test',
         onAppLeave: expect.any(Function),
         history: historyMock,
       });
     });
 
+    test('app is mounted in new div inside containing element', () => {
+      const { mountMock } = registerApp();
+      const controller = setRootControllerMock.mock.calls[0][1];
+      const scopeMock = { $on: jest.fn() };
+      const elementMock = [document.createElement('div')];
+
+      controller(scopeMock, elementMock);
+
+      const { element } = mountMock.mock.calls[0][0];
+      expect(element.parentElement).toEqual(elementMock[0]);
+    });
+
     test('controller calls deprecated context app.mount when invoked', () => {
       const unmountMock = jest.fn();
       // Two arguments changes how this is called.
@@ -84,7 +97,7 @@ describe('ui/new_platform', () => {
 
       controller(scopeMock, elementMock);
       expect(mountMock).toHaveBeenCalledWith(expect.any(Object), {
-        element: elementMock[0],
+        element: expect.any(HTMLElement),
         appBasePath: '/test/base/path/app/test',
         onAppLeave: expect.any(Function),
         history: historyMock,

src/legacy/ui/public/new_platform/new_platform.ts

@@ -176,7 +176,8 @@ export const legacyAppRegister = (app: App<any>) => {
   legacyAppRegistered = true;
 
   require('ui/chrome').setRootController(app.id, ($scope: IScope, $element: JQLite) => {
-    const element = $element[0];
+    const element = document.createElement('div');
+    $element[0].appendChild(element);
 
     // Root controller cannot return a Promise so use an internal async function and call it immediately
     (async () => {