Merge branch 'master' into so-migrations-on-by-default

.bazeliskversion

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

.bazelversion

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

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -29,7 +29,6 @@ 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,7 +2,6 @@
 
 JOB:
   - kibana-intake
-  - x-pack-intake
   - kibana-firefoxSmoke
   - kibana-ciGroup1
   - kibana-ciGroup2

.ci/teamcity/default/jest.sh

@@ -1,10 +1,4 @@
 #!/bin/bash
 
-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
+# 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)

.ci/teamcity/oss/jest.sh

@@ -1,10 +1,13 @@
 #!/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 "OSS Jest Unit Tests" \
-  node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest --ci --maxWorkers=5 --verbose

.ci/teamcity/tests/jest.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-jest
+
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest --ci --maxWorkers=5 --verbose

.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

.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,11 +9,9 @@
 /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
-/src/plugins/lens_oss/ @elastic/kibana-app
 /src/plugins/management/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
 /src/plugins/timelion/ @elastic/kibana-app
@@ -127,7 +125,6 @@
 /x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
 /x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
 #CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
-#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
 #CC# /x-pack/plugins/file_upload @elastic/kibana-gis
 #CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
 /src/plugins/tile_map/ @elastic/kibana-gis
@@ -332,6 +329,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

.i18nrc.json

@@ -61,8 +61,6 @@
     "visTypeVislib": "src/plugins/vis_type_vislib",
     "visTypeXy": "src/plugins/vis_type_xy",
     "visualizations": "src/plugins/visualizations",
-    "lensOss": "src/plugins/lens_oss",
-    "mapsOss": "src/plugins/maps_oss",
     "visualize": "src/plugins/visualize",
     "apmOss": "src/plugins/apm_oss",
     "usageCollection": "src/plugins/usage_collection"

.teamcity/src/Extensions.kt

@@ -20,20 +20,21 @@ fun BuildType.kibanaAgent(size: Int) {
 }
 
 val testArtifactRules = """
+    target/junit/**/*
     target/kibana-*
-    target/test-metrics/*
+    target/kibana-coverage/**/*
     target/kibana-security-solution/**/*.png
-    target/junit/**/*
+    target/test-metrics/*
     target/test-suites-ci-plan.json
-    test/**/screenshots/session/*.png
-    test/**/screenshots/failure/*.png
     test/**/screenshots/diff/*.png
+    test/**/screenshots/failure/*.png
+    test/**/screenshots/session/*.png
     test/functional/failure_debug/html/*.html
-    x-pack/test/**/screenshots/session/*.png
-    x-pack/test/**/screenshots/failure/*.png
     x-pack/test/**/screenshots/diff/*.png
-    x-pack/test/functional/failure_debug/html/*.html
+    x-pack/test/**/screenshots/failure/*.png
+    x-pack/test/**/screenshots/session/*.png
     x-pack/test/functional/apps/reporting/reports/session/*.pdf
+    x-pack/test/functional/failure_debug/html/*.html
   """.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, XPackJest, JestIntegration, OssApiServerIntegration)
+  dependsOn(QuickTests, Jest, JestIntegration, OssApiServerIntegration)
 })

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

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

.teamcity/src/projects/Kibana.kt

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

WORKSPACE.bazel

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

docs/developer/plugin-list.asciidoc

@@ -130,11 +130,6 @@ in Kibana, e.g. visualizations. It has the form of a flyout panel.
 |The legacyExport plugin adds support for the legacy saved objects export format.
 
 
-|{kib-repo}blob/{branch}/src/plugins/lens_oss/README.md[lensOss]
-|The lens_oss plugin registers the lens visualization on OSS.
-It is registered as disabled. The x-pack plugin should unregister this.
-
-
 |{kib-repo}blob/{branch}/src/plugins/management/README.md[management]
 |This plugins contains the "Stack Management" page framework. It offers navigation and an API
 to link individual managment section into it. This plugin does not contain any individual
@@ -145,11 +140,6 @@ management section itself.
 |Internal objects used by the Coordinate, Region, and Vega visualizations.
 
 
-|{kib-repo}blob/{branch}/src/plugins/maps_oss/README.md[mapsOss]
-|The maps_oss plugin registers the maps visualization on OSS.
-It is registered as disabled. The x-pack plugin should unregister this.
-
-
 |{kib-repo}blob/{branch}/src/plugins/navigation/README.md[navigation]
 |The navigation plugins exports the TopNavMenu component.
 It also provides a stateful version of it on the start contract.
@@ -380,10 +370,6 @@ and actions.
 |The features plugin enhance Kibana with a per-feature privilege system.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/file_upload/README.md[fileUpload]
-|Backend and core front-end react-components for GeoJson file upload. Only supports the Maps plugin.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/fleet/README.md[fleet]
 |Fleet needs to have Elasticsearch API keys enabled, and also to have TLS enabled on kibana, (if you want to run Kibana without TLS you can provide the following config flag --xpack.fleet.agents.tlsCheckDisabled=false)
 
@@ -453,6 +439,10 @@ using the CURL scripts in the scripts folder.
 |Visualize geo data from Elasticsearch or 3rd party geo-services.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/maps_file_upload/README.md[mapsFileUpload]
+|Deprecated - plugin targeted for removal and will get merged into file_upload plugin
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/maps_legacy_licensing/README.md[mapsLegacyLicensing]
 |This plugin provides access to the detailed tile map services from Elastic.
 
@@ -470,6 +460,10 @@ Elastic.
 |This plugin provides shared components and services for use across observability solutions, as well as the observability landing page UI.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/osquery/README.md[osquery]
+|This plugin adds extended support to Security Solution Fleet Osquery integration
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/painless_lab/README.md[painlessLab]
 |This plugin helps users learn how to use the Painless scripting language.
 
@@ -565,10 +559,6 @@ in their infrastructure.
 |NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/vis_type_timeseries_enhanced/README.md[visTypeTimeseriesEnhanced]
-|The vis_type_timeseries_enhanced plugin is the x-pack counterpart to the OSS vis_type_timeseries plugin.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/watcher/README.md[watcher]
 |This plugins adopts some conventions in addition to or in place of conventions in Kibana (at the time of the plugin's creation):
 

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -30,6 +30,11 @@ readonly links: {
         readonly metricbeat: {
             readonly base: string;
         };
+        readonly enterpriseSearch: {
+            readonly base: string;
+            readonly appSearchBase: string;
+            readonly workplaceSearchBase: string;
+        };
         readonly heartbeat: {
             readonly base: string;
         };