AMBARI-6715. Flume Service Page: missing 3 sections of host level metrics which should show up (alexantonenko)

ambari-web/app/messages.js

@@ -1192,6 +1192,11 @@ Em.I18n.translations = {
   'services.service.summary.flume.start.context': 'Start Flume Agent {0}',
   'services.service.summary.flume.noAgents': 'No Flume Agents to display',
 
+  'services.service.info.metrics.flume.channelFillPercent':'Channel Fill Percentage',
+  'services.service.info.metrics.flume.channelSize':'Channel Size',
+  'services.service.info.metrics.flume.sinkDrainSuccess':'Sink Event Drain Count',
+  'services.service.info.metrics.flume.sourceAccepted':'Source Event Accepted Count',
+  'services.service.info.metrics.flume.sinkConnectionFailed':'Sink Connection Failed Count',
   'services.service.info.metrics.flume.channelSizeMMA':'Channel size Min/Max/Avg',
   'services.service.info.metrics.flume.channelSizeSum':'Channel Size Sum',
   'services.service.info.metrics.flume.incoming.mma':'Incoming Min/Max/Avg',
@@ -1207,6 +1212,8 @@ Em.I18n.translations = {
   'services.service.info.metrics.flume.outgoing_mma':'Outgoing {0}',
   'services.service.info.metrics.flume.sourceName':'Source {0}',
   'services.service.info.metrics.flume.hostName':'Host: {0}',
+  'services.service.info.metrics.flume.channelName':'Channel {0}',
+  'services.service.info.metrics.flume.sinkName':'Sink {0}',
 
   'services.service.info.metrics.hbase.clusterRequests':'Cluster Requests',
   'services.service.info.metrics.hbase.clusterRequests.displayNames.requestCount':'Request Count',

ambari-web/app/utils/ajax/ajax.js

@@ -486,7 +486,32 @@ var urls = {
     'real': '/clusters/{clusterName}/services/{serviceName}/components/{componentName}?fields=host_components/{metricName}',
     '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}]',
+    '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}]',
+    '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}]',
+    '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}]',
+    '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}]',
+    '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}]'
   },
   'service.metrics.flume.gc': {

ambari-web/app/views.js

@@ -212,6 +212,11 @@ require('views/main/service/info/metrics/flume/flume_incoming_sum');
 require('views/main/service/info/metrics/flume/flume_incoming_mma');
 require('views/main/service/info/metrics/flume/flume_outgoing_sum');
 require('views/main/service/info/metrics/flume/flume_outgoing_mma');
+require('views/main/service/info/metrics/flume/channel_fill_pct');
+require('views/main/service/info/metrics/flume/channel_size');
+require('views/main/service/info/metrics/flume/sink_connection_failed');
+require('views/main/service/info/metrics/flume/sink_drain_success');
+require('views/main/service/info/metrics/flume/source_accepted');
 require('views/main/service/info/metrics/flume/gc');
 require('views/main/service/info/metrics/flume/jvm_heap');
 require('views/main/service/info/metrics/flume/jvm_threads_runnable');

ambari-web/app/views/main/service/info/metrics/flume/channel_fill_pct.js

@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+var App = require('app');
+
+/**
+ * @class
+ *
+ * This is a view for showing HBase Cluster Requests
+ *
+ * @extends App.ChartLinearTimeView
+ * @extends Ember.Object
+ * @extends Ember.View
+ */
+App.ChartServiceMetricsFlume_ChannelFillPercent = App.ChartLinearTimeView.extend({
+  id: "service-metrics-flume-channel-fill-percent",
+  title: Em.I18n.t('services.service.info.metrics.flume.channelFillPercent'),
+  yAxisFormatter: App.ChartLinearTimeView.PercentageFormatter,
+
+  ajaxIndex: 'service.metrics.flume.channel_fill_percent',
+
+  transformToSeries: function (jsonData) {
+    var seriesArray = [];
+    var self = this;
+    if (jsonData && jsonData.host_components) {
+      jsonData.host_components.forEach(function (hc) {
+        var hostName = hc.HostRoles.host_name;
+        var host = App.Host.find(hostName);
+        if (host && host.get('publicHostName')) {
+          hostName = host.get('publicHostName');
+        }
+        if (hc.metrics && hc.metrics.flume && hc.metrics.flume.flume && hc.metrics.flume.flume.CHANNEL) {
+          for ( var cname in hc.metrics.flume.flume.CHANNEL) {
+            var seriesName = Em.I18n.t('services.service.info.metrics.flume.channelName').format(cname + " (" + hostName + ")");
+            var seriesData = hc.metrics.flume.flume.CHANNEL[cname]['ChannelFillPercentage'];
+            if (seriesData) {
+              seriesArray.push(self.transformData(seriesData, seriesName));
+            }
+          }
+        }
+      });
+    }
+    return seriesArray;
+  }
+});

ambari-web/app/views/main/service/info/metrics/flume/channel_size.js

@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+var App = require('app');
+
+/**
+ * @class
+ *
+ * This is a view for showing HBase Cluster Requests
+ *
+ * @extends App.ChartLinearTimeView
+ * @extends Ember.Object
+ * @extends Ember.View
+ */
+App.ChartServiceMetricsFlume_ChannelSize = App.ChartLinearTimeView.extend({
+  id: "service-metrics-flume-channel-size",
+  title: Em.I18n.t('services.service.info.metrics.flume.channelSize'),
+
+  ajaxIndex: 'service.metrics.flume.channel_size',
+
+  transformToSeries: function (jsonData) {
+    var seriesArray = [];
+    var self = this;
+    if (jsonData && jsonData.host_components) {
+      jsonData.host_components.forEach(function (hc) {
+        var hostName = hc.HostRoles.host_name;
+        var host = App.Host.find(hostName);
+        if (host && host.get('publicHostName')) {
+          hostName = host.get('publicHostName');
+        }
+        if (hc.metrics && hc.metrics.flume && hc.metrics.flume.flume && hc.metrics.flume.flume.CHANNEL) {
+          for ( var cname in hc.metrics.flume.flume.CHANNEL) {
+            var seriesName = Em.I18n.t('services.service.info.metrics.flume.channelName').format(cname + " (" + hostName + ")");
+            var seriesData = hc.metrics.flume.flume.CHANNEL[cname]['ChannelSize'];
+            if (seriesData) {
+              seriesArray.push(self.transformData(seriesData, seriesName));
+            }
+          }
+        }
+      });
+    }
+    return seriesArray;
+  }
+});

ambari-web/app/views/main/service/info/metrics/flume/channel_size_mma.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsFlume_ChannelSizeMMA = App.ChartLinearTimeView.extend({
   title: Em.I18n.t('services.service.info.metrics.flume.channelSizeMMA'),
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
   renderer: 'line',
-  ajaxIndex: 'service.metrics.flume.channel_size',
+  ajaxIndex: 'service.metrics.flume.channel_size_for_all',
 
   transformToSeries: function (jsonData) {
     var seriesArray = [];

ambari-web/app/views/main/service/info/metrics/flume/channel_sum.js

@@ -31,7 +31,7 @@ App.ChartServiceMetricsFlume_ChannelSizeSum = App.ChartLinearTimeView.extend({
   title: Em.I18n.t('services.service.info.metrics.flume.channelSizeSum'),
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
 
-  ajaxIndex: 'service.metrics.flume.channel_size',
+  ajaxIndex: 'service.metrics.flume.channel_size_for_all',
 
   transformToSeries: function (jsonData) {
     var seriesArray = [];

ambari-web/app/views/main/service/info/metrics/flume/sink_connection_failed.js

@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+var App = require('app');
+
+/**
+ * @class
+ *
+ * This is a view for showing HBase Cluster Requests
+ *
+ * @extends App.ChartLinearTimeView
+ * @extends Ember.Object
+ * @extends Ember.View
+ */
+App.ChartServiceMetricsFlume_SinkConnectionFailedCount = App.ChartLinearTimeView.extend({
+  id: "service-metrics-flume-sink-connection-failed",
+  title: Em.I18n.t('services.service.info.metrics.flume.sinkConnectionFailed'),
+
+  ajaxIndex: 'service.metrics.flume.sink_connection_failed',
+
+  transformToSeries: function (jsonData) {
+    var seriesArray = [];
+    var self = this;
+    if (jsonData && jsonData.host_components) {
+      jsonData.host_components.forEach(function (hc) {
+        var hostName = hc.HostRoles.host_name;
+        var host = App.Host.find(hostName);
+        if (host && host.get('publicHostName')) {
+          hostName = host.get('publicHostName');
+        }
+        if (hc.metrics && hc.metrics.flume && hc.metrics.flume.flume && hc.metrics.flume.flume.SINK) {
+          for ( var cname in hc.metrics.flume.flume.SINK) {
+            var seriesName = Em.I18n.t('services.service.info.metrics.flume.sinkName').format(cname + " (" + hostName + ")");
+            var seriesData = hc.metrics.flume.flume.SINK[cname]['ConnectionFailedCount'];
+            if (seriesData) {
+              seriesArray.push(self.transformData(seriesData, seriesName));
+            }
+          }
+        }
+      });
+    }
+    return seriesArray;
+  }
+});

ambari-web/app/views/main/service/info/metrics/flume/sink_drain_success.js

@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+var App = require('app');
+
+/**
+ * @class
+ *
+ * This is a view for showing HBase Cluster Requests
+ *
+ * @extends App.ChartLinearTimeView
+ * @extends Ember.Object
+ * @extends Ember.View
+ */
+App.ChartServiceMetricsFlume_SinkDrainSuccessCount = App.ChartLinearTimeView.extend({
+  id: "service-metrics-flume-sink-drain-success",
+  title: Em.I18n.t('services.service.info.metrics.flume.sinkDrainSuccess'),
+
+  ajaxIndex: 'service.metrics.flume.sink_drain_success',
+
+  transformToSeries: function (jsonData) {
+    var seriesArray = [];
+    var self = this;
+    if (jsonData && jsonData.host_components) {
+      jsonData.host_components.forEach(function (hc) {
+        var hostName = hc.HostRoles.host_name;
+        var host = App.Host.find(hostName);
+        if (host && host.get('publicHostName')) {
+          hostName = host.get('publicHostName');
+        }
+        if (hc.metrics && hc.metrics.flume && hc.metrics.flume.flume && hc.metrics.flume.flume.SINK) {
+          for ( var cname in hc.metrics.flume.flume.SINK) {
+            var seriesName = Em.I18n.t('services.service.info.metrics.flume.sinkName').format(cname + " (" + hostName + ")");
+            var seriesData = hc.metrics.flume.flume.SINK[cname]['EventDrainSuccessCount'];
+            if (seriesData) {
+              seriesArray.push(self.transformData(seriesData, seriesName));
+            }
+          }
+        }
+      });
+    }
+    return seriesArray;
+  }
+});

ambari-web/app/views/main/service/info/metrics/flume/source_accepted.js

@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+var App = require('app');
+
+/**
+ * @class
+ *
+ * This is a view for showing HBase Cluster Requests
+ *
+ * @extends App.ChartLinearTimeView
+ * @extends Ember.Object
+ * @extends Ember.View
+ */
+App.ChartServiceMetricsFlume_SourceAcceptedCount = App.ChartLinearTimeView.extend({
+  id: "service-metrics-flume-source-accepted",
+  title: Em.I18n.t('services.service.info.metrics.flume.sourceAccepted'),
+
+  ajaxIndex: 'service.metrics.flume.source_accepted',
+
+  transformToSeries: function (jsonData) {
+    var seriesArray = [];
+    var self = this;
+    if (jsonData && jsonData.host_components) {
+      jsonData.host_components.forEach(function (hc) {
+        var hostName = hc.HostRoles.host_name;
+        var host = App.Host.find(hostName);
+        if (host && host.get('publicHostName')) {
+          hostName = host.get('publicHostName');
+        }
+        if (hc.metrics && hc.metrics.flume && hc.metrics.flume.flume && hc.metrics.flume.flume.SOURCE) {
+          for ( var cname in hc.metrics.flume.flume.SOURCE) {
+            var seriesName = Em.I18n.t('services.service.info.metrics.flume.sourceName').format(cname + " (" + hostName + ")");
+            var seriesData = hc.metrics.flume.flume.SOURCE[cname]['EventAcceptedCount'];
+            if (seriesData) {
+              seriesArray.push(self.transformData(seriesData, seriesName));
+            }
+          }
+        }
+      });
+    }
+    return seriesArray;
+  }
+});

ambari-web/app/views/main/service/services/flume.js

@@ -177,6 +177,6 @@ App.MainDashboardServiceFlumeView = App.TableView.extend({
       mockData.id = 'metric' + index;
       mockData.toggleIndex = '#' + mockData.id;
     });
-    this.set('parentView.collapsedSections', mockMetricData);
+    this.set('parentView.parentView.collapsedSections', mockMetricData);
   }
 });