Merge branch 'main' into fix-export-timelines-common

docs/developer/plugin-list.asciidoc

@@ -540,6 +540,11 @@ Elastic.
 |Add tagging capability to saved objects
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/screenshotting/README.md[screenshotting]
+|This plugin provides functionality to take screenshots of the Kibana pages.
+It uses Chromium and Puppeteer underneath to run the browser in headless mode.
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/searchprofiler/README.md[searchprofiler]
 |The search profiler consumes the Profile API
 by sending a search API with profile: true enabled in the request body. The response contains

docs/osquery/osquery.asciidoc

@@ -288,13 +288,21 @@ This is useful for teams who need in-depth and detailed control.
 
 [float]
 === Customize Osquery configuration
-By default, all Osquery Manager integrations share the same osquery configuration. However, you can customize how Osquery is configured by editing the Osquery Manager integration for each agent policy
+experimental[] By default, all Osquery Manager integrations share the same osquery configuration. However, you can customize how Osquery is configured by editing the Osquery Manager integration for each agent policy
 you want to adjust. The custom configuration is then applied to all agents in the policy. 
 This powerful feature allows you to configure
 https://osquery.readthedocs.io/en/stable/deployment/file-integrity-monitoring[File Integrity Monitoring], https://osquery.readthedocs.io/en/stable/deployment/process-auditing[Process auditing], 
 and https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-specification[others].
 
-IMPORTANT: Take caution when editing this configuration. The changes you make are distributed to all agents in the policy.
+[IMPORTANT]
+=========================
+
+* Take caution when editing this configuration. The changes you make are distributed to all agents in the policy.
+
+* Take caution when editing `packs` using the Advanced *Osquery config* field. 
+Any changes you make to `packs` from this field are not reflected in the UI on the Osquery *Packs* page in {kib}, however, these changes are deployed to agents in the policy. 
+While this allows you to use advanced Osquery functionality like pack discovery queries, you do lose the ability to manage packs defined this way from the Osquery *Packs* page.
+=========================
 
 . From the {kib} main menu, click *Fleet*, then the *Agent policies* tab.
 
@@ -315,6 +323,16 @@ IMPORTANT: Take caution when editing this configuration. The changes you make ar
 * (Optional) To load a full configuration file, drag and drop an Osquery `.conf` file into the area at the bottom of the page.
 
 . Click *Save integration* to apply the custom configuration to all agents in the policy.
++
+As an example, the following configuration disables two tables.
++
+```ts
+{
+   "options":{
+      "disable_tables":"curl,process_envs"
+   }
+}
+```
 
 [float]
 === Upgrade Osquery versions

docs/settings/url-drilldown-settings.asciidoc

@@ -6,16 +6,13 @@
 
 Configure the URL drilldown settings in your `kibana.yml` configuration file.
 
-[cols="2*<"]
-|===
-| [[external-URL-policy]] `externalUrl.policy`
- | Configures the external URL policies. URL drilldowns respect the global *External URL* service, which you can use to deny or allow external URLs.
+[[external-URL-policy]] `externalUrl.policy`::
+Configures the external URL policies. URL drilldowns respect the global *External URL* service, which you can use to deny or allow external URLs.
 By default all external URLs are allowed.
-|===
-
-For example, to allow external URLs only to the `example.com` domain with the `https` scheme, except for the `danger.example.com` sub-domain,
++
+For example, to allow only external URLs to the `example.com` domain with the `https` scheme, except for the `danger.example.com` sub-domain,
 which is denied even when `https` scheme is used:
-
++
 ["source","yml"]
 -----------
 externalUrl.policy:
@@ -25,4 +22,3 @@ externalUrl.policy:
     host: example.com
     protocol: https
 -----------
-

docs/setup/docker.asciidoc

@@ -152,7 +152,7 @@ services:
 
 ==== Persist the {kib} keystore
 
-By default, {kib] auto-generates a keystore file for secure settings at startup. To persist your {kibana-ref}/secure-settings.html[secure settings], use the `kibana-keystore` utility to bind-mount the parent directory of the keystore to the container. For example:
+By default, {kib} auto-generates a keystore file for secure settings at startup. To persist your {kibana-ref}/secure-settings.html[secure settings], use the `kibana-keystore` utility to bind-mount the parent directory of the keystore to the container. For example:
 
 ["source","sh",subs="attributes"]
 ----

docs/setup/install/deb.asciidoc

@@ -188,9 +188,9 @@ locations for a Debian-based system:
   | path.data
 
 | logs
-    | Logs files location
-    |  /var/log/kibana
-    | path.logs
+  | Logs files location
+  | /var/log/kibana
+  | path.logs
 
 | plugins
   | Plugin files location. Each plugin will be contained in a subdirectory.

docs/setup/install/rpm.asciidoc

