Merge branch 'master' into i/88107

.bazelignore

@@ -0,0 +1,15 @@
+# Bazel does not support wildcards like .gitignore
+# Issues are opened for to include that feature but not available yet
+# https://github.com/bazelbuild/bazel/issues/7093
+# https://github.com/bazelbuild/bazel/issues/8106
+.ci
+.git
+.github
+.idea
+.teamcity
+.yarn-local-mirror
+bazel-cache
+bazel-dist
+build
+node_modules
+target

.bazeliskversion

@@ -0,0 +1 @@
+1.7.3

.bazelrc

@@ -0,0 +1,9 @@
+# Inspired on from https://raw.githubusercontent.com/bazelbuild/rules_nodejs/master/.bazelrc
+# Import shared settings first so we can override below
+import %workspace%/.bazelrc.common
+
+# Remote cache settings for local env
+# build --remote_cache=https://storage.googleapis.com/kibana-bazel-cache
+# build --incompatible_remote_results_ignore_disk=true
+# build --remote_accept_cached=true
+# build --remote_upload_local_results=false

.bazelrc.common

@@ -0,0 +1,118 @@
+# Inspired on from https://raw.githubusercontent.com/bazelbuild/rules_nodejs/master/common.bazelrc
+# Common Bazel settings for JavaScript/NodeJS workspaces
+# This rc file is automatically discovered when Bazel is run in this workspace,
+# see https://docs.bazel.build/versions/master/guide.html#bazelrc
+#
+# The full list of Bazel options: https://docs.bazel.build/versions/master/command-line-reference.html
+
+# Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
+build --disk_cache=bazel-cache/disk-cache
+
+# Bazel repo cache settings
+build --repository_cache=bazel-cache/repository-cache
+
+# Bazel will create symlinks from the workspace directory to output artifacts.
+# Build results will be placed in a directory called "bazel-dist/bin"
+# This will still create a bazel-out symlink in
+# the project directory, which must be excluded from the
+# editor's search path.
+build --symlink_prefix=bazel-dist/
+# To disable the symlinks altogether (including bazel-out) we can use
+# build --symlink_prefix=/
+# however this makes it harder to find outputs.
+
+# Prevents the creation of bazel-out dir
+build --experimental_no_product_name_out_symlink
+
+# Make direct file system calls to create symlink trees
+build --experimental_inprocess_symlink_creation
+
+# Incompatible flags to run with
+build --incompatible_no_implicit_file_export
+build --incompatible_restrict_string_escapes
+
+# Log configs
+## different from default
+common --color=yes
+build --show_task_finish
+build --noshow_progress
+build --noshow_loading_progress
+
+## enforced default values
+build --show_result=1
+
+# Specifies desired output mode for running tests.
+# Valid values are
+#   'summary' to output only test status summary
+#   'errors' to also print test logs for failed tests
+#   'all' to print logs for all tests
+#   'streamed' to output logs for all tests in real time
+#     (this will force tests to be executed locally one at a time regardless of --test_strategy value).
+test --test_output=errors
+
+# Support for debugging NodeJS tests
+# Add the Bazel option `--config=debug` to enable this
+# --test_output=streamed
+#     Stream stdout/stderr output from each test in real-time.
+#     See https://docs.bazel.build/versions/master/user-manual.html#flag--test_output for more details.
+# --test_strategy=exclusive
+#     Run one test at a time.
+# --test_timeout=9999
+#     Prevent long running tests from timing out
+#     See https://docs.bazel.build/versions/master/user-manual.html#flag--test_timeout for more details.
+# --nocache_test_results
+#     Always run tests
+# --node_options=--inspect-brk
+#     Pass the --inspect-brk option to all tests which enables the node inspector agent.
+#     See https://nodejs.org/de/docs/guides/debugging-getting-started/#command-line-options for more details.
+# --define=VERBOSE_LOGS=1
+#     Rules will output verbose logs if the VERBOSE_LOGS environment variable is set. `VERBOSE_LOGS` will be passed to
+#     `nodejs_binary` and `nodejs_test` via the default value of the `default_env_vars` attribute of those rules.
+# --compilation_mode=dbg
+#     Rules may change their build outputs if the compilation mode is set to dbg. For example,
+#     mininfiers such as terser may make their output more human readable when this is set. `COMPILATION_MODE` will be passed to
+#     `nodejs_binary` and `nodejs_test` via the default value of the `default_env_vars` attribute of those rules.
+#     See https://docs.bazel.build/versions/master/user-manual.html#flag--compilation_mode for more details.
+test:debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results --define=VERBOSE_LOGS=1
+# Use bazel run with `--config=debug` to turn on the NodeJS inspector agent.
+# The node process will break before user code starts and wait for the debugger to connect.
+run:debug --define=VERBOSE_LOGS=1 -- --node_options=--inspect-brk
+# The following option will change the build output of certain rules such as terser and may not be desirable in all cases
+build:debug --compilation_mode=dbg
+
+# Turn off legacy external runfiles
+# This prevents accidentally depending on this feature, which Bazel will remove.
+build --nolegacy_external_runfiles
+run --nolegacy_external_runfiles
+test --nolegacy_external_runfiles
+
+# Turn on --incompatible_strict_action_env which was on by default
+# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
+# https://github.com/bazelbuild/bazel/issues/7026 for more details.
+# This flag is needed to so that the bazel cache is not invalidated
+# when running bazel via `yarn bazel`.
+# See https://github.com/angular/angular/issues/27514.
+build --incompatible_strict_action_env
+run --incompatible_strict_action_env
+test --incompatible_strict_action_env
+
+# Do not build runfile trees by default. If an execution strategy relies on runfile
+# symlink tree, the tree is created on-demand. See: https://github.com/bazelbuild/bazel/issues/6627
+# and https://github.com/bazelbuild/bazel/commit/03246077f948f2790a83520e7dccc2625650e6df
+build --nobuild_runfile_links
+
+# When running `bazel coverage` --instrument_test_targets needs to be set in order to
+# collect coverage information from test targets
+coverage --instrument_test_targets
+
+# Settings for CI
+# Bazel flags for CI are in /src/dev/ci_setup/.bazelrc-ci
+
+# Load any settings specific to the current user.
+# .bazelrc.user should appear in .gitignore so that settings are not shared with team members
+# This needs to be last statement in this
+# config, as the user configuration should be able to overwrite flags from this file.
+# See https://docs.bazel.build/versions/master/best-practices.html#bazelrc
+# (Note that we use .bazelrc.user so the file appears next to .bazelrc in directory listing,
+# rather than user.bazelrc as suggested in the Bazel docs)
+try-import %workspace%/.bazelrc.user

