diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js index 289c1cd1cdc..b4f3e24a3d6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js @@ -27,8 +27,8 @@ export default DS.JSONAPISerializer.extend({ finishedTs = appFinishedEvent? appFinishedEvent.timestamp : Date.now(), appState = (appFinishedEvent && appFinishedEvent.info)? appFinishedEvent.info.YARN_APPLICATION_STATE : "N/A", metrics = payload.metrics, - cpuMetric = metrics.findBy('id', 'CPU'), - memoryMetric = metrics.findBy('id', 'MEMORY'), + cpuMetric = metrics.findBy('id', 'YARN_APPLICATION_CPU'), + memoryMetric = metrics.findBy('id', 'YARN_APPLICATION_MEMORY'), cpu = cpuMetric? cpuMetric.values[Object.keys(cpuMetric.values)[0]] : -1, memory = memoryMetric? memoryMetric.values[Object.keys(memoryMetric.values)[0]] : -1; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js index 67603bb5598..0ee02302825 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js @@ -24,9 +24,9 @@ export default DS.JSONAPISerializer.extend({ normalizeSingleResponse(store, primaryModelClass, payload, id, requestType) { var metrics = payload.metrics, - cpuMetric = metrics.findBy('id', 'CPU'), + cpuMetric = metrics.findBy('id', 'YARN_APPLICATION_CPU'), cpu = cpuMetric? cpuMetric.values[Object.keys(cpuMetric.values)[0]] : -1, - memMetric = metrics.findBy('id', 'MEMORY'), + memMetric = metrics.findBy('id', 'YARN_APPLICATION_MEMORY'), memory = memMetric? memMetric.values[Object.keys(memMetric.values)[0]] : -1; var fixedPayload = {