-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
[ECO][Inventory v2] APM changes #202497
[ECO][Inventory v2] APM changes #202497
Conversation
Pinging @elastic/obs-ux-infra_services-team (Team:obs-ux-infra_services) |
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
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.
kibana.jsonc
changes LGTM
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.
Some nits, LGTM
x-pack/plugins/observability_solution/apm/server/routes/entities/services/routes.ts
Outdated
Show resolved
Hide resolved
x-pack/plugins/observability_solution/apm/server/routes/services/route.ts
Outdated
Show resolved
Hide resolved
💚 Build Succeeded
Metrics [docs]Public APIs missing comments
Page load bundle
History
|
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!
|
||
interface Params { | ||
entitiesESClient: EntitiesESClient; | ||
entityManagerClient: EntityClient; |
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.
Why not keep the name as entityClient
to match the type EntityClient
?
Starting backport for target branches: 8.x |
Closes [202299](elastic#202299) ## Summary This PR replaces the query in `getServiceEntitySummary` with the v2 function (`entityManagerClient.v2.searchEntities`) ## Testing - Verify the response of the summary endpoint in the UI: https://github.com/user-attachments/assets/ba895f7d-57c8-492b-81dd-cf7869ffbc86 - Dev tools query - APM service #### Request: ``` GET kbn:/internal/apm/entities/services/synth-node-0/summary?environment=ENVIRONMENT_ALL ``` #### Response ``` { "serviceName": "synth-node-0", "agentName": "nodejs", "lastSeenTimestamp": "2024-12-13T16:29:19.868Z", "dataStreamTypes": [ "logs", "traces" ], "environments": [ "Synthtrace: simple_trace" ] } ``` - Service from logs #### Request: ``` GET kbn:/internal/apm/entities/services/synth-node/summary?environment=ENVIRONMENT_ALL ``` #### Response: ``` { "serviceName": "synth-node", "agentName": "go", "lastSeenTimestamp": "2024-12-13T16:27:43.461Z", "dataStreamTypes": [ "logs", "traces" ], "environments": [ "Synthtrace: logs_traces_hosts" ] } ``` --------- Co-authored-by: Jenny <[email protected]> Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit a66c139)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
# Backport This will backport the following commits from `main` to `8.x`: - [[ECO][Inventory v2] APM changes (#202497)](#202497) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Cauê Marcondes","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-17T09:24:33Z","message":"[ECO][Inventory v2] APM changes (#202497)\n\nCloses [202299](https://github.com/elastic/kibana/issues/202299)\r\n\r\n## Summary\r\n\r\nThis PR replaces the query in `getServiceEntitySummary` with the v2\r\nfunction (`entityManagerClient.v2.searchEntities`)\r\n\r\n## Testing\r\n- Verify the response of the summary endpoint in the UI:\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/ba895f7d-57c8-492b-81dd-cf7869ffbc86\r\n\r\n\r\n\r\n- Dev tools query\r\n - APM service\r\n #### Request:\r\n ```\r\nGET\r\nkbn:/internal/apm/entities/services/synth-node-0/summary?environment=ENVIRONMENT_ALL\r\n ```\r\n #### Response\r\n ```\r\n {\r\n \"serviceName\": \"synth-node-0\",\r\n \"agentName\": \"nodejs\",\r\n \"lastSeenTimestamp\": \"2024-12-13T16:29:19.868Z\",\r\n \"dataStreamTypes\": [\r\n \"logs\",\r\n \"traces\"\r\n ],\r\n \"environments\": [\r\n \"Synthtrace: simple_trace\"\r\n ]\r\n }\r\n ```\r\n\r\n - Service from logs\r\n #### Request:\r\n ```\r\nGET\r\nkbn:/internal/apm/entities/services/synth-node/summary?environment=ENVIRONMENT_ALL\r\n ```\r\n #### Response: \r\n ```\r\n {\r\n \"serviceName\": \"synth-node\",\r\n \"agentName\": \"go\",\r\n \"lastSeenTimestamp\": \"2024-12-13T16:27:43.461Z\",\r\n \"dataStreamTypes\": [\r\n \"logs\",\r\n \"traces\"\r\n ],\r\n \"environments\": [\r\n \"Synthtrace: logs_traces_hosts\"\r\n ]\r\n }\r\n ```\r\n\r\n---------\r\n\r\nCo-authored-by: Jenny <[email protected]>\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"a66c1399e60b184c338fc99c9550539bd2ecf68b","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-infra_services"],"title":"[ECO][Inventory v2] APM changes","number":202497,"url":"https://github.com/elastic/kibana/pull/202497","mergeCommit":{"message":"[ECO][Inventory v2] APM changes (#202497)\n\nCloses [202299](https://github.com/elastic/kibana/issues/202299)\r\n\r\n## Summary\r\n\r\nThis PR replaces the query in `getServiceEntitySummary` with the v2\r\nfunction (`entityManagerClient.v2.searchEntities`)\r\n\r\n## Testing\r\n- Verify the response of the summary endpoint in the UI:\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/ba895f7d-57c8-492b-81dd-cf7869ffbc86\r\n\r\n\r\n\r\n- Dev tools query\r\n - APM service\r\n #### Request:\r\n ```\r\nGET\r\nkbn:/internal/apm/entities/services/synth-node-0/summary?environment=ENVIRONMENT_ALL\r\n ```\r\n #### Response\r\n ```\r\n {\r\n \"serviceName\": \"synth-node-0\",\r\n \"agentName\": \"nodejs\",\r\n \"lastSeenTimestamp\": \"2024-12-13T16:29:19.868Z\",\r\n \"dataStreamTypes\": [\r\n \"logs\",\r\n \"traces\"\r\n ],\r\n \"environments\": [\r\n \"Synthtrace: simple_trace\"\r\n ]\r\n }\r\n ```\r\n\r\n - Service from logs\r\n #### Request:\r\n ```\r\nGET\r\nkbn:/internal/apm/entities/services/synth-node/summary?environment=ENVIRONMENT_ALL\r\n ```\r\n #### Response: \r\n ```\r\n {\r\n \"serviceName\": \"synth-node\",\r\n \"agentName\": \"go\",\r\n \"lastSeenTimestamp\": \"2024-12-13T16:27:43.461Z\",\r\n \"dataStreamTypes\": [\r\n \"logs\",\r\n \"traces\"\r\n ],\r\n \"environments\": [\r\n \"Synthtrace: logs_traces_hosts\"\r\n ]\r\n }\r\n ```\r\n\r\n---------\r\n\r\nCo-authored-by: Jenny <[email protected]>\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"a66c1399e60b184c338fc99c9550539bd2ecf68b"}},"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/202497","number":202497,"mergeCommit":{"message":"[ECO][Inventory v2] APM changes (#202497)\n\nCloses [202299](https://github.com/elastic/kibana/issues/202299)\r\n\r\n## Summary\r\n\r\nThis PR replaces the query in `getServiceEntitySummary` with the v2\r\nfunction (`entityManagerClient.v2.searchEntities`)\r\n\r\n## Testing\r\n- Verify the response of the summary endpoint in the UI:\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/ba895f7d-57c8-492b-81dd-cf7869ffbc86\r\n\r\n\r\n\r\n- Dev tools query\r\n - APM service\r\n #### Request:\r\n ```\r\nGET\r\nkbn:/internal/apm/entities/services/synth-node-0/summary?environment=ENVIRONMENT_ALL\r\n ```\r\n #### Response\r\n ```\r\n {\r\n \"serviceName\": \"synth-node-0\",\r\n \"agentName\": \"nodejs\",\r\n \"lastSeenTimestamp\": \"2024-12-13T16:29:19.868Z\",\r\n \"dataStreamTypes\": [\r\n \"logs\",\r\n \"traces\"\r\n ],\r\n \"environments\": [\r\n \"Synthtrace: simple_trace\"\r\n ]\r\n }\r\n ```\r\n\r\n - Service from logs\r\n #### Request:\r\n ```\r\nGET\r\nkbn:/internal/apm/entities/services/synth-node/summary?environment=ENVIRONMENT_ALL\r\n ```\r\n #### Response: \r\n ```\r\n {\r\n \"serviceName\": \"synth-node\",\r\n \"agentName\": \"go\",\r\n \"lastSeenTimestamp\": \"2024-12-13T16:27:43.461Z\",\r\n \"dataStreamTypes\": [\r\n \"logs\",\r\n \"traces\"\r\n ],\r\n \"environments\": [\r\n \"Synthtrace: logs_traces_hosts\"\r\n ]\r\n }\r\n ```\r\n\r\n---------\r\n\r\nCo-authored-by: Jenny <[email protected]>\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"a66c1399e60b184c338fc99c9550539bd2ecf68b"}}]}] BACKPORT--> Co-authored-by: Cauê Marcondes <[email protected]>
Closes [202299](elastic#202299) ## Summary This PR replaces the query in `getServiceEntitySummary` with the v2 function (`entityManagerClient.v2.searchEntities`) ## Testing - Verify the response of the summary endpoint in the UI: https://github.com/user-attachments/assets/ba895f7d-57c8-492b-81dd-cf7869ffbc86 - Dev tools query - APM service #### Request: ``` GET kbn:/internal/apm/entities/services/synth-node-0/summary?environment=ENVIRONMENT_ALL ``` #### Response ``` { "serviceName": "synth-node-0", "agentName": "nodejs", "lastSeenTimestamp": "2024-12-13T16:29:19.868Z", "dataStreamTypes": [ "logs", "traces" ], "environments": [ "Synthtrace: simple_trace" ] } ``` - Service from logs #### Request: ``` GET kbn:/internal/apm/entities/services/synth-node/summary?environment=ENVIRONMENT_ALL ``` #### Response: ``` { "serviceName": "synth-node", "agentName": "go", "lastSeenTimestamp": "2024-12-13T16:27:43.461Z", "dataStreamTypes": [ "logs", "traces" ], "environments": [ "Synthtrace: logs_traces_hosts" ] } ``` --------- Co-authored-by: Jenny <[email protected]> Co-authored-by: kibanamachine <[email protected]>
Closes 202299
Summary
This PR replaces the query in
getServiceEntitySummary
with the v2 function (entityManagerClient.v2.searchEntities
)Testing
apm_v2.mov
APM service
Request:
Response
Service from logs
Request:
Response: