Merge branch '7.x' into ua/delete_deprecation_log_cache

Author: kibanamachine

.bazelrc

@@ -2,12 +2,13 @@
 # Import shared settings first so we can override below
 import %workspace%/.bazelrc.common
 
-## Disabled for now
 # 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
+build --remote_cache=grpcs://cloud.buildbuddy.io
+build --incompatible_remote_results_ignore_disk=true
+build --noremote_upload_local_results
+build --remote_timeout=30
+build --remote_header=x-buildbuddy-api-key=3EYk49W2NefOx2n3yMze
+build --remote_accept_cached=true
 
 # BuildBuddy
 ## Metadata settings

.buildkite/scripts/build_kibana_plugins.sh

@@ -8,8 +8,6 @@ node scripts/build_kibana_platform_plugins \
   --scan-dir "$KIBANA_DIR/test/interpreter_functional/plugins" \
   --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \
   --scan-dir "$KIBANA_DIR/examples" \
-  --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
-  --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_functional/plugins" \
   --scan-dir "$XPACK_DIR/test/functional_with_es_ssl/fixtures/plugins" \
   --scan-dir "$XPACK_DIR/test/alerting_api_integration/plugins" \

.buildkite/scripts/common/setup_bazel.sh

@@ -2,9 +2,12 @@
 
 set -euo pipefail
 
+node .buildkite/scripts/lifecycle/print_agent_links.js || true
+
 IS_TEST_EXECUTION_STEP="$(buildkite-agent meta-data get "${BUILDKITE_JOB_ID}_is_test_execution_step" --default '')"
 
 if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
+  echo "--- Upload Artifacts"
   buildkite-agent artifact upload 'target/junit/**/*'
   buildkite-agent artifact upload 'target/kibana-*'
   buildkite-agent artifact upload 'target/kibana-coverage/jest/**/*'
@@ -22,6 +25,7 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
   buildkite-agent artifact upload 'x-pack/test/functional/failure_debug/html/*.html'
   buildkite-agent artifact upload '.es/**/*.hprof'
 
+  echo "--- Run Failed Test Reporter"
   node scripts/report_failed_tests --build-url="${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}" 'target/junit/**/*.xml'
 
   if [[ -d 'target/test_failures' ]]; then

.buildkite/scripts/lifecycle/post_command.sh

@@ -4,12 +4,12 @@ set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
 
-node .buildkite/scripts/lifecycle/print_agent_links.js
+node .buildkite/scripts/lifecycle/print_agent_links.js || true
 
 echo '--- Job Environment Setup'
 
 cd '.buildkite'
-yarn install
+retry 5 15 yarn install
 cd -
 
 BUILDKITE_TOKEN="$(retry 5 5 vault read -field=buildkite_token_all_jobs secret/kibana-issues/dev/buildkite-ci)"
@@ -89,7 +89,6 @@ if [[ "${SKIP_CI_SETUP:-}" != "true" ]]; then
   if [[ -d .buildkite/scripts && "${BUILDKITE_COMMAND:-}" != "buildkite-agent pipeline upload"* ]]; then
     source .buildkite/scripts/common/env.sh
     source .buildkite/scripts/common/setup_node.sh
-    source .buildkite/scripts/common/setup_bazel.sh
   fi
 fi
 

.buildkite/scripts/lifecycle/pre_command.sh

@@ -1,21 +1,38 @@
-const NOW = new Date();
-const TWO_HOURS = new Date(NOW.getTime() + 2 * 60 * 60 * 1000);
+const { BuildkiteClient } = require('kibana-buildkite-library');
 
