Merge branch 'master' into threat_enrichment_simple

.bazelrc

@@ -11,7 +11,7 @@ import %workspace%/.bazelrc.common
 
 # BuildBuddy
 ## Metadata settings
-build --workspace_status_command=$(pwd)/src/dev/bazel_workspace_status.sh
+build --workspace_status_command="node ./src/dev/bazel_workspace_status.js"
 # Enable this in case you want to share your build info
 # build --build_metadata=VISIBILITY=PUBLIC
 build --build_metadata=TEST_GROUPS=//packages

.ci/Jenkinsfile_flaky

@@ -29,16 +29,20 @@ kibanaPipeline(timeoutMinutes: 180) {
       catchErrors {
         print "Agent ${agentNumberInside} - ${agentExecutions} executions"
 
-        workers.functional('flaky-test-runner', {
-          if (!IS_XPACK) {
-            kibanaPipeline.buildOss()
-            if (CI_GROUP == '1') {
-              runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
+        withEnv([
+          'IGNORE_SHIP_CI_STATS_ERROR=true',
+        ]) {
+          workers.functional('flaky-test-runner', {
+            if (!IS_XPACK) {
+              kibanaPipeline.buildOss()
+              if (CI_GROUP == '1') {
+                runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
+              }
+            } else {
+              kibanaPipeline.buildXpack()
             }
-          } else {
-            kibanaPipeline.buildXpack()
-          }
-        }, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
+          }, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
+        }
       }
     }
   }

.ci/Jenkinsfile_security_cypress

@@ -10,7 +10,8 @@ kibanaPipeline(timeoutMinutes: 180) {
   ) {
     catchError {
       withEnv([
-        'CI_PARALLEL_PROCESS_NUMBER=1'
+        'CI_PARALLEL_PROCESS_NUMBER=1',
+        'IGNORE_SHIP_CI_STATS_ERROR=true',
       ]) {
         def job = 'xpack-securityCypress'
 

.ci/end2end.groovy

@@ -121,15 +121,9 @@ pipeline {
 }
 
 def notifyStatus(String description, String status) {
-  notify(context: 'end2end-for-apm-ui', description: description, status: status, targetUrl: getBlueoceanTabURL('pipeline'))
+  withGithubStatus.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('pipeline'))
 }
 
 def notifyTestStatus(String description, String status) {
-  notify(context: 'end2end-for-apm-ui', description: description, status: status, targetUrl: getBlueoceanTabURL('tests'))
-}
-
-def notify(Map args = [:]) {
-  retryWithSleep(retries: 2, seconds: 5, backoff: true) {
-    githubNotify(context: args.context, description: args.description, status: args.status, targetUrl: args.targetUrl)
-  }
+  withGithubStatus.notify('end2end-for-apm-ui', description, status, getBlueoceanTabURL('tests'))
 }

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -26,10 +26,12 @@ kibanaPipeline(timeoutMinutes: 150) {
       message: "[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure",
     ) {
       retryable.enable(2)
-      withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
+      withEnv([
+        "ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}",
+        'IGNORE_SHIP_CI_STATS_ERROR=true',
+      ]) {
         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/packer_cache_for_branch.sh

@@ -26,7 +26,6 @@ source src/dev/ci_setup/setup.sh;
 
 # download es snapshots
 node scripts/es snapshot --download-only;
-node scripts/es snapshot --license=oss --download-only;
 
 # download reporting browsers
 (cd "x-pack" && node ../node_modules/.bin/gulp downloadChromium);

.eslintrc.js

@@ -1119,6 +1119,39 @@ module.exports = {
       // All files
       files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
       rules: {
+        'import/order': [
+          'error',
+          {
+            groups: ['unknown', ['builtin', 'external'], 'internal', 'parent', 'sibling', 'index'],
+            pathGroups: [
+              {
+                pattern:
+                  '{../../../../../../,../../../../../,../../../../,../../../,../../,../}{common/,*}__mocks__{*,/**}',
+                group: 'unknown',
+              },
+              {
+                pattern: '{**,.}/*.mock',
+                group: 'unknown',
+              },
+              {
+                pattern: 'react*',
+                group: 'external',
+                position: 'before',
+              },
+              {
+                pattern: '{@elastic/**,@kbn/**,src/**}',
+                group: 'internal',
+              },
+            ],
+            pathGroupsExcludedImportTypes: [],
+            alphabetize: {
+              order: 'asc',
+              caseInsensitive: true,
+            },
+            'newlines-between': 'always-and-inside-groups',
+          },
+        ],
+        'import/newline-after-import': 'error',
         'react-hooks/exhaustive-deps': 'off',
         'react/jsx-boolean-value': ['error', 'never'],
       },

.github/CODEOWNERS

@@ -26,6 +26,7 @@
 /src/plugins/vis_type_xy/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/visualizations/ @elastic/kibana-app
+/packages/kbn-tinymath/ @elastic/kibana-app
 
 # Application Services
 /examples/bfetch_explorer/ @elastic/kibana-app-services
@@ -91,6 +92,7 @@
 /src/plugins/dashboard/ @elastic/kibana-presentation
 /src/plugins/input_control_vis/ @elastic/kibana-presentation
 /src/plugins/vis_type_markdown/ @elastic/kibana-presentation
+/test/functional/apps/dashboard/  @elastic/kibana-presentation
 /x-pack/plugins/canvas/  @elastic/kibana-presentation
 /x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
 /x-pack/test/functional/apps/canvas/  @elastic/kibana-presentation
@@ -149,6 +151,7 @@
 /src/cli/keystore/ @elastic/kibana-operations
 /src/legacy/server/warnings/ @elastic/kibana-operations
 /.ci/es-snapshots/ @elastic/kibana-operations
+/.github/workflows/ @elastic/kibana-operations
 /vars/ @elastic/kibana-operations
 /.bazelignore @elastic/kibana-operations
 /.bazeliskversion @elastic/kibana-operations
@@ -220,9 +223,8 @@
 /x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-core
 /.telemetryrc.json @elastic/kibana-core
 /x-pack/.telemetryrc.json @elastic/kibana-core
-src/plugins/telemetry/schema/legacy_oss_plugins.json @elastic/kibana-core
-src/plugins/telemetry/schema/oss_plugins.json @elastic/kibana-core
-x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kibana-core
+src/plugins/telemetry/schema/ @elastic/kibana-core @elastic/kibana-telemetry @elastic/infra-telemetry
+x-pack/plugins/telemetry_collection_xpack/schema/ @elastic/kibana-core @elastic/kibana-telemetry @elastic/infra-telemetry
 
 # Kibana Localization
 /src/dev/i18n/  @elastic/kibana-localization @elastic/kibana-core
@@ -244,7 +246,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/test/security_api_integration/ @elastic/kibana-security
 /x-pack/test/security_functional/ @elastic/kibana-security
 /x-pack/test/spaces_api_integration/ @elastic/kibana-security
-#CC# /x-pack/plugins/security_solution/ @elastic/kibana-security
 #CC# /x-pack/plugins/security/ @elastic/kibana-security
 
 # Kibana Alerting Services
@@ -312,25 +313,22 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 #CC# /x-pack/plugins/console_extensions/ @elastic/es-ui
 #CC# /x-pack/plugins/cross_cluster_replication/ @elastic/es-ui
 
-# Endpoint
-/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem
-#CC# /x-pack/legacy/plugins/siem/ @elastic/siem
-#CC# /x-pack/plugins/siem/ @elastic/siem
-#CC# /x-pack/plugins/security_solution/ @elastic/siem
-
 # Security Solution
-/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
-/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
-/x-pack/test/lists_api_integration @elastic/siem @elastic/endpoint-app-team
-/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
-/x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team
-/x-pack/plugins/lists @elastic/siem @elastic/endpoint-app-team
-#CC# /x-pack/plugins/security_solution/ @elastic/siem
+/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/security-solution
+/x-pack/test/security_solution_endpoint/ @elastic/security-solution
+/x-pack/test/functional/es_archives/endpoint/ @elastic/security-solution
+/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/security-solution
+/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
+/x-pack/plugins/security_solution/ @elastic/security-solution
+/x-pack/test/detection_engine_api_integration @elastic/security-solution
+/x-pack/test/lists_api_integration @elastic/security-solution
+/x-pack/test/api_integration/apis/security_solution @elastic/security-solution
+#CC# /x-pack/plugins/security_solution/ @elastic/security-solution
+
+# Security Solution sub teams
+/x-pack/plugins/case @elastic/security-threat-hunting
+/x-pack/test/case_api_integration @elastic/security-threat-hunting
+/x-pack/plugins/lists @elastic/security-detections-response
 
 # Security Intelligence And Analytics
 /x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
@@ -362,3 +360,4 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 # Reporting
 #CC# /x-pack/plugins/reporting/ @elastic/kibana-reporting-services
 
+

.github/workflows/backport.yml

@@ -0,0 +1,51 @@
+on:
+  pull_request_target:
+    branches:
+      - master
+    types:
+      - labeled
+      - closed
+
+jobs:
+  backport:
+    name: Backport PR
+    if: |
+      github.event.pull_request.merged == true
+      && contains(github.event.pull_request.labels.*.name, 'auto-backport')
+      && (
+        (github.event.action == 'labeled' && github.event.label.name == 'auto-backport')
+        || (github.event.action == 'closed')
+      )
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Get backport config'
+        run: |
+          curl 'https://raw.githubusercontent.com/elastic/kibana/master/.backportrc.json' > .backportrc.json
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - name: Install backport CLI
+        run: npm install -g backport@5.6.4
+
+      - name: Backport PR
+        run: |
+          git config --global user.name "kibanamachine"
+          git config --global user.email "42973632+kibanamachine@users.noreply.github.com"
+          backport --fork true --username kibanamachine --accessToken "${{ secrets.KIBANAMACHINE_TOKEN }}" --ci --pr "$PR_NUMBER" --labels backport --assignee "$PR_OWNER" | tee 'output.log'
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_OWNER: ${{ github.event.pull_request.user.login }}
+
+      - name: Report backport status
+        run: |
+          COMMENT="Backport result
+          \`\`\`
+          $(cat output.log)
+          \`\`\`"
+
+          GITHUB_TOKEN="${{ secrets.KIBANAMACHINE_TOKEN }}" gh api -X POST repos/elastic/kibana/issues/$PR_NUMBER/comments -F body="$COMMENT"
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}