Skip to content

[Fleet] Add OpAMP field mappings to fleet-agents#142550

Merged
juliaElastic merged 14 commits intoelastic:mainfrom
juliaElastic:opamp-fleet-agents
Feb 19, 2026
Merged

[Fleet] Add OpAMP field mappings to fleet-agents#142550
juliaElastic merged 14 commits intoelastic:mainfrom
juliaElastic:opamp-fleet-agents

Conversation

@juliaElastic
Copy link
Copy Markdown
Contributor

@juliaElastic juliaElastic commented Feb 16, 2026 •
edited
Loading

  • Have you signed the contributor license agreement? yes
  • Have you followed the contributor guidelines? yes
  • If submitting code, have you built your formula locally prior to submission with gradle check?
  • If submitting code, is your pull request against main? Unless there is a good reason otherwise, we prefer pull requests against main and will backport as needed. yes
  • If submitting code, have you checked that your submission is for an OS and architecture that we support?
  • If you are submitting this code for a class then read our policy for that.

Relates https://github.com/elastic/ingest-dev/issues/6982

@elasticsearchmachine elasticsearchmachine added v9.4.0 needs:triage Requires assignment of a team area label external-contributor Pull request authored by a developer outside the Elasticsearch team labels Feb 16, 2026
@elasticsearchmachine elasticsearchmachine removed the needs:triage Requires assignment of a team area label label Feb 16, 2026
@juliaElastic juliaElastic added >enhancement needs:triage Requires assignment of a team area label labels Feb 16, 2026
@elasticsearchmachine elasticsearchmachine removed the needs:triage Requires assignment of a team area label label Feb 16, 2026
@juliaElastic juliaElastic added the Team:Core/Infra Meta label for core/infra team label Feb 16, 2026
@elasticsearchmachine elasticsearchmachine removed the Team:Core/Infra Meta label for core/infra team label Feb 16, 2026
@juliaElastic juliaElastic requested a review from a team as a code owner February 16, 2026 14:01
nchaulet
nchaulet approved these changes Feb 16, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

LGTM!

@juliaElastic juliaElastic added the :Core/Infra/Plugins Plugin API and infrastructure label Feb 16, 2026
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

elasticsearchmachine commented Feb 16, 2026

Pinging @elastic/es-core-infra (Team:Core/Infra)

@elasticsearchmachine elasticsearchmachine added the Team:Core/Infra Meta label for core/infra team label Feb 16, 2026
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

elasticsearchmachine commented Feb 16, 2026

Hi @juliaElastic, I've created a changelog YAML for you.

