Repository: ambari Updated Branches: refs/heads/trunk 3f767220f -> 4bd3471d6
AMBARI-6578 Usability: HDFS Total Space Utilization chart data needs more precision (Dmytro Shkvyra via dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4bd3471d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4bd3471d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4bd3471d Branch: refs/heads/trunk Commit: 4bd3471d654c8792fe95bd7cf276dc0961887a4d Parents: 3f76722 Author: Dmytro Sen <d...@hortonworks.com> Authored: Thu Jul 24 19:30:51 2014 +0300 Committer: Dmytro Sen <d...@hortonworks.com> Committed: Thu Jul 24 19:30:51 2014 +0300 ---------------------------------------------------------------------- .../2.0.6.GlusterFS/services/HDFS/metrics.json | 42 +++++++++++++++++++- .../stacks/HDP/2.0.6/services/HDFS/metrics.json | 42 +++++++++++++++++++- .../stacks/HDP/2.0.5/services/HDFS/metrics.json | 20 ++++++++++ .../stacks/HDP/2.0.7/services/HDFS/metrics.json | 42 +++++++++++++++++++- .../stacks/HDP/2.0.8/services/HDFS/metrics.json | 42 +++++++++++++++++++- ambari-web/app/messages.js | 4 ++ ambari-web/app/utils/ajax/ajax.js | 2 +- .../info/metrics/hdfs/space_utilization.js | 21 +++++----- 8 files changed, 199 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4bd3471d/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metrics.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metrics.json index c52a4c0..53996cb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metrics.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/metrics.json @@ -9,6 +9,26 @@ "pointInTime": false, "temporal": true }, + "metrics/dfs/FSNamesystem/CapacityTotal": { + "metric": "dfs.FSNamesystem.CapacityTotal", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityUsed": { + "metric": "dfs.FSNamesystem.CapacityUsed", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityRemaining": { + "metric": "dfs.FSNamesystem.CapacityRemaining", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityNonDFSUsed": { + "metric": "dfs.FSNamesystem.CapacityUsedNonDFS", + "pointInTime": false, + "temporal": true + }, "metrics/dfs/FSNamesystem/BlockCapacity": { "metric": "dfs.FSNamesystem.BlockCapacity", "pointInTime": false, @@ -1406,6 +1426,26 @@ "pointInTime": false, "temporal": true }, + "metrics/dfs/FSNamesystem/CapacityTotal": { + "metric": "dfs.FSNamesystem.CapacityTotal", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityUsed": { + "metric": "dfs.FSNamesystem.CapacityUsed", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityRemaining": { + "metric": "dfs.FSNamesystem.CapacityRemaining", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityNonDFSUsed": { + "metric": "dfs.FSNamesystem.CapacityUsedNonDFS", + "pointInTime": false, + "temporal": true + }, "metrics/dfs/FSNamesystem/BlockCapacity": { "metric": "dfs.FSNamesystem.BlockCapacity", "pointInTime": false, @@ -7797,4 +7837,4 @@ } ] } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/4bd3471d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metrics.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metrics.json index be49109..088626a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metrics.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/metrics.json @@ -9,6 +9,26 @@ "pointInTime": false, "temporal": true }, + "metrics/dfs/FSNamesystem/CapacityTotal": { + "metric": "dfs.FSNamesystem.CapacityTotal", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityUsed": { + "metric": "dfs.FSNamesystem.CapacityUsed", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityRemaining": { + "metric": "dfs.FSNamesystem.CapacityRemaining", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityNonDFSUsed": { + "metric": "dfs.FSNamesystem.CapacityUsedNonDFS", + "pointInTime": false, + "temporal": true + }, "metrics/dfs/FSNamesystem/BlockCapacity": { "metric": "dfs.FSNamesystem.BlockCapacity", "pointInTime": false, @@ -1406,6 +1426,26 @@ "pointInTime": false, "temporal": true }, + "metrics/dfs/FSNamesystem/CapacityTotal": { + "metric": "dfs.FSNamesystem.CapacityTotal", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityUsed": { + "metric": "dfs.FSNamesystem.CapacityUsed", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityRemaining": { + "metric": "dfs.FSNamesystem.CapacityRemaining", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityNonDFSUsed": { + "metric": "dfs.FSNamesystem.CapacityUsedNonDFS", + "pointInTime": false, + "temporal": true + }, "metrics/dfs/FSNamesystem/BlockCapacity": { "metric": "dfs.FSNamesystem.BlockCapacity", "pointInTime": false, @@ -7797,4 +7837,4 @@ } ] } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/4bd3471d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metrics.json b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metrics.json index fe33f71..dd68181 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metrics.json +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metrics.json @@ -1306,6 +1306,26 @@ "pointInTime":false, "temporal":true }, + "metrics/dfs/FSNamesystem/CapacityTotal": { + "metric": "dfs.FSNamesystem.CapacityTotal", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityUsed": { + "metric": "dfs.FSNamesystem.CapacityUsed", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityRemaining": { + "metric": "dfs.FSNamesystem.CapacityRemaining", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityNonDFSUsed": { + "metric": "dfs.FSNamesystem.CapacityUsedNonDFS", + "pointInTime": false, + "temporal": true + }, "metrics/dfs/FSNamesystem/BlocksTotal":{ "metric":"dfs.FSNamesystem.BlocksTotal", "pointInTime":false, http://git-wip-us.apache.org/repos/asf/ambari/blob/4bd3471d/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metrics.json b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metrics.json index be49109..2d3be9f 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metrics.json +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/metrics.json @@ -14,6 +14,26 @@ "pointInTime": false, "temporal": true }, + "metrics/dfs/FSNamesystem/CapacityTotal": { + "metric": "dfs.FSNamesystem.CapacityTotal", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityUsed": { + "metric": "dfs.FSNamesystem.CapacityUsed", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityRemaining": { + "metric": "dfs.FSNamesystem.CapacityRemaining", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityNonDFSUsed": { + "metric": "dfs.FSNamesystem.CapacityUsedNonDFS", + "pointInTime": false, + "temporal": true + }, "metrics/dfs/namenode/GetListingOps": { "metric": "dfs.namenode.GetListingOps", "pointInTime": false, @@ -1411,6 +1431,26 @@ "pointInTime": false, "temporal": true }, + "metrics/dfs/FSNamesystem/CapacityTotal": { + "metric": "dfs.FSNamesystem.CapacityTotal", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityUsed": { + "metric": "dfs.FSNamesystem.CapacityUsed", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityRemaining": { + "metric": "dfs.FSNamesystem.CapacityRemaining", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityNonDFSUsed": { + "metric": "dfs.FSNamesystem.CapacityUsedNonDFS", + "pointInTime": false, + "temporal": true + }, "metrics/dfs/namenode/GetListingOps": { "metric": "dfs.namenode.GetListingOps", "pointInTime": false, @@ -7797,4 +7837,4 @@ } ] } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/4bd3471d/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metrics.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metrics.json b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metrics.json index f33a0c0..2938552 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metrics.json +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/metrics.json @@ -14,6 +14,26 @@ "pointInTime": false, "temporal": true }, + "metrics/dfs/FSNamesystem/CapacityTotal": { + "metric": "dfs.FSNamesystem.CapacityTotal", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityUsed": { + "metric": "dfs.FSNamesystem.CapacityUsed", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityRemaining": { + "metric": "dfs.FSNamesystem.CapacityRemaining", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityNonDFSUsed": { + "metric": "dfs.FSNamesystem.CapacityUsedNonDFS", + "pointInTime": false, + "temporal": true + }, "metrics/dfs/namenode/GetListingOps": { "metric": "dfs.namenode.GetListingOps", "pointInTime": false, @@ -1411,6 +1431,26 @@ "pointInTime": false, "temporal": true }, + "metrics/dfs/FSNamesystem/CapacityTotal": { + "metric": "dfs.FSNamesystem.CapacityTotal", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityUsed": { + "metric": "dfs.FSNamesystem.CapacityUsed", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityRemaining": { + "metric": "dfs.FSNamesystem.CapacityRemaining", + "pointInTime": false, + "temporal": true + }, + "metrics/dfs/FSNamesystem/CapacityNonDFSUsed": { + "metric": "dfs.FSNamesystem.CapacityUsedNonDFS", + "pointInTime": false, + "temporal": true + }, "metrics/dfs/namenode/GetListingOps": { "metric": "dfs.namenode.GetListingOps", "pointInTime": false, @@ -7797,4 +7837,4 @@ } ] } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/4bd3471d/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index c0acf42..9770bf4 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1244,6 +1244,10 @@ Em.I18n.translations = { 'services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityRemainingGB':'Capacity Remaining', 'services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityUsedGB':'Capacity Used', 'services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityTotalGB':'Capacity Total', + 'services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityRemaining':'Capacity Remaining', + 'services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityUsed':'Capacity Used', + 'services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityTotal':'Capacity Total', + 'services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityNonDFSUsed':'Non DFS Capacity Used', 'services.service.info.metrics.mapreduce.gc':'Garbage Collection', 'services.service.info.metrics.mapreduce.gc.displayNames.gcTimeMillis':'Time', http://git-wip-us.apache.org/repos/asf/ambari/blob/4bd3471d/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js index 976459a..d5e0f97 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -616,7 +616,7 @@ var urls = { 'testInProduction': true }, 'service.metrics.hdfs.space_utilization': { - 'real': '/clusters/{clusterName}/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/CapacityRemainingGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityUsedGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityTotalGB[{fromSeconds},{toSeconds},{stepSeconds}]', + 'real': '/clusters/{clusterName}/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/CapacityRemaining[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityUsed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityTotal[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityNonDFSUsed[{fromSeconds},{toSeconds},{stepSeconds}]', 'mock': '/data/services/metrics/hdfs/space_utilization.json', 'testInProduction': true }, http://git-wip-us.apache.org/repos/asf/ambari/blob/4bd3471d/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js b/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js index 6bf00f0..42c7c06 100644 --- a/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js +++ b/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js @@ -35,33 +35,32 @@ App.ChartServiceMetricsHDFS_SpaceUtilization = App.ChartLinearTimeView.extend({ transformToSeries: function (jsonData) { var seriesArray = []; - var GB = Math.pow(2, 30); if (jsonData && jsonData.metrics && jsonData.metrics.dfs && jsonData.metrics.dfs.FSNamesystem) { for ( var name in jsonData.metrics.dfs.FSNamesystem) { var displayName; var seriesData = jsonData.metrics.dfs.FSNamesystem[name]; switch (name) { - case "CapacityRemainingGB": - displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityRemainingGB'); + case "CapacityRemaining": + displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityRemaining'); break; - case "CapacityUsedGB": - displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityUsedGB'); + case "CapacityUsed": + displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityUsed'); break; - case "CapacityTotalGB": - displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityTotalGB'); + case "CapacityTotal": + displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityTotal'); break; + case "CapacityNonDFSUsed": + displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityNonDFSUsed'); + break; default: break; } if (seriesData) { var s = this.transformData(seriesData, displayName); - for (var i = 0; i < s.data.length; i++) { - s.data[i].y *= GB; - } seriesArray.push(s); } } } return seriesArray; } -}); \ No newline at end of file +});
