-
Notifications
You must be signed in to change notification settings - Fork 526
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update apm-data and remap for OTel hostmetrics to elastic metrics #13196
Conversation
This pull request does not have a backport label. Could you fix it @lahsivjar? 🙏
NOTE: |
34bce97
to
0cef088
Compare
0cef088
to
2f65826
Compare
@@ -8,6 +8,7 @@ https://github.com/elastic/apm-server/compare/8.14\...main[View commits] | |||
|
|||
- Avoid data race due to reuse of `bytes.Buffer` in ES bulk requests {pull}13155[13155] | |||
- APM Server now relies on the Elasticsearch apm-data plugin's index templates, which reverts some unsafe uses of `flattened` field types {pull}12066[12066] | |||
- Add `error.id` to jaeger errors {pull}13196[13196] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CC: @kruskall this is due to the new apm-data version update.
This pull request is now in conflicts. Could you fix it @lahsivjar? 🙏
|
@@ -10,7 +10,7 @@ | |||
"opentelemetry/go" | |||
], | |||
"agent.version": [ | |||
"1.25.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[For reviewers] This change is due to upgrade of the otel-agent in the system test from v1.25.0
to v1.27.0
@@ -1,4 +1,102 @@ | |||
[ | |||
{ | |||
"@timestamp": [ | |||
"dynamic" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[For reviewers] This change is because PR elastic/apm-tools#61 now sorts the docs after handling dynamic
fields.
changelogs/head.asciidoc
Outdated
- Upgraded bundled APM Java agent attacher CLI to version 1.50.0 {pull}13326[13326] | ||
- Enable Kibana curated UIs to work with hostmetrics from OpenTelemetry's [hostmetricsreceiver](https://pkg.go.dev/go.opentelemetry.io/collector/receiver/hostmetricsreceiver) {pull}13196[13196] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if this link works in asciidoc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, updated!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The update is based on
apm-server/changelogs/8.5.asciidoc
Line 55 in ef91669
Please use the https://www.docker.elastic.co/r/apm[Elastic docker registry] to download the 8.5.0 APM Server image. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, can you fill out the "How to test these changes" section?
* upstream/main: chore: Update .go-version with Golang version 1.22.4 (#13367) build(deps): bump github.com/jaegertracing/jaeger from 1.56.0 to 1.57.0 in /systemtest (#13316) [updatecli] Bump elastic stack version to 8.15.0-725cdb43 (#13363) feat: add wolfi based image (#12671) Add Amazon Linux 2023 to the smoke tests (#13358) Update apm-data and remap for OTel hostmetrics to elastic metrics (#13196) build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.13.1 to 8.14.0 (#13356)
Motivation/summary
Remaps metrics produced by OTel's hostmetrics receiver to Elastic compatible metrics. This powers parts of Kibana's curated UIs around host and system.
To be merged after elastic/apm-data#277
Checklist
- [ ] Documentation has been updatedFor functional changes, consider:
How to test these changes
To test all the changes, the best approach would be to run the collector on K8s. This would allow to test the Kibana UI for both, hostmetrics and K8s metrics.
host.network.*
metrics opentelemetry-lib#14)Example K8s manifest for running OTel collector
Related issues