[Metrics UI] Use the normalized field for CPU usage for Observability…

… Overview (elastic#98995) (elastic#99236) * [Metrics UI] Use the noramlized field for CPU usage for Observability Overview * fixing overview page as well Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Kibana Machine <[email protected]>
kibanamachine · May 4, 2021 · fbaf9db · fbaf9db
1 parent f5ca0f4
commit fbaf9db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 35 deletions.
diff --git a/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_system_overview.ts b/x-pack/plugins/infra/common/inventory_models/host/metrics/tsvb/host_system_overview.ts
@@ -24,42 +24,10 @@ export const hostSystemOverview: TSVBMetricModelCreator = (
       split_mode: 'everything',
       metrics: [
         {
-          field: 'system.cpu.user.pct',
-          id: 'avg-cpu-user',
+          field: 'system.cpu.total.norm.pct',
+          id: 'avg-cpu-total',
           type: 'avg',
         },
-        {
-          field: 'system.cpu.cores',
-          id: 'max-cpu-cores',
-          type: 'max',
-        },
-        {
-          field: 'system.cpu.system.pct',
-          id: 'avg-cpu-system',
-          type: 'avg',
-        },
-        {
-          id: 'calc-user-system-cores',
-          script: '(params.users + params.system) / params.cores',
-          type: 'calculation',
-          variables: [
-            {
-              field: 'avg-cpu-user',
-              id: 'var-users',
-              name: 'users',
-            },
-            {
-              field: 'avg-cpu-system',
-              id: 'var-system',
-              name: 'system',
-            },
-            {
-              field: 'max-cpu-cores',
-              id: 'var-cores',
-              name: 'cores',
-            },
-          ],
-        },
       ],
     },
     {

diff --git a/x-pack/plugins/infra/server/routes/overview/lib/create_top_nodes_query.ts b/x-pack/plugins/infra/server/routes/overview/lib/create_top_nodes_query.ts
@@ -60,7 +60,7 @@ export const createTopNodesQuery = (
           },
           cpu: {
             avg: {
-              field: 'system.cpu.total.pct',
+              field: 'system.cpu.total.norm.pct',
             },
           },
           iowait: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ export const createTopNodesQuery = ( @@
               },
               cpu: {
                 avg: {
-                  field: 'system.cpu.total.pct',
+                  field: 'system.cpu.total.norm.pct',
                 },
               },
               iowait: {
@@ Expand Down @@