Merge branch 'master' into 65035-make-asset-ids-unique

.github/CODEOWNERS

@@ -84,7 +84,7 @@
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
-/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
+/x-pack/plugins/observability/ @elastic/observability-ui
 /x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime

docs/api/using-api.asciidoc

@@ -10,7 +10,7 @@ NOTE: The {kib} Console supports only Elasticsearch APIs. You are unable to inte
 [float]
 [[api-authentication]]
 === Authentication
-{kib} supports token-based authentication with the same username and password that you use to log into the {kib} Console.
+{kib} supports token-based authentication with the same username and password that you use to log into the {kib} Console.  In a given HTTP tool, and when available, you can select to use its 'Basic Authentication' option, which is where the username and password are stored in order to be passed as part of the call. 
 
 [float]
 [[api-calls]]

docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.getalltypes.md

@@ -4,7 +4,9 @@
 
 ## SavedObjectTypeRegistry.getAllTypes() method
 
-Return all [types](./kibana-plugin-core-server.savedobjectstype.md) currently registered.
+Return all [types](./kibana-plugin-core-server.savedobjectstype.md) currently registered, including the hidden ones.
+
+To only get the visible types (which is the most common use case), use `getVisibleTypes` instead.
 
 <b>Signature:</b>
 

docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.getvisibletypes.md

@@ -0,0 +1,19 @@
+<!-- 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; [SavedObjectTypeRegistry](./kibana-plugin-core-server.savedobjecttyperegistry.md) &gt; [getVisibleTypes](./kibana-plugin-core-server.savedobjecttyperegistry.getvisibletypes.md)
+
+## SavedObjectTypeRegistry.getVisibleTypes() method
+
+Returns all visible [types](./kibana-plugin-core-server.savedobjectstype.md)<!-- -->.
+
+A visible type is a type that doesn't explicitly define `hidden=true` during registration.
+
+<b>Signature:</b>
+
+```typescript
+getVisibleTypes(): SavedObjectsType[];
+```
+<b>Returns:</b>
+
+`SavedObjectsType[]`
+

docs/development/core/server/kibana-plugin-core-server.savedobjecttyperegistry.md

@@ -16,10 +16,11 @@ export declare class SavedObjectTypeRegistry
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [getAllTypes()](./kibana-plugin-core-server.savedobjecttyperegistry.getalltypes.md) |  | Return all [types](./kibana-plugin-core-server.savedobjectstype.md) currently registered. |
+|  [getAllTypes()](./kibana-plugin-core-server.savedobjecttyperegistry.getalltypes.md) |  | Return all [types](./kibana-plugin-core-server.savedobjectstype.md) currently registered, including the hidden ones.<!-- -->To only get the visible types (which is the most common use case), use <code>getVisibleTypes</code> instead. |
 |  [getImportableAndExportableTypes()](./kibana-plugin-core-server.savedobjecttyperegistry.getimportableandexportabletypes.md) |  | Return all [types](./kibana-plugin-core-server.savedobjectstype.md) currently registered that are importable/exportable. |
 |  [getIndex(type)](./kibana-plugin-core-server.savedobjecttyperegistry.getindex.md) |  | Returns the <code>indexPattern</code> property for given type, or <code>undefined</code> if the type is not registered. |
 |  [getType(type)](./kibana-plugin-core-server.savedobjecttyperegistry.gettype.md) |  | Return the [type](./kibana-plugin-core-server.savedobjectstype.md) definition for given type name. |
+|  [getVisibleTypes()](./kibana-plugin-core-server.savedobjecttyperegistry.getvisibletypes.md) |  | Returns all visible [types](./kibana-plugin-core-server.savedobjectstype.md)<!-- -->.<!-- -->A visible type is a type that doesn't explicitly define <code>hidden=true</code> during registration. |
 |  [isHidden(type)](./kibana-plugin-core-server.savedobjecttyperegistry.ishidden.md) |  | Returns the <code>hidden</code> property for given type, or <code>false</code> if the type is not registered. |
 |  [isImportableAndExportable(type)](./kibana-plugin-core-server.savedobjecttyperegistry.isimportableandexportable.md) |  | Returns the <code>management.importableAndExportable</code> property for given type, or <code>false</code> if the type is not registered or does not define a management section. |
 |  [isMultiNamespace(type)](./kibana-plugin-core-server.savedobjecttyperegistry.ismultinamespace.md) |  | Returns whether the type is multi-namespace (shareable); resolves to <code>false</code> if the type is not registered |

