From 5f13ad107fda589e6c2045e235e12d0a1d590d70 Mon Sep 17 00:00:00 2001
From: Maryia Lapata <mary.lopato@gmail.com>
Date: Mon, 27 Apr 2020 14:19:46 +0300
Subject: [PATCH 1/6] [NP] Migrate ui capabilities (#64185)

* Migrate ui capabilities

* Add capabilities for dashboard
---
 src/legacy/core_plugins/kibana/index.js       | 55 -------------------
 src/plugins/advanced_settings/kibana.json     |  2 +-
 .../server/capabilities_provider.ts           | 25 +++++++++
 src/plugins/advanced_settings/server/index.ts | 24 ++++++++
 .../advanced_settings/server/plugin.ts        | 44 +++++++++++++++
 .../dashboard/server/capabilities_provider.ts | 27 +++++++++
 src/plugins/dashboard/server/plugin.ts        |  2 +
 .../index_patterns/capabilities_provider.ts   | 24 ++++++++
 .../index_patterns/index_patterns_service.ts  |  2 +
 src/plugins/discover/kibana.json              |  2 +-
 .../discover/server/capabilities_provider.ts  | 27 +++++++++
 src/plugins/discover/server/index.ts          | 24 ++++++++
 src/plugins/discover/server/plugin.ts         | 44 +++++++++++++++
 .../home/server/capabilities_provider.ts      | 29 ++++++++++
 src/plugins/home/server/plugin.ts             |  2 +
 src/plugins/management/kibana.json            |  2 +-
 .../server/capabilities_provider.ts           | 32 +++++++++++
 src/plugins/management/server/index.ts        | 24 ++++++++
 src/plugins/management/server/plugin.ts       | 44 +++++++++++++++
 .../server/capabilities_provider.ts           | 26 +++++++++
 .../saved_objects_management/server/plugin.ts |  5 +-
 src/plugins/visualize/kibana.json             |  2 +-
 .../visualize/server/capabilities_provider.ts | 28 ++++++++++
 src/plugins/visualize/server/index.ts         | 24 ++++++++
 src/plugins/visualize/server/plugin.ts        | 44 +++++++++++++++
 25 files changed, 504 insertions(+), 60 deletions(-)
 create mode 100644 src/plugins/advanced_settings/server/capabilities_provider.ts
 create mode 100644 src/plugins/advanced_settings/server/index.ts
 create mode 100644 src/plugins/advanced_settings/server/plugin.ts
 create mode 100644 src/plugins/dashboard/server/capabilities_provider.ts
 create mode 100644 src/plugins/data/server/index_patterns/capabilities_provider.ts
 create mode 100644 src/plugins/discover/server/capabilities_provider.ts
 create mode 100644 src/plugins/discover/server/index.ts
 create mode 100644 src/plugins/discover/server/plugin.ts
 create mode 100644 src/plugins/home/server/capabilities_provider.ts
 create mode 100644 src/plugins/management/server/capabilities_provider.ts
 create mode 100644 src/plugins/management/server/index.ts
 create mode 100644 src/plugins/management/server/plugin.ts
 create mode 100644 src/plugins/saved_objects_management/server/capabilities_provider.ts
 create mode 100644 src/plugins/visualize/server/capabilities_provider.ts
 create mode 100644 src/plugins/visualize/server/index.ts
 create mode 100644 src/plugins/visualize/server/plugin.ts

diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
index 2d36d546e7163..19ae3f7a177ef 100644
--- a/src/legacy/core_plugins/kibana/index.js
+++ b/src/legacy/core_plugins/kibana/index.js
@@ -152,61 +152,6 @@ export default function(kibana) {
       uiSettingDefaults: getUiSettingDefaults(),
     },
 
-    uiCapabilities: async function() {
-      return {
-        discover: {
-          show: true,
-          createShortUrl: true,
-          save: true,
-          saveQuery: true,
-        },
-        visualize: {
-          show: true,
-          createShortUrl: true,
-          delete: true,
-          save: true,
-          saveQuery: true,
-        },
-        dashboard: {
-          createNew: true,
-          show: true,
-          showWriteControls: true,
-          saveQuery: true,
-        },
-        catalogue: {
-          discover: true,
-          dashboard: true,
-          visualize: true,
-          console: true,
-          advanced_settings: true,
-          index_patterns: true,
-        },
-        advancedSettings: {
-          show: true,
-          save: true,
-        },
-        indexPatterns: {
-          save: true,
-        },
-        savedObjectsManagement: {
-          delete: true,
-          edit: true,
-          read: true,
-        },
-        management: {
-          /*
-           * Management settings correspond to management section/link ids, and should not be changed
-           * without also updating those definitions.
-           */
-          kibana: {
-            settings: true,
-            index_patterns: true,
-            objects: true,
-          },
-        },
-      };
-    },
-
     preInit: async function(server) {
       try {
         // Create the data directory (recursively, if the a parent dir doesn't exist).
diff --git a/src/plugins/advanced_settings/kibana.json b/src/plugins/advanced_settings/kibana.json
index cac9a6daa8df8..e6ca6e797ba45 100644
--- a/src/plugins/advanced_settings/kibana.json
+++ b/src/plugins/advanced_settings/kibana.json
@@ -1,7 +1,7 @@
 {
   "id": "advancedSettings",
   "version": "kibana",
-  "server": false,
+  "server": true,
   "ui": true,
   "requiredPlugins": ["management"]
 }
diff --git a/src/plugins/advanced_settings/server/capabilities_provider.ts b/src/plugins/advanced_settings/server/capabilities_provider.ts
new file mode 100644
index 0000000000000..083d5f3ffced4
--- /dev/null
+++ b/src/plugins/advanced_settings/server/capabilities_provider.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const capabilitiesProvider = () => ({
+  advancedSettings: {
+    show: true,
+    save: true,
+  },
+});
diff --git a/src/plugins/advanced_settings/server/index.ts b/src/plugins/advanced_settings/server/index.ts
new file mode 100644
index 0000000000000..ffcf7cd49a8c3
--- /dev/null
+++ b/src/plugins/advanced_settings/server/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from 'kibana/server';
+import { AdvancedSettingsServerPlugin } from './plugin';
+
+export const plugin = (initContext: PluginInitializerContext) =>
+  new AdvancedSettingsServerPlugin(initContext);
diff --git a/src/plugins/advanced_settings/server/plugin.ts b/src/plugins/advanced_settings/server/plugin.ts
new file mode 100644
index 0000000000000..4d7bd34259819
--- /dev/null
+++ b/src/plugins/advanced_settings/server/plugin.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
+import { capabilitiesProvider } from './capabilities_provider';
+
+export class AdvancedSettingsServerPlugin implements Plugin<object, object> {
+  private readonly logger: Logger;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.logger = initializerContext.logger.get();
+  }
+
+  public setup(core: CoreSetup) {
+    this.logger.debug('advancedSettings: Setup');
+
+    core.capabilities.registerProvider(capabilitiesProvider);
+
+    return {};
+  }
+
+  public start(core: CoreStart) {
+    this.logger.debug('advancedSettings: Started');
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/src/plugins/dashboard/server/capabilities_provider.ts b/src/plugins/dashboard/server/capabilities_provider.ts
new file mode 100644
index 0000000000000..0bb53d60c38a5
--- /dev/null
+++ b/src/plugins/dashboard/server/capabilities_provider.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const capabilitiesProvider = () => ({
+  dashboard: {
+    createNew: true,
+    show: true,
+    showWriteControls: true,
+    saveQuery: true,
+  },
+});
diff --git a/src/plugins/dashboard/server/plugin.ts b/src/plugins/dashboard/server/plugin.ts
index 5d1b66002e749..ba7bdeeda0133 100644
--- a/src/plugins/dashboard/server/plugin.ts
+++ b/src/plugins/dashboard/server/plugin.ts
@@ -26,6 +26,7 @@ import {
 } from '../../../core/server';
 
 import { dashboardSavedObjectType } from './saved_objects';
+import { capabilitiesProvider } from './capabilities_provider';
 
 import { DashboardPluginSetup, DashboardPluginStart } from './types';
 
@@ -40,6 +41,7 @@ export class DashboardPlugin implements Plugin<DashboardPluginSetup, DashboardPl
     this.logger.debug('dashboard: Setup');
 
     core.savedObjects.registerType(dashboardSavedObjectType);
+    core.capabilities.registerProvider(capabilitiesProvider);
 
     return {};
   }
diff --git a/src/plugins/data/server/index_patterns/capabilities_provider.ts b/src/plugins/data/server/index_patterns/capabilities_provider.ts
new file mode 100644
index 0000000000000..d603830e44a53
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/capabilities_provider.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const capabilitiesProvider = () => ({
+  indexPatterns: {
+    save: true,
+  },
+});
diff --git a/src/plugins/data/server/index_patterns/index_patterns_service.ts b/src/plugins/data/server/index_patterns/index_patterns_service.ts
index 58e8fbae9f9e2..3e31f8e8a566d 100644
--- a/src/plugins/data/server/index_patterns/index_patterns_service.ts
+++ b/src/plugins/data/server/index_patterns/index_patterns_service.ts
@@ -20,10 +20,12 @@
 import { CoreSetup, Plugin } from 'kibana/server';
 import { registerRoutes } from './routes';
 import { indexPatternSavedObjectType } from '../saved_objects';
+import { capabilitiesProvider } from './capabilities_provider';
 
 export class IndexPatternsService implements Plugin<void> {
   public setup(core: CoreSetup) {
     core.savedObjects.registerType(indexPatternSavedObjectType);
+    core.capabilities.registerProvider(capabilitiesProvider);
 
     registerRoutes(core.http);
   }
diff --git a/src/plugins/discover/kibana.json b/src/plugins/discover/kibana.json
index 91d6358d44c18..2d41293f26369 100644
--- a/src/plugins/discover/kibana.json
+++ b/src/plugins/discover/kibana.json
@@ -1,6 +1,6 @@
 {
   "id": "discover",
   "version": "kibana",
-  "server": false,
+  "server": true,
   "ui": true
 }
diff --git a/src/plugins/discover/server/capabilities_provider.ts b/src/plugins/discover/server/capabilities_provider.ts
new file mode 100644
index 0000000000000..2e03631894aee
--- /dev/null
+++ b/src/plugins/discover/server/capabilities_provider.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const capabilitiesProvider = () => ({
+  discover: {
+    show: true,
+    createShortUrl: true,
+    save: true,
+    saveQuery: true,
+  },
+});
diff --git a/src/plugins/discover/server/index.ts b/src/plugins/discover/server/index.ts
new file mode 100644
index 0000000000000..15a948c56148e
--- /dev/null
+++ b/src/plugins/discover/server/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from 'kibana/server';
+import { DiscoverServerPlugin } from './plugin';
+
+export const plugin = (initContext: PluginInitializerContext) =>
+  new DiscoverServerPlugin(initContext);
diff --git a/src/plugins/discover/server/plugin.ts b/src/plugins/discover/server/plugin.ts
new file mode 100644
index 0000000000000..04502f5fc14e6
--- /dev/null
+++ b/src/plugins/discover/server/plugin.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
+import { capabilitiesProvider } from './capabilities_provider';
+
+export class DiscoverServerPlugin implements Plugin<object, object> {
+  private readonly logger: Logger;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.logger = initializerContext.logger.get();
+  }
+
+  public setup(core: CoreSetup) {
+    this.logger.debug('discover: Setup');
+
+    core.capabilities.registerProvider(capabilitiesProvider);
+
+    return {};
+  }
+
+  public start(core: CoreStart) {
+    this.logger.debug('discover: Started');
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/src/plugins/home/server/capabilities_provider.ts b/src/plugins/home/server/capabilities_provider.ts
new file mode 100644
index 0000000000000..1c662e2301e16
--- /dev/null
+++ b/src/plugins/home/server/capabilities_provider.ts
@@ -0,0 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const capabilitiesProvider = () => ({
+  catalogue: {
+    discover: true,
+    dashboard: true,
+    visualize: true,
+    console: true,
+    advanced_settings: true,
+    index_patterns: true,
+  },
+});
diff --git a/src/plugins/home/server/plugin.ts b/src/plugins/home/server/plugin.ts
index 1f530bc58f0b9..1050c19362ae1 100644
--- a/src/plugins/home/server/plugin.ts
+++ b/src/plugins/home/server/plugin.ts
@@ -26,6 +26,7 @@ import {
   SampleDataRegistryStart,
 } from './services';
 import { UsageCollectionSetup } from '../../usage_collection/server';
+import { capabilitiesProvider } from './capabilities_provider';
 import { sampleDataTelemetry } from './saved_objects';
 
 interface HomeServerPluginSetupDependencies {
@@ -38,6 +39,7 @@ export class HomeServerPlugin implements Plugin<HomeServerPluginSetup, HomeServe
   private readonly sampleDataRegistry = new SampleDataRegistry(this.initContext);
 
   public setup(core: CoreSetup, plugins: HomeServerPluginSetupDependencies): HomeServerPluginSetup {
+    core.capabilities.registerProvider(capabilitiesProvider);
     core.savedObjects.registerType(sampleDataTelemetry);
     return {
       tutorials: { ...this.tutorialsRegistry.setup(core) },
diff --git a/src/plugins/management/kibana.json b/src/plugins/management/kibana.json
index 1789b7cd5ddba..cc411a8c6a25c 100644
--- a/src/plugins/management/kibana.json
+++ b/src/plugins/management/kibana.json
@@ -1,7 +1,7 @@
 {
   "id": "management",
   "version": "kibana",
-  "server": false,
+  "server": true,
   "ui": true,
   "requiredPlugins": ["kibanaLegacy", "home"]
 }
diff --git a/src/plugins/management/server/capabilities_provider.ts b/src/plugins/management/server/capabilities_provider.ts
new file mode 100644
index 0000000000000..9a69749c8233b
--- /dev/null
+++ b/src/plugins/management/server/capabilities_provider.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const capabilitiesProvider = () => ({
+  management: {
+    /*
+     * Management settings correspond to management section/link ids, and should not be changed
+     * without also updating those definitions.
+     */
+    kibana: {
+      settings: true,
+      index_patterns: true,
+      objects: true,
+    },
+  },
+});
diff --git a/src/plugins/management/server/index.ts b/src/plugins/management/server/index.ts
new file mode 100644
index 0000000000000..afc7adf8832e1
--- /dev/null
+++ b/src/plugins/management/server/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from 'kibana/server';
+import { ManagementServerPlugin } from './plugin';
+
+export const plugin = (initContext: PluginInitializerContext) =>
+  new ManagementServerPlugin(initContext);
diff --git a/src/plugins/management/server/plugin.ts b/src/plugins/management/server/plugin.ts
new file mode 100644
index 0000000000000..f8fda7da9b95a
--- /dev/null
+++ b/src/plugins/management/server/plugin.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
+import { capabilitiesProvider } from './capabilities_provider';
+
+export class ManagementServerPlugin implements Plugin<object, object> {
+  private readonly logger: Logger;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.logger = initializerContext.logger.get();
+  }
+
+  public setup(core: CoreSetup) {
+    this.logger.debug('management: Setup');
+
+    core.capabilities.registerProvider(capabilitiesProvider);
+
+    return {};
+  }
+
+  public start(core: CoreStart) {
+    this.logger.debug('management: Started');
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/src/plugins/saved_objects_management/server/capabilities_provider.ts b/src/plugins/saved_objects_management/server/capabilities_provider.ts
new file mode 100644
index 0000000000000..bd621de4a6195
--- /dev/null
+++ b/src/plugins/saved_objects_management/server/capabilities_provider.ts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const capabilitiesProvider = () => ({
+  savedObjectsManagement: {
+    delete: true,
+    edit: true,
+    read: true,
+  },
+});
diff --git a/src/plugins/saved_objects_management/server/plugin.ts b/src/plugins/saved_objects_management/server/plugin.ts
index b72644b500967..4e39b08f5c62c 100644
--- a/src/plugins/saved_objects_management/server/plugin.ts
+++ b/src/plugins/saved_objects_management/server/plugin.ts
@@ -23,6 +23,7 @@ import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '
 import { SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart } from './types';
 import { SavedObjectsManagement } from './services';
 import { registerRoutes } from './routes';
+import { capabilitiesProvider } from './capabilities_provider';
 
 export class SavedObjectsManagementPlugin
   implements Plugin<SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart, {}, {}> {
@@ -33,13 +34,15 @@ export class SavedObjectsManagementPlugin
     this.logger = this.context.logger.get();
   }
 
-  public async setup({ http }: CoreSetup) {
+  public async setup({ http, capabilities }: CoreSetup) {
     this.logger.debug('Setting up SavedObjectsManagement plugin');
     registerRoutes({
       http,
       managementServicePromise: this.managementService$.pipe(first()).toPromise(),
     });
 
+    capabilities.registerProvider(capabilitiesProvider);
+
     return {};
   }
 
diff --git a/src/plugins/visualize/kibana.json b/src/plugins/visualize/kibana.json
index a7afa0697a5eb..d536d2f246a6b 100644
--- a/src/plugins/visualize/kibana.json
+++ b/src/plugins/visualize/kibana.json
@@ -1,7 +1,7 @@
 {
   "id": "visualize",
   "version": "kibana",
-  "server": false,
+  "server": true,
   "ui": true,
   "requiredPlugins": [
     "data",
diff --git a/src/plugins/visualize/server/capabilities_provider.ts b/src/plugins/visualize/server/capabilities_provider.ts
new file mode 100644
index 0000000000000..3b09b28f53c77
--- /dev/null
+++ b/src/plugins/visualize/server/capabilities_provider.ts
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const capabilitiesProvider = () => ({
+  visualize: {
+    show: true,
+    createShortUrl: true,
+    delete: true,
+    save: true,
+    saveQuery: true,
+  },
+});
diff --git a/src/plugins/visualize/server/index.ts b/src/plugins/visualize/server/index.ts
new file mode 100644
index 0000000000000..5cebef71d8d22
--- /dev/null
+++ b/src/plugins/visualize/server/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from 'kibana/server';
+import { VisualizeServerPlugin } from './plugin';
+
+export const plugin = (initContext: PluginInitializerContext) =>
+  new VisualizeServerPlugin(initContext);
diff --git a/src/plugins/visualize/server/plugin.ts b/src/plugins/visualize/server/plugin.ts
new file mode 100644
index 0000000000000..7cc57c25f3229
--- /dev/null
+++ b/src/plugins/visualize/server/plugin.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
+import { capabilitiesProvider } from './capabilities_provider';
+
+export class VisualizeServerPlugin implements Plugin<object, object> {
+  private readonly logger: Logger;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.logger = initializerContext.logger.get();
+  }
+
+  public setup(core: CoreSetup) {
+    this.logger.debug('visualize: Setup');
+
+    core.capabilities.registerProvider(capabilitiesProvider);
+
+    return {};
+  }
+
+  public start(core: CoreStart) {
+    this.logger.debug('visualize: Started');
+    return {};
+  }
+
+  public stop() {}
+}

From 0b8cd6eb46d8fbc63be4d5fe29cd59c4b7b9ce7c Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Mon, 27 Apr 2020 13:38:03 +0200
Subject: [PATCH 2/6] Migrate saved object of type url to kibana platform
 (#64043)

---
 src/legacy/core_plugins/kibana/index.js       | 10 ----
 src/legacy/core_plugins/kibana/mappings.json  | 22 --------
 src/plugins/share/server/plugin.ts            |  2 +
 .../share/server/saved_objects/index.ts       | 19 +++++++
 src/plugins/share/server/saved_objects/url.ts | 54 +++++++++++++++++++
 5 files changed, 75 insertions(+), 32 deletions(-)
 create mode 100644 src/plugins/share/server/saved_objects/index.ts
 create mode 100644 src/plugins/share/server/saved_objects/url.ts

diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
index 19ae3f7a177ef..48d86e3628e49 100644
--- a/src/legacy/core_plugins/kibana/index.js
+++ b/src/legacy/core_plugins/kibana/index.js
@@ -118,16 +118,6 @@ export default function(kibana) {
         },
       ],
 
-      savedObjectsManagement: {
-        url: {
-          defaultSearchField: 'url',
-          isImportableAndExportable: true,
-          getTitle(obj) {
-            return `/goto/${encodeURIComponent(obj.id)}`;
-          },
-        },
-      },
-
       injectDefaultVars(server, options) {
         const mapConfig = server.config().get('map');
         const tilemap = mapConfig.tilemap;
diff --git a/src/legacy/core_plugins/kibana/mappings.json b/src/legacy/core_plugins/kibana/mappings.json
index 81b46878f6c1a..e2cbd584dbe1f 100644
--- a/src/legacy/core_plugins/kibana/mappings.json
+++ b/src/legacy/core_plugins/kibana/mappings.json
@@ -1,26 +1,4 @@
 {
-  "url": {
-    "properties": {
-      "accessCount": {
-        "type": "long"
-      },
-      "accessDate": {
-        "type": "date"
-      },
-      "createDate": {
-        "type": "date"
-      },
-      "url": {
-        "type": "text",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 2048
-          }
-        }
-      }
-    }
-  },
   "server": {
     "properties": {
       "uuid": {
diff --git a/src/plugins/share/server/plugin.ts b/src/plugins/share/server/plugin.ts
index bcb681a50652a..0d9f183d13404 100644
--- a/src/plugins/share/server/plugin.ts
+++ b/src/plugins/share/server/plugin.ts
@@ -19,12 +19,14 @@
 
 import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
 import { createRoutes } from './routes/create_routes';
+import { url } from './saved_objects';
 
 export class SharePlugin implements Plugin {
   constructor(private readonly initializerContext: PluginInitializerContext) {}
 
   public async setup(core: CoreSetup) {
     createRoutes(core, this.initializerContext.logger.get());
+    core.savedObjects.registerType(url);
   }
 
   public start() {
diff --git a/src/plugins/share/server/saved_objects/index.ts b/src/plugins/share/server/saved_objects/index.ts
new file mode 100644
index 0000000000000..956f031d2f1a5
--- /dev/null
+++ b/src/plugins/share/server/saved_objects/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export { url } from './url';
diff --git a/src/plugins/share/server/saved_objects/url.ts b/src/plugins/share/server/saved_objects/url.ts
new file mode 100644
index 0000000000000..c76c21993a13f
--- /dev/null
+++ b/src/plugins/share/server/saved_objects/url.ts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { SavedObjectsType } from 'kibana/server';
+
+export const url: SavedObjectsType = {
+  name: 'url',
+  namespaceType: 'single',
+  hidden: false,
+  management: {
+    icon: 'link',
+    defaultSearchField: 'url',
+    importableAndExportable: true,
+    getTitle(obj) {
+      return `/goto/${encodeURIComponent(obj.id)}`;
+    },
+  },
+  mappings: {
+    properties: {
+      accessCount: {
+        type: 'long',
+      },
+      accessDate: {
+        type: 'date',
+      },
+      createDate: {
+        type: 'date',
+      },
+      url: {
+        type: 'text',
+        fields: {
+          keyword: {
+            type: 'keyword',
+          },
+        },
+      },
+    },
+  },
+};

From 8c05a724e7dae3e2c8494b9e53f2345bad2fa12b Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Mon, 27 Apr 2020 14:23:33 +0200
Subject: [PATCH 3/6] Bump cypress dev-dependency from 4.2.0 to 4.4.1 (#64408)

---
 package.json                           |   1 +
 src/es_archiver/actions/rebuild_all.ts |   4 +-
 x-pack/package.json                    |   2 +-
 yarn.lock                              | 178 +++++++++++++++----------
 4 files changed, 114 insertions(+), 71 deletions(-)

diff --git a/package.json b/package.json
index bf5f270cabe99..bfea8c7423f9c 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
     "**/@types/hapi": "^17.0.18",
     "**/@types/angular": "^1.6.56",
     "**/@types/hoist-non-react-statics": "^3.3.1",
+    "**/@types/chai": "^4.2.11",
     "**/typescript": "3.7.2",
     "**/graphql-toolkit/lodash": "^4.17.13",
     "**/hoist-non-react-statics": "^3.3.2",
diff --git a/src/es_archiver/actions/rebuild_all.ts b/src/es_archiver/actions/rebuild_all.ts
index 1467a1d0430b7..f35b2ca49c666 100644
--- a/src/es_archiver/actions/rebuild_all.ts
+++ b/src/es_archiver/actions/rebuild_all.ts
@@ -18,7 +18,7 @@
  */
 
 import { resolve, dirname, relative } from 'path';
-import { stat, rename, createReadStream, createWriteStream } from 'fs';
+import { stat, Stats, rename, createReadStream, createWriteStream } from 'fs';
 import { Readable, Writable } from 'stream';
 import { fromNode } from 'bluebird';
 import { ToolingLog } from '@kbn/dev-utils';
@@ -33,7 +33,7 @@ import {
 } from '../lib';
 
 async function isDirectory(path: string): Promise<boolean> {
-  const stats = await fromNode(cb => stat(path, cb));
+  const stats: Stats = await fromNode(cb => stat(path, cb));
   return stats.isDirectory();
 }
 
diff --git a/x-pack/package.json b/x-pack/package.json
index d0025ff436649..ca73884b8c7c7 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -121,7 +121,7 @@
     "cheerio": "0.22.0",
     "commander": "3.0.2",
     "copy-webpack-plugin": "^5.0.4",
-    "cypress": "^4.2.0",
+    "cypress": "^4.4.1",
     "cypress-multi-reporters": "^1.2.3",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
diff --git a/yarn.lock b/yarn.lock
index 0a1432882c327..f348aa99e6f20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1192,6 +1192,32 @@
     date-fns "^1.27.2"
     figures "^1.7.0"
 
+"@cypress/request@2.88.5":
+  version "2.88.5"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.5.tgz#8d7ecd17b53a849cfd5ab06d5abe7d84976375d7"
+  integrity sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 "@cypress/webpack-preprocessor@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-4.1.0.tgz#8c4debc0b1abf045b62524d1996dd9aeaf7e86a8"
@@ -3699,15 +3725,20 @@
   resolved "https://registry.yarnpkg.com/@types/base64-js/-/base64-js-1.2.5.tgz#582b2476169a6cba460a214d476c744441d873d5"
   integrity sha1-WCskdhaabLpGCiFNR2x0REHYc9U=
 
-"@types/bluebird@*":
-  version "3.5.28"
-  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.28.tgz#04c1a520ff076649236bc8ca21198542ce2bdb09"
-  integrity sha512-0Vk/kqkukxPKSzP9c8WJgisgGDx5oZDbsLLWIP5t70yThO/YleE+GEm2S1GlRALTaack3O7U5OS5qEm7q2kciA==
+"@types/blob-util@1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@types/blob-util/-/blob-util-1.3.3.tgz#adba644ae34f88e1dd9a5864c66ad651caaf628a"
+  integrity sha512-4ahcL/QDnpjWA2Qs16ZMQif7HjGP2cw3AGjHabybjw7Vm1EKu+cfQN1D78BaZbS1WJNa1opSMF5HNMztx7lR0w==
+
+"@types/bluebird@*", "@types/bluebird@^3.1.1":
+  version "3.5.30"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.30.tgz#ee034a0eeea8b84ed868b1aa60d690b08a6cfbc5"
+  integrity sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==
 
-"@types/bluebird@^3.1.1":
-  version "3.5.20"
-  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.20.tgz#f6363172add6f4eabb8cada53ca9af2781e8d6a1"
-  integrity sha512-Wk41MVdF+cHBfVXj/ufUHJeO3BlIQr1McbHZANErMykaCWeDSZbH5erGjNBw2/3UlRdSxZbLfSuQTzFmPOYFsA==
+"@types/bluebird@3.5.29":
+  version "3.5.29"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.29.tgz#7cd933c902c4fc83046517a1bef973886d00bdb6"
+  integrity sha512-kmVtnxTuUuhCET669irqQmPAez4KFnFVKvpleVRyfC3g+SHD1hIkFZcWLim9BVcwUBLO59o8VZE4yGCmTif8Yw==
 
 "@types/boom@*", "@types/boom@^7.2.0":
   version "7.2.0"
@@ -3739,6 +3770,19 @@
   resolved "https://registry.yarnpkg.com/@types/catbox/-/catbox-10.0.1.tgz#266679017749041fe9873fee1131dd2aaa04a07e"
   integrity sha512-ECuJ+f5gGHiLeiE4RlE/xdqv/0JVDToegPV1aTb10tQStYa0Ycq2OJfQukDv3IFaw3B+CMV46jHc5bXe6QXEQg==
 
+"@types/chai-jquery@1.1.40":
+  version "1.1.40"
+  resolved "https://registry.yarnpkg.com/@types/chai-jquery/-/chai-jquery-1.1.40.tgz#445bedcbbb2ae4e3027f46fa2c1733c43481ffa1"
+  integrity sha512-mCNEZ3GKP7T7kftKeIs7QmfZZQM7hslGSpYzKbOlR2a2HCFf9ph4nlMRA9UnuOETeOQYJVhJQK7MwGqNZVyUtQ==
+  dependencies:
+    "@types/chai" "*"
+    "@types/jquery" "*"
+
+"@types/chai@*", "@types/chai@4.2.7", "@types/chai@^4.2.11":
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.11.tgz#d3614d6c5f500142358e6ed24e1bf16657536c50"
+  integrity sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==
+
 "@types/chance@^1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/chance/-/chance-1.0.1.tgz#c10703020369602c40dd9428cc6e1437027116df"
@@ -4176,7 +4220,7 @@
   resolved "https://registry.yarnpkg.com/@types/joi/-/joi-13.6.1.tgz#325486a397504f8e22c8c551dc8b0e1d41d5d5ae"
   integrity sha512-JxZ0NP8NuB0BJOXi1KvAA6rySLTPmhOy4n2gzSFq/IFM3LNFm0h+2Vn/bPPgEYlWqzS2NPeLgKqfm75baX+Hog==
 
-"@types/jquery@*", "@types/jquery@^3.3.31":
+"@types/jquery@*", "@types/jquery@3.3.31", "@types/jquery@^3.3.31":
   version "3.3.31"
   resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.31.tgz#27c706e4bf488474e1cb54a71d8303f37c93451b"
   integrity sha512-Lz4BAJihoFw5nRzKvg4nawXPzutkv7wmfQ5121avptaSIXlDNJCUuxZxX/G+9EVidZGuO0UBlk+YjKbwRKJigg==
@@ -4282,9 +4326,14 @@
     "@types/lodash" "*"
 
 "@types/lodash@*", "@types/lodash@^4.14.110", "@types/lodash@^4.14.116":
-  version "4.14.137"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.137.tgz#8a4804937dc6462274ffcc088df8f14fc1b368e2"
-  integrity sha512-g4rNK5SRKloO+sUGbuO7aPtwbwzMgjK+bm9BBhLD7jGUiGR7zhwYEhSln/ihgYQBeIJ5j7xjyaYzrWTcu3UotQ==
+  version "4.14.150"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.150.tgz#649fe44684c3f1fcb6164d943c5a61977e8cf0bd"
+  integrity sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==
+
+"@types/lodash@4.14.149":
+  version "4.14.149"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440"
+  integrity sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==
 
 "@types/lodash@^3.10.1":
   version "3.10.2"
@@ -4342,7 +4391,7 @@
   dependencies:
     "@types/mime-db" "*"
 
-"@types/minimatch@*", "@types/minimatch@^3.0.3":
+"@types/minimatch@*", "@types/minimatch@3.0.3", "@types/minimatch@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
@@ -4359,6 +4408,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/mocha@5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
+  integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
+
 "@types/mocha@^7.0.2":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce"
@@ -4751,11 +4805,36 @@
   dependencies:
     "@types/node" "*"
 
+"@types/sinon-chai@3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@types/sinon-chai/-/sinon-chai-3.2.3.tgz#afe392303dda95cc8069685d1e537ff434fa506e"
+  integrity sha512-TOUFS6vqS0PVL1I8NGVSNcFaNJtFoyZPXZ5zur+qlhDfOmQECZZM4H4kKgca6O8L+QceX/ymODZASfUfn+y4yQ==
+  dependencies:
+    "@types/chai" "*"
+    "@types/sinon" "*"
+
+"@types/sinon@*":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.0.tgz#5b70a360f55645dd64f205defd2a31b749a59799"
+  integrity sha512-v2TkYHkts4VXshMkcmot/H+ERZ2SevKa10saGaJPGCJ8vh3lKrC4u663zYEeRZxep+VbG6YRDtQ6gVqw9dYzPA==
+  dependencies:
+    "@types/sinonjs__fake-timers" "*"
+
+"@types/sinon@7.5.1":
+  version "7.5.1"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.1.tgz#d27b81af0d1cfe1f9b24eebe7a24f74ae40f5b7c"
+  integrity sha512-EZQUP3hSZQyTQRfiLqelC9NMWd1kqLcmQE0dMiklxBkgi84T+cHOhnKpgk4NnOWpGX863yE6+IaGnOXUNFqDnQ==
+
 "@types/sinon@^7.0.13":
   version "7.0.13"
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.13.tgz#ca039c23a9e27ebea53e0901ef928ea2a1a6d313"
   integrity sha512-d7c/C/+H/knZ3L8/cxhicHUiTDxdgap0b/aNJfsmLwFu/iOP17mdgbQsbHA3SJmrzsjD0l3UEE5SN4xxuz5ung==
 
+"@types/sinonjs__fake-timers@*":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz#681df970358c82836b42f989188d133e218c458e"
+  integrity sha512-yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA==
+
 "@types/sizzle@*", "@types/sizzle@2.3.2":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
@@ -10370,13 +10449,24 @@ cypress-multi-reporters@^1.2.3:
     debug "^4.1.1"
     lodash "^4.17.11"
 
-cypress@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.2.0.tgz#45673fb648b1a77b9a78d73e58b89ed05212d243"
-  integrity sha512-8LdreL91S/QiTCLYLNbIjLL8Ht4fJmu/4HGLxUI20Tc7JSfqEfCmXELrRfuPT0kjosJwJJZacdSji9XSRkPKUw==
+cypress@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.4.1.tgz#f5aa1aa5f328f1299bff328103f7cbad89e80f29"
+  integrity sha512-LcskZ/PXRG9XTlEeeenKqz/KddT1x+7O7dqXsdKWPII01LxLNmNHIvHnlUqApchVbinJ5vir6J255CkELSeL0A==
   dependencies:
     "@cypress/listr-verbose-renderer" "0.4.1"
+    "@cypress/request" "2.88.5"
     "@cypress/xvfb" "1.2.4"
+    "@types/blob-util" "1.3.3"
+    "@types/bluebird" "3.5.29"
+    "@types/chai" "4.2.7"
+    "@types/chai-jquery" "1.1.40"
+    "@types/jquery" "3.3.31"
+    "@types/lodash" "4.14.149"
+    "@types/minimatch" "3.0.3"
+    "@types/mocha" "5.2.7"
+    "@types/sinon" "7.5.1"
+    "@types/sinon-chai" "3.2.3"
     "@types/sizzle" "2.3.2"
     arch "2.1.1"
     bluebird "3.7.2"
@@ -10390,7 +10480,7 @@ cypress@^4.2.0:
     eventemitter2 "4.1.2"
     execa "1.0.0"
     executable "4.1.1"
-    extract-zip "1.6.7"
+    extract-zip "1.7.0"
     fs-extra "8.1.0"
     getos "3.1.4"
     is-ci "2.0.0"
@@ -10399,12 +10489,11 @@ cypress@^4.2.0:
     listr "0.14.3"
     lodash "4.17.15"
     log-symbols "3.0.0"
-    minimist "1.2.2"
+    minimist "1.2.5"
     moment "2.24.0"
     ospath "1.2.2"
     pretty-bytes "5.3.0"
     ramda "0.26.1"
-    request cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16
     request-progress "3.0.0"
     supports-color "7.1.0"
     tmp "0.1.0"
@@ -13187,16 +13276,6 @@ extract-stack@^1.0.0:
   resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-1.0.0.tgz#b97acaf9441eea2332529624b732fc5a1c8165fa"
   integrity sha1-uXrK+UQe6iMyUpYktzL8WhyBZfo=
 
-extract-zip@1.6.7:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
-  integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
-  dependencies:
-    concat-stream "1.6.2"
-    debug "2.6.9"
-    mkdirp "0.5.1"
-    yauzl "2.4.1"
-
 extract-zip@1.7.0, extract-zip@^1.6.6, extract-zip@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
@@ -20579,12 +20658,7 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minimist@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63"
-  integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==
-
-minimist@^1.2.3, minimist@^1.2.5:
+minimist@1.2.5, minimist@^1.2.3, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -25793,31 +25867,6 @@ request@^2.87.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16:
-  version "2.88.1"
-  resolved "https://codeload.github.com/cypress-io/request/tar.gz/b5af0d1fa47eec97ba980cde90a13e69a2afcd16"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-ancestors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/require-ancestors/-/require-ancestors-1.0.0.tgz#807831f8f8081fb12863da81ddb15c8f2a73a004"
@@ -32456,13 +32505,6 @@ yauzl@2.10.0, yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yauzl@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
-  integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
-  dependencies:
-    fd-slicer "~1.0.1"
-
 yauzl@^2.4.2:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f"

From 6c98b2368bc7df5d3d4203d82960420546c37f29 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Mon, 27 Apr 2020 09:06:33 -0400
Subject: [PATCH 4/6] [Ingest] Add Global settings flyout (#64276)

---
 .../ingest_manager/common/constants/index.ts  |   1 +
 .../ingest_manager/common/constants/routes.ts |  13 +
 .../common/constants/settings.ts              |   7 +
 .../ingest_manager/common/services/routes.ts  |  14 +
 .../common/types/models/index.ts              |   1 +
 .../common/types/models/settings.ts           |  19 ++
 .../common/types/rest_spec/index.ts           |   2 +
 .../common/types/rest_spec/output.ts          |  40 +++
 .../common/types/rest_spec/settings.ts        |  20 ++
 .../ingest_manager/components/index.ts        |   1 +
 .../components/settings_flyout.tsx            | 240 ++++++++++++++++++
 .../ingest_manager/hooks/use_input.ts         |  22 ++
 .../ingest_manager/hooks/use_request/index.ts |   2 +
 .../hooks/use_request/outputs.ts              |  24 ++
 .../hooks/use_request/settings.ts             |  24 ++
 .../ingest_manager/layouts/default.tsx        | 126 +++++----
 .../ingest_manager/services/index.ts          |   2 +
 .../ingest_manager/types/index.ts             |   9 +
 .../ingest_manager/server/constants/index.ts  |   3 +
 .../plugins/ingest_manager/server/plugin.ts   |   4 +
 .../ingest_manager/server/routes/index.ts     |   2 +
 .../server/routes/output/handler.ts           |  90 +++++++
 .../server/routes/output/index.ts             |  41 +++
 .../server/routes/settings/index.ts           |  81 ++++++
 .../ingest_manager/server/saved_objects.ts    |  18 ++
 .../ingest_manager/server/services/index.ts   |   4 +-
 .../ingest_manager/server/services/output.ts  |  28 ++
 .../server/services/settings.ts               |  57 +++++
 .../ingest_manager/server/services/setup.ts   |  13 +
 .../ingest_manager/server/types/index.tsx     |   2 +
 .../server/types/rest_spec/index.ts           |   2 +
 .../server/types/rest_spec/output.ts          |  24 ++
 .../server/types/rest_spec/settings.ts        |  17 ++
 33 files changed, 899 insertions(+), 54 deletions(-)
 create mode 100644 x-pack/plugins/ingest_manager/common/constants/settings.ts
 create mode 100644 x-pack/plugins/ingest_manager/common/types/models/settings.ts
 create mode 100644 x-pack/plugins/ingest_manager/common/types/rest_spec/output.ts
 create mode 100644 x-pack/plugins/ingest_manager/common/types/rest_spec/settings.ts
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/outputs.ts
 create mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/settings.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/routes/output/handler.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/routes/output/index.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/routes/settings/index.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/services/settings.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/types/rest_spec/output.ts
 create mode 100644 x-pack/plugins/ingest_manager/server/types/rest_spec/settings.ts

diff --git a/x-pack/plugins/ingest_manager/common/constants/index.ts b/x-pack/plugins/ingest_manager/common/constants/index.ts
index 45d315e6d5664..6a2e559bbbe4f 100644
--- a/x-pack/plugins/ingest_manager/common/constants/index.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/index.ts
@@ -12,3 +12,4 @@ export * from './datasource';
 export * from './epm';
 export * from './output';
 export * from './enrollment_api_key';
+export * from './settings';
diff --git a/x-pack/plugins/ingest_manager/common/constants/routes.ts b/x-pack/plugins/ingest_manager/common/constants/routes.ts
index 98ca52651a2ae..35e3be98e3982 100644
--- a/x-pack/plugins/ingest_manager/common/constants/routes.ts
+++ b/x-pack/plugins/ingest_manager/common/constants/routes.ts
@@ -48,6 +48,19 @@ export const AGENT_CONFIG_API_ROUTES = {
   FULL_INFO_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/full`,
 };
 
+// Output API routes
+export const OUTPUT_API_ROUTES = {
+  LIST_PATTERN: `${API_ROOT}/outputs`,
+  INFO_PATTERN: `${API_ROOT}/outputs/{outputId}`,
+  UPDATE_PATTERN: `${API_ROOT}/outputs/{outputId}`,
+};
+
+// Settings API routes
+export const SETTINGS_API_ROUTES = {
+  INFO_PATTERN: `${API_ROOT}/settings`,
+  UPDATE_PATTERN: `${API_ROOT}/settings`,
+};
+
 // Agent API routes
 export const AGENT_API_ROUTES = {
   LIST_PATTERN: `${FLEET_API_ROOT}/agents`,
diff --git a/x-pack/plugins/ingest_manager/common/constants/settings.ts b/x-pack/plugins/ingest_manager/common/constants/settings.ts
new file mode 100644
index 0000000000000..a9e7f1df4119c
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/constants/settings.ts
@@ -0,0 +1,7 @@
+/*
+ * 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.
+ */
+
+export const GLOBAL_SETTINGS_SAVED_OBJECT_TYPE = 'ingest_manager_settings';
diff --git a/x-pack/plugins/ingest_manager/common/services/routes.ts b/x-pack/plugins/ingest_manager/common/services/routes.ts
index 46b76d886f3cd..1a1bd7c65aa25 100644
--- a/x-pack/plugins/ingest_manager/common/services/routes.ts
+++ b/x-pack/plugins/ingest_manager/common/services/routes.ts
@@ -13,6 +13,8 @@ import {
   AGENT_API_ROUTES,
   ENROLLMENT_API_KEY_ROUTES,
   SETUP_API_ROUTE,
+  OUTPUT_API_ROUTES,
+  SETTINGS_API_ROUTES,
 } from '../constants';
 
 export const epmRouteService = {
@@ -112,6 +114,18 @@ export const agentRouteService = {
   getStatusPath: () => AGENT_API_ROUTES.STATUS_PATTERN,
 };
 
+export const outputRoutesService = {
+  getInfoPath: (outputId: string) => OUTPUT_API_ROUTES.INFO_PATTERN.replace('{outputId}', outputId),
+  getUpdatePath: (outputId: string) =>
+    OUTPUT_API_ROUTES.UPDATE_PATTERN.replace('{outputId}', outputId),
+  getListPath: () => OUTPUT_API_ROUTES.LIST_PATTERN,
+};
+
+export const settingsRoutesService = {
+  getInfoPath: () => SETTINGS_API_ROUTES.INFO_PATTERN,
+  getUpdatePath: () => SETTINGS_API_ROUTES.UPDATE_PATTERN,
+};
+
 export const enrollmentAPIKeyRouteService = {
   getListPath: () => ENROLLMENT_API_KEY_ROUTES.LIST_PATTERN,
   getCreatePath: () => ENROLLMENT_API_KEY_ROUTES.CREATE_PATTERN,
diff --git a/x-pack/plugins/ingest_manager/common/types/models/index.ts b/x-pack/plugins/ingest_manager/common/types/models/index.ts
index f73ab7af636a9..2310fdd54a719 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/index.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/index.ts
@@ -11,3 +11,4 @@ export * from './data_stream';
 export * from './output';
 export * from './epm';
 export * from './enrollment_api_key';
+export * from './settings';
diff --git a/x-pack/plugins/ingest_manager/common/types/models/settings.ts b/x-pack/plugins/ingest_manager/common/types/models/settings.ts
new file mode 100644
index 0000000000000..2921808230b47
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/types/models/settings.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 { SavedObjectAttributes } from 'src/core/public';
+
+interface BaseSettings {
+  agent_auto_upgrade?: boolean;
+  package_auto_upgrade?: boolean;
+  kibana_url?: string;
+  kibana_ca_sha256?: string;
+}
+
+export interface Settings extends BaseSettings {
+  id: string;
+}
+
+export interface SettingsSOAttributes extends BaseSettings, SavedObjectAttributes {}
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts
index c1805023f497a..763fb7d820b2a 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/index.ts
@@ -12,3 +12,5 @@ export * from './fleet_setup';
 export * from './epm';
 export * from './enrollment_api_key';
 export * from './install_script';
+export * from './output';
+export * from './settings';
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/output.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/output.ts
new file mode 100644
index 0000000000000..4162060363381
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/output.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 { Output } from '../models';
+
+export interface GetOneOutputResponse {
+  item: Output;
+  success: boolean;
+}
+
+export interface GetOneOutputRequest {
+  params: {
+    outputId: string;
+  };
+}
+
+export interface PutOutputRequest {
+  params: {
+    outputId: string;
+  };
+  body: {
+    hosts?: string[];
+    ca_sha256?: string;
+  };
+}
+
+export interface PutOutputResponse {
+  item: Output;
+  success: boolean;
+}
+
+export interface GetOutputsResponse {
+  items: Output[];
+  total: number;
+  page: number;
+  perPage: number;
+  success: boolean;
+}
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/settings.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/settings.ts
new file mode 100644
index 0000000000000..c02a5e5878ee9
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/settings.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 { Settings } from '../models';
+
+export interface GetSettingsResponse {
+  item: Settings;
+  success: boolean;
+}
+
+export interface PutSettingsRequest {
+  body: Partial<Omit<Settings, 'id'>>;
+}
+
+export interface PutSettingsResponse {
+  item: Settings;
+  success: boolean;
+}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/index.ts
index bdc8f350f7108..b0b4e79cece79 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/index.ts
@@ -7,3 +7,4 @@ export { Loading } from './loading';
 export { Error } from './error';
 export { Header, HeaderProps } from './header';
 export { AlphaMessaging } from './alpha_messaging';
+export * from './settings_flyout';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
new file mode 100644
index 0000000000000..92146e9ee5679
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
@@ -0,0 +1,240 @@
+/*
+ * 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 React, { useEffect } from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiFlyout,
+  EuiFlyoutBody,
+  EuiFlyoutHeader,
+  EuiTitle,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButtonEmpty,
+  EuiSpacer,
+  EuiButton,
+  EuiFlyoutFooter,
+  EuiForm,
+  EuiFormRow,
+  EuiFieldText,
+  EuiRadioGroup,
+  EuiComboBox,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiText } from '@elastic/eui';
+import { useInput, useComboInput, useCore, useGetSettings, sendPutSettings } from '../hooks';
+import { useGetOutputs, sendPutOutput } from '../hooks/use_request/outputs';
+
+interface Props {
+  onClose: () => void;
+}
+
+function useSettingsForm(outputId: string | undefined) {
+  const { notifications } = useCore();
+  const kibanaUrlInput = useInput();
+  const elasticsearchUrlInput = useComboInput([]);
+
+  return {
+    onSubmit: async () => {
+      try {
+        if (!outputId) {
+          throw new Error('Unable to load outputs');
+        }
+        await sendPutOutput(outputId, {
+          hosts: elasticsearchUrlInput.value,
+        });
+        await sendPutSettings({
+          kibana_url: kibanaUrlInput.value,
+        });
+      } catch (error) {
+        notifications.toasts.addError(error, {
+          title: 'Error',
+        });
+      }
+      notifications.toasts.addSuccess(
+        i18n.translate('xpack.ingestManager.settings.success.message', {
+          defaultMessage: 'Settings saved',
+        })
+      );
+    },
+    inputs: {
+      kibanaUrl: kibanaUrlInput,
+      elasticsearchUrl: elasticsearchUrlInput,
+    },
+  };
+}
+
+export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
+  const core = useCore();
+  const settingsRequest = useGetSettings();
+  const settings = settingsRequest?.data?.item;
+  const outputsRequest = useGetOutputs();
+  const output = outputsRequest.data?.items?.[0];
+  const { inputs, onSubmit } = useSettingsForm(output?.id);
+
+  useEffect(() => {
+    if (output) {
+      inputs.elasticsearchUrl.setValue(output.hosts || []);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [output]);
+
+  useEffect(() => {
+    if (settings) {
+      inputs.kibanaUrl.setValue(
+        settings.kibana_url || `${window.location.origin}${core.http.basePath.get()}`
+      );
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [settings]);
+
+  const body = (
+    <EuiForm>
+      <EuiRadioGroup
+        options={[
+          {
+            id: 'enabled',
+            label: i18n.translate('xpack.ingestManager.settings.autoUpgradeEnabledLabel', {
+              defaultMessage:
+                'Automatically update agent binaries to use the latest minor version.',
+            }),
+          },
+          {
+            id: 'disabled',
+            disabled: true,
+            label: i18n.translate('xpack.ingestManager.settings.autoUpgradeDisabledLabel', {
+              defaultMessage: 'Manually manage agent binary versions. Requires Gold license.',
+            }),
+          },
+        ]}
+        idSelected={'enabled'}
+        onChange={id => {}}
+        legend={{
+          children: (
+            <EuiTitle size="xs">
+              <h3>
+                <FormattedMessage
+                  id="xpack.ingestManager.settings.autoUpgradeFieldLabel"
+                  defaultMessage="Elastic Agent binary version"
+                />
+              </h3>
+            </EuiTitle>
+          ),
+        }}
+      />
+      <EuiSpacer size="l" />
+      <EuiRadioGroup
+        options={[
+          {
+            id: 'enabled',
+            label: i18n.translate(
+              'xpack.ingestManager.settings.integrationUpgradeEnabledFieldLabel',
+              {
+                defaultMessage:
+                  'Automatically update Integrations to the latest version to receive the latest assets. Agent configurations may need to be updated in order to use new features.',
+              }
+            ),
+          },
+          {
+            id: 'disabled',
+            disabled: true,
+            label: i18n.translate(
+              'xpack.ingestManager.settings.integrationUpgradeDisabledFieldLabel',
+              {
+                defaultMessage: 'Manually manage integration versions yourself.',
+              }
+            ),
+          },
+        ]}
+        idSelected={'enabled'}
+        onChange={id => {}}
+        legend={{
+          children: (
+            <EuiTitle size="xs">
+              <h3>
+                <FormattedMessage
+                  id="xpack.ingestManager.settings.integrationUpgradeFieldLabel"
+                  defaultMessage="Elastic integration version"
+                />
+              </h3>
+            </EuiTitle>
+          ),
+        }}
+      />
+      <EuiSpacer size="l" />
+      <EuiTitle size="s">
+        <h3>
+          <FormattedMessage
+            id="xpack.ingestManager.settings.globalOutputTitle"
+            defaultMessage="Global output"
+          />
+        </h3>
+      </EuiTitle>
+      <EuiSpacer size="s" />
+      <EuiText color="subdued" size="s">
+        <FormattedMessage
+          id="xpack.ingestManager.settings.globalOutputDescription"
+          defaultMessage="The global output is applied to all agent configurations and specifies where data is sent."
+        />
+      </EuiText>
+      <EuiSpacer size="m" />
+      <EuiFormRow>
+        <EuiFormRow
+          label={i18n.translate('xpack.ingestManager.settings.kibanaUrlLabel', {
+            defaultMessage: 'Kibana URL',
+          })}
+        >
+          <EuiFieldText required={true} {...inputs.kibanaUrl.props} name="kibanaUrl" />
+        </EuiFormRow>
+      </EuiFormRow>
+      <EuiSpacer size="m" />
+      <EuiFormRow>
+        <EuiFormRow
+          label={i18n.translate('xpack.ingestManager.settings.elasticsearchUrlLabel', {
+            defaultMessage: 'Elasticsearch URL',
+          })}
+        >
+          <EuiComboBox noSuggestions {...inputs.elasticsearchUrl.props} />
+        </EuiFormRow>
+      </EuiFormRow>
+    </EuiForm>
+  );
+
+  return (
+    <EuiFlyout onClose={onClose} size="l" maxWidth={640}>
+      <EuiFlyoutHeader hasBorder aria-labelledby="IngestManagerSettingsFlyoutTitle">
+        <EuiTitle size="m">
+          <h2 id="IngestManagerSettingsFlyoutTitle">
+            <FormattedMessage
+              id="xpack.ingestManager.settings.flyoutTitle"
+              defaultMessage="Ingest Management settings"
+            />
+          </h2>
+        </EuiTitle>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>{body}</EuiFlyoutBody>
+      <EuiFlyoutFooter>
+        <EuiFlexGroup justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty iconType="cross" onClick={onClose} flush="left">
+              <FormattedMessage
+                id="xpack.ingestManager.settings.cancelButtonLabel"
+                defaultMessage="Cancel"
+              />
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButton onClick={onSubmit} iconType="save">
+              <FormattedMessage
+                id="xpack.ingestManager.settings.saveButtonLabel"
+                defaultMessage="Save settings"
+              />
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutFooter>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_input.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_input.ts
index 4aa0ad7155d2f..c535dc899638d 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_input.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_input.ts
@@ -20,5 +20,27 @@ export function useInput(defaultValue = '') {
     clear: () => {
       setValue('');
     },
+    setValue,
+  };
+}
+
+export function useComboInput(defaultValue = []) {
+  const [value, setValue] = React.useState<string[]>(defaultValue);
+
+  return {
+    props: {
+      selectedOptions: value.map((val: string) => ({ label: val })),
+      onCreateOption: (newVal: any) => {
+        setValue([...value, newVal]);
+      },
+      onChange: (newVals: any[]) => {
+        setValue(newVals.map(val => val.label));
+      },
+    },
+    value,
+    clear: () => {
+      setValue([]);
+    },
+    setValue,
   };
 }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts
index 084aba9a34309..c39d2a5860bf0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/index.ts
@@ -10,3 +10,5 @@ export * from './data_stream';
 export * from './agents';
 export * from './enrollment_api_keys';
 export * from './epm';
+export * from './outputs';
+export * from './settings';
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/outputs.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/outputs.ts
new file mode 100644
index 0000000000000..e57256d33ab2f
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/outputs.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { sendRequest, useRequest } from './use_request';
+import { outputRoutesService } from '../../services';
+import { PutOutputRequest, GetOutputsResponse } from '../../types';
+
+export function useGetOutputs() {
+  return useRequest<GetOutputsResponse>({
+    method: 'get',
+    path: outputRoutesService.getListPath(),
+  });
+}
+
+export function sendPutOutput(outputId: string, body: PutOutputRequest['body']) {
+  return sendRequest({
+    method: 'put',
+    path: outputRoutesService.getUpdatePath(outputId),
+    body,
+  });
+}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/settings.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/settings.ts
new file mode 100644
index 0000000000000..45e4eccf6625e
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/settings.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { sendRequest, useRequest } from './use_request';
+import { settingsRoutesService } from '../../services';
+import { PutSettingsResponse, PutSettingsRequest, GetSettingsResponse } from '../../types';
+
+export function useGetSettings() {
+  return useRequest<GetSettingsResponse>({
+    method: 'get',
+    path: settingsRoutesService.getInfoPath(),
+  });
+}
+
+export function sendPutSettings(body: PutSettingsRequest['body']) {
+  return sendRequest<PutSettingsResponse>({
+    method: 'put',
+    path: settingsRoutesService.getUpdatePath(),
+    body,
+  });
+}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
index f1f9063de72f0..10245e73520f7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
@@ -5,10 +5,10 @@
  */
 import React from 'react';
 import styled from 'styled-components';
-import { EuiTabs, EuiTab, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elastic/eui';
+import { EuiTabs, EuiTab, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Section } from '../sections';
-import { AlphaMessaging } from '../components';
+import { AlphaMessaging, SettingFlyout } from '../components';
 import { useLink, useConfig } from '../hooks';
 import { EPM_PATH, FLEET_PATH, AGENT_CONFIG_PATH, DATA_STREAM_PATH } from '../constants';
 
@@ -35,59 +35,79 @@ const Nav = styled.nav`
 
 export const DefaultLayout: React.FunctionComponent<Props> = ({ section, children }) => {
   const { epm, fleet } = useConfig();
+
+  const [isSettingsFlyoutOpen, setIsSettingsFlyoutOpen] = React.useState(false);
+
   return (
-    <Container>
-      <Nav>
-        <EuiFlexGroup gutterSize="l" alignItems="center">
-          <EuiFlexItem grow={false}>
-            <EuiIcon type="savedObjectsApp" size="l" />
-          </EuiFlexItem>
-          <EuiFlexItem>
-            <EuiTabs display="condensed">
-              <EuiTab isSelected={section === 'overview'} href={useLink()}>
-                <FormattedMessage
-                  id="xpack.ingestManager.appNavigation.overviewLinkText"
-                  defaultMessage="Overview"
-                />
-              </EuiTab>
-              <EuiTab
-                isSelected={section === 'epm'}
-                href={useLink(EPM_PATH)}
-                disabled={!epm?.enabled}
-              >
-                <FormattedMessage
-                  id="xpack.ingestManager.appNavigation.epmLinkText"
-                  defaultMessage="Integrations"
-                />
-              </EuiTab>
-              <EuiTab isSelected={section === 'agent_config'} href={useLink(AGENT_CONFIG_PATH)}>
-                <FormattedMessage
-                  id="xpack.ingestManager.appNavigation.configurationsLinkText"
-                  defaultMessage="Configurations"
-                />
-              </EuiTab>
-              <EuiTab
-                isSelected={section === 'fleet'}
-                href={useLink(FLEET_PATH)}
-                disabled={!fleet?.enabled}
-              >
-                <FormattedMessage
-                  id="xpack.ingestManager.appNavigation.fleetLinkText"
-                  defaultMessage="Fleet"
-                />
-              </EuiTab>
-              <EuiTab isSelected={section === 'data_stream'} href={useLink(DATA_STREAM_PATH)}>
+    <>
+      {isSettingsFlyoutOpen && (
+        <SettingFlyout
+          onClose={() => {
+            setIsSettingsFlyoutOpen(false);
+          }}
+        />
+      )}
+      <Container>
+        <Nav>
+          <EuiFlexGroup gutterSize="l" alignItems="center">
+            <EuiFlexItem grow={false}>
+              <EuiIcon type="savedObjectsApp" size="l" />
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiTabs display="condensed">
+                <EuiTab isSelected={section === 'overview'} href={useLink()}>
+                  <FormattedMessage
+                    id="xpack.ingestManager.appNavigation.overviewLinkText"
+                    defaultMessage="Overview"
+                  />
+                </EuiTab>
+                <EuiTab
+                  isSelected={section === 'epm'}
+                  href={useLink(EPM_PATH)}
+                  disabled={!epm?.enabled}
+                >
+                  <FormattedMessage
+                    id="xpack.ingestManager.appNavigation.epmLinkText"
+                    defaultMessage="Integrations"
+                  />
+                </EuiTab>
+                <EuiTab isSelected={section === 'agent_config'} href={useLink(AGENT_CONFIG_PATH)}>
+                  <FormattedMessage
+                    id="xpack.ingestManager.appNavigation.configurationsLinkText"
+                    defaultMessage="Configurations"
+                  />
+                </EuiTab>
+                <EuiTab
+                  isSelected={section === 'fleet'}
+                  href={useLink(FLEET_PATH)}
+                  disabled={!fleet?.enabled}
+                >
+                  <FormattedMessage
+                    id="xpack.ingestManager.appNavigation.fleetLinkText"
+                    defaultMessage="Fleet"
+                  />
+                </EuiTab>
+                <EuiTab isSelected={section === 'data_stream'} href={useLink(DATA_STREAM_PATH)}>
+                  <FormattedMessage
+                    id="xpack.ingestManager.appNavigation.dataStreamsLinkText"
+                    defaultMessage="Data streams"
+                  />
+                </EuiTab>
+              </EuiTabs>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiButtonEmpty iconType="gear" onClick={() => setIsSettingsFlyoutOpen(true)}>
                 <FormattedMessage
-                  id="xpack.ingestManager.appNavigation.dataStreamsLinkText"
-                  defaultMessage="Data streams"
+                  id="xpack.ingestManager.appNavigation.settingsButton"
+                  defaultMessage="General settings"
                 />
-              </EuiTab>
-            </EuiTabs>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </Nav>
-      {children}
-      <AlphaMessaging />
-    </Container>
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </Nav>
+        {children}
+        <AlphaMessaging />
+      </Container>
+    </>
   );
 };
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
index 53dbe295718c5..e4791cc816d04 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/services/index.ts
@@ -15,6 +15,8 @@ export {
   enrollmentAPIKeyRouteService,
   epmRouteService,
   setupRouteService,
+  outputRoutesService,
+  settingsRoutesService,
   packageToConfigDatasourceInputs,
   storedDatasourceToAgentDatasource,
   AgentStatusKueryHelper,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
index 8ca1495a94071..2f78ecd1b085e 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
@@ -17,6 +17,7 @@ export {
   DatasourceInput,
   DatasourceInputStream,
   DatasourceConfigRecordEntry,
+  Output,
   DataStream,
   // API schemas - Agent Config
   GetAgentConfigsResponse,
@@ -48,6 +49,14 @@ export {
   GetEnrollmentAPIKeysResponse,
   GetEnrollmentAPIKeysRequest,
   GetOneEnrollmentAPIKeyResponse,
+  // API schemas - Outputs
+  GetOutputsResponse,
+  PutOutputRequest,
+  PutOutputResponse,
+  // API schemas - Settings
+  GetSettingsResponse,
+  PutSettingsRequest,
+  PutSettingsResponse,
   // EPM types
   AssetReference,
   AssetsGroupedByServiceByType,
diff --git a/x-pack/plugins/ingest_manager/server/constants/index.ts b/x-pack/plugins/ingest_manager/server/constants/index.ts
index 9336b3f870e00..75c14ffc8fa84 100644
--- a/x-pack/plugins/ingest_manager/server/constants/index.ts
+++ b/x-pack/plugins/ingest_manager/server/constants/index.ts
@@ -19,7 +19,9 @@ export {
   FLEET_SETUP_API_ROUTES,
   ENROLLMENT_API_KEY_ROUTES,
   INSTALL_SCRIPT_API_ROUTES,
+  OUTPUT_API_ROUTES,
   SETUP_API_ROUTE,
+  SETTINGS_API_ROUTES,
   // Saved object types
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
@@ -30,6 +32,7 @@ export {
   PACKAGES_SAVED_OBJECT_TYPE,
   INDEX_PATTERN_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
+  GLOBAL_SETTINGS_SAVED_OBJECT_TYPE as GLOBAL_SETTINGS_SAVED_OBJET_TYPE,
   // Defaults
   DEFAULT_AGENT_CONFIG,
   DEFAULT_OUTPUT,
diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts
index 4bf9785dcd306..097825e0b69e1 100644
--- a/x-pack/plugins/ingest_manager/server/plugin.ts
+++ b/x-pack/plugins/ingest_manager/server/plugin.ts
@@ -39,6 +39,8 @@ import {
   registerAgentRoutes,
   registerEnrollmentApiKeyRoutes,
   registerInstallScriptRoutes,
+  registerOutputRoutes,
+  registerSettingsRoutes,
 } from './routes';
 
 import { IngestManagerConfigType } from '../common';
@@ -150,6 +152,8 @@ export class IngestManagerPlugin
     // Register routes
     registerAgentConfigRoutes(router);
     registerDatasourceRoutes(router);
+    registerOutputRoutes(router);
+    registerSettingsRoutes(router);
     registerDataStreamRoutes(router);
 
     // Conditional routes
diff --git a/x-pack/plugins/ingest_manager/server/routes/index.ts b/x-pack/plugins/ingest_manager/server/routes/index.ts
index 8a186c5485024..3ce34d15de46c 100644
--- a/x-pack/plugins/ingest_manager/server/routes/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/index.ts
@@ -11,3 +11,5 @@ export { registerRoutes as registerSetupRoutes } from './setup';
 export { registerRoutes as registerAgentRoutes } from './agent';
 export { registerRoutes as registerEnrollmentApiKeyRoutes } from './enrollment_api_key';
 export { registerRoutes as registerInstallScriptRoutes } from './install_script';
+export { registerRoutes as registerOutputRoutes } from './output';
+export { registerRoutes as registerSettingsRoutes } from './settings';
diff --git a/x-pack/plugins/ingest_manager/server/routes/output/handler.ts b/x-pack/plugins/ingest_manager/server/routes/output/handler.ts
new file mode 100644
index 0000000000000..cd35b2a43426c
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/routes/output/handler.ts
@@ -0,0 +1,90 @@
+/*
+ * 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 { RequestHandler } from 'src/core/server';
+import { TypeOf } from '@kbn/config-schema';
+import { GetOneOutputRequestSchema, PutOutputRequestSchema } from '../../types';
+import { GetOneOutputResponse, GetOutputsResponse } from '../../../common';
+import { outputService } from '../../services/output';
+
+export const getOutputsHandler: RequestHandler = async (context, request, response) => {
+  const soClient = context.core.savedObjects.client;
+  try {
+    const outputs = await outputService.list(soClient);
+
+    const body: GetOutputsResponse = {
+      items: outputs.items,
+      page: outputs.page,
+      perPage: outputs.perPage,
+      total: outputs.total,
+      success: true,
+    };
+
+    return response.ok({ body });
+  } catch (e) {
+    return response.customError({
+      statusCode: 500,
+      body: { message: e.message },
+    });
+  }
+};
+
+export const getOneOuputHandler: RequestHandler<TypeOf<
+  typeof GetOneOutputRequestSchema.params
+>> = async (context, request, response) => {
+  const soClient = context.core.savedObjects.client;
+  try {
+    const output = await outputService.get(soClient, request.params.outputId);
+
+    const body: GetOneOutputResponse = {
+      item: output,
+      success: true,
+    };
+
+    return response.ok({ body });
+  } catch (e) {
+    if (e.isBoom && e.output.statusCode === 404) {
+      return response.notFound({
+        body: { message: `Output ${request.params.outputId} not found` },
+      });
+    }
+
+    return response.customError({
+      statusCode: 500,
+      body: { message: e.message },
+    });
+  }
+};
+
+export const putOuputHandler: RequestHandler<
+  TypeOf<typeof PutOutputRequestSchema.params>,
+  undefined,
+  TypeOf<typeof PutOutputRequestSchema.body>
+> = async (context, request, response) => {
+  const soClient = context.core.savedObjects.client;
+  try {
+    await outputService.update(soClient, request.params.outputId, request.body);
+    const output = await outputService.get(soClient, request.params.outputId);
+
+    const body: GetOneOutputResponse = {
+      item: output,
+      success: true,
+    };
+
+    return response.ok({ body });
+  } catch (e) {
+    if (e.isBoom && e.output.statusCode === 404) {
+      return response.notFound({
+        body: { message: `Output ${request.params.outputId} not found` },
+      });
+    }
+
+    return response.customError({
+      statusCode: 500,
+      body: { message: e.message },
+    });
+  }
+};
diff --git a/x-pack/plugins/ingest_manager/server/routes/output/index.ts b/x-pack/plugins/ingest_manager/server/routes/output/index.ts
new file mode 100644
index 0000000000000..139d11dba951a
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/routes/output/index.ts
@@ -0,0 +1,41 @@
+/*
+ * 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 { IRouter } from 'src/core/server';
+import { PLUGIN_ID, OUTPUT_API_ROUTES } from '../../constants';
+import { getOneOuputHandler, getOutputsHandler, putOuputHandler } from './handler';
+import {
+  GetOneOutputRequestSchema,
+  GetOutputsRequestSchema,
+  PutOutputRequestSchema,
+} from '../../types';
+
+export const registerRoutes = (router: IRouter) => {
+  router.get(
+    {
+      path: OUTPUT_API_ROUTES.LIST_PATTERN,
+      validate: GetOutputsRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    getOutputsHandler
+  );
+  router.get(
+    {
+      path: OUTPUT_API_ROUTES.INFO_PATTERN,
+      validate: GetOneOutputRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    getOneOuputHandler
+  );
+  router.put(
+    {
+      path: OUTPUT_API_ROUTES.UPDATE_PATTERN,
+      validate: PutOutputRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    putOuputHandler
+  );
+};
diff --git a/x-pack/plugins/ingest_manager/server/routes/settings/index.ts b/x-pack/plugins/ingest_manager/server/routes/settings/index.ts
new file mode 100644
index 0000000000000..56e666056e8d0
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/routes/settings/index.ts
@@ -0,0 +1,81 @@
+/*
+ * 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 { IRouter, RequestHandler } from 'src/core/server';
+import { TypeOf } from '@kbn/config-schema';
+import { PLUGIN_ID, SETTINGS_API_ROUTES } from '../../constants';
+import { PutSettingsRequestSchema, GetSettingsRequestSchema } from '../../types';
+
+import { settingsService } from '../../services';
+
+export const getSettingsHandler: RequestHandler = async (context, request, response) => {
+  const soClient = context.core.savedObjects.client;
+
+  try {
+    const settings = await settingsService.getSettings(soClient);
+    const body = {
+      success: true,
+      item: settings,
+    };
+    return response.ok({ body });
+  } catch (e) {
+    if (e.isBoom && e.output.statusCode === 404) {
+      return response.notFound({
+        body: { message: `Setings not found` },
+      });
+    }
+
+    return response.customError({
+      statusCode: 500,
+      body: { message: e.message },
+    });
+  }
+};
+
+export const putSettingsHandler: RequestHandler<
+  undefined,
+  undefined,
+  TypeOf<typeof PutSettingsRequestSchema.body>
+> = async (context, request, response) => {
+  const soClient = context.core.savedObjects.client;
+  try {
+    const settings = await settingsService.saveSettings(soClient, request.body);
+    const body = {
+      success: true,
+      item: settings,
+    };
+    return response.ok({ body });
+  } catch (e) {
+    if (e.isBoom && e.output.statusCode === 404) {
+      return response.notFound({
+        body: { message: `Setings not found` },
+      });
+    }
+
+    return response.customError({
+      statusCode: 500,
+      body: { message: e.message },
+    });
+  }
+};
+
+export const registerRoutes = (router: IRouter) => {
+  router.get(
+    {
+      path: SETTINGS_API_ROUTES.INFO_PATTERN,
+      validate: GetSettingsRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
+    },
+    getSettingsHandler
+  );
+  router.put(
+    {
+      path: SETTINGS_API_ROUTES.UPDATE_PATTERN,
+      validate: PutSettingsRequestSchema,
+      options: { tags: [`access:${PLUGIN_ID}-all`] },
+    },
+    putSettingsHandler
+  );
+};
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects.ts b/x-pack/plugins/ingest_manager/server/saved_objects.ts
index d827fb776b12c..0b130e7b70101 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects.ts
@@ -15,6 +15,7 @@ import {
   AGENT_EVENT_SAVED_OBJECT_TYPE,
   AGENT_ACTION_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
+  GLOBAL_SETTINGS_SAVED_OBJET_TYPE,
 } from './constants';
 
 /*
@@ -22,7 +23,24 @@ import {
  *
  * Please update typings in `/common/types` if mappings are updated.
  */
+
 const savedObjectTypes: { [key: string]: SavedObjectsType } = {
+  [GLOBAL_SETTINGS_SAVED_OBJET_TYPE]: {
+    name: GLOBAL_SETTINGS_SAVED_OBJET_TYPE,
+    hidden: false,
+    namespaceType: 'agnostic',
+    management: {
+      importableAndExportable: false,
+    },
+    mappings: {
+      properties: {
+        agent_auto_upgrade: { type: 'keyword' },
+        package_auto_upgrade: { type: 'keyword' },
+        kibana_url: { type: 'keyword' },
+        kibana_ca_sha256: { type: 'keyword' },
+      },
+    },
+  },
   [AGENT_SAVED_OBJECT_TYPE]: {
     name: AGENT_SAVED_OBJECT_TYPE,
     hidden: false,
diff --git a/x-pack/plugins/ingest_manager/server/services/index.ts b/x-pack/plugins/ingest_manager/server/services/index.ts
index 5141c86516f13..483661b9de915 100644
--- a/x-pack/plugins/ingest_manager/server/services/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/index.ts
@@ -3,9 +3,10 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import { SavedObjectsClientContract } from 'kibana/server';
 import { AgentStatus } from '../../common/types/models';
-
+import * as settingsService from './settings';
 export { ESIndexPatternSavedObjectService } from './es_index_pattern';
 
 /**
@@ -35,6 +36,7 @@ export interface AgentService {
 export { datasourceService } from './datasource';
 export { agentConfigService } from './agent_config';
 export { outputService } from './output';
+export { settingsService };
 
 // Plugin services
 export { appContextService } from './app_context';
diff --git a/x-pack/plugins/ingest_manager/server/services/output.ts b/x-pack/plugins/ingest_manager/server/services/output.ts
index 6c0dce79d550d..395c9af4a4ca2 100644
--- a/x-pack/plugins/ingest_manager/server/services/output.ts
+++ b/x-pack/plugins/ingest_manager/server/services/output.ts
@@ -95,6 +95,34 @@ class OutputService {
       ...outputSO.attributes,
     };
   }
+
+  public async update(soClient: SavedObjectsClientContract, id: string, data: Partial<Output>) {
+    const outputSO = await soClient.update<Output>(SAVED_OBJECT_TYPE, id, data);
+
+    if (outputSO.error) {
+      throw new Error(outputSO.error.message);
+    }
+  }
+
+  public async list(soClient: SavedObjectsClientContract) {
+    const outputs = await soClient.find<Output>({
+      type: SAVED_OBJECT_TYPE,
+      page: 1,
+      perPage: 1000,
+    });
+
+    return {
+      items: outputs.saved_objects.map<Output>(outputSO => {
+        return {
+          id: outputSO.id,
+          ...outputSO.attributes,
+        };
+      }),
+      total: outputs.total,
+      page: 1,
+      perPage: 1000,
+    };
+  }
 }
 
 export const outputService = new OutputService();
diff --git a/x-pack/plugins/ingest_manager/server/services/settings.ts b/x-pack/plugins/ingest_manager/server/services/settings.ts
new file mode 100644
index 0000000000000..f1c09746d9abd
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/services/settings.ts
@@ -0,0 +1,57 @@
+/*
+ * 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 Boom from 'boom';
+import { SavedObjectsClientContract } from 'kibana/server';
+import { GLOBAL_SETTINGS_SAVED_OBJECT_TYPE, SettingsSOAttributes, Settings } from '../../common';
+
+export async function getSettings(soClient: SavedObjectsClientContract): Promise<Settings> {
+  const res = await soClient.find<SettingsSOAttributes>({
+    type: GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
+  });
+
+  if (res.total === 0) {
+    throw Boom.notFound('Global settings not found');
+  }
+  const settingsSo = res.saved_objects[0];
+  return {
+    id: settingsSo.id,
+    ...settingsSo.attributes,
+  };
+}
+
+export async function saveSettings(
+  soClient: SavedObjectsClientContract,
+  newData: Partial<Omit<Settings, 'id'>>
+): Promise<Settings> {
+  try {
+    const settings = await getSettings(soClient);
+
+    const res = await soClient.update<SettingsSOAttributes>(
+      GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
+      settings.id,
+      newData
+    );
+
+    return {
+      id: settings.id,
+      ...res.attributes,
+    };
+  } catch (e) {
+    if (e.isBoom && e.output.statusCode === 404) {
+      const res = await soClient.create<SettingsSOAttributes>(
+        GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
+        newData
+      );
+
+      return {
+        id: res.id,
+        ...res.attributes,
+      };
+    }
+
+    throw e;
+  }
+}
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index 167a24481aba5..206ad76703cf5 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -21,6 +21,8 @@ import {
 import { getPackageInfo } from './epm/packages';
 import { datasourceService } from './datasource';
 import { generateEnrollmentAPIKey } from './api_keys';
+import { settingsService } from '.';
+import { appContextService } from './app_context';
 
 const FLEET_ENROLL_USERNAME = 'fleet_enroll';
 const FLEET_ENROLL_ROLE = 'fleet_enroll';
@@ -34,6 +36,17 @@ export async function setupIngestManager(
     ensureInstalledDefaultPackages(soClient, callCluster),
     outputService.ensureDefaultOutput(soClient),
     agentConfigService.ensureDefaultAgentConfig(soClient),
+    settingsService.getSettings(soClient).catch((e: any) => {
+      if (e.isBoom && e.output.statusCode === 404) {
+        return settingsService.saveSettings(soClient, {
+          agent_auto_upgrade: true,
+          package_auto_upgrade: true,
+          kibana_url: appContextService.getConfig()?.fleet?.kibana?.host,
+        });
+      }
+
+      return Promise.reject(e);
+    }),
   ]);
 
   // ensure default packages are added to the default conifg
diff --git a/x-pack/plugins/ingest_manager/server/types/index.tsx b/x-pack/plugins/ingest_manager/server/types/index.tsx
index aa5496cc836b7..a7019ebc0a271 100644
--- a/x-pack/plugins/ingest_manager/server/types/index.tsx
+++ b/x-pack/plugins/ingest_manager/server/types/index.tsx
@@ -50,6 +50,8 @@ export {
   DefaultPackages,
   TemplateRef,
   IndexTemplateMappings,
+  Settings,
+  SettingsSOAttributes,
 } from '../../common';
 
 export type CallESAsCurrentUser = ScopedClusterClient['callAsCurrentUser'];
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts
index 42b607fa1c715..6976dae38d5f1 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/index.ts
@@ -10,3 +10,5 @@ export * from './datasource';
 export * from './epm';
 export * from './enrollment_api_key';
 export * from './install_script';
+export * from './output';
+export * from './settings';
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/output.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/output.ts
new file mode 100644
index 0000000000000..79a7c444dacdb
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/output.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+
+export const GetOneOutputRequestSchema = {
+  params: schema.object({
+    outputId: schema.string(),
+  }),
+};
+
+export const GetOutputsRequestSchema = {};
+
+export const PutOutputRequestSchema = {
+  params: schema.object({
+    outputId: schema.string(),
+  }),
+  body: schema.object({
+    hosts: schema.maybe(schema.arrayOf(schema.string())),
+    ca_sha256: schema.maybe(schema.string()),
+  }),
+};
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/settings.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/settings.ts
new file mode 100644
index 0000000000000..8b7500e4a9bd9
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/settings.ts
@@ -0,0 +1,17 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+
+export const GetSettingsRequestSchema = {};
+
+export const PutSettingsRequestSchema = {
+  body: schema.object({
+    agent_auto_upgrade: schema.maybe(schema.boolean()),
+    package_auto_upgrade: schema.maybe(schema.boolean()),
+    kibana_url: schema.maybe(schema.string()),
+    kibana_ca_sha256: schema.maybe(schema.string()),
+  }),
+};

From fe79979328b38b1394a945ff47b8194188238f3f Mon Sep 17 00:00:00 2001
From: Robert Oskamp <robert.oskamp@elastic.co>
Date: Mon, 27 Apr 2020 15:13:13 +0200
Subject: [PATCH 5/6] [ML] Functional tests - stabilize job row details
 validations (#64503)

This PR stabilizes the AD job row details check by only validating expected properties instead of the whole object.
---
 .../anomaly_detection/advanced_job.ts         |  4 --
 .../anomaly_detection/categorization_job.ts   |  1 -
 .../anomaly_detection/date_nanos_job.ts       |  2 -
 .../anomaly_detection/multi_metric_job.ts     |  1 -
 .../anomaly_detection/population_job.ts       |  1 -
 .../anomaly_detection/saved_search_job.ts     |  6 --
 .../anomaly_detection/single_metric_job.ts    |  1 -
 .../functional/apps/machine_learning/pages.ts |  2 +-
 .../services/machine_learning/job_table.ts    | 56 ++++++-------------
 9 files changed, 19 insertions(+), 55 deletions(-)

diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts
index e238937ee845f..a9133bb380179 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts
@@ -195,7 +195,6 @@ export default function({ getService }: FtrProviderContext) {
         modelSizeStats: {
           result_type: 'model_size_stats',
           model_bytes_exceeded: '0.0 B',
-          model_bytes_memory_limit: '10.0 MB',
           total_by_field_count: '37',
           total_over_field_count: '92',
           total_partition_field_count: '8',
@@ -262,7 +261,6 @@ export default function({ getService }: FtrProviderContext) {
         modelSizeStats: {
           result_type: 'model_size_stats',
           model_bytes_exceeded: '0.0 B',
-          model_bytes_memory_limit: '100.0 MB',
           total_by_field_count: '994',
           total_over_field_count: '0',
           total_partition_field_count: '2',
@@ -549,7 +547,6 @@ export default function({ getService }: FtrProviderContext) {
               job_id: testData.jobId,
               result_type: testData.expected.modelSizeStats.result_type,
               model_bytes_exceeded: testData.expected.modelSizeStats.model_bytes_exceeded,
-              model_bytes_memory_limit: testData.expected.modelSizeStats.model_bytes_memory_limit,
               total_by_field_count: testData.expected.modelSizeStats.total_by_field_count,
               total_over_field_count: testData.expected.modelSizeStats.total_over_field_count,
               total_partition_field_count:
@@ -813,7 +810,6 @@ export default function({ getService }: FtrProviderContext) {
               job_id: testData.jobIdClone,
               result_type: testData.expected.modelSizeStats.result_type,
               model_bytes_exceeded: testData.expected.modelSizeStats.model_bytes_exceeded,
-              model_bytes_memory_limit: testData.expected.modelSizeStats.model_bytes_memory_limit,
               total_by_field_count: testData.expected.modelSizeStats.total_by_field_count,
               total_over_field_count: testData.expected.modelSizeStats.total_over_field_count,
               total_partition_field_count:
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/categorization_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/categorization_job.ts
index 5a39b06b4c15a..b8ac646c35875 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/categorization_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/categorization_job.ts
@@ -64,7 +64,6 @@ export default function({ getService }: FtrProviderContext) {
       job_id: expectedJobId,
       result_type: 'model_size_stats',
       model_bytes_exceeded: '0.0 B',
-      model_bytes_memory_limit: '15.0 MB',
       total_by_field_count: '30',
       total_over_field_count: '0',
       total_partition_field_count: '2',
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/date_nanos_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/date_nanos_job.ts
index 96b69c10f4c2f..d3934d674124e 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/date_nanos_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/date_nanos_job.ts
@@ -153,7 +153,6 @@ export default function({ getService }: FtrProviderContext) {
         modelSizeStats: {
           result_type: 'model_size_stats',
           model_bytes_exceeded: '0.0 B',
-          model_bytes_memory_limit: '10.0 MB',
           total_by_field_count: '3',
           total_over_field_count: '0',
           total_partition_field_count: '2',
@@ -422,7 +421,6 @@ export default function({ getService }: FtrProviderContext) {
               job_id: testData.jobId,
               result_type: testData.expected.modelSizeStats.result_type,
               model_bytes_exceeded: testData.expected.modelSizeStats.model_bytes_exceeded,
-              model_bytes_memory_limit: testData.expected.modelSizeStats.model_bytes_memory_limit,
               total_by_field_count: testData.expected.modelSizeStats.total_by_field_count,
               total_over_field_count: testData.expected.modelSizeStats.total_over_field_count,
               total_partition_field_count:
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
index 45b03b3d179b7..f6a9c96492f39 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
@@ -61,7 +61,6 @@ export default function({ getService }: FtrProviderContext) {
       job_id: expectedJobId,
       result_type: 'model_size_stats',
       model_bytes_exceeded: '0.0 B',
-      model_bytes_memory_limit: '20.0 MB',
       total_by_field_count: '59',
       total_over_field_count: '0',
       total_partition_field_count: '58',
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
index a9c94a650898e..547c489411b5f 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
@@ -75,7 +75,6 @@ export default function({ getService }: FtrProviderContext) {
       job_id: expectedJobId,
       result_type: 'model_size_stats',
       model_bytes_exceeded: '0.0 B',
-      model_bytes_memory_limit: '8.0 MB',
       total_by_field_count: '25',
       total_over_field_count: '92',
       total_partition_field_count: '3',
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
index 862904862cb13..b1fee1633641a 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
@@ -54,7 +54,6 @@ export default function({ getService }: FtrProviderContext) {
         modelSizeStats: {
           result_type: 'model_size_stats',
           model_bytes_exceeded: '0.0 B',
-          model_bytes_memory_limit: '20.0 MB',
           total_by_field_count: '3',
           total_over_field_count: '0',
           total_partition_field_count: '2',
@@ -105,7 +104,6 @@ export default function({ getService }: FtrProviderContext) {
         modelSizeStats: {
           result_type: 'model_size_stats',
           model_bytes_exceeded: '0.0 B',
-          model_bytes_memory_limit: '20.0 MB',
           total_by_field_count: '7',
           total_over_field_count: '0',
           total_partition_field_count: '6',
@@ -156,7 +154,6 @@ export default function({ getService }: FtrProviderContext) {
         modelSizeStats: {
           result_type: 'model_size_stats',
           model_bytes_exceeded: '0.0 B',
-          model_bytes_memory_limit: '20.0 MB',
           total_by_field_count: '7',
           total_over_field_count: '0',
           total_partition_field_count: '6',
@@ -208,7 +205,6 @@ export default function({ getService }: FtrProviderContext) {
         modelSizeStats: {
           result_type: 'model_size_stats',
           model_bytes_exceeded: '0.0 B',
-          model_bytes_memory_limit: '20.0 MB',
           total_by_field_count: '3',
           total_over_field_count: '0',
           total_partition_field_count: '2',
@@ -259,7 +255,6 @@ export default function({ getService }: FtrProviderContext) {
         modelSizeStats: {
           result_type: 'model_size_stats',
           model_bytes_exceeded: '0.0 B',
-          model_bytes_memory_limit: '20.0 MB',
           total_by_field_count: '3',
           total_over_field_count: '0',
           total_partition_field_count: '2',
@@ -464,7 +459,6 @@ export default function({ getService }: FtrProviderContext) {
               job_id: testData.jobId,
               result_type: testData.expected.modelSizeStats.result_type,
               model_bytes_exceeded: testData.expected.modelSizeStats.model_bytes_exceeded,
-              model_bytes_memory_limit: testData.expected.modelSizeStats.model_bytes_memory_limit,
               total_by_field_count: testData.expected.modelSizeStats.total_by_field_count,
               total_over_field_count: testData.expected.modelSizeStats.total_over_field_count,
               total_partition_field_count:
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
index 46fbc40139485..0f8655e3c6bbc 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
@@ -60,7 +60,6 @@ export default function({ getService }: FtrProviderContext) {
       job_id: expectedJobId,
       result_type: 'model_size_stats',
       model_bytes_exceeded: '0.0 B',
-      model_bytes_memory_limit: '15.0 MB',
       total_by_field_count: '3',
       total_over_field_count: '0',
       total_partition_field_count: '2',
diff --git a/x-pack/test/functional/apps/machine_learning/pages.ts b/x-pack/test/functional/apps/machine_learning/pages.ts
index 3c3698792ff7d..35536b4eeda12 100644
--- a/x-pack/test/functional/apps/machine_learning/pages.ts
+++ b/x-pack/test/functional/apps/machine_learning/pages.ts
@@ -10,7 +10,7 @@ export default function({ getService }: FtrProviderContext) {
   const ml = getService('ml');
 
   describe('page navigation', function() {
-    this.tags(['includeFirefox', 'mlqa']);
+    this.tags(['skipFirefox', 'mlqa']);
     before(async () => {
       await ml.api.cleanMlIndices();
       await ml.securityUI.loginAsMlPowerUser();
diff --git a/x-pack/test/functional/services/machine_learning/job_table.ts b/x-pack/test/functional/services/machine_learning/job_table.ts
index 0e638963f2367..e2451328ea941 100644
--- a/x-pack/test/functional/services/machine_learning/job_table.ts
+++ b/x-pack/test/functional/services/machine_learning/job_table.ts
@@ -187,44 +187,24 @@ export function MachineLearningJobTableProvider({ getService }: FtrProviderConte
       expectedCounts: object,
       expectedModelSizeStats: object
     ) {
-      const countDetails = await this.parseJobCounts(jobId);
-      const counts = countDetails.counts;
-
-      // fields that have changing values are only validated
-      // to be present and then removed so they don't make
-      // the object validation fail
-      expect(counts).to.have.property('last_data_time');
-      delete counts.last_data_time;
-
-      expect(counts).to.eql(expectedCounts);
-
-      const modelSizeStats = countDetails.modelSizeStats;
-
-      // fields that have changing values are only validated
-      // to be present and then removed so they don't make
-      // the object validation fail
-      expect(modelSizeStats).to.have.property('log_time');
-      delete modelSizeStats.log_time;
-      expect(modelSizeStats).to.have.property('model_bytes');
-      delete modelSizeStats.model_bytes;
-
-      // remove categorization fields from validation until
-      // the ES version is updated
-      delete modelSizeStats.categorization_status;
-      delete modelSizeStats.categorized_doc_count;
-      delete modelSizeStats.dead_category_count;
-      delete modelSizeStats.frequent_category_count;
-      delete modelSizeStats.rare_category_count;
-      delete modelSizeStats.total_category_count;
-
-      // MML during clone has changed in #61589
-      // TODO: adjust test code to reflect the new behavior
-      expect(modelSizeStats).to.have.property('model_bytes_memory_limit');
-      delete modelSizeStats.model_bytes_memory_limit;
-      // @ts-ignore
-      delete expectedModelSizeStats.model_bytes_memory_limit;
-
-      expect(modelSizeStats).to.eql(expectedModelSizeStats);
+      const { counts, modelSizeStats } = await this.parseJobCounts(jobId);
+
+      // Only check for expected keys / values, ignore additional properties
+      // This way the tests stay stable when new properties are added on the ES side
+      for (const [key, value] of Object.entries(expectedCounts)) {
+        expect(counts)
+          .to.have.property(key)
+          .eql(value, `Expected counts property '${key}' to exist with value '${value}'`);
+      }
+
+      for (const [key, value] of Object.entries(expectedModelSizeStats)) {
+        expect(modelSizeStats)
+          .to.have.property(key)
+          .eql(
+            value,
+            `Expected model size stats property '${key}' to exist with value '${value}')`
+          );
+      }
     }
 
     public async clickActionsMenu(jobId: string) {

From dfb6a308cfe2a51084d07d1c02e2d00a4fb7d2da Mon Sep 17 00:00:00 2001
From: Rudolf Meijering <skaapgif@gmail.com>
Date: Mon, 27 Apr 2020 16:08:27 +0200
Subject: [PATCH 6/6] Remove SO root property index signature (#64434)

* Remove SO root property index signature

* Update documentation
---
 .../core/server/kibana-plugin-core-server.md  |  3 ++-
 ...gin-core-server.savedobjectsanitizeddoc.md |  1 +
 ...n-core-server.savedobjectunsanitizeddoc.md | 13 ++++++++++++
 .../migrations/core/document_migrator.test.ts | 12 +++++------
 .../migrations/core/document_migrator.ts      |  2 +-
 .../saved_objects/serialization/types.ts      | 21 +++++++++----------
 src/core/server/server.api.md                 |  2 +-
 src/dev/run_check_published_api_changes.ts    |  2 +-
 8 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectunsanitizeddoc.md

diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index b8cffb36b821a..a91a5bec988b7 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -263,13 +263,14 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectAttribute](./kibana-plugin-core-server.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
 |  [SavedObjectAttributeSingle](./kibana-plugin-core-server.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-core-server.savedobjectattribute.md) |
 |  [SavedObjectMigrationFn](./kibana-plugin-core-server.savedobjectmigrationfn.md) | A migration function for a [saved object type](./kibana-plugin-core-server.savedobjectstype.md) used to migrate it to a given version |
-|  [SavedObjectSanitizedDoc](./kibana-plugin-core-server.savedobjectsanitizeddoc.md) |  |
+|  [SavedObjectSanitizedDoc](./kibana-plugin-core-server.savedobjectsanitizeddoc.md) | Describes Saved Object documents that have passed through the migration framework and are guaranteed to have a <code>references</code> root property. |
 |  [SavedObjectsClientContract](./kibana-plugin-core-server.savedobjectsclientcontract.md) | Saved Objects is Kibana's data persisentence mechanism allowing plugins to use Elasticsearch for storing plugin state.<!-- -->\#\# SavedObjectsClient errors<!-- -->Since the SavedObjectsClient has its hands in everything we are a little paranoid about the way we present errors back to to application code. Ideally, all errors will be either:<!-- -->1. Caused by bad implementation (ie. undefined is not a function) and as such unpredictable 2. An error that has been classified and decorated appropriately by the decorators in [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md)<!-- -->Type 1 errors are inevitable, but since all expected/handle-able errors should be Type 2 the <code>isXYZError()</code> helpers exposed at <code>SavedObjectsErrorHelpers</code> should be used to understand and manage error responses from the <code>SavedObjectsClient</code>.<!-- -->Type 2 errors are decorated versions of the source error, so if the elasticsearch client threw an error it will be decorated based on its type. That means that rather than looking for <code>error.body.error.type</code> or doing substring checks on <code>error.body.error.reason</code>, just use the helpers to understand the meaning of the error:<!-- -->\`\`\`<!-- -->js if (SavedObjectsErrorHelpers.isNotFoundError(error)) { // handle 404 }<!-- -->if (SavedObjectsErrorHelpers.isNotAuthorizedError(error)) { // 401 handling should be automatic, but in case you wanted to know }<!-- -->// always rethrow the error unless you handle it throw error; \`\`\`<!-- -->\#\#\# 404s from missing index<!-- -->From the perspective of application code and APIs the SavedObjectsClient is a black box that persists objects. One of the internal details that users have no control over is that we use an elasticsearch index for persistance and that index might be missing.<!-- -->At the time of writing we are in the process of transitioning away from the operating assumption that the SavedObjects index is always available. Part of this transition is handling errors resulting from an index missing. These used to trigger a 500 error in most cases, and in others cause 404s with different error messages.<!-- -->From my (Spencer) perspective, a 404 from the SavedObjectsApi is a 404; The object the request/call was targeting could not be found. This is why \#14141 takes special care to ensure that 404 errors are generic and don't distinguish between index missing or document missing.<!-- -->See [SavedObjectsClient](./kibana-plugin-core-server.savedobjectsclient.md) See [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) |
 |  [SavedObjectsClientFactory](./kibana-plugin-core-server.savedobjectsclientfactory.md) | Describes the factory used to create instances of the Saved Objects Client. |
 |  [SavedObjectsClientFactoryProvider](./kibana-plugin-core-server.savedobjectsclientfactoryprovider.md) | Provider to invoke to retrieve a [SavedObjectsClientFactory](./kibana-plugin-core-server.savedobjectsclientfactory.md)<!-- -->. |
 |  [SavedObjectsClientWrapperFactory](./kibana-plugin-core-server.savedobjectsclientwrapperfactory.md) | Describes the factory used to create instances of Saved Objects Client Wrappers. |
 |  [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) | Describe a [saved object type mapping](./kibana-plugin-core-server.savedobjectstypemappingdefinition.md) field.<!-- -->Please refer to [elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html) For the mapping documentation |
 |  [SavedObjectsNamespaceType](./kibana-plugin-core-server.savedobjectsnamespacetype.md) | The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive: \* single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace. \* multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces. \* agnostic: this type of saved object is global.<!-- -->Note: do not write logic that uses this value directly; instead, use the appropriate accessors in the [type registry](./kibana-plugin-core-server.savedobjecttyperegistry.md)<!-- -->. |
+|  [SavedObjectUnsanitizedDoc](./kibana-plugin-core-server.savedobjectunsanitizeddoc.md) | Describes Saved Object documents from Kibana &lt; 7.0.0 which don't have a <code>references</code> root property defined. This type should only be used in migrations. |
 |  [ScopeableRequest](./kibana-plugin-core-server.scopeablerequest.md) | A user credentials container. It accommodates the necessary auth credentials to impersonate the current user.<!-- -->See [KibanaRequest](./kibana-plugin-core-server.kibanarequest.md)<!-- -->. |
 |  [ServiceStatusLevel](./kibana-plugin-core-server.servicestatuslevel.md) | A convenience type that represents the union of each value in [ServiceStatusLevels](./kibana-plugin-core-server.servicestatuslevels.md)<!-- -->. |
 |  [SharedGlobalConfig](./kibana-plugin-core-server.sharedglobalconfig.md) |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsanitizeddoc.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsanitizeddoc.md
index 47feb50e9a827..6d4e252fe7532 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsanitizeddoc.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsanitizeddoc.md
@@ -4,6 +4,7 @@
 
 ## SavedObjectSanitizedDoc type
 
+Describes Saved Object documents that have passed through the migration framework and are guaranteed to have a `references` root property.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectunsanitizeddoc.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectunsanitizeddoc.md
new file mode 100644
index 0000000000000..be51400addbbc
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectunsanitizeddoc.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectUnsanitizedDoc](./kibana-plugin-core-server.savedobjectunsanitizeddoc.md)
+
+## SavedObjectUnsanitizedDoc type
+
+Describes Saved Object documents from Kibana &lt; 7.0.0 which don't have a `references` root property defined. This type should only be used in migrations.
+
+<b>Signature:</b>
+
+```typescript
+export declare type SavedObjectUnsanitizedDoc = SavedObjectDoc & Partial<Referencable>;
+```
diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.test.ts b/src/core/server/saved_objects/migrations/core/document_migrator.test.ts
index 64270c677ff20..3ec478e3ca28d 100644
--- a/src/core/server/saved_objects/migrations/core/document_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/document_migrator.test.ts
@@ -149,13 +149,13 @@ describe('DocumentMigrator', () => {
     expect(_.get(migratedDoc, 'attributes.name')).toBe('Mike');
   });
 
-  it('migrates meta properties', () => {
+  it('migrates root properties', () => {
     const migrator = new DocumentMigrator({
       ...testOpts(),
       typeRegistry: createRegistry({
         name: 'acl',
         migrations: {
-          '2.3.5': setAttr('acl', 'admins-only,sucka!'),
+          '2.3.5': setAttr('acl', 'admins-only, sucka!'),
         },
       }),
     });
@@ -165,13 +165,13 @@ describe('DocumentMigrator', () => {
       attributes: { name: 'Tyler' },
       acl: 'anyone',
       migrationVersion: {},
-    });
+    } as SavedObjectUnsanitizedDoc);
     expect(actual).toEqual({
       id: 'me',
       type: 'user',
       attributes: { name: 'Tyler' },
       migrationVersion: { acl: '2.3.5' },
-      acl: 'admins-only,sucka!',
+      acl: 'admins-only, sucka!',
     });
   });
 
@@ -241,7 +241,7 @@ describe('DocumentMigrator', () => {
       type: 'user',
       attributes: { name: 'Tyler' },
       bbb: 'Shazm',
-    });
+    } as SavedObjectUnsanitizedDoc);
     expect(actual).toEqual({
       id: 'me',
       type: 'user',
@@ -405,7 +405,7 @@ describe('DocumentMigrator', () => {
       attributes: { name: 'Callie' },
       dawg: 'Yo',
       migrationVersion: {},
-    });
+    } as SavedObjectUnsanitizedDoc);
     expect(actual).toEqual({
       id: 'smelly',
       type: 'foo',
diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.ts b/src/core/server/saved_objects/migrations/core/document_migrator.ts
index 0284f513a361c..4ddb2b070d3ac 100644
--- a/src/core/server/saved_objects/migrations/core/document_migrator.ts
+++ b/src/core/server/saved_objects/migrations/core/document_migrator.ts
@@ -279,7 +279,7 @@ function props(doc: SavedObjectUnsanitizedDoc) {
  */
 function propVersion(doc: SavedObjectUnsanitizedDoc | ActiveMigrations, prop: string) {
   return (
-    (doc[prop] && doc[prop].latestVersion) ||
+    ((doc as any)[prop] && (doc as any)[prop].latestVersion) ||
     (doc.migrationVersion && (doc as any).migrationVersion[prop])
   );
 }
diff --git a/src/core/server/saved_objects/serialization/types.ts b/src/core/server/saved_objects/serialization/types.ts
index 7ea61f67e9496..a33e16895078e 100644
--- a/src/core/server/saved_objects/serialization/types.ts
+++ b/src/core/server/saved_objects/serialization/types.ts
@@ -45,10 +45,7 @@ export interface SavedObjectsRawDocSource {
 }
 
 /**
- * A saved object type definition that allows for miscellaneous, unknown
- * properties, as current discussions around security, ACLs, etc indicate
- * that future props are likely to be added. Migrations support this
- * scenario out of the box.
+ * Saved Object base document
  */
 interface SavedObjectDoc {
   attributes: any;
@@ -59,8 +56,6 @@ interface SavedObjectDoc {
   migrationVersion?: SavedObjectsMigrationVersion;
   version?: string;
   updated_at?: string;
-
-  [rootProp: string]: any;
 }
 
 interface Referencable {
@@ -68,14 +63,18 @@ interface Referencable {
 }
 
 /**
- * We want to have two types, one that guarantees a "references" attribute
- * will exist and one that allows it to be null. Since we're not migrating
- * all the saved objects to have a "references" array, we need to support
- * the scenarios where it may be missing (ex migrations).
+ * Describes Saved Object documents from Kibana < 7.0.0 which don't have a
+ * `references` root property defined. This type should only be used in
+ * migrations.
  *
  * @public
  */
 export type SavedObjectUnsanitizedDoc = SavedObjectDoc & Partial<Referencable>;
 
-/** @public */
+/**
+ * Describes Saved Object documents that have passed through the migration
+ * framework and are guaranteed to have a `references` root property.
+ *
+ * @public
+ */
 export type SavedObjectSanitizedDoc = SavedObjectDoc & Referencable;
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 2efa7dac393b4..a36e746f6d940 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -1707,7 +1707,7 @@ export interface SavedObjectsAddToNamespacesOptions extends SavedObjectsBaseOpti
 // Warning: (ae-forgotten-export) The symbol "SavedObjectDoc" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "Referencable" needs to be exported by the entry point index.d.ts
 //
-// @public (undocumented)
+// @public
 export type SavedObjectSanitizedDoc = SavedObjectDoc & Referencable;
 
 // @public (undocumented)
diff --git a/src/dev/run_check_published_api_changes.ts b/src/dev/run_check_published_api_changes.ts
index ba3cd1280f34b..6d5fa04a93951 100644
--- a/src/dev/run_check_published_api_changes.ts
+++ b/src/dev/run_check_published_api_changes.ts
@@ -250,7 +250,7 @@ async function run(
         Options:
           --accept    {dim Accepts all changes by updating the API Review files and documentation}
           --docs      {dim Updates the Core API documentation}
-          --only      {dim RegExp that folder names must match, folders: [${folders.join(', ')}]}
+          --filter    {dim RegExp that folder names must match, folders: [${folders.join(', ')}]}
           --help      {dim Show this message}
       `)
     );