Merge branch 'master' into fix-aws-metrics-explorer-group-by

.github/CODEOWNERS

@@ -87,6 +87,7 @@
 /src/dev/ @elastic/kibana-operations
 /src/setup_node_env/ @elastic/kibana-operations
 /src/optimize/ @elastic/kibana-operations
+/src/es_archiver/ @elastic/kibana-operations
 /packages/*eslint*/ @elastic/kibana-operations
 /packages/*babel*/ @elastic/kibana-operations
 /packages/kbn-dev-utils*/ @elastic/kibana-operations
@@ -112,6 +113,7 @@
 /src/legacy/server/logging/ @elastic/kibana-platform
 /src/legacy/server/saved_objects/  @elastic/kibana-platform
 /src/legacy/server/status/ @elastic/kibana-platform
+/src/dev/run_check_core_api_changes.ts @elastic/kibana-platform
 
 # Security
 /src/core/server/csp/  @elastic/kibana-security @elastic/kibana-platform

docs/migration/migrate_8_0.asciidoc

@@ -80,4 +80,15 @@ specified explicitly.
 
 *Impact:* Any workflow that involved manually clearing generated bundles will have to be updated with the new path.
 
+
+[float]
+[[breaking_80_reporting_changes]]
+=== Reporting changes
+
+[float]
+==== Legacy job parameters are no longer supported
+*Details:* POST URL snippets that were copied in Kibana 6.2 or below are no longer supported. These logs have
+been deprecated with warnings that have been logged throughout 7.x. Please use Kibana UI to re-generate the
+POST URL snippets if you depend on these for automated PDF reports.
+
 // end::notable-breaking-changes[]

src/core/server/config/deprecation/core_deprecations.ts

