Skip to content

[Sustainable Architecture] Telemetry schemas#201760

Merged
afharo merged 4 commits intoelastic:mainfrom
afharo:sustainable-arch/telemetry-schema
Nov 27, 2024
Merged

[Sustainable Architecture] Telemetry schemas#201760
afharo merged 4 commits intoelastic:mainfrom
afharo:sustainable-arch/telemetry-schema

Conversation

@afharo
Copy link
Copy Markdown
Member

@afharo afharo commented Nov 26, 2024

Summary

Since we are moving code around, the schema extractor now needs to adapt to the new directories.

This PR adds new per-solution schemas to the .telemetryrc.json files and adapts FTRs accordingly.

Related #201653

Checklist

@afharo afharo added Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// Feature:Telemetry technical debt Improvement of the software architecture and operational architecture release_note:skip Skip the PR/issue when compiling release notes backport:prev-minor labels Nov 26, 2024
@afharo afharo requested a review from gsoldevila November 26, 2024 11:16
@afharo afharo self-assigned this Nov 26, 2024
@afharo afharo requested a review from a team as a code owner November 26, 2024 11:16
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-core (Team:Core)

@afharo afharo requested a review from Bamieh November 26, 2024 11:17
"exclude": []
},
{
"output": "src/plugins/telemetry/schema/oss_platform.json",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the configs above make a distinction between "plugins" and "packages", producing different output files.
Is it okay to not do the distinction here?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so... IMO, the main reason we had to do distinction is that they had different roots.

const plugins = [
ossPluginsTelemetrySchema,
ossPackagesTelemetrySchema,
ossPlatformTelemetrySchema,
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose this answers my question, as all schemas are merged here anyway.

Copy link
Copy Markdown
Member

@gsoldevila gsoldevila left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot!

@afharo afharo enabled auto-merge (squash) November 26, 2024 11:23
@afharo afharo disabled auto-merge November 26, 2024 14:19
@elasticmachine
Copy link
Copy Markdown
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Jest Tests #12 / FilterPopover renders empty label correctly

Metrics [docs]

✅ unchanged

History

cc @afharo

@afharo afharo merged commit dac87ef into elastic:main Nov 27, 2024
@afharo afharo deleted the sustainable-arch/telemetry-schema branch November 27, 2024 17:18
@kibanamachine
Copy link
Copy Markdown
Contributor

Starting backport for target branches: 8.x

https://github.com/elastic/kibana/actions/runs/12055251694

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 27, 2024
## Summary

Since we are moving code around, the schema extractor now needs to adapt
to the new directories.

This PR adds new per-solution schemas to the `.telemetryrc.json` files
and adapts FTRs accordingly.

Related elastic#201653

### Checklist

- [x]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

(cherry picked from commit dac87ef)
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 All backports created successfully

Status Branch Result
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Nov 27, 2024
# Backport

This will backport the following commits from `main` to `8.x`:
- [[Sustainable Architecture] Telemetry schemas
(#201760)](#201760)

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

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

<!--BACKPORT [{"author":{"name":"Alejandro Fernández
Haro","email":"alejandro.haro@elastic.co"},"sourceCommit":{"committedDate":"2024-11-27T17:18:09Z","message":"[Sustainable
Architecture] Telemetry schemas (#201760)\n\n## Summary\n\nSince we are
moving code around, the schema extractor now needs to adapt\nto the new
directories.\n\nThis PR adds new per-solution schemas to the
`.telemetryrc.json` files\nand adapts FTRs accordingly.\n\nRelated
https://github.com/elastic/kibana/pull/201653\n\n### Checklist\n\n-
[x]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas
added for features that require explanation or tutorials\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"dac87ef6fec2ff2291ea72ffe5ec00588265500a","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","Feature:Telemetry","technical
debt","release_note:skip","v9.0.0","backport:prev-minor"],"title":"[Sustainable
Architecture] Telemetry
schemas","number":201760,"url":"https://github.com/elastic/kibana/pull/201760","mergeCommit":{"message":"[Sustainable
Architecture] Telemetry schemas (#201760)\n\n## Summary\n\nSince we are
moving code around, the schema extractor now needs to adapt\nto the new
directories.\n\nThis PR adds new per-solution schemas to the
`.telemetryrc.json` files\nand adapts FTRs accordingly.\n\nRelated
https://github.com/elastic/kibana/pull/201653\n\n### Checklist\n\n-
[x]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas
added for features that require explanation or tutorials\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"dac87ef6fec2ff2291ea72ffe5ec00588265500a"}},"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/201760","number":201760,"mergeCommit":{"message":"[Sustainable
Architecture] Telemetry schemas (#201760)\n\n## Summary\n\nSince we are
moving code around, the schema extractor now needs to adapt\nto the new
directories.\n\nThis PR adds new per-solution schemas to the
`.telemetryrc.json` files\nand adapts FTRs accordingly.\n\nRelated
https://github.com/elastic/kibana/pull/201653\n\n### Checklist\n\n-
[x]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas
added for features that require explanation or tutorials\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"dac87ef6fec2ff2291ea72ffe5ec00588265500a"}}]}]
BACKPORT-->

Co-authored-by: Alejandro Fernández Haro <alejandro.haro@elastic.co>
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Dec 12, 2024
## Summary

Since we are moving code around, the schema extractor now needs to adapt
to the new directories.

This PR adds new per-solution schemas to the `.telemetryrc.json` files
and adapts FTRs accordingly.

Related elastic#201653

### Checklist

- [x]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Feature:Telemetry release_note:skip Skip the PR/issue when compiling release notes Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// technical debt Improvement of the software architecture and operational architecture v8.18.0 v9.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants