From f08b07a041a00e1330f3c7c4b4e9843913ea8960 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Tue, 24 Dec 2024 03:10:28 +1100
Subject: [PATCH] [8.x] SKA: Relocate script 6.1 (#205086) (#205092)

# Backport

This will backport the following commits from `main` to `8.x`:
- [SKA: Relocate script 6.1
(#205086)](https://github.com/elastic/kibana/pull/205086)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Gerard
Soldevila","email":"gerard.soldevila@elastic.co"},"sourceCommit":{"committedDate":"2024-12-23T14:17:44Z","message":"SKA:
Relocate script 6.1 (#205086)\n\n## Summary\r\n\r\n* Exclude example
modules from relocation.\r\n* Add an extra path transform to simplify
packages
folders.","sha":"19f24b31d9dec5ec6d6c97a9bcbcd26657f181e8","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","v9.0.0","backport:prev-minor","plugin
groups"],"title":"SKA: Relocate script
6.1","number":205086,"url":"https://github.com/elastic/kibana/pull/205086","mergeCommit":{"message":"SKA:
Relocate script 6.1 (#205086)\n\n## Summary\r\n\r\n* Exclude example
modules from relocation.\r\n* Add an extra path transform to simplify
packages
folders.","sha":"19f24b31d9dec5ec6d6c97a9bcbcd26657f181e8"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205086","number":205086,"mergeCommit":{"message":"SKA:
Relocate script 6.1 (#205086)\n\n## Summary\r\n\r\n* Exclude example
modules from relocation.\r\n* Add an extra path transform to simplify
packages folders.","sha":"19f24b31d9dec5ec6d6c97a9bcbcd26657f181e8"}}]}]
BACKPORT-->

Co-authored-by: Gerard Soldevila <gerard.soldevila@elastic.co>
---
 packages/kbn-relocate/relocate.ts         | 6 ++++--
 packages/kbn-relocate/utils/transforms.ts | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/kbn-relocate/relocate.ts b/packages/kbn-relocate/relocate.ts
index a96c58629bab7..f9ead5f815736 100644
--- a/packages/kbn-relocate/relocate.ts
+++ b/packages/kbn-relocate/relocate.ts
@@ -110,11 +110,13 @@ const findModules = ({ teams, paths, included, excluded }: FindModulesParams, lo
       .filter(({ manifest }) => !manifest.devOnly)
       // explicit exclusions
       .filter(({ id }) => !EXCLUDED_MODULES.includes(id) && !excluded.includes(id))
-      // we don't want to move test modules (just yet)
+      // we don't want to move test and example modules (just yet)
       .filter(
         ({ directory }) =>
           !directory.includes(`/${KIBANA_FOLDER}/test/`) &&
-          !directory.includes(`/${KIBANA_FOLDER}/x-pack/test/`)
+          !directory.includes(`/${KIBANA_FOLDER}/x-pack/test/`) &&
+          !directory.includes(`/${KIBANA_FOLDER}/examples/`) &&
+          !directory.includes(`/${KIBANA_FOLDER}/x-pack/examples/`)
       )
       // the module is under the umbrella specified by the user
       .filter(
diff --git a/packages/kbn-relocate/utils/transforms.ts b/packages/kbn-relocate/utils/transforms.ts
index ed584abeb55ab..267d570169d67 100644
--- a/packages/kbn-relocate/utils/transforms.ts
+++ b/packages/kbn-relocate/utils/transforms.ts
@@ -14,6 +14,8 @@ const TRANSFORMS: Record<string, string | TransformFunction> = {
   'x-pack/solutions/security/packages/security-solution/': 'x-pack/solutions/security/packages/',
   'x-pack/solutions/observability/plugins/observability_solution/':
     'x-pack/solutions/observability/plugins/',
+  'x-pack/solutions/observability/packages/observability/observability_utils/observability_':
+    'x-pack/solutions/observability/packages/',
   'x-pack/solutions/observability/packages/observability/':
     'x-pack/solutions/observability/packages/',
   'src/core/packages/core/': (path: string) => {