@@ -119,56 +119,6 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({
   renameFromRoot('xpack.telemetry.config', 'telemetry.config'),
   renameFromRoot('xpack.telemetry.banner', 'telemetry.banner'),
   renameFromRoot('xpack.telemetry.url', 'telemetry.url'),
-  // Monitoring renames
-  // TODO: Remove these from here once the monitoring plugin is migrated to NP
-  renameFromRoot('xpack.monitoring.enabled', 'monitoring.enabled'),
-  renameFromRoot('xpack.monitoring.ui.enabled', 'monitoring.ui.enabled'),
-  renameFromRoot(
-    'xpack.monitoring.kibana.collection.enabled',
-    'monitoring.kibana.collection.enabled'
-  ),
-  renameFromRoot('xpack.monitoring.max_bucket_size', 'monitoring.ui.max_bucket_size'),
-  renameFromRoot('xpack.monitoring.min_interval_seconds', 'monitoring.ui.min_interval_seconds'),
-  renameFromRoot(
-    'xpack.monitoring.show_license_expiration',
-    'monitoring.ui.show_license_expiration'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.ui.container.elasticsearch.enabled',
-    'monitoring.ui.container.elasticsearch.enabled'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.ui.container.logstash.enabled',
-    'monitoring.ui.container.logstash.enabled'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.tests.cloud_detector.enabled',
-    'monitoring.tests.cloud_detector.enabled'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.kibana.collection.interval',
-    'monitoring.kibana.collection.interval'
-  ),
-  renameFromRoot('xpack.monitoring.elasticsearch.hosts', 'monitoring.ui.elasticsearch.hosts'),
-  renameFromRoot('xpack.monitoring.elasticsearch.username', 'monitoring.ui.elasticsearch.username'),
-  renameFromRoot('xpack.monitoring.elasticsearch.password', 'monitoring.ui.elasticsearch.password'),
-  renameFromRoot(
-    'xpack.monitoring.xpack_api_polling_frequency_millis',
-    'monitoring.xpack_api_polling_frequency_millis'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.cluster_alerts.email_notifications.enabled',
-    'monitoring.cluster_alerts.email_notifications.enabled'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.cluster_alerts.email_notifications.email_address',
-    'monitoring.cluster_alerts.email_notifications.email_address'
-  ),
-  renameFromRoot('xpack.monitoring.ccs.enabled', 'monitoring.ui.ccs.enabled'),
-  renameFromRoot(
-    'xpack.monitoring.elasticsearch.logFetchCount',
-    'monitoring.ui.elasticsearch.logFetchCount'
-  ),
   configPathDeprecation,
   dataPathDeprecation,
   rewriteBasePathDeprecation,

src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts

@@ -108,8 +108,6 @@ describe('getSortedObjectsForExport()', () => {
               "namespace": undefined,
               "perPage": 500,
               "search": undefined,
-              "sortField": "_id",
-              "sortOrder": "asc",
               "type": Array [
                 "index-pattern",
                 "search",
@@ -256,8 +254,6 @@ describe('getSortedObjectsForExport()', () => {
               "namespace": undefined,
               "perPage": 500,
               "search": "foo",
-              "sortField": "_id",
-              "sortOrder": "asc",
               "type": Array [
                 "index-pattern",
                 "search",
@@ -345,8 +341,6 @@ describe('getSortedObjectsForExport()', () => {
               "namespace": "foo",
               "perPage": 500,
               "search": undefined,
-              "sortField": "_id",
-              "sortOrder": "asc",
               "type": Array [
                 "index-pattern",
                 "search",
@@ -399,6 +393,79 @@ describe('getSortedObjectsForExport()', () => {
     ).rejects.toThrowErrorMatchingInlineSnapshot(`"Can't export more than 1 objects"`);
   });
 
+  test('sorts objects within type', async () => {
+    savedObjectsClient.find.mockResolvedValueOnce({
+      total: 3,
+      per_page: 10000,
+      page: 1,
+      saved_objects: [
+        {
+          id: '3',
+          type: 'index-pattern',
+          attributes: {
+            name: 'baz',
+          },
+          references: [],
+        },
+        {
+          id: '1',
+          type: 'index-pattern',
+          attributes: {
+            name: 'foo',
+          },
+          references: [],
+        },
+        {
+          id: '2',
+          type: 'index-pattern',
+          attributes: {
+            name: 'bar',
+          },
+          references: [],
+        },
+      ],
+    });
+    const exportStream = await getSortedObjectsForExport({
+      exportSizeLimit: 10000,
+      savedObjectsClient,
+      types: ['index-pattern'],
+    });
+    const response = await readStreamToCompletion(exportStream);
+    expect(response).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "attributes": Object {
+            "name": "foo",
+          },
+          "id": "1",
+          "references": Array [],
+          "type": "index-pattern",
+        },
+        Object {
+          "attributes": Object {
+            "name": "bar",
+          },
+          "id": "2",
+          "references": Array [],
+          "type": "index-pattern",
+        },
+        Object {
+          "attributes": Object {
+            "name": "baz",
+          },
+          "id": "3",
+          "references": Array [],
+          "type": "index-pattern",
+        },
+        Object {
+          "exportedCount": 3,
+          "missingRefCount": 0,
+          "missingReferences": Array [],
+        },
+      ]
+    `);
+  });
+
   test('exports selected objects and sorts them', async () => {
     savedObjectsClient.bulkGet.mockResolvedValueOnce({
       saved_objects: [

src/core/server/saved_objects/export/get_sorted_objects_for_export.ts

@@ -19,7 +19,7 @@
 
 import Boom from 'boom';
 import { createListStream } from '../../../../legacy/utils/streams';
-import { SavedObjectsClientContract } from '../types';
+import { SavedObjectsClientContract, SavedObject } from '../types';
 import { fetchNestedDependencies } from './inject_nested_depdendencies';
 import { sortObjects } from './sort_objects';
 
@@ -105,15 +105,17 @@ async function fetchObjectsToExport({
     const findResponse = await savedObjectsClient.find({
       type: types,
       search,
-      sortField: '_id',
-      sortOrder: 'asc',
       perPage: exportSizeLimit,
       namespace,
     });
     if (findResponse.total > exportSizeLimit) {
       throw Boom.badRequest(`Can't export more than ${exportSizeLimit} objects`);
     }
-    return findResponse.saved_objects;
+
+    // sorts server-side by _id, since it's only available in fielddata
+    return findResponse.saved_objects.sort((a: SavedObject, b: SavedObject) =>
+      a.id > b.id ? 1 : -1
+    );
   } else {
     throw Boom.badRequest('Either `type` or `objects` are required.');
   }
@@ -137,14 +139,17 @@ export async function getSortedObjectsForExport({
     exportSizeLimit,
     namespace,
   });
-  let exportedObjects = [...rootObjects];
+  let exportedObjects = [];
   let missingReferences: SavedObjectsExportResultDetails['missingReferences'] = [];
+
   if (includeReferencesDeep) {
     const fetchResult = await fetchNestedDependencies(rootObjects, savedObjectsClient, namespace);
-    exportedObjects = fetchResult.objects;
+    exportedObjects = sortObjects(fetchResult.objects);
     missingReferences = fetchResult.missingRefs;
+  } else {
+    exportedObjects = sortObjects(rootObjects);
   }
-  exportedObjects = sortObjects(exportedObjects);
+
   const exportDetails: SavedObjectsExportResultDetails = {
     exportedCount: exportedObjects.length,
     missingRefCount: missingReferences.length,

x-pack/legacy/plugins/monitoring/config.js

@@ -15,12 +15,12 @@ export const config = Joi => {
   const DEFAULT_REQUEST_HEADERS = ['authorization'];
 
   return Joi.object({
+    ccs: Joi.object({
+      enabled: Joi.boolean().default(true),
+    }).default(),
     enabled: Joi.boolean().default(true),
     ui: Joi.object({
       enabled: Joi.boolean().default(true),
-      ccs: Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default(),
       container: Joi.object({
         elasticsearch: Joi.object({
           enabled: Joi.boolean().default(false),
@@ -29,51 +29,6 @@ export const config = Joi => {
           enabled: Joi.boolean().default(false),
         }).default(),
       }).default(),
-      max_bucket_size: Joi.number().default(10000),
-      min_interval_seconds: Joi.number().default(10),
-      show_license_expiration: Joi.boolean().default(true),
-      elasticsearch: Joi.object({
-        customHeaders: Joi.object().default({}),
-        logQueries: Joi.boolean().default(false),
-        requestHeadersWhitelist: Joi.array()
-          .items()
-          .single()
-          .default(DEFAULT_REQUEST_HEADERS),
-        sniffOnStart: Joi.boolean().default(false),
-        sniffInterval: Joi.number()
-          .allow(false)
-          .default(false),
-        sniffOnConnectionFault: Joi.boolean().default(false),
-        hosts: Joi.array()
-          .items(Joi.string().uri({ scheme: ['http', 'https'] }))
-          .single(), // if empty, use Kibana's connection config
-        username: Joi.string(),
-        password: Joi.string(),
-        requestTimeout: Joi.number().default(30000),
-        pingTimeout: Joi.number().default(30000),
-        ssl: Joi.object({
-          verificationMode: Joi.string()
-            .valid('none', 'certificate', 'full')
-            .default('full'),
-          certificateAuthorities: Joi.array()
-            .single()
-            .items(Joi.string()),
-          certificate: Joi.string(),
-          key: Joi.string(),
-          keyPassphrase: Joi.string(),
-          keystore: Joi.object({
-            path: Joi.string(),
-            password: Joi.string(),
-          }).default(),
-          truststore: Joi.object({
-            path: Joi.string(),
-            password: Joi.string(),
-          }).default(),
-          alwaysPresentCertificate: Joi.boolean().default(false),
-        }).default(),
-        apiVersion: Joi.string().default('master'),
-        logFetchCount: Joi.number().default(10),
-      }).default(),
     }).default(),
     kibana: Joi.object({
       collection: Joi.object({
@@ -91,11 +46,56 @@ export const config = Joi => {
     xpack_api_polling_frequency_millis: Joi.number().default(
       XPACK_INFO_API_DEFAULT_POLL_FREQUENCY_IN_MILLIS
     ),
+    max_bucket_size: Joi.number().default(10000),
+    min_interval_seconds: Joi.number().default(10),
+    show_license_expiration: Joi.boolean().default(true),
     agent: Joi.object({
       interval: Joi.string()
         .regex(/[\d\.]+[yMwdhms]/)
         .default('10s'),
     }).default(),
+    elasticsearch: Joi.object({
+      customHeaders: Joi.object().default({}),
+      logQueries: Joi.boolean().default(false),
+      requestHeadersWhitelist: Joi.array()
+        .items()
+        .single()
+        .default(DEFAULT_REQUEST_HEADERS),
+      sniffOnStart: Joi.boolean().default(false),
+      sniffInterval: Joi.number()
+        .allow(false)
+        .default(false),
+      sniffOnConnectionFault: Joi.boolean().default(false),
+      hosts: Joi.array()
+        .items(Joi.string().uri({ scheme: ['http', 'https'] }))
+        .single(), // if empty, use Kibana's connection config
+      username: Joi.string(),
+      password: Joi.string(),
+      requestTimeout: Joi.number().default(30000),
+      pingTimeout: Joi.number().default(30000),
+      ssl: Joi.object({
+        verificationMode: Joi.string()
+          .valid('none', 'certificate', 'full')
+          .default('full'),
+        certificateAuthorities: Joi.array()
+          .single()
+          .items(Joi.string()),
+        certificate: Joi.string(),
+        key: Joi.string(),
+        keyPassphrase: Joi.string(),
+        keystore: Joi.object({
+          path: Joi.string(),
+          password: Joi.string(),
+        }).default(),
+        truststore: Joi.object({
+          path: Joi.string(),
+          password: Joi.string(),
+        }).default(),
+        alwaysPresentCertificate: Joi.boolean().default(false),
+      }).default(),
+      apiVersion: Joi.string().default('master'),
+      logFetchCount: Joi.number().default(10),
+    }).default(),
     tests: Joi.object({
       cloud_detector: Joi.object({
         enabled: Joi.boolean().default(true),