Browse Source

AMBARI-6718. Units for Flume service level graphs not showing (srimanth)

Srimanth Gunturi 10 năm trước cách đây
mục cha
commit
00b24a491c

+ 6 - 6
ambari-web/app/messages.js

@@ -1197,12 +1197,12 @@ Em.I18n.translations = {
   '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',
-  'services.service.info.metrics.flume.incoming.sum':'Incoming Sum',
-  'services.service.info.metrics.flume.outgoing.mma':'Outgoing Min/Max/Avg',
-  'services.service.info.metrics.flume.outgoing.sum':'Outgoing Sum',
+  'services.service.info.metrics.flume.channelSizeMMA':'Channel Size Events',
+  'services.service.info.metrics.flume.channelSizeSum':'Channel Size Event Sum',
+  'services.service.info.metrics.flume.incoming.mma':'Incoming Event Rate',
+  'services.service.info.metrics.flume.incoming.sum':'Incoming Event Sum',
+  'services.service.info.metrics.flume.outgoing.mma':'Outgoing Event Rate',
+  'services.service.info.metrics.flume.outgoing.sum':'Outgoing Event Sum',
   'services.service.info.metrics.flume.gc':'Garbage Collection Time',
   'services.service.info.metrics.flume.cpu.user':'CPU (User)',
   'services.service.info.metrics.flume.jvmThreadsRunnable':'JVM Runnable Threads',

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

@@ -29,7 +29,6 @@ var App = require('app');
 App.ChartServiceMetricsFlume_ChannelSizeMMA = App.ChartLinearTimeView.extend({
   id: "service-metrics-flume-channel-size-mma",
   title: Em.I18n.t('services.service.info.metrics.flume.channelSizeMMA'),
-  yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
   renderer: 'line',
   ajaxIndex: 'service.metrics.flume.channel_size_for_all',
 

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

@@ -37,7 +37,7 @@ App.ChartServiceMetricsFlume_ChannelSizeSum = App.ChartLinearTimeView.extend({
     var seriesArray = [];
     var self = this;
     if(Em.get(jsonData, "metrics.flume.flume.CHANNEL.ChannelSize.sum")){
-      var seriesName = Em.I18n.t('services.service.info.metrics.flume.incoming.sum');
+      var seriesName = Em.I18n.t('services.service.info.metrics.flume.channelSizeSum');
       var seriesData = jsonData.metrics.flume.flume.CHANNEL.ChannelSize.sum;
       if (seriesData) {
         seriesArray.push(self.transformData(seriesData, seriesName));

+ 2 - 0
ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_mma.js

@@ -31,6 +31,8 @@ App.ChartServiceMetricsFlume_IncommingMMA = App.ChartLinearTimeView.extend({
   title: Em.I18n.t('services.service.info.metrics.flume.incoming.mma'),
 
   ajaxIndex: 'service.metrics.flume.incoming_event_put_successCount',
+  yAxisFormatter: App.ChartLinearTimeView.CreateRateFormatter('',
+      App.ChartLinearTimeView.DefaultFormatter),
 
   transformToSeries: function (jsonData) {
     var seriesArray = [];

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_sum.js

@@ -35,7 +35,7 @@ App.ChartServiceMetricsFlume_IncommingSum = App.ChartLinearTimeView.extend({
     var seriesArray = [];
     var self = this;
     if(Em.get(jsonData, "metrics.flume.flume.CHANNEL.EventPutSuccessCount.rate.sum")){
-      var seriesName = Em.I18n.t('services.service.info.metrics.flume.channelSizeSum');
+      var seriesName = Em.I18n.t('services.service.info.metrics.flume.incoming.sum');
       var seriesData = jsonData.metrics.flume.flume.CHANNEL.EventPutSuccessCount.rate.sum;
       if (seriesData) {
         seriesArray.push(self.transformData(seriesData, seriesName));

+ 2 - 0
ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_mma.js

@@ -31,6 +31,8 @@ App.ChartServiceMetricsFlume_OutgoingMMA = App.ChartLinearTimeView.extend({
   title: Em.I18n.t('services.service.info.metrics.flume.outgoing.mma'),
 
   ajaxIndex: 'service.metrics.flume.outgoing_event_take_success_count',
+  yAxisFormatter: App.ChartLinearTimeView.CreateRateFormatter('',
+      App.ChartLinearTimeView.DefaultFormatter),
 
   transformToSeries: function (jsonData) {
     var seriesArray = [];

+ 1 - 1
ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_sum.js

@@ -35,7 +35,7 @@ App.ChartServiceMetricsFlume_OutgoingSum = App.ChartLinearTimeView.extend({
     var seriesArray = [];
     var self = this;
     if(Em.get(jsonData, "metrics.flume.flume.CHANNEL.EventTakeSuccessCount.rate.sum")){
-      var seriesName = Em.I18n.t('services.service.info.metrics.flume.channelSizeSum');
+      var seriesName = Em.I18n.t('services.service.info.metrics.flume.outgoing.sum');
       var seriesData = jsonData.metrics.flume.flume.CHANNEL.EventTakeSuccessCount.rate.sum;
       if (seriesData) {
         seriesArray.push(self.transformData(seriesData, seriesName));