diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/snapshot_container.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/snapshot_container.tsx index 40b41ac3a1d5e..f73c6680c5bd2 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/snapshot_container.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/snapshot_container.tsx @@ -25,7 +25,7 @@ interface Props { } export const SnapshotContainer = ({ render }: Props) => { const { sourceId } = useSourceContext(); - const { metric, groupBy, nodeType, accountId, region, view } = useWaffleOptionsContext(); + const { metric, groupBy, nodeType, accountId, region } = useWaffleOptionsContext(); const { currentTime } = useWaffleTimeContext(); const { filterQueryAsJson } = useWaffleFiltersContext(); const { @@ -44,7 +44,6 @@ export const SnapshotContainer = ({ render }: Props) => { accountId, region, sendRequestImmediately: false, - includeTimeseries: view === 'table', }, { abortable: true, diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx index f023cc1c5760c..67654803ef844 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx @@ -107,7 +107,6 @@ describe('ConditionalToolTip', () => { filterQuery: expectedQuery, metrics: expectedMetrics, groupBy: [], - includeTimeseries: false, nodeType: 'host', sourceId: 'default', currentTime, diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx index 7bbb696103cd6..4b3b8bfb05dc0 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx @@ -62,7 +62,6 @@ export const ConditionalToolTip = ({ node, nodeType, currentTime }: Props) => { currentTime: requestCurrentTime.current, accountId: '', region: '', - includeTimeseries: false, }, { abortable: true, diff --git a/x-pack/test/functional/apps/infra/home_page.ts b/x-pack/test/functional/apps/infra/home_page.ts index a41c12e0d833d..e8ec102eef397 100644 --- a/x-pack/test/functional/apps/infra/home_page.ts +++ b/x-pack/test/functional/apps/infra/home_page.ts @@ -238,12 +238,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await retry.try(async () => { const nodesWithValue = await pageObjects.infraHome.getNodesWithValues(); expect(nodesWithValue).to.eql([ - { name: 'demo-stack-apache-01', value: 1.2, color: '#6092c0' }, - { name: 'demo-stack-mysql-01', value: 1, color: '#93b1d3' }, - { name: 'demo-stack-nginx-01', value: 0.9, color: '#b2c7df' }, - { name: 'demo-stack-redis-01', value: 0.8, color: '#b2c7df' }, + { name: 'demo-stack-apache-01', value: 1.4, color: '#6092c0' }, + { name: 'demo-stack-mysql-01', value: 1.2, color: '#82a7cd' }, + { name: 'demo-stack-nginx-01', value: 1.1, color: '#93b1d3' }, + { name: 'demo-stack-redis-01', value: 1, color: '#a2bcd9' }, { name: 'demo-stack-haproxy-01', value: 0.8, color: '#c2d2e6' }, - { name: 'demo-stack-client-01', value: 0.5, color: '#f0f4f9' }, + { name: 'demo-stack-client-01', value: 0.6, color: '#f0f4f9' }, ]); }); }); @@ -256,12 +256,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await retry.try(async () => { const nodesWithValue = await pageObjects.infraHome.getNodesWithValues(); expect(nodesWithValue).to.eql([ - { name: 'demo-stack-client-01', value: 0.5, color: '#f0f4f9' }, + { name: 'demo-stack-client-01', value: 0.6, color: '#f0f4f9' }, { name: 'demo-stack-haproxy-01', value: 0.8, color: '#c2d2e6' }, - { name: 'demo-stack-redis-01', value: 0.8, color: '#b2c7df' }, - { name: 'demo-stack-nginx-01', value: 0.9, color: '#b2c7df' }, - { name: 'demo-stack-mysql-01', value: 1, color: '#93b1d3' }, - { name: 'demo-stack-apache-01', value: 1.2, color: '#6092c0' }, + { name: 'demo-stack-redis-01', value: 1, color: '#a2bcd9' }, + { name: 'demo-stack-nginx-01', value: 1.1, color: '#93b1d3' }, + { name: 'demo-stack-mysql-01', value: 1.2, color: '#82a7cd' }, + { name: 'demo-stack-apache-01', value: 1.4, color: '#6092c0' }, ]); }); }); @@ -282,7 +282,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await retry.try(async () => { const nodesWithValue = await pageObjects.infraHome.getNodesWithValues(); expect(nodesWithValue).to.eql([ - { name: 'demo-stack-apache-01', value: 1.2, color: '#6092c0' }, + { name: 'demo-stack-apache-01', value: 1.4, color: '#6092c0' }, ]); }); await pageObjects.infraHome.clearSearchTerm(); @@ -295,12 +295,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await retry.try(async () => { const nodesWithValue = await pageObjects.infraHome.getNodesWithValues(); expect(nodesWithValue).to.eql([ - { name: 'demo-stack-client-01', value: 0.5, color: '#6092c0' }, + { name: 'demo-stack-client-01', value: 0.6, color: '#6092c0' }, { name: 'demo-stack-haproxy-01', value: 0.8, color: '#b5c9df' }, - { name: 'demo-stack-redis-01', value: 0.8, color: '#d0dcea' }, - { name: 'demo-stack-nginx-01', value: 0.9, color: '#d0dcea' }, - { name: 'demo-stack-mysql-01', value: 1, color: '#eec096' }, - { name: 'demo-stack-apache-01', value: 1.2, color: '#e7664c' }, + { name: 'demo-stack-redis-01', value: 1, color: '#f1d9b9' }, + { name: 'demo-stack-nginx-01', value: 1.1, color: '#eec096' }, + { name: 'demo-stack-mysql-01', value: 1.2, color: '#eba47a' }, + { name: 'demo-stack-apache-01', value: 1.4, color: '#e7664c' }, ]); }); });