Merge branch 'master' of github.com:elastic/kibana into kibana_usage_…

…collection-to-ts-project-refs

docs/api/dashboard/export-dashboard.asciidoc

@@ -11,6 +11,8 @@ experimental[] Export dashboards and corresponding saved objects.
 
 `GET <kibana host>:<port>/api/kibana/dashboards/export`
 
+`GET <kibana host>:<port>/s/<space-id>/api/kibana/dashboards/export`
+
 [[dashboard-api-export-params]]
 ==== Query parameters
 

docs/api/dashboard/import-dashboard.asciidoc

@@ -11,6 +11,8 @@ experimental[] Import dashboards and corresponding saved objects.
 
 `POST <kibana host>:<port>/api/kibana/dashboards/import`
 
+`POST <kibana host>:<port>/s/<space-id>/api/kibana/dashboards/import`
+
 [[dashboard-api-import-params]]
 ==== Query parameters
 

docs/settings/monitoring-settings.asciidoc

@@ -76,6 +76,9 @@ a|`monitoring.cluster_alerts.`
   health checks. By default, it matches the <<elasticsearch-pingTimeout, `elasticsearch.pingTimeout`>> setting,
   which has a default value of `30000`.
 
+| `monitoring.ui.elasticsearch.ssl`
+  | Shares the same configuration as <<elasticsearch-ssl-cert-key, `elasticsearch.ssl`>>. These settings configure encrypted communication between {kib} and the monitoring cluster.
+
 |===
 
 [float]

src/plugins/discover/public/application/angular/context/query/actions.js

@@ -25,7 +25,7 @@ import { getServices } from '../../../../kibana_services';
 import { fetchAnchorProvider } from '../api/anchor';
 import { fetchContextProvider } from '../api/context';
 import { getQueryParameterActions } from '../query_parameters';
-import { FAILURE_REASONS, LOADING_STATUS } from './constants';
+import { FAILURE_REASONS, LOADING_STATUS } from './index';
 import { MarkdownSimple } from '../../../../../../kibana_react/public';
 
 export function QueryActionsProvider(Promise) {

src/plugins/discover/public/application/angular/context/query/index.js

@@ -18,5 +18,5 @@
  */
 
 export { QueryActionsProvider } from './actions';
-export { FAILURE_REASONS, LOADING_STATUS } from './constants';
+export { FAILURE_REASONS, LOADING_STATUS } from '../../../components/context_app/constants';
 export { createInitialLoadingStatusState } from './state';

src/plugins/discover/public/application/angular/context/query/state.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { LOADING_STATUS } from './constants';
+import { LOADING_STATUS } from './index';
 
 export function createInitialLoadingStatusState() {
   return {

src/plugins/discover/public/application/angular/context_app.html

@@ -12,8 +12,8 @@
 
 
 <!-- Error feedback -->
-<context-error-message 
-  status="contextApp.state.loadingStatus.anchor.status" 
+<context-error-message
+  status="contextApp.state.loadingStatus.anchor.status"
   reason="contextApp.state.loadingStatus.anchor.reason">
 </context-error-message>
 
@@ -35,39 +35,17 @@
         type="'predecessors'"
   ></context-action-bar>
 
-
-  <!-- Loading feedback -->
-  <div
-    ng-if="[
-      contextApp.constants.LOADING_STATUS.UNINITIALIZED,
-      contextApp.constants.LOADING_STATUS.LOADING,
-    ].includes(contextApp.state.loadingStatus.anchor.status)"
-    class="kuiPanel kuiPanel--centered kuiVerticalRhythm"
-  >
-    <div
-      class="kuiTableInfo"
-      i18n-id="discover.context.loadingDescription"
-      i18n-default-message="Loading…"
-    ></div>
-  </div>
-
   <!-- Table -->
-  <div
-    ng-if="contextApp.state.loadingStatus.anchor.status === contextApp.constants.LOADING_STATUS.LOADED"
-    class="kuiPanel kuiVerticalRhythm"
-  >
-    <div class="discover-table" fixed-scroll>
-      <doc-table
-        filter="contextApp.actions.addFilter"
-        hits="contextApp.state.rows.all"
-        index-pattern="contextApp.indexPattern"
-        sorting="contextApp.state.queryParameters.sort"
-        columns="contextApp.state.queryParameters.columns"
-        infinite-scroll="true"
-        minimum-visible-rows="contextApp.state.rows.all.length"
-      ></doc-table>
-    </div>
-  </div>
+  <context-app-legacy
+    filter="contextApp.actions.addFilter"
+    hits="contextApp.state.rows.all"
+    index-pattern="contextApp.indexPattern"
+    sorting="contextApp.state.queryParameters.sort"
+    columns="contextApp.state.queryParameters.columns"
+    infinite-scroll="true"
+    minimum-visible-rows="contextApp.state.rows.all.length"
+    status="contextApp.state.loadingStatus.anchor.status"
+  ></context-app-legacy>
 
   <!-- Controls -->
   <context-action-bar

src/plugins/discover/public/application/angular/directives/_index.scss

@@ -1,2 +1 @@
-@import 'no_results';
 @import 'histogram';

src/plugins/discover/public/application/angular/directives/index.js → src/plugins/discover/public/application/angular/directives/index.ts

@@ -17,15 +17,5 @@
  * under the License.
  */
 
-import { DiscoverNoResults } from './no_results';
-import { DiscoverUninitialized } from './uninitialized';
-import { DiscoverHistogram } from './histogram';
-import { getAngularModule } from '../../../kibana_services';
-
-const app = getAngularModule();
-
-app.directive('discoverNoResults', (reactDirective) => reactDirective(DiscoverNoResults));
-
-app.directive('discoverUninitialized', (reactDirective) => reactDirective(DiscoverUninitialized));
-
-app.directive('discoverHistogram', (reactDirective) => reactDirective(DiscoverHistogram));
+export { DiscoverUninitialized } from './uninitialized';
+export { DiscoverHistogram } from './histogram';