Merge branch 'main' into 170295-pre-fill-custom-threshold

.buildkite/scripts/serverless/create_deploy_tag/collect_commit_info.ts

@@ -13,6 +13,7 @@ import {
   getSelectedCommitHash,
   getCommitByHash,
   makeCommitInfoHtml,
+  getRecentCommits,
 } from './info_sections/commit_info';
 import {
   getArtifactBuild,
@@ -45,7 +46,8 @@ async function main() {
   const buildkiteBuild = await getOnMergePRBuild(selectedSha);
   const nextBuildContainingCommit = await getQAFBuildContainingCommit(
     selectedSha,
-    selectedCommitInfo.date!
+    selectedCommitInfo.date!,
+    await getRecentCommits(50)
   );
   const artifactBuild = await getArtifactBuild(selectedSha);
   addBuildkiteInfoSection(

.buildkite/scripts/serverless/create_deploy_tag/create_deploy_tag.sh

@@ -11,9 +11,12 @@ fi
 
 echo "--- Creating deploy tag $DEPLOY_TAG at $KIBANA_COMMIT_SHA"
 
+echo "Fetching user identity from GitHub..."
+IDENTITY_JSON=$(ts-node .buildkite/scripts/serverless/create_deploy_tag/get_github_identity.ts)
+
 # Set git identity to whomever triggered the buildkite job
-git config user.email "$BUILDKITE_BUILD_CREATOR_EMAIL"
-git config user.name "$BUILDKITE_BUILD_CREATOR"
+git config user.email "${BUILDKITE_BUILD_CREATOR_EMAIL:-$(echo ${IDENTITY_JSON} | jq .email)}"
+git config user.name "${BUILDKITE_BUILD_CREATOR:-$(echo ${IDENTITY_JSON} | jq .name)}"
 
 # Create a tag for the deploy
 git tag -a "$DEPLOY_TAG" "$KIBANA_COMMIT_SHA" \

.buildkite/scripts/serverless/create_deploy_tag/get_github_identity.ts

@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+// Query the GitHub API for the user's GitHub identity
+import { octokit } from './shared';
+
+const getGitHubIdentity = async (): Promise<{
+  login: string;
+  name: string | null;
+  email: string | null;
+}> => {
+  const { data } = await octokit.users.getAuthenticated();
+
+  return {
+    login: data.login,
+    name: data.name,
+    email: data.email,
+  };
+};
+
+async function main() {
+  try {
+    const identity = await getGitHubIdentity();
+
+    if (!identity.name) {
+      identity.name = identity.login;
+    }
+
+    if (!identity.email) {
+      identity.email = `${identity.login}@elastic.co`;
+    }
+
+    return identity;
+  } catch (error) {
+    console.error(error);
+
+    return {
+      login: 'unknown-user',
+      name: 'Unknown User',
+      email: '[email protected]',
+    };
+  }
+}
+
+if (require.main === module) {
+  main().then((identity) => {
+    console.log(JSON.stringify(identity));
+  });
+} else {
+  module.exports = main;
+}

.buildkite/scripts/serverless/create_deploy_tag/info_sections/build_info.ts

@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { components } from '@octokit/openapi-types';
-import { buildkite, buildkiteBuildStateToEmoji, CommitWithStatuses, octokit } from '../shared';
+import { buildkite, buildkiteBuildStateToEmoji, CommitWithStatuses } from '../shared';
+import { GitCommitExtract } from './commit_info';
 import { Build } from '#pipeline-utils/buildkite';
 
 const QA_FTR_TEST_SLUG = 'appex-qa-serverless-kibana-ftr-tests';
@@ -70,27 +70,30 @@ export async function getArtifactBuild(commitSha: string): Promise<BuildkiteBuil
 
 export async function getQAFBuildContainingCommit(
   commitSha: string,
-  date: string
+  date: string,
+  recentGitCommits: GitCommitExtract[]
 ): Promise<BuildkiteBuildExtract | null> {
-  // List of commits
-  const commitShaList = await getCommitListCached();
-
   // List of QAF builds
   const qafBuilds = await buildkite.getBuildsAfterDate(QA_FTR_TEST_SLUG, date, 30);
+  qafBuilds.reverse();
 
   // Find the first build that contains this commit
-  const build = qafBuilds.find((kbBuild) => {
-    // Check if build.commit is after commitSha?
-    const kibanaCommitSha = tryGetKibanaBuildHashFromQAFBuild(kbBuild);
-    const buildkiteBuildShaIndex = commitShaList.findIndex((c) => c.sha === kibanaCommitSha);
-    const commitShaIndex = commitShaList.findIndex((c) => c.sha === commitSha);
-
-    return (
-      commitShaIndex !== -1 &&
-      buildkiteBuildShaIndex !== -1 &&
-      buildkiteBuildShaIndex < commitShaIndex
-    );
-  });
+  const build = qafBuilds
+    // Only search across scheduled builds, triggered builds might run with different commits
+    .filter((e) => e.source === 'schedule')
+    .find((kbBuild) => {
+      const commitShaIndex = recentGitCommits.findIndex((c) => c.sha === commitSha);
+
+      const kibanaCommitOfFTR = tryGetKibanaBuildHashFromQAFBuild(kbBuild);
+      const buildkiteBuildShaIndex = recentGitCommits.findIndex((c) => c.sha === kibanaCommitOfFTR);
+
+      // Check if build.commit is after commitSha?
+      return (
+        commitShaIndex !== -1 &&
+        buildkiteBuildShaIndex !== -1 &&
+        buildkiteBuildShaIndex <= commitShaIndex
+      );
+    });
 
   if (!build) {
     return null;
@@ -121,25 +124,6 @@ function tryGetKibanaBuildHashFromQAFBuild(build: Build) {
   }
 }
 
-let _commitListCache: Array<components['schemas']['commit']> | null = null;
-async function getCommitListCached() {
-  if (!_commitListCache) {
-    const resp = await octokit.request<'GET /repos/{owner}/{repo}/commits'>(
-      'GET /repos/{owner}/{repo}/commits',
-      {
-        owner: 'elastic',
-        repo: 'kibana',
-        headers: {
-          accept: 'application/vnd.github.v3+json',
-          'X-GitHub-Api-Version': '2022-11-28',
-        },
-      }
-    );
-    _commitListCache = resp.data;
-  }
-  return _commitListCache;
-}
-
 function makeBuildInfoSnippetHtml(name: string, build: BuildkiteBuildExtract | null) {
   if (!build) {
     return `[❓] ${name} - no build found`;

.buildkite/scripts/serverless/create_deploy_tag/list_commit_candidates.ts

@@ -83,7 +83,7 @@ async function enrichWithStatuses(commits: GitCommitExtract[]): Promise<CommitWi
         };
       }
 
-      const nextFTRBuild = await getQAFBuildContainingCommit(commit.sha, commit.date);
+      const nextFTRBuild = await getQAFBuildContainingCommit(commit.sha, commit.date, commits);
       const artifactBuild = await getArtifactBuild(commit.sha);
 
       return {

.buildkite/scripts/serverless/create_deploy_tag/mock_exec.ts

@@ -75,7 +75,10 @@ const loadFakeResponses = (() => {
 })();
 
 const makeMockExec = (id: string) => {
-  console.warn("--- Using mock exec, don't use this on CI. ---");
+  if (process.env?.CI?.match(/(1|true)/i)) {
+    throw new Error(`Mock exec is not supported in CI - your commands won't be executed.`);
+  }
+
   const callStorage = getCallStorage();
   const calls = callStorage[id];
 

api_docs/actions.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
 title: "actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the actions plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';

api_docs/advanced_settings.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
 title: "advancedSettings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the advancedSettings plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';

api_docs/ai_assistant_management_observability.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementObservability
 title: "aiAssistantManagementObservability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiAssistantManagementObservability plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementObservability']
 ---
 import aiAssistantManagementObservabilityObj from './ai_assistant_management_observability.devdocs.json';

api_docs/ai_assistant_management_selection.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
 title: "aiAssistantManagementSelection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiAssistantManagementSelection plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
 ---
 import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';

api_docs/aiops.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
 title: "aiops"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiops plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';

api_docs/alerting.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
 title: "alerting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the alerting plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
 ---
 import alertingObj from './alerting.devdocs.json';

api_docs/apm.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
 title: "apm"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apm plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
 ---
 import apmObj from './apm.devdocs.json';

api_docs/apm_data_access.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apmDataAccess
 title: "apmDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apmDataAccess plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apmDataAccess']
 ---
 import apmDataAccessObj from './apm_data_access.devdocs.json';

api_docs/asset_manager.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/assetManager
 title: "assetManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the assetManager plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'assetManager']
 ---
 import assetManagerObj from './asset_manager.devdocs.json';

api_docs/banners.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
 title: "banners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the banners plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
 ---
 import bannersObj from './banners.devdocs.json';

api_docs/bfetch.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch
 title: "bfetch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the bfetch plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'bfetch']
 ---
 import bfetchObj from './bfetch.devdocs.json';

api_docs/canvas.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas
 title: "canvas"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the canvas plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'canvas']
 ---
 import canvasObj from './canvas.devdocs.json';

api_docs/cases.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases
 title: "cases"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cases plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases']
 ---
 import casesObj from './cases.devdocs.json';

api_docs/charts.devdocs.json

@@ -2239,19 +2239,9 @@
           "label": "theme",
           "description": [],
           "signature": [
-            "{ readonly chartsDefaultTheme: ",
-            "RecursivePartial",
-            "<",
-            "Theme",
-            ">; readonly chartsDefaultBaseTheme: ",
-            "Theme",
-            "; chartsTheme$: ",
-            "Observable",
-            "<",
-            "RecursivePartial",
-            "<",
+            "{ readonly chartsDefaultBaseTheme: ",
             "Theme",
-            ">>; chartsBaseTheme$: ",
+            "; chartsBaseTheme$: ",
             "Observable",
             "<",
             "Theme",
@@ -3403,7 +3393,7 @@
           "CustomXDomain",
           " | undefined>; ariaDescription?: string | undefined; ariaDescribedBy?: string | undefined; ariaLabelledBy?: string | undefined; ariaTableCaption?: string | undefined; legendAction?: \"ignore\" | undefined; legendStrategy?: ",
           "LegendStrategy",
-          " | undefined; onLegendItemClick?: \"ignore\" | undefined; customLegend?: \"ignore\" | undefined; onLegendItemMinusClick?: \"ignore\" | undefined; onLegendItemOut?: \"ignore\" | undefined; onLegendItemOver?: \"ignore\" | undefined; onLegendItemPlusClick?: \"ignore\" | undefined; debugState?: boolean | undefined; onProjectionClick?: \"ignore\" | undefined; onElementClick?: \"ignore\" | undefined; onElementOver?: \"ignore\" | undefined; onElementOut?: \"ignore\" | undefined; onBrushEnd?: \"ignore\" | undefined; onProjectionAreaChange?: \"ignore\" | undefined; onAnnotationClick?: \"ignore\" | undefined; pointerUpdateDebounce?: number | undefined; roundHistogramBrushValues?: boolean | undefined; noResults?: React.ReactChild | React.ComponentType<{}> | undefined; legendSort?: \"ignore\" | undefined; } | undefined; }"
+          " | undefined; onLegendItemClick?: \"ignore\" | undefined; customLegend?: \"ignore\" | undefined; onLegendItemMinusClick?: \"ignore\" | undefined; onLegendItemOut?: \"ignore\" | undefined; onLegendItemOver?: \"ignore\" | undefined; onLegendItemPlusClick?: \"ignore\" | undefined; debugState?: boolean | undefined; onProjectionClick?: \"ignore\" | undefined; onElementClick?: \"ignore\" | undefined; onElementOver?: \"ignore\" | undefined; onElementOut?: \"ignore\" | undefined; onBrushEnd?: \"ignore\" | undefined; onResize?: \"ignore\" | undefined; onWillRender?: \"ignore\" | undefined; onProjectionAreaChange?: \"ignore\" | undefined; onAnnotationClick?: \"ignore\" | undefined; pointerUpdateDebounce?: number | undefined; roundHistogramBrushValues?: boolean | undefined; noResults?: React.ReactChild | React.ComponentType<{}> | undefined; legendSort?: \"ignore\" | undefined; } | undefined; }"
         ],
         "path": "src/plugins/charts/common/static/overrides/settings.ts",
         "deprecated": false,

api_docs/charts.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts
 title: "charts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the charts plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'charts']
 ---
 import chartsObj from './charts.devdocs.json';

api_docs/cloud.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloud
 title: "cloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloud plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud']
 ---
 import cloudObj from './cloud.devdocs.json';

api_docs/cloud_data_migration.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDataMigration
 title: "cloudDataMigration"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDataMigration plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDataMigration']
 ---
 import cloudDataMigrationObj from './cloud_data_migration.devdocs.json';

api_docs/cloud_defend.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDefend
 title: "cloudDefend"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDefend plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDefend']
 ---
 import cloudDefendObj from './cloud_defend.devdocs.json';

api_docs/cloud_experiments.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudExperiments
 title: "cloudExperiments"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudExperiments plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudExperiments']
 ---
 import cloudExperimentsObj from './cloud_experiments.devdocs.json';

api_docs/cloud_security_posture.mdx

@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudSecurityPosture
 title: "cloudSecurityPosture"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudSecurityPosture plugin
-date: 2023-12-13
+date: 2023-12-14
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudSecurityPosture']
 ---
 import cloudSecurityPostureObj from './cloud_security_posture.devdocs.json';