You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/02/15 17:19:08 UTC

[2/3] ambari git commit: AMBARI-9604 Fix Flume Agent graphs on Ambari service page (dsen)

http://git-wip-us.apache.org/repos/asf/ambari/blob/075acd71/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json
index 2114c12..c841438 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/metrics.json
@@ -4,351 +4,206 @@
         {
         "type": "ganglia",
         "metrics": {
-          "metrics/boottime":{
-            "metric":"boottime",
+          "metrics/flume/flume/CHANNEL/ChannelCapacity":{
+            "metric":"ChannelCapacity",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/cpu/cpu_aidle":{
-            "metric":"cpu_aidle",
+          "metrics/flume/flume/CHANNEL/StartTime":{
+            "metric":"StartTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/cpu/cpu_idle":{
-            "metric":"cpu_idle",
+          "metrics/flume/flume/CHANNEL/EventTakeAttemptCount":{
+            "metric":"EventTakeAttemptCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/cpu/cpu_nice":{
-            "metric":"cpu_nice",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount":{
+            "metric":"EventTakeSuccessCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/cpu/cpu_num":{
-            "metric":"cpu_num",
+          "metrics/flume/flume/CHANNEL/EventPutAttemptCount":{
+            "metric":"EventPutAttemptCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/cpu/cpu_speed":{
-            "metric":"cpu_speed",
+          "metrics/flume/flume/CHANNEL/StopTime":{
+            "metric":"StopTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/cpu/cpu_system":{
-            "metric":"cpu_system",
+          "metrics/flume/flume/CHANNEL/ChannelFillPercentage":{
+            "metric":"ChannelFillPercentage",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/cpu/cpu_user":{
-            "metric":"cpu_user",
+          "metrics/flume/flume/CHANNEL/ChannelSize":{
+            "metric":"ChannelSize",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/cpu/cpu_wio":{
-            "metric":"cpu_wio",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount":{
+            "metric":"EventPutSuccessCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/disk/disk_free":{
-            "metric":"disk_free",
+          "metrics/flume/flume/SINK/ConnectionCreatedCount":{
+            "metric":"ConnectionCreatedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/disk/disk_total":{
-            "metric":"disk_total",
+          "metrics/flume/flume/SINK/BatchCompleteCount":{
+            "metric":"BatchCompleteCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/disk/part_max_used":{
-            "metric":"part_max_used",
+          "metrics/flume/flume/SINK/EventDrainSuccessCount":{
+            "metric":"EventDrainSuccessCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/gcCount":{
-            "metric":"jvm.metrics.gcCount",
+          "metrics/flume/flume/SINK/StartTime":{
+            "metric":"StartTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/gcTimeMillis":{
-            "metric":"jvm.metrics.gcTimeMillis",
+          "metrics/flume/flume/SINK/EventDrainAttemptCount":{
+            "metric":"EventDrainAttemptCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/logError":{
-            "metric":"jvm.metrics.logError",
+          "metrics/flume/flume/SINK/ConnectionFailedCount":{
+            "metric":"ConnectionFailedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/logFatal":{
-            "metric":"jvm.metrics.logFatal",
+          "metrics/flume/flume/SINK/BatchUnderflowCount":{
+            "metric":"BatchUnderflowCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/logInfo":{
-            "metric":"jvm.metrics.logInfo",
+          "metrics/flume/flume/SINK/ConnectionClosedCount":{
+            "metric":"ConnectionClosedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/logWarn":{
-            "metric":"jvm.metrics.logWarn",
+          "metrics/flume/flume/SINK/StopTime":{
+            "metric":"StopTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/maxMemoryM":{
-            "metric":"jvm.metrics.maxMemoryM",
+          "metrics/flume/flume/SINK/BatchEmptyCount":{
+            "metric":"BatchEmptyCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/memHeapCommittedM":{
-            "metric":"jvm.metrics.memHeapCommittedM",
+          "metrics/flume/flume/SOURCE/AppendBatchReceivedCount":{
+            "metric":"AppendBatchReceivedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/memHeapUsedM":{
-            "metric":"jvm.metrics.memHeapUsedM",
+          "metrics/flume/flume/SOURCE/AppendAcceptedCount":{
+            "metric":"AppendAcceptedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/memNonHeapCommittedM":{
-            "metric":"jvm.metrics.memNonHeapCommittedM",
+          "metrics/flume/flume/SOURCE/StartTime":{
+            "metric":"StartTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/memNonHeapUsedM":{
-            "metric":"jvm.metrics.memNonHeapUsedM",
+          "metrics/flume/flume/SOURCE/OpenConnectionCount":{
+            "metric":"OpenConnectionCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/threadsBlocked":{
-            "metric":"jvm.metrics.threadsBlocked",
+          "metrics/flume/flume/SOURCE/AppendBatchAcceptedCount":{
+            "metric":"AppendBatchAcceptedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/threadsNew":{
-            "metric":"jvm.metrics.threadsNew",
+          "metrics/flume/flume/SOURCE/AppendReceivedCount":{
+            "metric":"AppendReceivedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/threadsRunnable":{
-            "metric":"jvm.metrics.threadsRunnable",
+          "metrics/flume/flume/SOURCE/EventReceivedCount":{
+            "metric":"EventReceivedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/threadsTerminated":{
-            "metric":"jvm.metrics.threadsTerminated",
+          "metrics/flume/flume/SOURCE/StopTime":{
+            "metric":"StopTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/jvm/threadsTimedWaiting":{
-            "metric":"jvm.metrics.threadsTimedWaiting",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/threadsWaiting":{
-            "metric":"jvm.metrics.threadsWaiting",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/ChannelCapacity":{
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelCapacity",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/StartTime":{
-            "metric":"(\\w+).CHANNEL.(\\w+).StartTime",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/EventTakeAttemptCount":{
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeAttemptCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/EventTakeSuccessCount":{
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/EventPutAttemptCount":{
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutAttemptCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/StopTime":{
-            "metric":"(\\w+).CHANNEL.(\\w+).StopTime",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/ChannelFillPercentage":{
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelFillPercentage",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/ChannelSize":{
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/EventPutSuccessCount":{
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/ConnectionCreatedCount":{
-            "metric":"(\\w+).SINK.(\\w+).ConnectionCreatedCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/BatchCompleteCount":{
-            "metric":"(\\w+).SINK.(\\w+).BatchCompleteCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/EventDrainSuccessCount":{
-            "metric":"(\\w+).SINK.(\\w+).EventDrainSuccessCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/StartTime":{
-            "metric":"(\\w+).SINK.(\\w+).StartTime",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/EventDrainAttemptCount":{
-            "metric":"(\\w+).SINK.(\\w+).EventDrainAttemptCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/ConnectionFailedCount":{
-            "metric":"(\\w+).SINK.(\\w+).ConnectionFailedCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/BatchUnderflowCount":{
-            "metric":"(\\w+).SINK.(\\w+).BatchUnderflowCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/ConnectionClosedCount":{
-            "metric":"(\\w+).SINK.(\\w+).ConnectionClosedCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/StopTime":{
-            "metric":"(\\w+).SINK.(\\w+).StopTime",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SINK/$2/BatchEmptyCount":{
-            "metric":"(\\w+).SINK.(\\w+).BatchEmptyCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SOURCE/$2/AppendBatchReceivedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).AppendBatchReceivedCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SOURCE/$2/AppendAcceptedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).AppendAcceptedCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SOURCE/$2/StartTime":{
-            "metric":"(\\w+).SOURCE.(\\w+).StartTime",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SOURCE/$2/OpenConnectionCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).OpenConnectionCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SOURCE/$2/AppendBatchAcceptedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).AppendBatchAcceptedCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SOURCE/$2/AppendReceivedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).AppendReceivedCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SOURCE/$2/EventReceivedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).EventReceivedCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SOURCE/$2/StopTime":{
-            "metric":"(\\w+).SOURCE.(\\w+).StopTime",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/SOURCE/$2/EventAcceptedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).EventAcceptedCount",
+          "metrics/flume/flume/SOURCE/EventAcceptedCount":{
+            "metric":"EventAcceptedCount",
             "pointInTime":true,
             "temporal":true
           },
 
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventTakeSuccessCount/rate/min": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount._rate._min",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount/rate/min": {
+            "metric":"EventTakeSuccessCount._rate._min",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventTakeSuccessCount/rate/max": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount._rate._max",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount/rate/max": {
+            "metric":"EventTakeSuccessCount._rate._max",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventTakeSuccessCount/rate/avg": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount._rate._avg",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount/rate/avg": {
+            "metric":"EventTakeSuccessCount._rate._avg",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventTakeSuccessCount/rate/sum": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount._rate._sum",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount/rate/sum": {
+            "metric":"EventTakeSuccessCount._rate._sum",
             "pointInTime":false,
             "temporal":true
           },
 
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventPutSuccessCount/rate/avg": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount._rate._avg",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount/rate/avg": {
+            "metric":"EventPutSuccessCount._rate._avg",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventPutSuccessCount/rate/max": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount._rate._max",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount/rate/max": {
+            "metric":"EventPutSuccessCount._rate._max",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventPutSuccessCount/rate/min": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount._rate._min",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount/rate/min": {
+            "metric":"EventPutSuccessCount._rate._min",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventPutSuccessCount/rate/sum": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount._rate._sum",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount/rate/sum": {
+            "metric":"EventPutSuccessCount._rate._sum",
             "pointInTime":false,
             "temporal":true
           },
           
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")ChannelSize/avg": {
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize._avg",
+          "metrics/flume/flume/CHANNEL/ChannelSize/rate/avg": {
+            "metric":"ChannelSize._rate._avg",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")ChannelSize/max": {
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize._max",
+          "metrics/flume/flume/CHANNEL/ChannelSize/rate/max": {
+            "metric":"ChannelSize._rate._max",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")ChannelSize/min": {
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize._min",
+          "metrics/flume/flume/CHANNEL/ChannelSize/rate/min": {
+            "metric":"ChannelSize._rate._min",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")ChannelSize/sum": {
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize._sum",
+          "metrics/flume/flume/CHANNEL/ChannelSize/rate/sum": {
+            "metric":"ChannelSize._rate._sum",
             "pointInTime":false,
             "temporal":true
           }
@@ -360,351 +215,206 @@
       {
         "type": "ganglia",
         "metrics": {
-          "metrics/boottime":{
-            "metric":"boottime",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/cpu/cpu_aidle":{
-            "metric":"cpu_aidle",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/cpu/cpu_idle":{
-            "metric":"cpu_idle",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/cpu/cpu_nice":{
-            "metric":"cpu_nice",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/cpu/cpu_num":{
-            "metric":"cpu_num",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/cpu/cpu_speed":{
-            "metric":"cpu_speed",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/cpu/cpu_system":{
-            "metric":"cpu_system",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/cpu/cpu_user":{
-            "metric":"cpu_user",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/cpu/cpu_wio":{
-            "metric":"cpu_wio",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/disk/disk_free":{
-            "metric":"disk_free",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/disk/disk_total":{
-            "metric":"disk_total",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/disk/part_max_used":{
-            "metric":"part_max_used",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/gcCount":{
-            "metric":"jvm.metrics.gcCount",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/gcTimeMillis":{
-            "metric":"jvm.metrics.gcTimeMillis",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/logError":{
-            "metric":"jvm.metrics.logError",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/logFatal":{
-            "metric":"jvm.metrics.logFatal",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/logInfo":{
-            "metric":"jvm.metrics.logInfo",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/logWarn":{
-            "metric":"jvm.metrics.logWarn",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/maxMemoryM":{
-            "metric":"jvm.metrics.maxMemoryM",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/memHeapCommittedM":{
-            "metric":"jvm.metrics.memHeapCommittedM",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/memHeapUsedM":{
-            "metric":"jvm.metrics.memHeapUsedM",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/memNonHeapCommittedM":{
-            "metric":"jvm.metrics.memNonHeapCommittedM",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/memNonHeapUsedM":{
-            "metric":"jvm.metrics.memNonHeapUsedM",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/threadsBlocked":{
-            "metric":"jvm.metrics.threadsBlocked",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/threadsNew":{
-            "metric":"jvm.metrics.threadsNew",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/threadsRunnable":{
-            "metric":"jvm.metrics.threadsRunnable",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/threadsTerminated":{
-            "metric":"jvm.metrics.threadsTerminated",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/threadsTimedWaiting":{
-            "metric":"jvm.metrics.threadsTimedWaiting",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/jvm/threadsWaiting":{
-            "metric":"jvm.metrics.threadsWaiting",
-            "pointInTime":true,
-            "temporal":true
-          },
-          "metrics/flume/$1/CHANNEL/$2/ChannelCapacity":{
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelCapacity",
+          "metrics/flume/flume/CHANNEL/ChannelCapacity":{
+            "metric":"ChannelCapacity",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/CHANNEL/$2/StartTime":{
-            "metric":"(\\w+).CHANNEL.(\\w+).StartTime",
+          "metrics/flume/flume/CHANNEL/StartTime":{
+            "metric":"StartTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/CHANNEL/$2/EventTakeAttemptCount":{
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeAttemptCount",
+          "metrics/flume/flume/CHANNEL/EventTakeAttemptCount":{
+            "metric":"EventTakeAttemptCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/CHANNEL/$2/EventTakeSuccessCount":{
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount":{
+            "metric":"EventTakeSuccessCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/CHANNEL/$2/EventPutAttemptCount":{
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutAttemptCount",
+          "metrics/flume/flume/CHANNEL/EventPutAttemptCount":{
+            "metric":"EventPutAttemptCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/CHANNEL/$2/StopTime":{
-            "metric":"(\\w+).CHANNEL.(\\w+).StopTime",
+          "metrics/flume/flume/CHANNEL/StopTime":{
+            "metric":"StopTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/CHANNEL/$2/ChannelFillPercentage":{
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelFillPercentage",
+          "metrics/flume/flume/CHANNEL/ChannelFillPercentage":{
+            "metric":"ChannelFillPercentage",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/CHANNEL/$2/ChannelSize":{
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize",
+          "metrics/flume/flume/CHANNEL/ChannelSize":{
+            "metric":"ChannelSize",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/CHANNEL/$2/EventPutSuccessCount":{
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount":{
+            "metric":"EventPutSuccessCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/ConnectionCreatedCount":{
-            "metric":"(\\w+).SINK.(\\w+).ConnectionCreatedCount",
+          "metrics/flume/flume/SINK/ConnectionCreatedCount":{
+            "metric":"ConnectionCreatedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/BatchCompleteCount":{
-            "metric":"(\\w+).SINK.(\\w+).BatchCompleteCount",
+          "metrics/flume/flume/SINK/BatchCompleteCount":{
+            "metric":"BatchCompleteCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/EventDrainSuccessCount":{
-            "metric":"(\\w+).SINK.(\\w+).EventDrainSuccessCount",
+          "metrics/flume/flume/SINK/EventDrainSuccessCount":{
+            "metric":"EventDrainSuccessCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/StartTime":{
-            "metric":"(\\w+).SINK.(\\w+).StartTime",
+          "metrics/flume/flume/SINK/StartTime":{
+            "metric":"StartTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/EventDrainAttemptCount":{
-            "metric":"(\\w+).SINK.(\\w+).EventDrainAttemptCount",
+          "metrics/flume/flume/SINK/EventDrainAttemptCount":{
+            "metric":"EventDrainAttemptCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/ConnectionFailedCount":{
-            "metric":"(\\w+).SINK.(\\w+).ConnectionFailedCount",
+          "metrics/flume/flume/SINK/ConnectionFailedCount":{
+            "metric":"ConnectionFailedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/BatchUnderflowCount":{
-            "metric":"(\\w+).SINK.(\\w+).BatchUnderflowCount",
+          "metrics/flume/flume/SINK/BatchUnderflowCount":{
+            "metric":"BatchUnderflowCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/ConnectionClosedCount":{
-            "metric":"(\\w+).SINK.(\\w+).ConnectionClosedCount",
+          "metrics/flume/flume/SINK/ConnectionClosedCount":{
+            "metric":"ConnectionClosedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/StopTime":{
-            "metric":"(\\w+).SINK.(\\w+).StopTime",
+          "metrics/flume/flume/SINK/StopTime":{
+            "metric":"StopTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SINK/$2/BatchEmptyCount":{
-            "metric":"(\\w+).SINK.(\\w+).BatchEmptyCount",
+          "metrics/flume/flume/SINK/BatchEmptyCount":{
+            "metric":"BatchEmptyCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SOURCE/$2/AppendBatchReceivedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).AppendBatchReceivedCount",
+          "metrics/flume/flume/SOURCE/AppendBatchReceivedCount":{
+            "metric":"AppendBatchReceivedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SOURCE/$2/AppendAcceptedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).AppendAcceptedCount",
+          "metrics/flume/flume/SOURCE/AppendAcceptedCount":{
+            "metric":"AppendAcceptedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SOURCE/$2/StartTime":{
-            "metric":"(\\w+).SOURCE.(\\w+).StartTime",
+          "metrics/flume/flume/SOURCE/StartTime":{
+            "metric":"StartTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SOURCE/$2/OpenConnectionCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).OpenConnectionCount",
+          "metrics/flume/flume/SOURCE/OpenConnectionCount":{
+            "metric":"OpenConnectionCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SOURCE/$2/AppendBatchAcceptedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).AppendBatchAcceptedCount",
+          "metrics/flume/flume/SOURCE/AppendBatchAcceptedCount":{
+            "metric":"AppendBatchAcceptedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SOURCE/$2/AppendReceivedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).AppendReceivedCount",
+          "metrics/flume/flume/SOURCE/AppendReceivedCount":{
+            "metric":"AppendReceivedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SOURCE/$2/EventReceivedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).EventReceivedCount",
+          "metrics/flume/flume/SOURCE/EventReceivedCount":{
+            "metric":"EventReceivedCount",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SOURCE/$2/StopTime":{
-            "metric":"(\\w+).SOURCE.(\\w+).StopTime",
+          "metrics/flume/flume/SOURCE/StopTime":{
+            "metric":"StopTime",
             "pointInTime":true,
             "temporal":true
           },
-          "metrics/flume/$1/SOURCE/$2/EventAcceptedCount":{
-            "metric":"(\\w+).SOURCE.(\\w+).EventAcceptedCount",
+          "metrics/flume/flume/SOURCE/EventAcceptedCount":{
+            "metric":"EventAcceptedCount",
             "pointInTime":true,
             "temporal":true
           },
 
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventTakeSuccessCount/rate/avg": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount._rate._avg",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount/rate/avg": {
+            "metric":"EventTakeSuccessCount._rate._avg",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventTakeSuccessCount/rate/max": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount._rate._max",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount/rate/max": {
+            "metric":"EventTakeSuccessCount._rate._max",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventTakeSuccessCount/rate/min": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount._rate._min",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount/rate/min": {
+            "metric":"EventTakeSuccessCount._rate._min",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventTakeSuccessCount/rate/sum": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventTakeSuccessCount._rate._sum",
+          "metrics/flume/flume/CHANNEL/EventTakeSuccessCount/rate/sum": {
+            "metric":"EventTakeSuccessCount._rate._sum",
             "pointInTime":false,
             "temporal":true
           },
 
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventPutSuccessCount/rate/avg": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount._rate._avg",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount/rate/avg": {
+            "metric":"EventPutSuccessCount._rate._avg",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventPutSuccessCount/rate/max": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount._rate._max",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount/rate/max": {
+            "metric":"EventPutSuccessCount._rate._max",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventPutSuccessCount/rate/min": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount._rate._min",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount/rate/min": {
+            "metric":"EventPutSuccessCount._rate._min",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")EventPutSuccessCount/rate/sum": {
-            "metric":"(\\w+).CHANNEL.(\\w+).EventPutSuccessCount._rate._sum",
+          "metrics/flume/flume/CHANNEL/EventPutSuccessCount/rate/sum": {
+            "metric":"EventPutSuccessCount._rate._sum",
             "pointInTime":false,
             "temporal":true
           },
           
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")ChannelSize/avg": {
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize._avg",
+          "metrics/flume/flume/CHANNEL/ChannelSize/rate/avg": {
+            "metric":"ChannelSize._rate._avg",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")ChannelSize/max": {
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize._max",
+          "metrics/flume/flume/CHANNEL/ChannelSize/rate/max": {
+            "metric":"ChannelSize._rate._max",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")ChannelSize/min": {
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize._min",
+          "metrics/flume/flume/CHANNEL/ChannelSize/rate/min": {
+            "metric":"ChannelSize._rate._min",
             "pointInTime":false,
             "temporal":true
           },
-          "metrics/flume/$1.substring(0)/CHANNEL/$2.replaceAll(\"[^-]+\",\"\")ChannelSize/sum": {
-            "metric":"(\\w+).CHANNEL.(\\w+).ChannelSize._sum",
+          "metrics/flume/flume/CHANNEL/ChannelSize/rate/sum": {
+            "metric":"ChannelSize._rate._sum",
             "pointInTime":false,
             "temporal":true
           }

http://git-wip-us.apache.org/repos/asf/ambari/blob/075acd71/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
index 8bf0cc2..ee1ed00 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
@@ -140,7 +140,9 @@ def flume(action = None):
           extra_args = '-Dflume.monitoring.type=ganglia -Dflume.monitoring.hosts={0}:{1}'
           extra_args = extra_args.format(params.ganglia_server_host, '8655')
         if params.has_metric_collector:
-          extra_args = '-Dflume.monitoring.type=org.apache.hadoop.metrics2.sink.flume.FlumeTimelineMetricsSink'
+          extra_args = '-Dflume.monitoring.type=org.apache.hadoop.metrics2.sink.flume.FlumeTimelineMetricsSink ' \
+                       '-Dflume.monitoring.node={0}:{1}'
+          extra_args = extra_args.format(params.metric_collector_host, params.metric_collector_port)
 
         flume_cmd = flume_base.format(agent, flume_agent_conf_dir,
            flume_agent_conf_file, extra_args, agent)

http://git-wip-us.apache.org/repos/asf/ambari/blob/075acd71/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
index 8b5a05f..889aa39 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
@@ -84,3 +84,7 @@ ams_collector_hosts = default("/clusterHostInfo/metrics_collector_hosts", [])
 has_metric_collector = not len(ams_collector_hosts) == 0
 if has_metric_collector:
   metric_collector_host = ams_collector_hosts[0]
+  metric_collector_port = default("/configurations/ams-site/timeline.metrics.service.webapp.address", "0.0.0.0:6188")
+  if metric_collector_port and metric_collector_port.find(':') != -1:
+    metric_collector_port = metric_collector_port.split(':')[1]
+  pass

http://git-wip-us.apache.org/repos/asf/ambari/blob/075acd71/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2 b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2
index b124c37..bc18043 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2
@@ -16,7 +16,11 @@
 # limitations under the License.
 #}
 
-collector={{metric_collector_host}}:6188
+collector={{metric_collector_host}}
+port={{metric_collector_port}}
 collectionFrequency=60000
 maxRowCacheSize=10000
-sendInterval=59000
\ No newline at end of file
+sendInterval=59000
+
+# Metric names having type COUNTER
+counters=EventTakeSuccessCount,EventPutSuccessCount,EventTakeAttemptCount,EventPutAttemptCount

http://git-wip-us.apache.org/repos/asf/ambari/blob/075acd71/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 5f70bd2..d739da7 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -794,32 +794,32 @@ var urls = {
     'mock': '/data/cluster_metrics/cpu_1hr.json'
   },
   'service.metrics.flume.channel_fill_percent': {
-    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/CHANNEL/*/ChannelFillPercentage[{fromSeconds},{toSeconds},{stepSeconds}]',
+    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/CHANNEL/ChannelFillPercentage[{fromSeconds},{toSeconds},{stepSeconds}]',
     'mock': '/data/services/metrics/flume/channelFillPct.json',
     'testInProduction': true
   },
   'service.metrics.flume.channel_size': {
-    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/CHANNEL/*/ChannelSize[{fromSeconds},{toSeconds},{stepSeconds}]',
+    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/CHANNEL/ChannelSize[{fromSeconds},{toSeconds},{stepSeconds}]',
     'mock': '/data/services/metrics/flume/channelSize.json',
     'testInProduction': true
   },
   'service.metrics.flume.sink_drain_success': {
-    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/SINK/*/EventDrainSuccessCount[{fromSeconds},{toSeconds},{stepSeconds}]',
+    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/SINK/EventDrainSuccessCount[{fromSeconds},{toSeconds},{stepSeconds}]',
     'mock': '/data/services/metrics/flume/sinkDrainSuccessCount.json',
     'testInProduction': true
   },
   'service.metrics.flume.sink_connection_failed': {
-    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/SINK/*/ConnectionFailedCount[{fromSeconds},{toSeconds},{stepSeconds}]',
+    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/SINK/ConnectionFailedCount[{fromSeconds},{toSeconds},{stepSeconds}]',
     'mock': '/data/services/metrics/flume/sinkConnectionFailedCount.json',
     'testInProduction': true
   },
   'service.metrics.flume.source_accepted': {
-    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/SOURCE/*/EventAcceptedCount[{fromSeconds},{toSeconds},{stepSeconds}]',
+    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/flume/flume/SOURCE/EventAcceptedCount[{fromSeconds},{toSeconds},{stepSeconds}]',
     'mock': '/data/services/metrics/flume/sourceEventAccepted.json',
     'testInProduction': true
   },
   'service.metrics.flume.channel_size_for_all': {
-    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=metrics/flume/flume/CHANNEL/ChannelSize/_sum[{fromSeconds},{toSeconds},{stepSeconds}]'
+    'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=metrics/flume/flume/CHANNEL/ChannelSize/rate[{fromSeconds},{toSeconds},{stepSeconds}]'
   },
   'service.metrics.flume.gc': {
     'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_HANDLER?fields=host_components/metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]',

http://git-wip-us.apache.org/repos/asf/ambari/blob/075acd71/ambari-web/app/views/main/service/info/metrics/flume/channel_size_mma.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/metrics/flume/channel_size_mma.js b/ambari-web/app/views/main/service/info/metrics/flume/channel_size_mma.js
index 365d048..ba0fd0f 100644
--- a/ambari-web/app/views/main/service/info/metrics/flume/channel_size_mma.js
+++ b/ambari-web/app/views/main/service/info/metrics/flume/channel_size_mma.js
@@ -31,16 +31,18 @@ App.ChartServiceMetricsFlume_ChannelSizeMMA = App.ChartLinearTimeView.extend({
   title: Em.I18n.t('services.service.info.metrics.flume.channelSizeMMA'),
   renderer: 'line',
   ajaxIndex: 'service.metrics.flume.channel_size_for_all',
+  yAxisFormatter: App.ChartLinearTimeView.CreateRateFormatter('',
+    App.ChartLinearTimeView.DefaultFormatter),
 
   transformToSeries: function (jsonData) {
     var seriesArray = [];
     var self = this;
 
-    if (Em.get(jsonData, "metrics.flume.flume.CHANNEL.ChannelSize")) {
-      for ( var cname in jsonData.metrics.flume.flume.CHANNEL.ChannelSize) {
+    if (Em.get(jsonData, "metrics.flume.flume.CHANNEL.ChannelSize.rate")) {
+      for ( var cname in jsonData.metrics.flume.flume.CHANNEL.ChannelSize.rate) {
         if(cname != "sum"){
           var seriesName = Em.I18n.t('services.service.info.metrics.flume.channelType').format(cname);
-          var seriesData = jsonData.metrics.flume.flume.CHANNEL.ChannelSize[cname];
+          var seriesData = jsonData.metrics.flume.flume.CHANNEL.ChannelSize.rate[cname];
           if (seriesData) {
             seriesArray.push(self.transformData(seriesData, seriesName));
           }

http://git-wip-us.apache.org/repos/asf/ambari/blob/075acd71/ambari-web/app/views/main/service/info/metrics/flume/channel_sum.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/metrics/flume/channel_sum.js b/ambari-web/app/views/main/service/info/metrics/flume/channel_sum.js
index 0fb0677..6056fe3 100644
--- a/ambari-web/app/views/main/service/info/metrics/flume/channel_sum.js
+++ b/ambari-web/app/views/main/service/info/metrics/flume/channel_sum.js
@@ -36,9 +36,9 @@ App.ChartServiceMetricsFlume_ChannelSizeSum = App.ChartLinearTimeView.extend({
   transformToSeries: function (jsonData) {
     var seriesArray = [];
     var self = this;
-    if(Em.get(jsonData, "metrics.flume.flume.CHANNEL.ChannelSize.sum")){
+    if(Em.get(jsonData, "metrics.flume.flume.CHANNEL.ChannelSize.rate.sum")){
       var seriesName = Em.I18n.t('services.service.info.metrics.flume.channelSizeSum');
-      var seriesData = jsonData.metrics.flume.flume.CHANNEL.ChannelSize.sum;
+      var seriesData = jsonData.metrics.flume.flume.CHANNEL.ChannelSize.rate.sum;
       if (seriesData) {
         seriesArray.push(self.transformData(seriesData, seriesName));
       }