[Infra] Infra Inventory refactors #229980

crespocarlos · 2025-07-30T16:09:09Z

Summary

This PR fixes and simplifies some things in the Infra Inventory UI

Payload simplified

The Snapshop API currently accepts query DSL in the request body. This object is complex, and there are no apparent reason for it to remain like this.

Before	After
`filterQuery: "{\"bool\":{\"should\":[{\"term\":{\"host.name\":{\"value\":\"advertService\"}}}],\"minimum_should_match\":1}}"`	`kuery: "host.name:\"metricbeat-host\""`

Race condition fix

An old issue with a race condition between Saved Views and URL state has been fixed

Before	After

Misc

Centralize entity-specific code in the inventory models
Fix caching issues with the useUrlState

…requests

…eshold rule params

crespocarlos · 2025-07-30T16:21:38Z

...utions/observability/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx

-  const { onViewChange } = useWaffleViewState();
-
-  useEffect(() => {
-    if (currentView) {
-      onViewChange(currentView);
-    }
-  }, [currentView, onViewChange]);
-
-  useEffect(() => {
-    // load snapshot data after default view loaded, unless we're not loading a view
-    if (currentView != null) {
-      reload();
-    }
-  }, [currentView, reload]);


Srlsy, why?

crespocarlos · 2025-07-30T16:22:44Z

...servability/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_view_state.ts