nchaulet
nchaulet reviewed Feb 16, 2026
View reviewed changes
x-pack/plugin/core/template-resources/src/main/resources/fleet-agents.json Outdated
"type": "keyword"
},
"identifying_attributes": {
"type": "object"
Copy link
Copy Markdown
Member

@nchaulet nchaulet Feb 16, 2026

Choose a reason for hiding this comment

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

@juliaElastic Do we want to have specific mapping for those attributes or should we start with enabled: false? same question for non_identifying

Copy link
Copy Markdown
Contributor Author

@juliaElastic juliaElastic Feb 16, 2026

Choose a reason for hiding this comment

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

Yeah I was just testing the search on the UI, we will need more specific mappings to search on these attributes, I'll update the PR.

For example:

          "identifying_attributes": {
            "service.instance.id": "119b8d7a-2da8-7657-b52d-492a9de33316",
            "service.name": "otelcol-contrib",
            "service.version": "0.144.0"
          },
          "non_identifying_attributes": {
            "host.arch": "arm64",
            "host.name": "Julias-MacBook-Pro.local",
            "os.description": "macOS 26.3",
            "os.type": "darwin"
          },

@juliaElastic juliaElastic mentioned this pull request Feb 17, 2026
Merged
10 tasks
juliaElastic added a commit to elastic/kibana that referenced this pull request Feb 19, 2026
@juliaElastic @kibanamachine @florent-leborgne
[Fleet] OpAMP UI changes (#252541)
1a28691 
## Summary

Relates elastic/ingest-dev#6829
Closes elastic/ingest-dev#6982

Depends on elastic/fleet-server#6330
Follow the instructions in the fleet-server PR to start an otel
collector with OpAMP config.

OTel Collector displayed in Fleet UI including:
- Capabilities
- Component Health
- Effective Config (click on View Collector Configuration)
- Link to OTel internal dashboard (click on View more agent metrics)
elastic/opentelemetry-dev#1038
- Calculate CPU and Memory metrics from internal telemetry for OTel
collectors

Added `.fleet-agents` mappings for the new fields to be searchable (e.g.
identifying attributes):
elastic/elasticsearch#142550


https://github.com/user-attachments/assets/a0a30e31-c7cd-456b-9004-4002c36c46fe



<img width="1245" height="864" alt="image"
src="https://github.com/user-attachments/assets/8c092c76-a789-4ddb-8265-3191268cfb80"
/>

<img width="1249" height="861" alt="image"
src="https://github.com/user-attachments/assets/ae9e0835-cbe4-4ed5-b3ab-d0720d8775e8"
/>

<img width="1802" height="623" alt="image"
src="https://github.com/user-attachments/assets/0256693f-6da9-457a-a363-1d8e54d94973"
/>

<img width="1245" height="852" alt="image"
src="https://github.com/user-attachments/assets/d1cec06f-9116-40cc-ba65-da42e16b6f12"
/>

<img width="1752" height="626" alt="image"
src="https://github.com/user-attachments/assets/d190065a-b4be-4682-b1ff-6314a4ada9c8"
/>


### Checklist

Check the PR satisfies following conditions. 

Reviewers should verify this PR satisfies this list as well.

- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [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
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This was checked for breaking HTTP API changes, and any breaking
changes have been approved by the breaking-change committee. The
`release_note:breaking` label should be applied in these situations.
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] The PR description includes the appropriate Release Notes section,
and the correct `release_note:*` label is applied per the
[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
- [ ] Review the [backport
guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)
and apply applicable `backport:*` labels.

### Identify risks

Does this PR introduce any risks? For example, consider risks like hard
to test bugs, performance regression, potential of data loss.

Describe the risk, its severity, and mitigation for each identified
risk. Invite stakeholders and evaluate how to proceed before merging.

- [ ] [See some risk
examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)
- [ ] ...

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: florent-leborgne <florent.leborgne@elastic.co>
@juliaElastic juliaElastic merged commit 59bcc55 into elastic:main Feb 19, 2026
35 checks passed
szybia added a commit to szybia/elasticsearch that referenced this pull request Feb 19, 2026
@szybia
Merge remote-tracking branch 'upstream/main' into stop-and-relocate-n…
7b9c598 
…on-sliced-reindex

* upstream/main: (120 commits)
  [Fleet] Add OpAMP field mappings to fleet-agents (elastic#142550)
  Clarify `expectedSize` behaviour of `ReleasableBytesStreamOutput` (elastic#142451)
  Refactor KnnIndexTester to tidy up some options (elastic#142651)
  Fixed with elastic#142638 already (elastic#142655)
  Change *OverTimeTests to extend AbstractAggregationTestCase (elastic#142659)
  Fix byteRefBlockHashSize for release mode (elastic#142668)
  Mute org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests testTransform {class org.elasticsearch.xpack.esql.plan.logical.MMR} elastic#142674
  Fix PAUSED_FOR_NODE_REMOVAL shard blocking QUEUED promotion (elastic#142637)
  Mute org.elasticsearch.xpack.logsdb.RandomizedRollingUpgradeIT testIndexingStandardSource elastic#142670
  Revert "[ESQL] Introduce pluggable external datasource framework (elastic#141678) (elastic#142663)
  Mute org.elasticsearch.xpack.esql.spatial.SpatialPushDownGeoShapeIT testQuantizedXY elastic#141234
  PromQL: infer start/end from query DSL filters (elastic#142580)
  Add GPU vector indexing monitoring to _xpack/usage (elastic#141932)
  Fix testTrackerClearShutdown: use non-zero startTimeMillis for DONE status (elastic#142646)
  Mute org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT test elastic#142426
  ESQL_ Move time_zone to GA (elastic#142287)
  Mute org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT test elastic#142426
  DOCS: Convert Painless diagrams to mermaid (elastic#141851)
  ES|QL: fix validation in generative tests (elastic#142638)
  Unmute tests that do not reproduce failures (elastic#141712)
  ...
ersin-erdal pushed a commit to ersin-erdal/kibana that referenced this pull request Feb 19, 2026
@juliaElastic @kibanamachine
@florent-leborgne @ersin-erdal
[Fleet] OpAMP UI changes (elastic#252541)
a9bb1c6 
## Summary

Relates elastic/ingest-dev#6829
Closes elastic/ingest-dev#6982

Depends on elastic/fleet-server#6330
Follow the instructions in the fleet-server PR to start an otel
collector with OpAMP config.

OTel Collector displayed in Fleet UI including:
- Capabilities
- Component Health
- Effective Config (click on View Collector Configuration)
- Link to OTel internal dashboard (click on View more agent metrics)
elastic/opentelemetry-dev#1038
- Calculate CPU and Memory metrics from internal telemetry for OTel
collectors

Added `.fleet-agents` mappings for the new fields to be searchable (e.g.
identifying attributes):
elastic/elasticsearch#142550


https://github.com/user-attachments/assets/a0a30e31-c7cd-456b-9004-4002c36c46fe



<img width="1245" height="864" alt="image"
src="https://github.com/user-attachments/assets/8c092c76-a789-4ddb-8265-3191268cfb80"
/>

<img width="1249" height="861" alt="image"
src="https://github.com/user-attachments/assets/ae9e0835-cbe4-4ed5-b3ab-d0720d8775e8"
/>

<img width="1802" height="623" alt="image"
src="https://github.com/user-attachments/assets/0256693f-6da9-457a-a363-1d8e54d94973"
/>

<img width="1245" height="852" alt="image"
src="https://github.com/user-attachments/assets/d1cec06f-9116-40cc-ba65-da42e16b6f12"
/>

<img width="1752" height="626" alt="image"
src="https://github.com/user-attachments/assets/d190065a-b4be-4682-b1ff-6314a4ada9c8"
/>


### Checklist

Check the PR satisfies following conditions. 

Reviewers should verify this PR satisfies this list as well.

- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [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
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This was checked for breaking HTTP API changes, and any breaking
changes have been approved by the breaking-change committee. The
`release_note:breaking` label should be applied in these situations.
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] The PR description includes the appropriate Release Notes section,
and the correct `release_note:*` label is applied per the
[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
- [ ] Review the [backport
guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)
and apply applicable `backport:*` labels.

### Identify risks

Does this PR introduce any risks? For example, consider risks like hard
to test bugs, performance regression, potential of data loss.

Describe the risk, its severity, and mitigation for each identified
risk. Invite stakeholders and evaluate how to proceed before merging.

- [ ] [See some risk
examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)
- [ ] ...

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: florent-leborgne <florent.leborgne@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nchaulet nchaulet nchaulet approved these changes

@cmacknz cmacknz cmacknz approved these changes

Assignees

No one assigned

Labels

: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 Team:Fleet v9.4.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@juliaElastic @elasticsearchmachine @nchaulet @cmacknz