Merge branch 'master' of github.com:elastic/kibana into security-navi…

…gation

.ci/packer_cache.sh

@@ -40,7 +40,7 @@ echo "Creating bootstrap_cache archive"
 # archive cacheable directories
 mkdir -p "$HOME/.kibana/bootstrap_cache"
 tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
-  x-pack/legacy/plugins/reporting/.chromium \
+  x-pack/plugins/reporting/.chromium \
   .es \
   .chromedriver \
   .geckodriver;

src/cli/cluster/cluster_manager.ts

@@ -261,7 +261,7 @@ export class ClusterManager {
       /debug\.log$/,
       ...pluginInternalDirsIgnore,
       fromRoot('src/legacy/server/sass/__tmp__'),
-      fromRoot('x-pack/legacy/plugins/reporting/.chromium'),
+      fromRoot('x-pack/plugins/reporting/.chromium'),
       fromRoot('x-pack/plugins/security_solution/cypress'),
       fromRoot('x-pack/plugins/apm/e2e'),
       fromRoot('x-pack/plugins/apm/scripts'),

src/dev/build/tasks/clean_tasks.js

@@ -206,7 +206,7 @@ export const CleanExtraBrowsersTask = {
 
   async run(config, log, build) {
     const getBrowserPathsForPlatform = (platform) => {
-      const reportingDir = 'x-pack/legacy/plugins/reporting';
+      const reportingDir = 'x-pack/plugins/reporting';
       const chromiumDir = '.chromium';
       const chromiumPath = (p) =>
         build.resolvePathForPlatform(platform, reportingDir, chromiumDir, p);

src/dev/code_coverage/ingest_coverage/__tests__/transforms.test.js

@@ -35,13 +35,13 @@ describe(`Transform fn`, () => {
     it(`should remove the jenkins workspace path`, () => {
       const obj = {
         staticSiteUrl:
-          '/var/lib/jenkins/workspace/elastic+kibana+code-coverage/kibana/x-pack/legacy/plugins/reporting/server/browsers/extract/unzip.js',
+          '/var/lib/jenkins/workspace/elastic+kibana+code-coverage/kibana/x-pack/plugins/reporting/server/browsers/extract/unzip.js',
         COVERAGE_INGESTION_KIBANA_ROOT:
           '/var/lib/jenkins/workspace/elastic+kibana+code-coverage/kibana',
       };
       expect(coveredFilePath(obj)).to.have.property(
         'coveredFilePath',
-        'x-pack/legacy/plugins/reporting/server/browsers/extract/unzip.js'
+        'x-pack/plugins/reporting/server/browsers/extract/unzip.js'
       );
     });
   });

src/dev/code_coverage/ingest_coverage/integration_tests/mocks/jest-combined/coverage-summary-manual-mix.json

@@ -1,5 +1,5 @@
 {
-  "/var/lib/jenkins/workspace/elastic+kibana+code-coverage/kibana/x-pack/legacy/plugins/reporting/server/browsers/extract/unzip.js": {
+  "/var/lib/jenkins/workspace/elastic+kibana+code-coverage/kibana/x-pack/plugins/reporting/server/browsers/extract/unzip.js": {
     "lines": {
       "total": 4,
       "covered": 4,

src/dev/precommit_hook/casing_check_config.js

@@ -173,12 +173,12 @@ export const TEMPORARILY_IGNORED_PATHS = [
   'x-pack/plugins/monitoring/public/icons/health-green.svg',
   'x-pack/plugins/monitoring/public/icons/health-red.svg',
   'x-pack/plugins/monitoring/public/icons/health-yellow.svg',
-  'x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/pdf/assets/fonts/noto/NotoSansCJKtc-Medium.ttf',
-  'x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/pdf/assets/fonts/noto/NotoSansCJKtc-Regular.ttf',
-  'x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/pdf/assets/fonts/roboto/Roboto-Italic.ttf',
-  'x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/pdf/assets/fonts/roboto/Roboto-Medium.ttf',
-  'x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/pdf/assets/fonts/roboto/Roboto-Regular.ttf',
-  'x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/pdf/assets/img/logo-grey.png',
+  'x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/fonts/noto/NotoSansCJKtc-Medium.ttf',
+  'x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/fonts/noto/NotoSansCJKtc-Regular.ttf',
+  'x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/fonts/roboto/Roboto-Italic.ttf',
+  'x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/fonts/roboto/Roboto-Medium.ttf',
+  'x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/fonts/roboto/Roboto-Regular.ttf',
+  'x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/img/logo-grey.png',
   'x-pack/test/functional/es_archives/monitoring/beats-with-restarted-instance/data.json.gz',
   'x-pack/test/functional/es_archives/monitoring/beats-with-restarted-instance/mappings.json',
   'x-pack/test/functional/es_archives/monitoring/logstash-pipelines/data.json.gz',

x-pack/.gitignore

@@ -5,8 +5,8 @@
 /test/functional/screenshots
 /test/functional/apps/reporting/reports/session
 /test/reporting/configs/failure_debug/
-/legacy/plugins/reporting/.chromium/
-/legacy/plugins/reporting/.phantom/
+/plugins/reporting/.chromium/
+/plugins/reporting/.phantom/
 /.aws-config.json
 /.env
 /.kibana-plugin-helpers.dev.*

x-pack/.i18nrc.json

@@ -35,7 +35,7 @@
     "xpack.monitoring": ["plugins/monitoring", "legacy/plugins/monitoring"],
     "xpack.remoteClusters": "plugins/remote_clusters",
     "xpack.painlessLab": "plugins/painless_lab",
-    "xpack.reporting": ["plugins/reporting", "legacy/plugins/reporting"],
+    "xpack.reporting": ["plugins/reporting"],
     "xpack.rollupJobs": ["legacy/plugins/rollup", "plugins/rollup"],
     "xpack.searchProfiler": "plugins/searchprofiler",
     "xpack.security": ["legacy/plugins/security", "plugins/security"],

x-pack/.kibana-plugin-helpers.json

@@ -13,8 +13,8 @@
     "index.js",
     ".i18nrc.json",
     "plugins/**/*",
-    "legacy/plugins/reporting/.phantom/*",
-    "legacy/plugins/reporting/.chromium/*",
+    "plugins/reporting/.phantom/*",
+    "plugins/reporting/.chromium/*",
     "legacy/common/**/*",
     "legacy/plugins/**/*",
     "legacy/server/**/*",

x-pack/build_chromium/README.md

@@ -110,7 +110,7 @@ To run the build, replace the sha in the following commands with the sha that yo
 
 After the build completes, there will be a .zip file and a .md5 file in `~/chromium/chromium/src/out/headless`. These are named like so: `chromium-{first_7_of_SHA}-{platform}`, for example: `chromium-4747cc2-linux`.
 
-The zip files need to be deployed to s3. For testing, I drop them into `headless-shell-dev`, but for production, they need to be in `headless-shell`. And the `x-pack/legacy/plugins/reporting/server/browsers/chromium/paths.js` file needs to be upated to have the correct `archiveChecksum`, `archiveFilename`, `binaryChecksum` and `baseUrl`. Below is a list of what the archive's are:
+The zip files need to be deployed to s3. For testing, I drop them into `headless-shell-dev`, but for production, they need to be in `headless-shell`. And the `x-pack/plugins/reporting/server/browsers/chromium/paths.ts` file needs to be upated to have the correct `archiveChecksum`, `archiveFilename`, `binaryChecksum` and `baseUrl`. Below is a list of what the archive's are:
 
 - `archiveChecksum`: The contents of the `.md5` file, which is the `md5` checksum of the zip file.
 - `binaryChecksum`: The `md5` checksum of the `headless_shell` binary itself.

x-pack/index.js

@@ -6,7 +6,6 @@
 
 import { xpackMain } from './legacy/plugins/xpack_main';
 import { monitoring } from './legacy/plugins/monitoring';
-import { reporting } from './legacy/plugins/reporting';
 import { security } from './legacy/plugins/security';
 import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
@@ -18,7 +17,6 @@ module.exports = function (kibana) {
   return [
     xpackMain(kibana),
     monitoring(kibana),
-    reporting(kibana),
     spaces(kibana),
     security(kibana),
     dashboardMode(kibana),

x-pack/plugins/infra/common/http_api/snapshot_api.ts

@@ -6,6 +6,7 @@
 
 import * as rt from 'io-ts';
 import { SnapshotMetricTypeRT, ItemTypeRT } from '../inventory_models/types';
+import { metricsExplorerSeriesRT } from './metrics_explorer';
 
 export const SnapshotNodePathRT = rt.intersection([
   rt.type({
@@ -21,6 +22,7 @@ const SnapshotNodeMetricOptionalRT = rt.partial({
   value: rt.union([rt.number, rt.null]),
   avg: rt.union([rt.number, rt.null]),
   max: rt.union([rt.number, rt.null]),
+  timeseries: metricsExplorerSeriesRT,
 });
 
 const SnapshotNodeMetricRequiredRT = rt.type({
@@ -41,11 +43,18 @@ export const SnapshotNodeResponseRT = rt.type({
   interval: rt.string,
 });
 
-export const InfraTimerangeInputRT = rt.type({
-  interval: rt.string,
-  to: rt.number,
-  from: rt.number,
-});
+export const InfraTimerangeInputRT = rt.intersection([
+  rt.type({
+    interval: rt.string,
+    to: rt.number,
+    from: rt.number,
+  }),
+  rt.partial({
+    lookbackSize: rt.number,
+    ignoreLookback: rt.boolean,
+    forceInterval: rt.boolean,
+  }),
+]);
 
 export const SnapshotGroupByRT = rt.array(
   rt.partial({
@@ -97,6 +106,7 @@ export const SnapshotRequestRT = rt.intersection([
     accountId: rt.string,
     region: rt.string,
     filterQuery: rt.union([rt.string, rt.null]),
+    includeTimeseries: rt.boolean,
   }),
 ]);