Skip to content

Add upgrade.rollbacks mapping to .fleet-agents system index#139363

Merged
jillguyonnet merged 7 commits intoelastic:mainfrom
pchila:add-rollback-information
Dec 24, 2025
Merged

Add upgrade.rollbacks mapping to .fleet-agents system index#139363
jillguyonnet merged 7 commits intoelastic:mainfrom
pchila:add-rollback-information

Conversation

@pchila
Copy link
Member

@pchila pchila commented Dec 11, 2025 •
edited
Loading

As follow-up to new rollback information managed by fleet-server with elastic/fleet-server#5975 this PR adds the mapping of the new fields to .fleet-agents system index.

Resolves elastic/fleet-server#6039
@pchila pchila requested a review from a team as a code owner December 11, 2025 11:02
@pchila pchila added the :Core/Infra/Plugins Plugin API and infrastructure label Dec 11, 2025
@elasticsearchmachine elasticsearchmachine added v9.3.0 Team:Core/Infra Meta label for core/infra team external-contributor Pull request authored by a developer outside the Elasticsearch team labels Dec 11, 2025
@elasticsearchmachine
Copy link
Collaborator

elasticsearchmachine commented Dec 11, 2025

Pinging @elastic/es-core-infra (Team:Core/Infra)
@elasticsearchmachine
Copy link
Collaborator

elasticsearchmachine commented Dec 11, 2025

Hi @pchila, I've created a changelog YAML for you.
juliaElastic
juliaElastic reviewed Dec 11, 2025
View reviewed changes
x-pack/plugin/core/template-resources/src/main/resources/fleet-agents.json Outdated
"type": "date"
},
"version": {
"type": "text",
Copy link
Contributor

@juliaElastic juliaElastic Dec 11, 2025

Choose a reason for hiding this comment

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

do we need both text and keyword type? Isn't it enough to have keyword?
Copy link
Member Author

@pchila pchila Dec 11, 2025

Choose a reason for hiding this comment

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

I used the same definition for version used elsewhere in the mappings.
I also think that keyword may be enough but I thought that the text mapping was there for a good reason.
Copy link
Contributor

@juliaElastic juliaElastic Dec 11, 2025

Choose a reason for hiding this comment

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

I'm not aware of a reason, but I suppose it's okay to make it consistent with other version fields.
Copy link
Member Author

@pchila pchila Dec 12, 2025

Choose a reason for hiding this comment

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

After discussing offline with @jillguyonnet about her comment, we came to the conclusion that it's worth trying to map field version as type: version.
She's going to run some tests and update the PR based on the outcome.

In case type: version doesn't work out, we can always go for type: keyword as suggested by @juliaElastic
@jillguyonnet
Copy link
Contributor

jillguyonnet commented Dec 12, 2025 •
edited
Loading

Looks like I accidentally made my comment part of a pending review and it wasn't showing in the thread 🙈

Should we rather use the version field type? I don't foresee this being an issue in this case (it would be if we wanted to sort/compare rollback versions, cf. elastic/kibana#168604), but it should be the correct type for a version field.

I don't have any strong objections to text+keyword, version seems a bit cleaner though.
@ebeahan ebeahan added >bug v9.3.0 auto-backport Automatically create backport pull requests when merged and removed >enhancement v9.4.0 labels Dec 19, 2025
@elasticsearchmachine
Copy link
Collaborator

elasticsearchmachine commented Dec 19, 2025

Hi @pchila, I've updated the changelog YAML for you.
@elasticsearchmachine
Copy link
Collaborator

elasticsearchmachine commented Dec 19, 2025

Hi @pchila, I've updated the changelog YAML for you.
@ebeahan ebeahan mentioned this pull request Dec 19, 2025
Closed
@jillguyonnet
Copy link
Contributor

jillguyonnet commented Dec 24, 2025

Tested version type for version field, it seems to behave well including with IAR versioning.
@jillguyonnet
Copy link
Contributor

jillguyonnet commented Dec 24, 2025

@elasticmachine merge upstream
@jillguyonnet jillguyonnet merged commit a4681c2 into elastic:main Dec 24, 2025
35 checks passed
@pchila pchila mentioned this pull request Dec 24, 2025
Merged
pchila added a commit to pchila/elasticsearch that referenced this pull request Dec 24, 2025
@pchila @ebeahan
@jillguyonnet @elasticmachine
Add upgrade.rollbacks mapping to .fleet-agents system index (elastic#…
2c73e02 
…139363)

* Add upgrade.rollbacks mapping to .fleet-agents system index

* Update docs/changelog/139363.yaml

* Update docs/changelog/139363.yaml

* Update docs/changelog/139363.yaml

* Change version field type to version

---------

Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
Co-authored-by: jillguyonnet <jill.guyonnet@gmail.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@elasticsearchmachine
Copy link
Collaborator

elasticsearchmachine commented Dec 24, 2025

💚 Backport successful

Status Branch Result
✅ 9.3
elasticsearchmachine pushed a commit that referenced this pull request Dec 24, 2025
@pchila @ebeahan
@jillguyonnet @elasticmachine
Add upgrade.rollbacks mapping to .fleet-agents system index (#139363) (…
b6856d4 
…#139993)

* Add upgrade.rollbacks mapping to .fleet-agents system index

* Update docs/changelog/139363.yaml

* Update docs/changelog/139363.yaml

* Update docs/changelog/139363.yaml

* Change version field type to version

---------

Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
Co-authored-by: jillguyonnet <jill.guyonnet@gmail.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
rjernst pushed a commit to rjernst/elasticsearch that referenced this pull request Dec 29, 2025
@pchila @ebeahan
@jillguyonnet @elasticmachine @rjernst
Add upgrade.rollbacks mapping to .fleet-agents system index (elastic#…
9227ab8 
…139363)

* Add upgrade.rollbacks mapping to .fleet-agents system index

* Update docs/changelog/139363.yaml

* Update docs/changelog/139363.yaml

* Update docs/changelog/139363.yaml

* Change version field type to version

---------

Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
Co-authored-by: jillguyonnet <jill.guyonnet@gmail.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged :Core/Infra/Plugins Plugin API and infrastructure >enhancement external-contributor Pull request authored by a developer outside the Elasticsearch team Team:Core/Infra Meta label for core/infra team v9.3.1 v9.4.0

6 participants

@pchila @elasticsearchmachine @jillguyonnet @juliaElastic @ebeahan @elasticmachine