@@ -174,17 +174,16 @@ locations for an RPM-based system:
   | Configuration files including `kibana.yml`
   | /etc/kibana
   | <<settings,KBN_PATH_CONF>>
- d|
 
 | data
   | The location of the data files written to disk by Kibana and its plugins
   | /var/lib/kibana
   | path.data
 
 | logs
-    | Logs files location
-    |  /var/log/kibana
-    | path.logs
+  | Logs files location
+  | /var/log/kibana
+  | path.logs
 
 | plugins
   | Plugin files location. Each plugin will be contained in a subdirectory.

docs/setup/install/targz.asciidoc

@@ -125,7 +125,7 @@ important data later on.
 | home
   | Kibana home directory or `$KIBANA_HOME`
  d| Directory created by unpacking the archive
- d|
+  |
 
 | bin
   | Binary scripts including `kibana` to start the Kibana server
@@ -137,7 +137,6 @@ important data later on.
   | Configuration files including `kibana.yml`
   | $KIBANA_HOME\config
   | <<settings,KBN_PATH_CONF>>
- d|
 
 | data
   | The location of the data files written to disk by Kibana and its plugins

package.json

@@ -531,7 +531,6 @@
     "@types/file-saver": "^2.0.0",
     "@types/flot": "^0.0.31",
     "@types/geojson": "7946.0.7",
-    "@types/getopts": "^2.0.1",
     "@types/getos": "^3.0.0",
     "@types/glob": "^7.1.2",
     "@types/gulp": "^4.0.6",
@@ -568,6 +567,7 @@
     "@types/kbn__config": "link:bazel-bin/packages/kbn-config/npm_module_types",
     "@types/kbn__config-schema": "link:bazel-bin/packages/kbn-config-schema/npm_module_types",
     "@types/kbn__crypto": "link:bazel-bin/packages/kbn-crypto/npm_module_types",
+    "@types/kbn__docs-utils": "link:bazel-bin/packages/kbn-docs-utils/npm_module_types",
     "@types/kbn__i18n": "link:bazel-bin/packages/kbn-i18n/npm_module_types",
     "@types/kbn__i18n-react": "link:bazel-bin/packages/kbn-i18n-react/npm_module_types",
     "@types/license-checker": "15.0.0",
@@ -677,7 +677,7 @@
     "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-istanbul": "^6.1.1",
     "babel-plugin-require-context-hook": "^1.0.0",
-    "babel-plugin-styled-components": "^1.13.3",
+    "babel-plugin-styled-components": "^2.0.2",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "backport": "^5.6.6",
     "callsites": "^3.1.0",

packages/BUILD.bazel

@@ -86,6 +86,7 @@ filegroup(
       "//packages/kbn-config:build_types",
       "//packages/kbn-config-schema:build_types",
       "//packages/kbn-crypto:build_types",
+      "//packages/kbn-docs-utils:build_types",
       "//packages/kbn-i18n:build_types",
       "//packages/kbn-i18n-react:build_types",
   ],

packages/kbn-cli-dev-mode/BUILD.bazel