packages/eslint-config-kibana/typescript.js

@@ -124,7 +124,6 @@ module.exports = {
           }],
           '@typescript-eslint/no-var-requires': 'error',
           '@typescript-eslint/unified-signatures': 'error',
-          '@typescript-eslint/prefer-ts-expect-error': 'warn',
           'constructor-super': 'error',
           'dot-notation': 'error',
           'eqeqeq': ['error', 'always', {'null': 'ignore'}],

packages/kbn-ui-shared-deps/entry.js

@@ -61,5 +61,8 @@ if (window.__kbnThemeVersion__ === 'v7') {
   ElasticEuiDarkTheme = require('@elastic/eui/dist/eui_theme_amsterdam_dark.json');
 }
 
+import * as Theme from './theme.ts';
+export { Theme };
+
 // massive deps that we should really get rid of or reduce in size substantially
 export const ElasticsearchBrowser = require('elasticsearch-browser/elasticsearch.js');

packages/kbn-ui-shared-deps/index.js

@@ -44,6 +44,7 @@ exports.externals = {
   'react-router-dom': '__kbnSharedDeps__.ReactRouterDom',
   'styled-components': '__kbnSharedDeps__.StyledComponents',
   '@kbn/monaco': '__kbnSharedDeps__.KbnMonaco',
+  '@kbn/ui-shared-deps/theme': '__kbnSharedDeps__.Theme',
   // this is how plugins/consumers from npm load monaco
   'monaco-editor/esm/vs/editor/editor.api': '__kbnSharedDeps__.MonacoBarePluginApi',
 
@@ -59,8 +60,8 @@ exports.externals = {
   '@elastic/eui/lib/services': '__kbnSharedDeps__.ElasticEuiLibServices',
   '@elastic/eui/lib/services/format': '__kbnSharedDeps__.ElasticEuiLibServicesFormat',
   '@elastic/eui/dist/eui_charts_theme': '__kbnSharedDeps__.ElasticEuiChartsTheme',
-  '@elastic/eui/dist/eui_theme_light.json': '__kbnSharedDeps__.ElasticEuiLightTheme',
-  '@elastic/eui/dist/eui_theme_dark.json': '__kbnSharedDeps__.ElasticEuiDarkTheme',
+  '@elastic/eui/dist/eui_theme_light.json': '__kbnSharedDeps__.Theme.euiLightVars',
+  '@elastic/eui/dist/eui_theme_dark.json': '__kbnSharedDeps__.Theme.euiDarkVars',
 
   /**
    * massive deps that we should really get rid of or reduce in size substantially

packages/kbn-ui-shared-deps/theme.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 LightTheme from '@elastic/eui/dist/eui_theme_light.json';
+
+const globals: any = typeof window === 'undefined' ? {} : window;
+
+export type Theme = typeof LightTheme;
+
+export let euiLightVars: Theme;
+export let euiDarkVars: Theme;
+if (globals.__kbnThemeVersion__ === 'v7') {
+  euiLightVars = require('@elastic/eui/dist/eui_theme_light.json');
+  euiDarkVars = require('@elastic/eui/dist/eui_theme_dark.json');
+} else {
+  euiLightVars = require('@elastic/eui/dist/eui_theme_amsterdam_light.json');
+  euiDarkVars = require('@elastic/eui/dist/eui_theme_amsterdam_dark.json');
+}
+
+/**
+ * EUI Theme vars that automatically adjust to light/dark theme
+ */
+export let euiThemeVars: Theme;
+if (globals.__kbnDarkTheme__) {
+  euiThemeVars = euiDarkVars;
+} else {
+  euiThemeVars = euiLightVars;
+}

packages/kbn-ui-shared-deps/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["index.d.ts", "./monaco"]
+  "include": [
+    "index.d.ts",
+    "theme.ts"
+  ]
 }

packages/kbn-ui-shared-deps/webpack.config.js

@@ -78,6 +78,17 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
         test: /\.css$/,
         use: [MiniCssExtractPlugin.loader, 'css-loader'],
       },
+      {
+        include: [require.resolve('./theme.ts')],
+        use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              presets: [require.resolve('@kbn/babel-preset/webpack_preset')],
+            },
+          },
+        ],
+      },
     ],
   },
 

src/core/public/chrome/chrome_service.tsx

@@ -185,27 +185,27 @@ export class ChromeService {
           />
         ),
       });
+    }
 
-      if (isIE()) {
-        notifications.toasts.addWarning({
-          title: mountReactNode(
-            <FormattedMessage
-              id="core.chrome.browserDeprecationWarning"
-              defaultMessage="Support for Internet Explorer will be dropped in future versions of this software, please check {link}."
-              values={{
-                link: (
-                  <EuiLink target="_blank" href="https://www.elastic.co/support/matrix" external>
-                    <FormattedMessage
-                      id="core.chrome.browserDeprecationLink"
-                      defaultMessage="the support matrix on our website"
-                    />
-                  </EuiLink>
-                ),
-              }}
-            />
-          ),
-        });
-      }
+    if (isIE()) {
+      notifications.toasts.addWarning({
+        title: mountReactNode(
+          <FormattedMessage
+            id="core.chrome.browserDeprecationWarning"
+            defaultMessage="Support for Internet Explorer will be dropped in future versions of this software, please check {link}."
+            values={{
+              link: (
+                <EuiLink target="_blank" href="https://www.elastic.co/support/matrix" external>
+                  <FormattedMessage
+                    id="core.chrome.browserDeprecationLink"
+                    defaultMessage="the support matrix on our website"
+                  />
+                </EuiLink>
+              ),
+            }}
+          />
+        ),
+      });
     }
 
     return {

src/core/server/logging/integration_tests/logging.test.ts

@@ -18,6 +18,9 @@
  */
 
 import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import { InternalCoreSetup } from '../../internal_types';
+import { LoggerContextConfigInput } from '../logging_config';
+import { Subject } from 'rxjs';
 
 function createRoot() {
   return kbnTestServer.createRoot({
@@ -111,4 +114,162 @@ describe('logging service', () => {
       expect(mockConsoleLog).toHaveBeenCalledTimes(0);
     });
   });
+
+  describe('custom context configuration', () => {
+    const CUSTOM_LOGGING_CONFIG: LoggerContextConfigInput = {
+      appenders: {
+        customJsonConsole: {
+          kind: 'console',
+          layout: {
+            kind: 'json',
+          },
+        },
+        customPatternConsole: {
+          kind: 'console',
+          layout: {
+            kind: 'pattern',
+            pattern: 'CUSTOM - PATTERN [%logger][%level] %message',
+          },
+        },
+      },
+
+      loggers: [
+        { context: 'debug_json', appenders: ['customJsonConsole'], level: 'debug' },
+        { context: 'debug_pattern', appenders: ['customPatternConsole'], level: 'debug' },
+        { context: 'info_json', appenders: ['customJsonConsole'], level: 'info' },
+        { context: 'info_pattern', appenders: ['customPatternConsole'], level: 'info' },
+        {
+          context: 'all',
+          appenders: ['customJsonConsole', 'customPatternConsole'],
+          level: 'debug',
+        },
+      ],
+    };
+
+    let root: ReturnType<typeof createRoot>;
+    let setup: InternalCoreSetup;
+    let mockConsoleLog: jest.SpyInstance;
+    const loggingConfig$ = new Subject<LoggerContextConfigInput>();
+    const setContextConfig = (enable: boolean) =>
+      enable ? loggingConfig$.next(CUSTOM_LOGGING_CONFIG) : loggingConfig$.next({});
+    beforeAll(async () => {
+      mockConsoleLog = jest.spyOn(global.console, 'log');
+      root = kbnTestServer.createRoot();
+
+      setup = await root.setup();
+      setup.logging.configure(['plugins', 'myplugin'], loggingConfig$);
+    }, 30000);
+
+    beforeEach(() => {
+      mockConsoleLog.mockClear();
+    });
+
+    afterAll(async () => {
+      mockConsoleLog.mockRestore();
+      await root.shutdown();
+    });
+
+    it('does not write to custom appenders when not configured', async () => {
+      const logger = root.logger.get('plugins.myplugin.debug_pattern');
+      setContextConfig(false);
+      logger.info('log1');
+      setContextConfig(true);
+      logger.debug('log2');
+      logger.info('log3');
+      setContextConfig(false);
+      logger.info('log4');
+      expect(mockConsoleLog).toHaveBeenCalledTimes(2);
+      expect(mockConsoleLog).toHaveBeenCalledWith(
+        'CUSTOM - PATTERN [plugins.myplugin.debug_pattern][DEBUG] log2'
+      );
+      expect(mockConsoleLog).toHaveBeenCalledWith(
+        'CUSTOM - PATTERN [plugins.myplugin.debug_pattern][INFO ] log3'
+      );
+    });
+
+    it('writes debug_json context to custom JSON appender', async () => {
+      setContextConfig(true);
+      const logger = root.logger.get('plugins.myplugin.debug_json');
+      logger.debug('log1');
+      logger.info('log2');
+      expect(mockConsoleLog).toHaveBeenCalledTimes(2);
+
+      const [firstCall, secondCall] = mockConsoleLog.mock.calls.map(([jsonString]) =>
+        JSON.parse(jsonString)
+      );
+      expect(firstCall).toMatchObject({
+        level: 'DEBUG',
+        context: 'plugins.myplugin.debug_json',
+        message: 'log1',
+      });
+      expect(secondCall).toMatchObject({
+        level: 'INFO',
+        context: 'plugins.myplugin.debug_json',
+        message: 'log2',
+      });
+    });
+
+    it('writes info_json context to custom JSON appender', async () => {
+      setContextConfig(true);
+      const logger = root.logger.get('plugins.myplugin.info_json');
+      logger.debug('i should not be logged!');
+      logger.info('log2');
+
+      expect(mockConsoleLog).toHaveBeenCalledTimes(1);
+      expect(JSON.parse(mockConsoleLog.mock.calls[0][0])).toMatchObject({
+        level: 'INFO',
+        context: 'plugins.myplugin.info_json',
+        message: 'log2',
+      });
+    });
+
+    it('writes debug_pattern context to custom pattern appender', async () => {
+      setContextConfig(true);
+      const logger = root.logger.get('plugins.myplugin.debug_pattern');
+      logger.debug('log1');
+      logger.info('log2');
+
+      expect(mockConsoleLog).toHaveBeenCalledTimes(2);
+      expect(mockConsoleLog).toHaveBeenCalledWith(
+        'CUSTOM - PATTERN [plugins.myplugin.debug_pattern][DEBUG] log1'
+      );
+      expect(mockConsoleLog).toHaveBeenCalledWith(
+        'CUSTOM - PATTERN [plugins.myplugin.debug_pattern][INFO ] log2'
+      );
+    });
+
+    it('writes info_pattern context to custom pattern appender', async () => {
+      setContextConfig(true);
+      const logger = root.logger.get('plugins.myplugin.info_pattern');
+      logger.debug('i should not be logged!');
+      logger.info('log2');
+      expect(mockConsoleLog).toHaveBeenCalledTimes(1);
+      expect(mockConsoleLog).toHaveBeenCalledWith(
+        'CUSTOM - PATTERN [plugins.myplugin.info_pattern][INFO ] log2'
+      );
+    });
+
+    it('writes all context to both appenders', async () => {
+      setContextConfig(true);
+      const logger = root.logger.get('plugins.myplugin.all');
+      logger.debug('log1');
+      logger.info('log2');
+
+      expect(mockConsoleLog).toHaveBeenCalledTimes(4);
+      const logs = mockConsoleLog.mock.calls.map(([jsonString]) => jsonString);
+
+      expect(JSON.parse(logs[0])).toMatchObject({
+        level: 'DEBUG',
+        context: 'plugins.myplugin.all',
+        message: 'log1',
+      });
+      expect(logs[1]).toEqual('CUSTOM - PATTERN [plugins.myplugin.all][DEBUG] log1');
+      expect(JSON.parse(logs[2])).toMatchObject({
+        level: 'INFO',
+        context: 'plugins.myplugin.all',
+        message: 'log2',
+      });
+      expect(logs[3]).toEqual('CUSTOM - PATTERN [plugins.myplugin.all][INFO ] log2');
+    });
+  });
 });