From f6968f3091a0ccc2b5730b8daf0c5b749d55659f Mon Sep 17 00:00:00 2001 From: Alex Szabo Date: Mon, 17 Jun 2024 10:42:47 +0200 Subject: [PATCH 1/2] [CI] Prevent duplicate serverless image build (#186164) ## Summary Only adds build_project.yml if there's not already a deploy_project.yml added through labels ## Context Based on the labeling logic, if we had `ci:build-serverless-image` and `ci:project-deploy-*`, the steps for building the docker image would be added twice. See: https://elastic.slack.com/archives/C0D8P2XK5/p1718268306523329 --- .buildkite/scripts/pipelines/pull_request/pipeline.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index 02011690a13c3..38ae590f18e0b 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -145,15 +145,14 @@ const getPipeline = (filename: string, removeSteps = true) => { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/fips.yml')); } - if (GITHUB_PR_LABELS.includes('ci:build-serverless-image')) { - pipeline.push(getPipeline('.buildkite/pipelines/pull_request/build_project.yml')); - } if ( GITHUB_PR_LABELS.includes('ci:project-deploy-elasticsearch') || GITHUB_PR_LABELS.includes('ci:project-deploy-observability') || GITHUB_PR_LABELS.includes('ci:project-deploy-security') ) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/deploy_project.yml')); + } else if (GITHUB_PR_LABELS.includes('ci:build-serverless-image')) { + pipeline.push(getPipeline('.buildkite/pipelines/pull_request/build_project.yml')); } if ( From 34b052c12be929b6d223cdc5ec41cbcbc471442e Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 17 Jun 2024 03:25:09 -0600 Subject: [PATCH 2/2] Update nav-kibana-dev.docnav.json (#186192) Attempt to force a nav rebuild. --- .../performance/adding_custom_performance_metrics.mdx | 3 +-- nav-kibana-dev.docnav.json | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev_docs/tutorials/performance/adding_custom_performance_metrics.mdx b/dev_docs/tutorials/performance/adding_custom_performance_metrics.mdx index 4db207ad4aecb..1c1224c1c858a 100644 --- a/dev_docs/tutorials/performance/adding_custom_performance_metrics.mdx +++ b/dev_docs/tutorials/performance/adding_custom_performance_metrics.mdx @@ -3,7 +3,6 @@ id: kibDevTutorialAddingCustomPerformanceMetrics slug: /kibana-dev-docs/tutorial/performance/adding_custom_performance_metrics title: Adding Performance Metrics summary: Learn how to instrument your code and analyze performance -date: 2023-01-13 tags: ['kibana', 'onboarding', 'setup', 'performance', 'development', 'telemetry'] --- @@ -241,7 +240,7 @@ const MyApp = () => { if (fetchedData.status === 'success') { setData(fetchedData); - // Call onPageReady once the meaningful data has rendered and visible to the user + // Call onPageReady once the meaningful data has rendered and visible to the user onPageReady(); } diff --git a/nav-kibana-dev.docnav.json b/nav-kibana-dev.docnav.json index cfe16536856d0..60dcb5d054393 100644 --- a/nav-kibana-dev.docnav.json +++ b/nav-kibana-dev.docnav.json @@ -115,7 +115,8 @@ "label": "Tutorials", "items": [ { - "id": "kibDevTutorialAddingCustomPerformanceMetrics" + "id": "kibDevTutorialAddingCustomPerformanceMetrics", + "label": "Adding Performance Metrics" }, { "id": "kibDevTutorialSetupWindowsDevWSL"