Skip to content

Commit

Permalink
[8.x] Sustainable Kibana Architecture: Fix after-relocation issues (#…
Browse files Browse the repository at this point in the history 
…205613) (#205641)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Sustainable Kibana Architecture: Fix after-relocation issues
(#205613)](#205613)

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

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

<!--BACKPORT [{"author":{"name":"Michael
Dokolin","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-06T18:02:36Z","message":"Sustainable
Kibana Architecture: Fix after-relocation issues (#205613)\n\nAfter
merging #202748, #204959, and #201653, all of the properties in\nsome
telemetry schemas were moved completely, but
`node\nscripts/telemetry_check --fix` didn't update the `properties`
object\ncorrectly.\n\nAlso, in #202748 and #201653, the relocation
script changed some paths,\nconfusing them with `@kbn/security-plugin`
and
`@kbn/cloud-plugin`.","sha":"540963148dc671b02655ced8285dbbd817d9d5c9","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:version","v8.18.0","plugin
groups"],"title":"Sustainable Kibana Architecture: Fix after-relocation
issues","number":205613,"url":"https://github.com/elastic/kibana/pull/205613","mergeCommit":{"message":"Sustainable
Kibana Architecture: Fix after-relocation issues (#205613)\n\nAfter
merging #202748, #204959, and #201653, all of the properties in\nsome
telemetry schemas were moved completely, but
`node\nscripts/telemetry_check --fix` didn't update the `properties`
object\ncorrectly.\n\nAlso, in #202748 and #201653, the relocation
script changed some paths,\nconfusing them with `@kbn/security-plugin`
and
`@kbn/cloud-plugin`.","sha":"540963148dc671b02655ced8285dbbd817d9d5c9"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205613","number":205613,"mergeCommit":{"message":"Sustainable
Kibana Architecture: Fix after-relocation issues (#205613)\n\nAfter
merging #202748, #204959, and #201653, all of the properties in\nsome
telemetry schemas were moved completely, but
`node\nscripts/telemetry_check --fix` didn't update the `properties`
object\ncorrectly.\n\nAlso, in #202748 and #201653, the relocation
script changed some paths,\nconfusing them with `@kbn/security-plugin`
and
`@kbn/cloud-plugin`.","sha":"540963148dc671b02655ced8285dbbd817d9d5c9"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Michael Dokolin <[email protected]>
  • Loading branch information
@kibanamachine @dokmic
kibanamachine and dokmic authored Jan 6, 2025
1 parent b4b7d31 commit 305f79d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^packages\/kbn-securitysolution-.*/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/test\/defend_workflows_cypress/,
/^x-pack\/test\/security_solution_cypress/,
/^fleet_packages\.json/,
Expand All @@ -256,9 +256,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/platform\/plugins\/shared\/data_views\/common/,
/^x-pack\/solutions\/security\/plugins\/lists/,
/^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_ess/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_serverless/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
/^x-pack\/platform\/plugins\/shared\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
Expand Down Expand Up @@ -341,9 +341,9 @@ const getPipeline = (filename: string, removeSteps = true) => {
/^x-pack\/solutions\/security\/plugins\/elastic_assistant/,
/^x-pack\/solutions\/security\/plugins\/lists/,
/^x-pack\/platform\/plugins\/shared\/rule_registry\/common/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_ess/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution_serverless/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution_ess/,
/^x-pack\/solutions\/security\/plugins\/security_solution_serverless/,
/^x-pack\/platform\/plugins\/shared\/task_manager/,
/^x-pack\/solutions\/security\/plugins\/threat_intelligence/,
/^x-pack\/solutions\/security\/plugins\/timelines/,
Expand All @@ -363,7 +363,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
((await doAnyChangesMatch([
/^x-pack\/platform\/plugins\/shared\/osquery/,
/^x-pack\/test\/osquery_cypress/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')) &&
!GITHUB_PR_LABELS.includes('ci:skip-cypress-osquery')
Expand All @@ -376,8 +376,8 @@ const getPipeline = (filename: string, removeSteps = true) => {
if (
(await doAnyChangesMatch([
/^x-pack\/packages\/kbn-cloud-security-posture/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/cloud_security_posture/,
/^x-pack\/solutions\/security\/platform\/plugins\/shared\/security_solution/,
/^x-pack\/solutions\/security\/plugins\/cloud_security_posture/,
/^x-pack\/solutions\/security\/plugins\/security_solution/,
/^x-pack\/test\/security_solution_cypress/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-telemetry-tools/src/tools/tasks/generate_schemas_task.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { generateMapping } from '../manage_schema';
export function generateSchemasTask({ roots }: TaskContext) {
return roots.map((root) => ({
task: () => {
if (!root.parsedCollections || !root.parsedCollections.length) {
if (!root.parsedCollections) {
return;
}
const mapping = generateMapping(root.parsedCollections);
Expand Down

0 comments on commit 305f79d

Please sign in to comment.