Merge branch 'master' into task-manager/docs-monitoring

* master: (157 commits)
  [DOCS] Adds machine learning to the security section of alerting (elastic#91501)
  [Uptime] Ping list step screenshot caption formatting (elastic#91403)
  [Vislib] Use timestamp on brush event instead of iso dates (elastic#91483)
  [Application Usage] Remove deprecated & unused legacy.appChanged API (elastic#91464)
  Migrate logstash, monitoring, url_drilldowns, xpack_legacy to ts projects (elastic#91194)
  [APM] Wrap Elasticsearch client errors (elastic#91125)
  [APM] Fix optimize-tsconfig script (elastic#91487)
  [Discover][docs] Add searchFieldsFromSource description (elastic#90980)
  Adds support for 'ip' data type (elastic#85087)
  [Detection Rules] Add updates from 7.11.2 rules (elastic#91553)
  [SECURITY SOLUTION] Eql in timeline (elastic#90816)
  [APM] Correlations Beta (elastic#86477) (elastic#89952)
  [Security Solutions][Detection Engine] Adds a warning banner when the alerts data has not been migrated yet. (elastic#90258)
  [Security Solution] [Timeline] Endpoint row renderers (2nd batch) (elastic#91446)
  skip flaky suite (elastic#91450)
  skip flaky suite (elastic#91592)
  [Security Solution][Endpoint][Admin] Endpoint Details UX Enhancements (elastic#90870)
  [ML] Add better UI support for runtime fields Transforms  (elastic#90363)
  [Security Solution] [Detections] Replace 'partial failure' with 'warning' for rule statuses (elastic#91167)
  [Security Solution][Detections] Adds Indicator path config for indicator match rules (elastic#91260)
  ...

.ci/Jenkinsfile_baseline_capture

@@ -12,7 +12,17 @@ kibanaPipeline(timeoutMinutes: 120) {
         ]) {
           parallel([
             'oss-baseline': {
-              workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
+              workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false, bootstrapped: false) {
+                // bootstrap ourselves, but with the env needed to upload the ts refs cache
+                withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
+                  withEnv([
+                    'BUILD_TS_REFS_CACHE_ENABLE=true',
+                    'BUILD_TS_REFS_CACHE_CAPTURE=true'
+                  ]) {
+                    kibanaPipeline.doSetup()
+                  }
+                }
+
                 kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
               }
             },

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -19,7 +19,7 @@ currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch
 
 def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
 
-kibanaPipeline(timeoutMinutes: 150) {
+kibanaPipeline(timeoutMinutes: 210) {
   catchErrors {
     slackNotifications.onFailure(
       title: "*<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",

.github/CODEOWNERS

@@ -74,7 +74,13 @@
 #CC# /src/plugins/apm_oss/ @elastic/apm-ui
 #CC# /x-pack/plugins/observability/ @elastic/apm-ui
 
-# Client Side Monitoring (lives in APM directories but owned by Uptime)
+# Uptime
+/x-pack/plugins/uptime @elastic/uptime
+/x-pack/test/functional_with_es_ssl/apps/uptime  @elastic/uptime
+/x-pack/test/functional/apps/uptime @elastic/uptime
+/x-pack/test/api_integration/apis/uptime @elastic/uptime
+
+# Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
 /x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
 /x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature @elastic/uptime
 /x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
@@ -106,7 +112,6 @@
 /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
 
 # Machine Learning
 /x-pack/plugins/ml/  @elastic/ml-ui

.github/workflows/backport.yml

@@ -18,34 +18,20 @@ jobs:
       )
     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
+      - name: Checkout Actions
+        uses: actions/checkout@v2
         with:
-          node-version: 14.x
-
-      - name: Install backport CLI
-        run: npm install -g backport@5.6.4
+          repository: 'elastic/kibana-github-actions'
+          ref: main
+          path: ./actions
 
-      - 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: Install Actions
+        run: npm install --production --prefix ./actions
 
-      - 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 }}
+      - name: Run Backport
+        uses: ./actions/backport
+        with:
+          branch: master
+          github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
+          commit_user: kibanamachine
+          commit_email: 42973632+kibanamachine@users.noreply.github.com

.gitignore

@@ -61,9 +61,6 @@ npm-debug.log*
 .ci/bash_standard_lib.sh
 .gradle
 
-# apm plugin
-/x-pack/plugins/apm/tsconfig.json
-apm.tsconfig.json
 ## @cypress/snapshot from apm plugin
 snapshots.js
 

Jenkinsfile

@@ -3,7 +3,7 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true) {
+kibanaPipeline(timeoutMinutes: 210, checkPrChanges: true, setCommitStatus: true) {
   slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
     githubPr.withDefaultPrComments {
       ciStats.trackBuild {