You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/05/27 04:01:18 UTC

[1/2] ambari git commit: AMBARI-11407. Create widget wizard: Metric selection shown for JournalNode in non NN HA cluster. (jaimin)

Repository: ambari
Updated Branches:
  refs/heads/trunk ee8e2f650 -> f57d0e2ec


AMBARI-11407. Create widget wizard: Metric selection shown for JournalNode in non NN HA cluster. (jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f5af335
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f5af335
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f5af335

Branch: refs/heads/trunk
Commit: 8f5af335eae4f03699cc6807a930b7b6829e9f9c
Parents: ee8e2f6
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue May 26 19:00:07 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue May 26 19:00:07 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/mixins/common/widgets/widget_mixin.js         | 3 +--
 ambari-web/app/models/service/hdfs.js                        | 3 +++
 .../app/views/main/service/widgets/create/expression_view.js | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8f5af335/ambari-web/app/mixins/common/widgets/widget_mixin.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js b/ambari-web/app/mixins/common/widgets/widget_mixin.js
index 9e20cf4..264d19f 100644
--- a/ambari-web/app/mixins/common/widgets/widget_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js
@@ -173,8 +173,7 @@ App.WidgetMixin = Ember.Mixin.create({
       case 'NAMENODE':
         if (request.host_component_criteria === 'host_components/metrics/dfs/FSNamesystem/HAState=active') {
           var hdfs = App.HDFSService.find().objectAt(0);
-          var activeNNHostName = !hdfs.get('snameNode') && hdfs.get('activeNameNode');
-          if (!activeNNHostName) {
+          if (!hdfs.get('isNnHaEnabled')) {
             return '';
           }
         }

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f5af335/ambari-web/app/models/service/hdfs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service/hdfs.js b/ambari-web/app/models/service/hdfs.js
index d00479f..3cb1cef 100644
--- a/ambari-web/app/models/service/hdfs.js
+++ b/ambari-web/app/models/service/hdfs.js
@@ -28,6 +28,9 @@ App.HDFSService = App.Service.extend({
   activeNameNode: DS.belongsTo('App.HostComponent'),
   standbyNameNode: DS.belongsTo('App.HostComponent'),
   standbyNameNode2: DS.belongsTo('App.HostComponent'),
+  isNnHaEnabled: function() {
+    return !this.get('snameNode') && this.get('hostComponents').filterProperty('componentName', 'NAMENODE').length > 1;
+  }.property('snameNode','hostComponents'),
   dataNodesStarted: DS.attr('number'),
   dataNodesInstalled: DS.attr('number'),
   dataNodesTotal: DS.attr('number'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f5af335/ambari-web/app/views/main/service/widgets/create/expression_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/widgets/create/expression_view.js b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 9900915..1c56fe5 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -336,9 +336,13 @@ App.AddMetricExpressionView = Em.View.extend({
       for (var componentId in servicesMap[serviceName].components) {
 
         //HBase service should not show "Active HBase master"
-        if (servicesMap[serviceName].components[componentId].component_name === 'HBASE_MASTER' &&
-          servicesMap[serviceName].components[componentId].level === 'HOSTCOMPONENT') continue;
+        var isActiveHbaseMaster = servicesMap[serviceName].components[componentId].component_name === 'HBASE_MASTER' &&
+          servicesMap[serviceName].components[componentId].level === 'HOSTCOMPONENT';
 
+        // Hide the option if none of the hostComponent is created in the cluster yet
+        var componentName = servicesMap[serviceName].components[componentId].component_name;
+        var isHostComponentAbsent = !App.HostComponent.find().filterProperty('componentName',componentName).length;
+        if (isActiveHbaseMaster || isHostComponentAbsent) continue;
         var component = Em.Object.create({
           componentName: servicesMap[serviceName].components[componentId].component_name,
           level: servicesMap[serviceName].components[componentId].level,


[2/2] ambari git commit: AMBARI-11404. Graph Widget Edit/Create: some HDFS metric cannot be added as a dataset. (jaimin)

Posted by ja...@apache.org.
AMBARI-11404. Graph Widget Edit/Create: some HDFS metric cannot be added as a dataset. (jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f57d0e2e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f57d0e2e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f57d0e2e

Branch: refs/heads/trunk
Commit: f57d0e2ec68161bfc0293a3e5556ab39f39719af
Parents: 8f5af33
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue May 26 19:00:52 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue May 26 19:00:52 2015 -0700

----------------------------------------------------------------------
 .../common-services/HDFS/2.1.0.2.0/metrics.json | 740 ++++++++++++++-----
 1 file changed, 541 insertions(+), 199 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f57d0e2e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
index ff2aba4..4cf93d5 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
@@ -5,6 +5,180 @@
         "type": "ganglia",
         "metrics": {
           "default": {
+            "metrics/cpu/cpu_idle":{
+              "metric":"cpu_idle",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_nice":{
+              "metric":"cpu_nice",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_system":{
+              "metric":"cpu_system",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_user":{
+              "metric":"cpu_user",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_wio":{
+              "metric":"cpu_wio",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/disk_free":{
+              "metric":"disk_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/disk_total":{
+              "metric":"disk_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_fifteen":{
+              "metric":"load_fifteen",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_five":{
+              "metric":"load_five",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_one":{
+              "metric":"load_one",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_buffers":{
+              "metric":"mem_buffers",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_cached":{
+              "metric":"mem_cached",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_free":{
+              "metric":"mem_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_shared":{
+              "metric":"mem_shared",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_total":{
+              "metric":"mem_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/swap_free":{
+              "metric":"swap_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/swap_total":{
+              "metric":"swap_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/bytes_in":{
+              "metric":"bytes_in",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/bytes_out":{
+              "metric":"bytes_out",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/pkts_in":{
+              "metric":"pkts_in",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/pkts_out":{
+              "metric":"pkts_out",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/process/proc_run":{
+              "metric":"proc_run",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/process/proc_total":{
+              "metric":"proc_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_count":{
+              "metric":"read_count",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_count":{
+              "metric":"write_count",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_bytes":{
+              "metric":"read_bytes",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_bytes":{
+              "metric":"write_bytes",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_time":{
+              "metric":"read_time",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_time":{
+              "metric":"write_time",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
             "metrics/dfs/FSNamesystem/TotalLoad": {
               "metric": "dfs.FSNamesystem.TotalLoad",
               "pointInTime": false,
@@ -60,11 +234,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/load/load_one": {
-              "metric": "load_one",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/renewLease_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseNumOps",
               "pointInTime": true,
@@ -106,11 +275,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/FSNamesystem/CapacityUsedGB": {
               "metric": "dfs.FSNamesystem.CapacityUsedGB",
               "pointInTime": false,
@@ -121,11 +285,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/namenode/FilesDeleted": {
               "metric": "dfs.namenode.FilesDeleted",
               "pointInTime": true,
@@ -146,11 +305,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/namenode/blockReport_avg_time": {
               "metric": "dfs.namenode.BlockReportAvgTime",
               "pointInTime": false,
@@ -186,11 +340,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/versionRequest_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.VersionRequestNumOps",
               "pointInTime": true,
@@ -211,21 +360,11 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/setSafeMode_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.SetSafeModeNumOps",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/memNonHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
               "pointInTime": false,
@@ -326,11 +465,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/getEditLogSize_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.GetEditLogManifestNumOps",
               "pointInTime": false,
@@ -467,11 +601,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/gcTimeMillis": {
               "metric": "jvm.JvmMetrics.GcTimeMillis",
               "pointInTime": false,
@@ -497,16 +626,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/FSNamesystem/CapacityRemainingGB": {
               "metric": "dfs.FSNamesystem.CapacityRemainingGB",
               "pointInTime": false,
@@ -557,11 +676,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/load/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/logInfo": {
               "metric": "jvm.JvmMetrics.LogInfo",
               "pointInTime": false,
@@ -5770,38 +5884,207 @@
         "type": "ganglia",
         "metrics": {
           "default": {
-            "metrics/dfs/journalNode/syncs300s75thPercentileLatencyMicros": {
-              "metric": "dfs.JournalNode.Syncs300s75thPercentileLatencyMicros",
-              "pointInTime": true,
-              "temporal": true
+            "metrics/cpu/cpu_idle":{
+              "metric":"cpu_idle",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
             },
-            "metrics/dfs/journalNode/lastWrittenTxId": {
-              "metric": "dfs.JournalNode.LastWrittenTxId",
-              "pointInTime": true,
-              "temporal": true
+            "metrics/cpu/cpu_nice":{
+              "metric":"cpu_nice",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
             },
-            "metrics/dfs/journalNode/syncs60s90thPercentileLatencyMicros": {
-              "metric": "dfs.JournalNode.Syncs60s90thPercentileLatencyMicros",
-              "pointInTime": true,
-              "temporal": true
+            "metrics/cpu/cpu_system":{
+              "metric":"cpu_system",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
             },
-            "metrics/rpcdetailed/finalizeLogSegment_num_ops": {
-              "metric": "rpcdetailed.rpcdetailed.FinalizeLogSegmentNumOps",
-              "pointInTime": true,
-              "temporal": true
+            "metrics/cpu/cpu_user":{
+              "metric":"cpu_user",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
             },
-            "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "ugi.UgiMetrics.LoginSuccessAvgTime",
-              "pointInTime": true,
-              "temporal": true
+            "metrics/cpu/cpu_wio":{
+              "metric":"cpu_wio",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
             },
-            "metrics/rpcdetailed/startLogSegment_avg_time": {
-              "metric": "rpcdetailed.rpcdetailed.StartLogSegmentAvgTime",
+            "metrics/disk/disk_free":{
+              "metric":"disk_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/disk_total":{
+              "metric":"disk_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_fifteen":{
+              "metric":"load_fifteen",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_five":{
+              "metric":"load_five",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_one":{
+              "metric":"load_one",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_buffers":{
+              "metric":"mem_buffers",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_cached":{
+              "metric":"mem_cached",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_free":{
+              "metric":"mem_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_shared":{
+              "metric":"mem_shared",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_total":{
+              "metric":"mem_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/swap_free":{
+              "metric":"swap_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/swap_total":{
+              "metric":"swap_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/bytes_in":{
+              "metric":"bytes_in",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/bytes_out":{
+              "metric":"bytes_out",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/pkts_in":{
+              "metric":"pkts_in",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/pkts_out":{
+              "metric":"pkts_out",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/process/proc_run":{
+              "metric":"proc_run",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/process/proc_total":{
+              "metric":"proc_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_count":{
+              "metric":"read_count",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_count":{
+              "metric":"write_count",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_bytes":{
+              "metric":"read_bytes",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_bytes":{
+              "metric":"write_bytes",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_time":{
+              "metric":"read_time",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_time":{
+              "metric":"write_time",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/dfs/journalNode/syncs300s75thPercentileLatencyMicros": {
+              "metric": "dfs.JournalNode.Syncs300s75thPercentileLatencyMicros",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/load/load_one": {
-              "metric": "load_one",
+            "metrics/dfs/journalNode/lastWrittenTxId": {
+              "metric": "dfs.JournalNode.LastWrittenTxId",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/dfs/journalNode/syncs60s90thPercentileLatencyMicros": {
+              "metric": "dfs.JournalNode.Syncs60s90thPercentileLatencyMicros",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/rpcdetailed/finalizeLogSegment_num_ops": {
+              "metric": "rpcdetailed.rpcdetailed.FinalizeLogSegmentNumOps",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/ugi/loginSuccess_avg_time": {
+              "metric": "ugi.UgiMetrics.LoginSuccessAvgTime",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/rpcdetailed/startLogSegment_avg_time": {
+              "metric": "rpcdetailed.rpcdetailed.StartLogSegmentAvgTime",
               "pointInTime": true,
               "temporal": true
             },
@@ -5821,21 +6104,11 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/acceptRecovery_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.AcceptRecoveryNumOps",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/journalNode/txnsWritten": {
               "metric": "dfs.JournalNode.TxnsWritten",
               "pointInTime": true,
@@ -5851,11 +6124,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/disk/part_max_used": {
               "metric": "part_max_used",
               "pointInTime": true,
@@ -5891,21 +6159,11 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/journalNode/syncs300s50thPercentileLatencyMicros": {
               "metric": "dfs.JournalNode.Syncs300s50thPercentileLatencyMicros",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/journalNode/syncs300s_num_ops": {
               "metric": "dfs.JournalNode.Syncs300sNumOps",
               "pointInTime": true,
@@ -5916,11 +6174,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/memNonHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
               "pointInTime": true,
@@ -5971,11 +6224,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/memHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemHeapCommittedM",
               "unit": "MB",
@@ -6088,11 +6336,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/journalNode/syncs60s_num_ops": {
               "metric": "dfs.JournalNode.Syncs60sNumOps",
               "pointInTime": true,
@@ -6113,16 +6356,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/getJournalState_avg_time": {
               "metric": "rpcdetailed.rpcdetailed.GetJournalStateAvgTime",
               "pointInTime": true,
@@ -6153,11 +6386,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/load/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/startLogSegment_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.StartLogSegmentNumOps",
               "pointInTime": true,
@@ -6392,6 +6620,180 @@
         "type": "ganglia",
         "metrics": {
           "default": {
+            "metrics/cpu/cpu_idle":{
+              "metric":"cpu_idle",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_nice":{
+              "metric":"cpu_nice",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_system":{
+              "metric":"cpu_system",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_user":{
+              "metric":"cpu_user",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_wio":{
+              "metric":"cpu_wio",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/disk_free":{
+              "metric":"disk_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/disk_total":{
+              "metric":"disk_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_fifteen":{
+              "metric":"load_fifteen",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_five":{
+              "metric":"load_five",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_one":{
+              "metric":"load_one",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_buffers":{
+              "metric":"mem_buffers",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_cached":{
+              "metric":"mem_cached",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_free":{
+              "metric":"mem_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_shared":{
+              "metric":"mem_shared",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_total":{
+              "metric":"mem_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/swap_free":{
+              "metric":"swap_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/swap_total":{
+              "metric":"swap_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/bytes_in":{
+              "metric":"bytes_in",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/bytes_out":{
+              "metric":"bytes_out",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/pkts_in":{
+              "metric":"pkts_in",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/pkts_out":{
+              "metric":"pkts_out",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/process/proc_run":{
+              "metric":"proc_run",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/process/proc_total":{
+              "metric":"proc_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_count":{
+              "metric":"read_count",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_count":{
+              "metric":"write_count",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_bytes":{
+              "metric":"read_bytes",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_bytes":{
+              "metric":"write_bytes",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_time":{
+              "metric":"read_time",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_time":{
+              "metric":"write_time",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
             "metrics/dfs/journalNode/syncs300s75thPercentileLatencyMicros": {
               "metric": "dfs.JournalNode.Syncs300s75thPercentileLatencyMicros",
               "pointInTime": true,
@@ -6422,11 +6824,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/load/load_one": {
-              "metric": "load_one",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/journalNode/currentLagTxns": {
               "metric": "dfs.JournalNode.CurrentLagTxns",
               "pointInTime": true,
@@ -6443,21 +6840,11 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/acceptRecovery_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.AcceptRecoveryNumOps",
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/journalNode/txnsWritten": {
               "metric": "dfs.JournalNode.TxnsWritten",
               "pointInTime": true,
@@ -6473,11 +6860,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/disk/part_max_used": {
               "metric": "part_max_used",
               "pointInTime": true,
@@ -6513,21 +6895,11 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/journalNode/syncs300s50thPercentileLatencyMicros": {
               "metric": "dfs.JournalNode.Syncs300s50thPercentileLatencyMicros",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/journalNode/syncs300s_num_ops": {
               "metric": "dfs.JournalNode.Syncs300sNumOps",
               "pointInTime": true,
@@ -6538,11 +6910,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/memNonHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
               "pointInTime": false,
@@ -6593,11 +6960,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/memHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemHeapCommittedM",
               "unit": "MB",
@@ -6710,11 +7072,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/journalNode/syncs60s_num_ops": {
               "metric": "dfs.JournalNode.Syncs60sNumOps",
               "pointInTime": true,
@@ -6735,16 +7092,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/getJournalState_avg_time": {
               "metric": "rpcdetailed.rpcdetailed.GetJournalStateAvgTime",
               "pointInTime": false,
@@ -6775,11 +7122,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/load/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/startLogSegment_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.StartLogSegmentNumOps",
               "pointInTime": false,