@@ -60,12 +60,12 @@ TYPES_DEPS = [
   "@npm//chokidar",
   "@npm//elastic-apm-node",
   "@npm//execa",
+  "@npm//getopts",
   "@npm//moment",
   "@npm//rxjs",
   "@npm//supertest",
   "@npm//@types/hapi__h2o2",
   "@npm//@types/hapi__hapi",
-  "@npm//@types/getopts",
   "@npm//@types/jest",
   "@npm//@types/lodash",
   "@npm//@types/node",

packages/kbn-cli-dev-mode/src/get_server_watch_paths.test.ts

@@ -65,7 +65,7 @@ it('produces the right watch and ignore list', () => {
       <absolute path>/x-pack/test/plugin_functional/plugins/resolver_test/target/**,
       <absolute path>/x-pack/test/plugin_functional/plugins/resolver_test/scripts/**,
       <absolute path>/x-pack/test/plugin_functional/plugins/resolver_test/docs/**,
-      <absolute path>/x-pack/plugins/reporting/chromium,
+      <absolute path>/x-pack/plugins/screenshotting/chromium,
       <absolute path>/x-pack/plugins/security_solution/cypress,
       <absolute path>/x-pack/plugins/apm/scripts,
       <absolute path>/x-pack/plugins/apm/ftr_e2e,

packages/kbn-cli-dev-mode/src/get_server_watch_paths.ts

@@ -56,7 +56,7 @@ export function getServerWatchPaths({ pluginPaths, pluginScanDirs }: Options) {
     /\.(md|sh|txt)$/,
     /debug\.log$/,
     ...pluginInternalDirsIgnore,
-    fromRoot('x-pack/plugins/reporting/chromium'),
+    fromRoot('x-pack/plugins/screenshotting/chromium'),
     fromRoot('x-pack/plugins/security_solution/cypress'),
     fromRoot('x-pack/plugins/apm/scripts'),
     fromRoot('x-pack/plugins/apm/ftr_e2e'), // prevents restarts for APM cypress tests

packages/kbn-docs-utils/BUILD.bazel

@@ -1,9 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
-load("//src/dev/bazel:index.bzl", "jsts_transpiler")
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
 
 PKG_BASE_NAME = "kbn-docs-utils"
 PKG_REQUIRE_NAME = "@kbn/docs-utils"
+TYPES_PKG_REQUIRE_NAME = "@types/kbn__docs-utils"
 
 SOURCE_FILES = glob(
   [
@@ -77,7 +78,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
+  deps = RUNTIME_DEPS + [":target_node"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )
@@ -96,3 +97,20 @@ filegroup(
   ],
   visibility = ["//visibility:public"],
 )
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = TYPES_PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [
+    ":npm_module_types",
+  ],
+  visibility = ["//visibility:public"],
+)

packages/kbn-docs-utils/package.json

@@ -4,7 +4,6 @@
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "private": "true",
   "main": "target_node/index.js",
-  "types": "target_types/index.d.ts",
   "kibana": {
     "devOnly": true
   }

packages/kbn-optimizer/limits.yml

@@ -117,3 +117,4 @@ pageLoadAssetSize:
   dataViewManagement: 5000
   reporting: 57003
   visTypeHeatmap: 25340
+  screenshotting: 17017

packages/kbn-storybook/src/lib/theme_switcher.tsx

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { Icons, IconButton, TooltipLinkList, WithTooltip } from '@storybook/components';
 import { useGlobals } from '@storybook/api';
 
@@ -17,14 +17,52 @@ type Link = ArrayItem<PropsOf<typeof TooltipLinkList>['links']>;
 const defaultTheme = 'v8.light';
 
 export function ThemeSwitcher() {
-  const [globals, updateGlobals] = useGlobals();
-  const selectedTheme = globals.euiTheme;
+  const [{ euiTheme: selectedTheme }, updateGlobals] = useGlobals();
 
-  if (!selectedTheme) {
-    updateGlobals({ euiTheme: defaultTheme });
-  }
+  const selectTheme = useCallback(
+    (themeId: string) => {
+      updateGlobals({ euiTheme: themeId });
+    },
+    [updateGlobals]
+  );
 
-  function Menu({ onHide }: { onHide: () => void }) {
+  useEffect(() => {
+    if (!selectedTheme) {
+      selectTheme(defaultTheme);
+    }
+  }, [selectTheme, selectedTheme]);
+
+  return (
+    <WithTooltip
+      placement="top"
+      trigger="click"
+      closeOnClick
+      tooltip={({ onHide }) => (
+        <ThemeSwitcherTooltip
+          onHide={onHide}
+          onChangeSelectedTheme={selectTheme}
+          selectedTheme={selectedTheme}
+        />
+      )}
+    >
+      {/* @ts-ignore Remove when @storybook has moved to @emotion v11 */}
+      <IconButton key="eui-theme" title="Change the EUI theme">
+        <Icons icon={selectedTheme?.includes('dark') ? 'heart' : 'hearthollow'} />
+      </IconButton>
+    </WithTooltip>
+  );
+}
+
+const ThemeSwitcherTooltip = React.memo(
+  ({
+    onHide,
+    onChangeSelectedTheme,
+    selectedTheme,
+  }: {
+    onHide: () => void;
+    onChangeSelectedTheme: (themeId: string) => void;
+    selectedTheme: string;
+  }) => {
     const links = [
       {
         id: 'v8.light',
@@ -38,8 +76,8 @@ export function ThemeSwitcher() {
       (link): Link => ({
         ...link,
         onClick: (_event, item) => {
-          if (item.id !== selectedTheme) {
-            updateGlobals({ euiTheme: item.id });
+          if (item.id != null && item.id !== selectedTheme) {
+            onChangeSelectedTheme(item.id);
           }
           onHide();
         },
@@ -49,18 +87,4 @@ export function ThemeSwitcher() {
 
     return <TooltipLinkList links={links} />;
   }
-
-  return (
-    <WithTooltip
-      placement="top"
-      trigger="click"
-      closeOnClick
-      tooltip={({ onHide }) => <Menu onHide={onHide} />}
-    >
-      {/* @ts-ignore Remove when @storybook has moved to @emotion v11 */}
-      <IconButton key="eui-theme" title="Change the EUI theme">
-        <Icons icon={selectedTheme?.includes('dark') ? 'heart' : 'hearthollow'} />
-      </IconButton>
-    </WithTooltip>
-  );
-}
+);