@@ -1,101 +0,0 @@
-/*


This thing had become a second source of truth, causing all the shenanigans around race conditions between saved view state and URL state

crespocarlos · 2025-07-30T16:23:27Z

...ata_access/server/routes/metrics_explorer/lib/convert_request_to_metrics_api_options.test.ts

-    });
-  });
-
-  it('should work with filterQuery as Lucene expressions', () => {


kqlQuery takes care of this

crespocarlos · 2025-07-30T16:25:24Z

.../observability/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_filters.ts

-  const filterQueryAsJson = useMemo(
-    () => convertKueryToElasticSearchQuery(urlState.expression, metricsView?.dataViewReference),
-    [metricsView?.dataViewReference, urlState.expression]
-  );


There are 0 reasons to send a DSL query object to APIs

crespocarlos · 2025-07-30T16:26:09Z

x-pack/solutions/observability/plugins/infra/common/http_api/snapshot_api.ts

  rt.partial({
    accountId: rt.string,
    region: rt.string,
-    filterQuery: rt.union([rt.string, rt.null]),


the API can handle KQL filters internally

crespocarlos · 2025-07-30T16:27:46Z

x-pack/solutions/observability/plugins/metrics_data_access/common/constants.ts

+export const METRICS_EXPLORER_API_MAX_METRICS = 20;
+
 export const TIMESTAMP_FIELD = '@timestamp';
-export const HOST_FIELD = 'host.name';
-export const CONTAINER_FIELD = 'container.id';
-export const POD_FIELD = 'kubernetes.pod.uid';
+export const HOST_NAME_FIELD = 'host.name';
+export const CONTAINER_ID_FIELD = 'container.id';
+export const KUBERNETES_POD_UID_FIELD = 'kubernetes.pod.uid';

-export const METRICS_EXPLORER_API_MAX_METRICS = 20;
+export const EVENT_MODULE = 'event.module';
+export const METRICSET_MODULE = 'metricset.module';
+export const METRICSET_NAME = 'metricset.name';
+export const DATASTREAM_DATASET = 'data_stream.dataset';
+
+// integrations
+export const SYSTEM_INTEGRATION = 'system';
+export const HOST_METRICS_RECEIVER_OTEL = 'hostmetricsreceiver.otel';


This has to be temporary and we need a centralized place to define these constants, but this will do for this PR

crespocarlos · 2025-07-30T17:59:33Z

.../observability/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_filters.ts

    urlStateKey: 'waffleFilter',
  });

-  const [state, setState] = useState<InventoryFiltersState>(urlState);


second source of truth

crespocarlos · 2025-07-30T17:59:39Z

...ons/observability/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_time.ts

    urlStateKey: 'waffleTime',
  });

-  const [state, setState] = useState<WaffleTimeState>(urlState);


second source of truth

crespocarlos · 2025-07-30T17:59:55Z

.../observability/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts

    urlStateKey: 'waffleOptions',
  });

-  const [state, setState] = useState<WaffleOptionsState>(urlState);


second source of truth

crespocarlos · 2025-07-31T07:12:49Z

x-pack/solutions/observability/plugins/observability_shared/public/hooks/use_url_state.ts

        history.replace(newLocation);
      }
    },
-    [decodeUrlState, defaultState, encodeUrlState, history, urlStateKey]


defaultState was causing setState function to be redefined during re-renders

elasticmachine · 2025-07-31T16:45:24Z

Pinging @elastic/obs-ux-infra_services-team (Team:obs-ux-infra_services)

MiriamAparicio · 2025-08-01T10:15:29Z

x-pack/solutions/observability/plugins/infra/public/alerting/inventory/components/node_type.tsx

        <EuiSelect
+          aria-label={i18n.translate('xpack.infra.nodeTypeExpression.select.ariaLabel', {
+            defaultMessage: 'Select a node type',
+          })}


A11y ❤️

MiriamAparicio · 2025-08-01T10:20:19Z

...lutions/observability/plugins/infra/public/pages/metrics/inventory_view/hooks/use_snaphot.ts

-          schema: config.featureFlags.hostOtelEnabled
-            ? DataSchemaFormat.SEMCONV
-            : DataSchemaFormat.ECS,
+          schema: config.featureFlags.hostOtelEnabled ? DataSchemaFormat.SEMCONV : undefined,


Why we change this to undefined instead of 'ecs'?

We'll change this soon when we add the schema selector to the page

MiriamAparicio · 2025-08-01T10:21:50Z

.../observability/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts

-  const [state, setState] = useState<WaffleOptionsState>(urlState);
-
-  useEffect(() => setUrlState(state), [setUrlState, state]);
+  const previousViewId = useRef<string | undefined>(currentView?.id);


...ck/solutions/observability/plugins/metrics_data_access/common/inventory_models/host/index.ts

MiriamAparicio

Thanks for making our infra live better, just added a couple of comments and a question

crespocarlos · 2025-08-04T07:04:17Z

@elasticmachine merge upstream

tonyghiani

Unblocking for shared ownership of use_url_state, change LGTM

crespocarlos · 2025-08-04T13:16:09Z

.../solutions/observability/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx

 export const PrefilledInventoryAlertFlyout = ({ onClose }: { onClose(): void }) => {
  const { inventoryPrefill } = useAlertPrefillContext();
-  const { nodeType, metric, filterQuery } = inventoryPrefill;
+  const { nodeType, metric, kuery } = inventoryPrefill;


Instead of a query DSL object, inventoryPrefill will store a kql filter

crespocarlos · 2025-08-04T13:18:12Z

x-pack/solutions/observability/plugins/infra/public/alerting/inventory/components/metric.tsx

  nodeType,
 }: Props) => {
-  const [popoverOpen, setPopoverOpen] = useState(false);
+  const [popoverOpen, { toggle: togglePopover }] = useBoolean(false);


This solves a problem with the popover not closing when the focus leaves the popover if the field is clicked twice

crespocarlos · 2025-08-04T13:20:24Z

...s/observability/plugins/infra/public/alerting/inventory/hooks/use_inventory_alert_prefill.ts

 export const useInventoryAlertPrefill = () => {
  const [nodeType, setNodeType] = useState<InventoryItemType>('host');
-  const [filterQuery, setFilterQuery] = useState<string | undefined>();
+  const [kuery, setKuery] = useState<string | undefined>();


Change to store kql instead of query DSL

cesco-f

obs-ux-management-team changes LGTM.

Just a heads up that I see this error when creating an inventory rule from observability/alerts/rules but I see the same error in the edge-oblt cluster so I don't think it's related with changes in this PR.

cesco-f · 2025-08-05T08:28:37Z

Same error if I try creating the rule from management/insightsAndAlerting/triggersActions/rules/create/metrics.alert.inventory.threshold

crespocarlos · 2025-08-05T08:35:58Z

Same error if I try creating the rule from management/insightsAndAlerting/triggersActions/rules/create/metrics.alert.inventory.threshold

I think this was introduced by another PR. I'll check it. Thanks for flagging it.

crespocarlos · 2025-08-05T08:45:54Z

triggersActions/rules/create/metrics.alert.inventory.threshold

fixed: beaacdc

elasticmachine · 2025-08-05T10:45:07Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: beaacdc

Failed CI Steps

FTR Configs #132

Test Failures

[job] [logs] FTR Configs #132 / InfraOps App Metrics UI Home page with metrics present sort nodes by ascending value

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id	before	after	diff
`infra`	1531	1530	-1

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id	before	after	diff
`metricsDataAccess`	136	146	+10

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`infra`	1.0MB	1.0MB	-110.0B
`metricsDataAccess`	78.7KB	78.7KB	-6.0B
total			-116.0B

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id	before	after	diff
`infra`	50.1KB	50.1KB	+16.0B
`metricsDataAccess`	38.3KB	38.9KB	+622.0B
`observabilityShared`	67.1KB	67.1KB	-20.0B
total			+618.0B

Unknown metric groups

API count

id	before	after	diff
`metricsDataAccess`	136	146	+10

ESLint disabled line counts

id	before	after	diff
`infra`	38	37	-1

Total ESLint disabled count

id	before	after	diff
`infra`	46	45	-1

History

💚 Build #325836 succeeded e787b8d
💚 Build #325509 succeeded d15786e
💚 Build #325144 succeeded 75f9c7d
💔 Build #325084 failed ffe6643
💔 Build #325028 failed 37e594d
💔 Build #324965 failed 64c7f52

part of elastic#226336 ## Summary This PR fixes and simplifies some things in the Infra Inventory UI **Payload simplified** The Snapshop API currently accepts query DSL in the request body. This object is complex, and there are no apparent reason for it to remain like this. | Before | After | |--------|-----------------| | `filterQuery: "{\"bool\":{\"should\":[{\"term\":{\"host.name\":{\"value\":\"advertService\"}}}],\"minimum_should_match\":1}}"` | `kuery: "host.name:\"metricbeat-host\""` | **Race condition fix** An old issue with a race condition between Saved Views and URL state has been fixed | Before | After | |--------|-----------------| |![inv_state_problem](https://github.com/user-attachments/assets/d3c3e3b1-11a8-4b48-832c-42b17de4f3ac)|![inv_state_fix](https://github.com/user-attachments/assets/90e597a8-6ee8-42cd-9a81-915c8ca2ec7f)| **Misc** - Centralize entity-specific code in the inventory models - Fix caching issues with the `useUrlState` --------- Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

crespocarlos added 5 commits July 30, 2025 18:08

feat: add schema selection to host inventory alert rule

8445c57

refactor: improve types

5c53430

fix: update tests

1360c4e

refactor: centralize everything in inventory models and simplify API …

4bbc46c

…requests

refactor: remove unused data schema formats from metric inventory thr…

01218bb

…eshold rule params

crespocarlos commented Jul 30, 2025

View reviewed changes

refactor: streamline filter query handling and state management

6d4f8c7

crespocarlos commented Jul 30, 2025

View reviewed changes

fix: anomaly table state update

64c7f52

crespocarlos commented Jul 31, 2025

View reviewed changes

crespocarlos changed the title ~~feat: add schema selection to host inventory alert rule~~ [Infra] Infra Inventory refactors Jul 31, 2025

crespocarlos added 2 commits July 31, 2025 12:09

fix: adjust tests

37e594d

fix: handle undefined previous state in setState callback

ffe6643

crespocarlos added release_note:fix backport:skip This PR does not require backporting Team:obs-ux-infra_services - DEPRECATED DEPRECATED - Use Team:obs-presentation. v9.2.0 labels Jul 31, 2025

fix: preserve url state on page revisit by preventing unwanted overwrite

75f9c7d

crespocarlos marked this pull request as ready for review July 31, 2025 16:45

crespocarlos requested a review from a team as a code owner July 31, 2025 16:45

crespocarlos requested a review from a team July 31, 2025 16:45

crespocarlos requested review from a team as code owners July 31, 2025 16:45

MiriamAparicio reviewed Aug 1, 2025

View reviewed changes

...ck/solutions/observability/plugins/metrics_data_access/common/inventory_models/host/index.ts Show resolved Hide resolved

MiriamAparicio approved these changes Aug 1, 2025

View reviewed changes

fix: base snapshot filter

d15786e

Merge branch 'main' into 226336-infra-inventory-ui-improvements

e787b8d

crespocarlos added release_note:skip Skip the PR/issue when compiling release notes and removed release_note:fix labels Aug 4, 2025

tonyghiani approved these changes Aug 4, 2025

View reviewed changes

crespocarlos commented Aug 4, 2025

View reviewed changes

crespocarlos enabled auto-merge (squash) August 4, 2025 14:54

crespocarlos disabled auto-merge August 4, 2025 14:54

cesco-f approved these changes Aug 5, 2025

View reviewed changes

fix: remove dependency with PluginConfigContext on useSnapshot hook

beaacdc

crespocarlos merged commit 381ef6e into elastic:main Aug 5, 2025
12 checks passed

crespocarlos deleted the 226336-infra-inventory-ui-improvements branch August 5, 2025 10:57

wildemat mentioned this pull request Aug 7, 2025

pr 230826 #231022

Closed

10 tasks

[Infra] Infra Inventory refactors #229980

[Infra] Infra Inventory refactors #229980

Uh oh!

Conversation

crespocarlos commented Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

Choose a reason for hiding this comment

Uh oh!

crespocarlos Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elasticmachine commented Jul 31, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

MiriamAparicio left a comment

Choose a reason for hiding this comment

Uh oh!

crespocarlos commented Aug 4, 2025

Uh oh!

tonyghiani left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

crespocarlos Aug 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cesco-f left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cesco-f commented Aug 5, 2025

Uh oh!

crespocarlos commented Aug 5, 2025

Uh oh!

crespocarlos commented Aug 5, 2025

Uh oh!

elasticmachine commented Aug 5, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

Metrics [docs]

Module Count

Public APIs missing comments

Async chunks

Page load bundle

API count

ESLint disabled line counts

Total ESLint disabled count

History

crespocarlos commented Jul 30, 2025 •

edited

Loading

crespocarlos Jul 30, 2025 •

edited

Loading

crespocarlos Aug 4, 2025 •

edited

Loading

cesco-f left a comment •

edited

Loading