Merge remote-tracking branch 'upstream/7.x' into backport/7.x/pr-52651

.i18nrc.json

@@ -11,6 +11,7 @@
     "embeddableApi": "src/plugins/embeddable",
     "embeddableExamples": "examples/embeddable_examples",
     "share": "src/plugins/share",
+    "home": "src/plugins/home",
     "esUi": "src/plugins/es_ui_shared",
     "devTools": "src/plugins/dev_tools",
     "expressions": "src/plugins/expressions",

docs/limitations.asciidoc

@@ -12,7 +12,7 @@
 These {stack} features also have limitations that affect {kib}:
 
 * {ref}/watcher-limitations.html[Alerting]
-* {stack-ov}/ml-limitations.html[Machine learning]
+* {ml-docs}/ml-limitations.html[Machine learning]
 * {ref}/security-limitations.html[Security]
 
 --

docs/redirects.asciidoc

@@ -44,12 +44,12 @@ This page is deleted. Please see
 [role="exclude",id="ml-jobs"]
 == Creating {anomaly-jobs}
 
-This page has moved. Please see {stack-ov}/create-jobs.html[Creating {anomaly-jobs}].
+This page has moved. Please see {ml-docs}/create-jobs.html[Creating {anomaly-jobs}].
 
 [role="exclude",id="job-tips"]
 == Machine learning job tips
 
-This page has moved. Please see {stack-ov}/create-jobs.html#job-tips[Machine learning job tips].
+This page has moved. Please see {ml-docs}/create-jobs.html#job-tips[Machine learning job tips].
 
 [role="exclude",id="extend"]
 == Extend your use case

docs/release-notes/highlights-7.2.0.asciidoc

@@ -165,7 +165,8 @@ image::release-notes/images/7.2-localization.jpg[Kibana in Japanese]
 [float]
 === {dataframes-cap}
 
-beta[] Machine Learning now enables you to transform your data with {stack-ov}/ml-dataframes.html[{dataframes}]. A 
+beta[] Machine Learning now enables you to transform your data with
+{ref}/transforms.html[{dataframes}]. A 
 new wizard guides you through the process of creating a {dataframe}: selecting 
 the source data, the fields you want to group by, and the aggregations for 
 pivoting the data. There is also a preview of the transform for reviewing the configuration. 

docs/user/ml/index.asciidoc

@@ -50,8 +50,8 @@ pane:
 image::user/ml/images/ml-job-management.jpg[Job Management]
 
 You can use the *Settings* pane to create and edit 
-{stack-ov}/ml-calendars.html[calendars] and the filters that are used in 
-{stack-ov}/ml-rules.html[custom rules]:
+{ml-docs}/ml-calendars.html[calendars] and the filters that are used in 
+{ml-docs}/ml-rules.html[custom rules]:
 
 [role="screenshot"]
 image::user/ml/images/ml-settings.jpg[Calendar Management]
@@ -73,7 +73,7 @@ image::user/ml/images/ml-annotations-list.jpg[Single Metric Viewer with annotati
 In some circumstances, annotations are also added automatically. For example, if
 the {anomaly-job} detects that there is missing data, it annotates the affected 
 time period. For more information, see 
-{stack-ov}/ml-delayed-data-detection.html[Handling delayed data]. The 
+{ml-docs}/ml-delayed-data-detection.html[Handling delayed data]. The 
 *Job Management* pane shows the full list of annotations for each job.
 
 NOTE: The {kib} {ml-features} use pop-ups. You must configure your web 
@@ -82,7 +82,7 @@ browser so that it does not block pop-up windows or create an exception for your
 
 For more information about the {anomaly-detect} feature, see
 https://www.elastic.co/what-is/elastic-stack-machine-learning[{ml-cap} in the {stack}]
-and {stack-ov}/xpack-ml.html[{ml-cap} {anomaly-detect}].
+and {ml-docs}/xpack-ml.html[{ml-cap} {anomaly-detect}].
 
 [[xpack-ml-dfanalytics]]
 == {dfanalytics-cap}
@@ -99,4 +99,4 @@ in {kib}. For example:
 image::user/ml/images/outliers.jpg[{oldetection-cap} results in {kib}]
 
 For more information about the {dfanalytics} feature, see 
-{stack-ov}/ml-dfanalytics.html[{ml-cap} {dfanalytics}].
+{ml-docs}/ml-dfanalytics.html[{ml-cap} {dfanalytics}].

src/legacy/server/kbn_server.d.ts

@@ -44,6 +44,7 @@ import { UsageCollectionSetup } from '../../plugins/usage_collection/server';
 import { IndexPatternsServiceFactory } from './index_patterns';
 import { Capabilities } from '../../core/server';
 import { UiSettingsServiceFactoryOptions } from '../../legacy/ui/ui_settings/ui_settings_service_factory';
+import { HomeServerPluginSetup } from '../../plugins/home/server';
 
 // lot of legacy code was assuming this type only had these two methods
 export type KibanaConfig = Pick<LegacyConfig, 'get' | 'has'>;
@@ -99,6 +100,7 @@ type KbnMixinFunc = (kbnServer: KbnServer, server: Server, config: any) => Promi
 
 export interface PluginsSetup {
   usageCollection: UsageCollectionSetup;
+  home: HomeServerPluginSetup;
   [key: string]: object;
 }
 

src/legacy/server/kbn_server.js

@@ -35,7 +35,6 @@ import optimizeMixin from '../../optimize';
 import * as Plugins from './plugins';
 import { indexPatternsMixin } from './index_patterns';
 import { savedObjectsMixin } from './saved_objects/saved_objects_mixin';
-import { sampleDataMixin } from './sample_data';
 import { capabilitiesMixin } from './capabilities';
 import { urlShorteningMixin } from './url_shortening';
 import { serverExtensionsMixin } from './server_extensions';
@@ -112,9 +111,6 @@ export default class KbnServer {
         // setup capabilities routes
         capabilitiesMixin,
 
-        // setup routes for installing/uninstalling sample data sets
-        sampleDataMixin,
-
         // setup routes for short urls
         urlShorteningMixin,