Skip to content

Commit

Permalink
[8.11] [Infra UI] Fix process charts after refactoring (#168159) (#16…
Browse files Browse the repository at this point in the history
…8210)

# Backport

This will backport the following commits from `main` to `8.11`:
- [[Infra UI] Fix process charts after refactoring
(#168159)](#168159)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT
[{"author":{"name":"jennypavlova","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-10-06T12:01:19Z","message":"[Infra
UI] Fix process charts after refactoring (#168159)\n\nCloses #168156
\r\n## Summary\r\n\r\nThis PR fixes process charts error:
\r\n\r\n![image](https://github.com/elastic/kibana/assets/14139027/4d907c77-07a3-40da-96fd-2340bce2efc8)\r\n\r\nI
assume that after the merge of the refactoring PR, those files
were\r\nrecreated by another PR or most likely when `main` was merged to
[the\r\nrefactoring PR](#166965)
with them\r\nas resolved conflicts. Deleting the files again fixed the
issue.\r\n\r\n## Testing\r\nI found the issue on serverless but it
probably can be reproduced on\r\non-prem as well\r\nOn Serverless: \r\n-
Start a local es instance: `yarn es serverless --kill
--clean\r\n--license trial --ssl`\r\n- Enable infra in the
`serverless.oblt.dev.yml` file:\r\n - `xpack.infra.enabled: true`\r\n-
Start a local kibana instance: `yarn serverless-oblt --ssl` and see
if\r\nthe side nav contains the Infrastructure item\r\n- Navigate to
https://0.0.0.0:5601/ftw/app/hosts and open Asset details\r\nflyout or
page\r\n- Click on the process tab and expand one of the processes\r\n-
The charts (CPU and Memory) should be
visible","sha":"000b70c000ec1c8ce9d2ccda6faf60247116a263","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Infra
Monitoring
UI","release_note:skip","backport:prev-minor","v8.12.0"],"number":168159,"url":"https://github.com/elastic/kibana/pull/168159","mergeCommit":{"message":"[Infra
UI] Fix process charts after refactoring (#168159)\n\nCloses #168156
\r\n## Summary\r\n\r\nThis PR fixes process charts error:
\r\n\r\n![image](https://github.com/elastic/kibana/assets/14139027/4d907c77-07a3-40da-96fd-2340bce2efc8)\r\n\r\nI
assume that after the merge of the refactoring PR, those files
were\r\nrecreated by another PR or most likely when `main` was merged to
[the\r\nrefactoring PR](#166965)
with them\r\nas resolved conflicts. Deleting the files again fixed the
issue.\r\n\r\n## Testing\r\nI found the issue on serverless but it
probably can be reproduced on\r\non-prem as well\r\nOn Serverless: \r\n-
Start a local es instance: `yarn es serverless --kill
--clean\r\n--license trial --ssl`\r\n- Enable infra in the
`serverless.oblt.dev.yml` file:\r\n - `xpack.infra.enabled: true`\r\n-
Start a local kibana instance: `yarn serverless-oblt --ssl` and see
if\r\nthe side nav contains the Infrastructure item\r\n- Navigate to
https://0.0.0.0:5601/ftw/app/hosts and open Asset details\r\nflyout or
page\r\n- Click on the process tab and expand one of the processes\r\n-
The charts (CPU and Memory) should be
visible","sha":"000b70c000ec1c8ce9d2ccda6faf60247116a263"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/168159","number":168159,"mergeCommit":{"message":"[Infra
UI] Fix process charts after refactoring (#168159)\n\nCloses #168156
\r\n## Summary\r\n\r\nThis PR fixes process charts error:
\r\n\r\n![image](https://github.com/elastic/kibana/assets/14139027/4d907c77-07a3-40da-96fd-2340bce2efc8)\r\n\r\nI
assume that after the merge of the refactoring PR, those files
were\r\nrecreated by another PR or most likely when `main` was merged to
[the\r\nrefactoring PR](#166965)
with them\r\nas resolved conflicts. Deleting the files again fixed the
issue.\r\n\r\n## Testing\r\nI found the issue on serverless but it
probably can be reproduced on\r\non-prem as well\r\nOn Serverless: \r\n-
Start a local es instance: `yarn es serverless --kill
--clean\r\n--license trial --ssl`\r\n- Enable infra in the
`serverless.oblt.dev.yml` file:\r\n - `xpack.infra.enabled: true`\r\n-
Start a local kibana instance: `yarn serverless-oblt --ssl` and see
if\r\nthe side nav contains the Infrastructure item\r\n- Navigate to
https://0.0.0.0:5601/ftw/app/hosts and open Asset details\r\nflyout or
page\r\n- Click on the process tab and expand one of the processes\r\n-
The charts (CPU and Memory) should be
visible","sha":"000b70c000ec1c8ce9d2ccda6faf60247116a263"}}]}]
BACKPORT-->

Co-authored-by: jennypavlova <[email protected]>
  • Loading branch information
kibanamachine and jennypavlova authored Oct 6, 2023
1 parent 467f42b commit 8bcb550
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 139 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ import { parseSearchString } from './parse_search_string';
import { ProcessesTable } from './processes_table';
import { STATE_NAMES } from './states';
import { SummaryTable } from './summary_table';
import {
SortBy,
useProcessList,
ProcessListContextProvider,
} from '../../../../pages/metrics/inventory_view/hooks/use_process_list';
import { SortBy, useProcessList, ProcessListContextProvider } from '../../hooks/use_process_list';
import { getFieldByType } from '../../../../../common/inventory_models';
import { useAssetDetailsRenderPropsContext } from '../../hooks/use_asset_details_render_props';
import { useDateRangeProviderContext } from '../../hooks/use_date_range';
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 8bcb550

Please sign in to comment.