.bazelversion

@@ -0,0 +1 @@
+4.0.0

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -29,6 +29,7 @@ kibanaPipeline(timeoutMinutes: 150) {
       withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
         parallel([
           'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
+          'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
           'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
             'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
             'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),

.ci/jobs.yml

@@ -2,6 +2,7 @@
 
 JOB:
   - kibana-intake
+  - x-pack-intake
   - kibana-firefoxSmoke
   - kibana-ciGroup1
   - kibana-ciGroup2

.ci/teamcity/default/jest.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
 
-# This file is temporary and can be removed once #85850 has been
-# merged and the changes included in open PR's (~3 days after merging)
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-default-jest
+
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest x-pack --ci --verbose --maxWorkers=5

.ci/teamcity/oss/jest.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 
-# This file is temporary and can be removed once #85850 has been
-# merged and the changes included in open PR's (~3 days after merging)
-
 set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
 export JOB=kibana-oss-jest
 
-checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --ci --verbose
+checks-reporter-with-killswitch "OSS Jest Unit Tests" \
+  node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5

.ci/teamcity/tests/test_projects.sh

@@ -5,4 +5,4 @@ set -euo pipefail
 source "$(dirname "${0}")/../util.sh"
 
 checks-reporter-with-killswitch "Test Projects" \
-  yarn kbn run test --exclude kibana --oss --skip-kibana-plugins
+  yarn kbn run test --exclude kibana --oss --skip-kibana-plugins --skip-missing

.eslintignore

@@ -36,10 +36,14 @@ snapshots.js
 # package overrides
 /packages/elastic-eslint-config-kibana
 /packages/kbn-interpreter/src/common/lib/grammar.js
+/packages/kbn-tinymath/src/grammar.js
 /packages/kbn-plugin-generator/template
 /packages/kbn-pm/dist
 /packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
 /packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
 /packages/kbn-ui-framework/dist
 /packages/kbn-ui-shared-deps/flot_charts
 /packages/kbn-monaco/src/painless/antlr
+
+# Bazel
+/bazel-*

.eslintrc.js

@@ -1192,6 +1192,32 @@ module.exports = {
       },
     },
 
+    /**
+     * Osquery overrides
+     */
+    {
+      extends: ['eslint:recommended', 'plugin:react/recommended'],
+      plugins: ['react'],
+      files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
+      rules: {
+        'arrow-body-style': ['error', 'as-needed'],
+        'prefer-arrow-callback': 'error',
+        'no-unused-vars': 'off',
+        'react/prop-types': 'off',
+      },
+    },
+    {
+      // typescript and javascript for front end react performance
+      files: ['x-pack/plugins/osquery/public/**/!(*.test).{js,mjs,ts,tsx}'],
+      plugins: ['react', 'react-perf'],
+      rules: {
+        'react-perf/jsx-no-new-object-as-prop': 'error',
+        'react-perf/jsx-no-new-array-as-prop': 'error',
+        'react-perf/jsx-no-new-function-as-prop': 'error',
+        'react/jsx-no-bind': 'error',
+      },
+    },
+
     /**
      * Prettier disables all conflicting rules, listing as last override so it takes precedence
      */

.github/CODEOWNERS

@@ -9,7 +9,6 @@
 /x-pack/plugins/discover_enhanced/ @elastic/kibana-app
 /x-pack/plugins/lens/ @elastic/kibana-app
 /x-pack/plugins/graph/ @elastic/kibana-app
-/x-pack/plugins/vis_type_timeseries_enhanced/ @elastic/kibana-app
 /src/plugins/advanced_settings/ @elastic/kibana-app
 /src/plugins/charts/ @elastic/kibana-app
 /src/plugins/discover/ @elastic/kibana-app
@@ -67,6 +66,7 @@
 # APM
 /x-pack/plugins/apm/  @elastic/apm-ui
 /x-pack/test/functional/apps/apm/  @elastic/apm-ui
+/x-pack/test/apm_api_integration/ @elastic/apm-ui
 /src/plugins/apm_oss/  @elastic/apm-ui
 /src/apm.js @elastic/kibana-core @vigneshshanmugam
 /packages/kbn-apm-config-loader/ @elastic/kibana-core @vigneshshanmugam
@@ -81,6 +81,7 @@
 /x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
 /x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
 /x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
+/x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime
 
 # Beats
 /x-pack/plugins/beats_management/  @elastic/beats
@@ -100,7 +101,7 @@
 
 # Observability UIs
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
-/x-pack/plugins/fleet/ @elastic/ingest-management
+/x-pack/plugins/fleet/ @elastic/fleet
 /x-pack/plugins/observability/ @elastic/observability-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
@@ -330,6 +331,9 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 # Security Intelligence And Analytics
 /x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
 
+# Security Asset Management
+/x-pack/plugins/osquery @elastic/security-asset-management
+
 # Design (at the bottom for specificity of SASS files)
 **/*.scss  @elastic/kibana-design
 #CC# /packages/kbn-ui-framework/ @elastic/kibana-design

.github/paths-labeller.yml

@@ -10,7 +10,7 @@
     - "src/plugins/bfetch/**/*.*"
   - "Team:apm":
     - "x-pack/plugins/apm/**/*.*"
-  - "Team:Ingest Management":
+  - "Team:Fleet":
     - "x-pack/plugins/fleet/**/*.*"
     - "x-pack/test/fleet_api_integration/**/*.*"
   - "Team:uptime":

.gitignore

@@ -76,3 +76,7 @@ report.asciidoc
 
 # Yarn local mirror content
 .yarn-local-mirror
+
+# Bazel
+/bazel-*
+/.bazelrc.user

.teamcity/src/Extensions.kt

@@ -20,21 +20,20 @@ fun BuildType.kibanaAgent(size: Int) {
 }
 
 val testArtifactRules = """
-    target/junit/**/*
     target/kibana-*
-    target/kibana-coverage/**/*
-    target/kibana-security-solution/**/*.png
     target/test-metrics/*
+    target/kibana-security-solution/**/*.png
+    target/junit/**/*
     target/test-suites-ci-plan.json
-    test/**/screenshots/diff/*.png
-    test/**/screenshots/failure/*.png
     test/**/screenshots/session/*.png
+    test/**/screenshots/failure/*.png
+    test/**/screenshots/diff/*.png
     test/functional/failure_debug/html/*.html
-    x-pack/test/**/screenshots/diff/*.png
-    x-pack/test/**/screenshots/failure/*.png
     x-pack/test/**/screenshots/session/*.png
-    x-pack/test/functional/apps/reporting/reports/session/*.pdf
+    x-pack/test/**/screenshots/failure/*.png
+    x-pack/test/**/screenshots/diff/*.png
     x-pack/test/functional/failure_debug/html/*.html
+    x-pack/test/functional/apps/reporting/reports/session/*.pdf
   """.trimIndent()
 
 fun BuildType.addTestSettings() {

.teamcity/src/builds/test/AllTests.kt

@@ -9,5 +9,5 @@ object AllTests : BuildType({
   description = "All Non-Functional Tests"
   type = Type.COMPOSITE
 
-  dependsOn(QuickTests, Jest, JestIntegration, OssApiServerIntegration)
+  dependsOn(QuickTests, Jest, XPackJest, JestIntegration, OssApiServerIntegration)
 })

.teamcity/src/builds/test/Jest.kt

@@ -12,7 +12,7 @@ object Jest : BuildType({
   kibanaAgent(8)
 
   steps {
-    runbld("Jest Unit", "./.ci/teamcity/tests/jest.sh")
+    runbld("Jest Unit", "./.ci/teamcity/oss/jest.sh")
   }
 
   addTestSettings()

.teamcity/src/builds/test/XPackJest.kt

@@ -0,0 +1,19 @@
+package builds.test
+
+import addTestSettings
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import kibanaAgent
+import runbld
+
+object XPackJest : BuildType({
+  name = "X-Pack Jest Unit"
+  description = "Executes X-Pack Jest Unit Tests"
+
+  kibanaAgent(16)
+
+  steps {
+    runbld("X-Pack Jest Unit", "./.ci/teamcity/default/jest.sh")
+  }
+
+  addTestSettings()
+})

.teamcity/src/projects/Kibana.kt

@@ -77,6 +77,7 @@ fun Kibana(config: KibanaConfiguration = KibanaConfiguration()) : Project {
           name = "Jest"
 
           buildType(Jest)
+          buildType(XPackJest)
           buildType(JestIntegration)
         }
 

WORKSPACE.bazel

@@ -0,0 +1,3 @@
+workspace(
+    name = "kibana",
+)