Merge branch 'IS-51910_share-lens-change-index-pattern-in-discover' o…

…f github.com:mbondyra/kibana into IS-51910_share-lens-change-index-pattern-in-discover * 'IS-51910_share-lens-change-index-pattern-in-discover' of github.com:mbondyra/kibana: [Discover] Remove angular field filter template code (elastic#53513) [APM] Improve table and other panel loading states (elastic#53459) Security/Spaces - cleanup react warnings (elastic#53287) Revert "NP licensing add functional tests (elastic#53002)" (elastic#53577) NP licensing add functional tests (elastic#53002) fix onLicenseInfoChange callback to be called on update (elastic#53559) Document how to extend request handler context (elastic#53271)
mbondyra · Dec 19, 2019 · 7ccca91 · 7ccca91
2 parents 8a6c901 + 1b42770
commit 7ccca91
Show file tree

Hide file tree

Showing 20 changed files with 225 additions and 135 deletions.
diff --git a/docs/development/core/server/kibana-plugin-server.logger.get.md b/docs/development/core/server/kibana-plugin-server.logger.get.md
@@ -0,0 +1,33 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [Logger](./kibana-plugin-server.logger.md) &gt; [get](./kibana-plugin-server.logger.get.md)
+
+## Logger.get() method
+
+Returns a new [Logger](./kibana-plugin-server.logger.md) instance extending the current logger context.
+
+<b>Signature:</b>
+
+```typescript
+get(...childContextPaths: string[]): Logger;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  childContextPaths | <code>string[]</code> |  |
+
+<b>Returns:</b>
+
+`Logger`
+
+## Example
+
+
+```typescript
+const logger = loggerFactory.get('plugin', 'service'); // 'plugin.service' context
+const subLogger = logger.get('feature'); // 'plugin.service.feature' context
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.md b/docs/development/core/server/kibana-plugin-server.md
@@ -90,7 +90,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [PluginManifest](./kibana-plugin-server.pluginmanifest.md) | Describes the set of required and optional properties plugin can define in its mandatory JSON manifest file. |
 |  [PluginsServiceSetup](./kibana-plugin-server.pluginsservicesetup.md) |  |
 |  [PluginsServiceStart](./kibana-plugin-server.pluginsservicestart.md) |  |
-|  [RequestHandlerContext](./kibana-plugin-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients: - [savedObjects.client](./kibana-plugin-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [elasticsearch.dataClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request |
+|  [RequestHandlerContext](./kibana-plugin-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients: - [savedObjects.client](./kibana-plugin-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [elasticsearch.dataClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request |
 |  [RouteConfig](./kibana-plugin-server.routeconfig.md) | Route specific configuration. |
 |  [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md) | Additional route options. |
 |  [RouteConfigOptionsBody](./kibana-plugin-server.routeconfigoptionsbody.md) | Additional body options for a route |

diff --git a/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md b/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md
@@ -6,7 +6,7 @@
 
 Plugin specific context passed to a route handler.
 
-Provides the following clients: - [savedObjects.client](./kibana-plugin-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [elasticsearch.dataClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request
+Provides the following clients: - [savedObjects.client](./kibana-plugin-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [elasticsearch.dataClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request
 
 <b>Signature:</b>
 

diff --git a/src/core/MIGRATION.md b/src/core/MIGRATION.md
@@ -46,6 +46,8 @@
   - [How to](#how-to)
     - [Configure plugin](#configure-plugin)
       - [Handle plugin configuration deprecations](#handle-plugin-config-deprecations)
+    - [Use scoped services](#use-scoped-services)
+      - [Declare a custom scoped service](#declare-a-custom-scoped-service)
     - [Mock new platform services in tests](#mock-new-platform-services-in-tests)
       - [Writing mocks for your plugin](#writing-mocks-for-your-plugin)
       - [Using mocks in your tests](#using-mocks-in-your-tests)
@@ -1190,22 +1192,23 @@ In server code, `core` can be accessed from either `server.newPlatform` or `kbnS
 | `server.config()`                                                             | [`initializerContext.config.create()`](/docs/development/core/server/kibana-plugin-server.plugininitializercontext.config.md)                                                                                                                                                                               | Must also define schema. See _[how to configure plugin](#configure-plugin)_ |
 | `server.route`                                                                | [`core.http.createRouter`](/docs/development/core/server/kibana-plugin-server.httpservicesetup.createrouter.md)                                                                                                                                                                                             | [Examples](./MIGRATION_EXAMPLES.md#route-registration)                      |
 | `request.getBasePath()`                                                       | [`core.http.basePath.get`](/docs/development/core/server/kibana-plugin-server.httpservicesetup.basepath.md)                                                                                                                                                                                                 |                                                                             |
-| `server.plugins.elasticsearch.getCluster('data')`                             | [`core.elasticsearch.dataClient$`](/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient_.md)                                                                                                                                                                             | Handlers will also include a pre-configured client                          |
-| `server.plugins.elasticsearch.getCluster('admin')`                            | [`core.elasticsearch.adminClient$`](/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient_.md)                                                                                                                                                                           | Handlers will also include a pre-configured client                          |
-| `xpackMainPlugin.info.feature(pluginID).registerLicenseCheckResultsGenerator` | [`x-pack licensing plugin`](/x-pack/plugins/licensing/README.md)                                                                                                                                                                                                                                            |                                                                             |
+| `server.plugins.elasticsearch.getCluster('data')`                             | [`context.elasticsearch.dataClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)                                                                                                                                                                                            |                                                                             |
+| `server.plugins.elasticsearch.getCluster('admin')`                            | [`context.elasticsearch.adminClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)                                                                                                                                                                                           |                                                                             |
 | `server.savedObjects.setScopedSavedObjectsClientFactory`                      | [`core.savedObjects.setClientFactory`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md)                                                                                                                                                                     |                                                                             |
 | `server.savedObjects.addScopedSavedObjectsClientWrapperFactory`               | [`core.savedObjects.addClientWrapper`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.addclientwrapper.md)                                                                                                                                                                     |                                                                             |
 | `server.savedObjects.getSavedObjectsRepository`                               | [`core.savedObjects.createInternalRepository`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.createinternalrepository.md) [`core.savedObjects.createScopedRepository`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.createscopedrepository.md) |                                                                             |
 | `server.savedObjects.getScopedSavedObjectsClient`                             | [`core.savedObjects.getScopedClient`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicestart.getscopedclient.md)                                                                                                                                                                       |                                                                             |
 | `request.getSavedObjectsClient`                                               | [`context.core.savedObjects.client`](/docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md)                                                                                                                                                                                      |                                                                             |
+| `request.getUiSettingsService`                                                | [`context.uiSettings.client`](/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md)                                                                                                                                                                                                      |                                                                             |
 | `kibana.Plugin.deprecations`                                                  | [Handle plugin configuration deprecations](#handle-plugin-config-deprecations) and [`PluginConfigDescriptor.deprecations`](docs/development/core/server/kibana-plugin-server.pluginconfigdescriptor.md)                                                                                                     | Deprecations from New Platform are not applied to legacy configuration      |
 
 _See also: [Server's CoreSetup API Docs](/docs/development/core/server/kibana-plugin-server.coresetup.md)_
 
 ##### Plugin services
-| Legacy Platform                             | New Platform                                                                   | Notes |
-| ------------------------------------------- | ------------------------------------------------------------------------------ | ----- |
-| `server.plugins.xpack_main.registerFeature` | [`plugins.features.registerFeature`](x-pack/plugins/features/server/plugin.ts) |       |
+| Legacy Platform                                                                    | New Platform                                                                   | Notes |
+| ---------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | ----- |
+| `server.plugins.xpack_main.registerFeature`                                        | [`plugins.features.registerFeature`](x-pack/plugins/features/server/plugin.ts) |       |
+| `server.plugins.xpack_main.feature(pluginID).registerLicenseCheckResultsGenerator` | [`x-pack licensing plugin`](/x-pack/plugins/licensing/README.md)               |       |
 
 #### UI Exports
 
@@ -1399,7 +1402,7 @@ export const config: PluginConfigDescriptor<ConfigType> = {
   deprecations: ({ rename, unused }) => [
     rename('oldProperty', 'newProperty'),
     unused('someUnusedProperty'),
-  ]   
+  ]
 };
 ```
 
@@ -1413,14 +1416,76 @@ export const config: PluginConfigDescriptor<ConfigType> = {
   deprecations: ({ renameFromRoot, unusedFromRoot }) => [
     renameFromRoot('oldplugin.property', 'myplugin.property'),
     unusedFromRoot('oldplugin.deprecated'),
-  ]   
+  ]
 };
 ```
 
 Note that deprecations registered in new platform's plugins are not applied to the legacy configuration.
 During migration, if you still need the deprecations to be effective in the legacy plugin, you need to declare them in
 both plugin definitions.
 
+### Use scoped services
+Whenever Kibana needs to get access to data saved in elasticsearch, it should perform a check whether an end-user has access to the data.
+In the legacy platform, Kibana requires to bind elasticsearch related API with an incoming request to access elasticsearch service on behalf of a user.
+```js
+  async function handler(req, res) {
+    const dataCluster = server.plugins.elasticsearch.getCluster('data');
+    const data = await dataCluster.callWithRequest(req, 'ping');
+  }
+```
+
+The new platform introduced [a handler interface](/rfcs/text/0003_handler_interface.md) on the server-side to perform that association internally. Core services, that require impersonation with an incoming request, are
+exposed via `context` argument of [the request handler interface.](/docs/development/core/server/kibana-plugin-server.requesthandler.md)
+The above example looks in the new platform as
+```js
+  async function handler(context, req, res) {
+    const data = await context.core.elasticsearch.adminClient.callAsInternalUser('ping')
+  }
+```
+
+The [request handler context](/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md) exposed the next scoped **core** services:
+| Legacy Platform                                     | New Platform                                                                                                       |
+| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------|
+| `request.getSavedObjectsClient`                     | [`context.savedObjects.client`](/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md)          |
+| `server.plugins.elasticsearch.getCluster('admin')`  | [`context.elasticsearch.adminClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)  |
+| `server.plugins.elasticsearch.getCluster('data')`   | [`context.elasticsearch.dataClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)   |
+| `request.getUiSettingsService`                      | [`context.uiSettings.client`](/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md)             |
+
+#### Declare a custom scoped service
+Plugins can extend the handler context with custom API that will be available to the plugin itself and all dependent plugins.
+For example, the plugin creates a custom elasticsearch client and want to use it via the request handler context:
+
+```ts
+import { CoreSetup, IScopedClusterClient } from 'kibana/server';
+
+export interface MyPluginContext {
+  client: IScopedClusterClient;
+}
+
+// extend RequestHandlerContext when a dependent plugin imports MyPluginContext from the file
+declare module 'src/core/server' {
+  interface RequestHandlerContext {
+    myPlugin?: MyPluginContext;
+  }
+}
+
+class Plugin {
+  setup(core: CoreSetup) {
+    const client = core.elasticsearch.createClient('myClient');
+    core.http.registerRouteHandlerContext('myPlugin', (context, req, res) => {
+      return { client: client.asScoped(req) };
+    });
+
+    router.get(
+      { path: '/api/my-plugin/', validate },
+      async (context, req, res) => {
+        const data = await context.myPlugin.client.callAsCurrentUser('endpoint');
+        ...
+      }
+    );
+  }
+```
+
 ### Mock new platform services in tests
 
 #### Writing mocks for your plugin

diff --git a/src/core/server/index.ts b/src/core/server/index.ts
@@ -234,6 +234,8 @@ export { LegacyServiceSetupDeps, LegacyServiceStartDeps } from './legacy';
  *      data client which uses the credentials of the incoming request
  *    - {@link ScopedClusterClient | elasticsearch.adminClient} - Elasticsearch
  *      admin client which uses the credentials of the incoming request
+ *    - {@link IUiSettingsClient | uiSettings.client} - uiSettings client
+ *      which uses the credentials of the incoming request
  *
  * @public
  */

diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html
@@ -13,64 +13,6 @@
         types="fieldTypes"
       >
       </discover-field-search>
-      <div data-test-subj="discoverFieldFilter" class="dscFieldFilter" ng-show="showFilter">
-        <div class="form-group" >
-          <label
-            for="discoverFieldChooserFilterAggregatable"
-            i18n-id="kbn.discover.fieldChooser.filter.aggregatableLabel"
-            i18n-default-message="Aggregatable"
-          ></label>
-          <select
-            id="discoverFieldChooserFilterAggregatable"
-            ng-options="opt.value as opt.label for opt in filter.boolOpts"
-            ng-model="filter.vals.aggregatable"
-            class="form-control">
-          </select>
-        </div>
-        <div class="form-group" ng-show="showFilter">
-          <label
-            for="discoverFieldChooserFilterSearchable"
-            i18n-id="kbn.discover.fieldChooser.filter.searchableLabel"
-            i18n-default-message="Searchable"
-          ></label>
-          <select
-            id="discoverFieldChooserFilterSearchable"
-            ng-options="opt.value as opt.label for opt in filter.boolOpts"
-            ng-model="filter.vals.searchable"
-            class="form-control">
-          </select>
-        </div>
-        <div class="form-group" ng-show="showFilter">
-          <label
-            for="discoverFieldChooserFilterType"
-            i18n-id="kbn.discover.fieldChooser.filter.typeLabel"
-            i18n-default-message="Type"
-          ></label>
-          <select
-            id="discoverFieldChooserFilterType"
-            ng-options="field as field for field in fieldTypes"
-            ng-model="filter.vals.type"
-            class="form-control">
-          </select>
-        </div>
-        <div class="form-group"  ng-show="showFilter">
-          <label for="discoverFieldChooserHideMissingFields">
-            <input id="discoverFieldChooserHideMissingFields" type="checkbox" ng-model="filter.vals.missing">
-            <span
-              i18n-id="kbn.discover.fieldChooser.filter.hideMissingFieldsLabel"
-              i18n-default-message="Hide missing fields"
-            ></span>
-          </label>
-        </div>
-        <button
-          ng-show="showFilter"
-          ng-click="filter.reset()"
-          ng-disabled="!filter.active"
-          class="kuiButton kuiButton--danger kuiButton--fullWidth"
-          i18n-id="kbn.discover.fieldChooser.filter.resetFiltersButtonLabel"
-          i18n-default-message="Reset filters"
-        ></button>
-      </div>
     </form>
   </div>