-const METRICS_URL = [
-  `https://kibana-ops-buildkite-monitoring.kb.us-central1.gcp.cloud.es.io:9243`,
-  `/app/metrics/link-to/host-detail/${process.env.BUILDKITE_AGENT_NAME}`,
-  `?to=${TWO_HOURS.getTime()}`,
-  `&from=${NOW.getTime()}`,
-].join('');
+(async () => {
+  try {
+    const client = new BuildkiteClient();
+    const build = await client.getCurrentBuild();
 
-const LOGS_URL = [
-  `https://kibana-ops-buildkite-monitoring.kb.us-central1.gcp.cloud.es.io:9243`,
-  `/app/logs/link-to/host-logs/${process.env.BUILDKITE_AGENT_NAME}`,
-  `?time=${NOW.getTime()}`,
-].join('');
+    const job = build.jobs.find((j) => j.id === process.env.BUILDKITE_JOB_ID);
+    const startTime = job ? new Date(job.started_at) : new Date().getTime() - 60 * 60 * 1000;
+    const twoHours = new Date(startTime.getTime() + 2 * 60 * 60 * 1000);
 
-console.log('--- Agent Debug Links');
-console.log('Agent Metrics:');
-console.log('\u001b]1339;' + `url='${METRICS_URL}'\u0007`);
-console.log('Agent Logs:');
-console.log('\u001b]1339;' + `url='${LOGS_URL}'\u0007`);
+    const METRICS_URL = [
+      `https://kibana-ops-buildkite-monitoring.kb.us-central1.gcp.cloud.es.io:9243`,
+      `/app/metrics/link-to/host-detail/${process.env.BUILDKITE_AGENT_NAME}`,
+      `?to=${twoHours.getTime()}`,
+      `&from=${startTime.getTime()}`,
+    ].join('');
+
+    const LOGS_URL = [
+      `https://kibana-ops-buildkite-monitoring.kb.us-central1.gcp.cloud.es.io:9243`,
+      `/app/logs/link-to/host-logs/${process.env.BUILDKITE_AGENT_NAME}`,
+      `?time=${startTime.getTime()}`,
+    ].join('');
+
+    console.log('--- Agent Debug Links');
+    console.log('Agent Metrics:');
+    console.log('\u001b]1339;' + `url='${METRICS_URL}'\u0007`);
+    console.log('Agent Logs:');
+    console.log('\u001b]1339;' + `url='${LOGS_URL}'\u0007`);
+  } catch (ex) {
+    // Probably don't need to fail the build for this failure, just log it
+    console.error('Buildkite API Error', ex.message);
+    if (ex.response) {
+      console.error('HTTP Error Response Status', ex.response.status);
+      console.error('HTTP Error Response Body', ex.response.data);
+    }
+  }
+})();

.buildkite/scripts/lifecycle/print_agent_links.js

@@ -2,6 +2,9 @@
 
 set -euo pipefail
 
+# Write Bazel cache for Linux
+.buildkite/scripts/common/setup_bazel.sh
+
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/build_kibana.sh
 .buildkite/scripts/post_build_kibana.sh

.buildkite/scripts/steps/on_merge_build_and_metrics.sh

@@ -496,6 +496,7 @@ module.exports = {
     {
       files: [
         '**/*.stories.tsx',
+        '**/*.test.js',
         'x-pack/test/apm_api_integration/**/*.ts',
         'x-pack/test/functional/apps/**/*.js',
         'x-pack/plugins/apm/**/*.js',
@@ -510,6 +511,7 @@ module.exports = {
       ],
       rules: {
         'import/no-default-export': 'off',
+        'import/no-named-as-default-member': 'off',
         'import/no-named-as-default': 'off',
       },
     },
@@ -1551,8 +1553,8 @@ module.exports = {
       plugins: ['react', '@typescript-eslint'],
       files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
       rules: {
-        'arrow-body-style': ['error', 'as-needed'],
-        'prefer-arrow-callback': 'error',
+        // 'arrow-body-style': ['error', 'as-needed'],
+        // 'prefer-arrow-callback': 'error',
         'no-unused-vars': 'off',
         'react/prop-types': 'off',
         '@typescript-eslint/explicit-module-boundary-types': 'off',
@@ -1597,7 +1599,6 @@ module.exports = {
      */
     {
       files: [
-        'src/plugins/security_oss/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/encrypted_saved_objects/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/security/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/spaces/**/*.{js,mjs,ts,tsx}',

.eslintrc.js

@@ -5,6 +5,7 @@
     "kbnConfig": "packages/kbn-config/src",
     "console": "src/plugins/console",
     "core": "src/core",
+    "customIntegrations": "src/plugins/custom_integrations",
     "discover": "src/plugins/discover",
     "bfetch": "src/plugins/bfetch",
     "dashboard": "src/plugins/dashboard",
@@ -29,6 +30,7 @@
     "expressionRevealImage": "src/plugins/expression_reveal_image",
     "expressionShape": "src/plugins/expression_shape",
     "expressionTagcloud": "src/plugins/chart_expressions/expression_tagcloud",
+    "expressionMetricVis": "src/plugins/chart_expressions/expression_metric",
     "inputControl": "src/plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
@@ -55,7 +57,6 @@
     "regionMap": "src/plugins/region_map",
     "savedObjects": "src/plugins/saved_objects",
     "savedObjectsManagement": "src/plugins/saved_objects_management",
-    "security": "src/plugins/security_oss",
     "server": "src/legacy/server",
     "statusPage": "src/legacy/core_plugins/status_page",
     "telemetry": ["src/plugins/telemetry", "src/plugins/telemetry_management_section"],