You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/08/01 22:05:46 UTC
git commit: AMBARI-6718. Units for Flume service level graphs not
showing (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 249401df1 -> 00b24a491
AMBARI-6718. Units for Flume service level graphs not showing (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00b24a49
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00b24a49
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00b24a49
Branch: refs/heads/trunk
Commit: 00b24a491c200feaaeffeb78da0e39a4cbc873ff
Parents: 249401d
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Aug 1 13:00:33 2014 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri Aug 1 13:00:33 2014 -0700
----------------------------------------------------------------------
ambari-web/app/messages.js | 12 ++++++------
.../main/service/info/metrics/flume/channel_size_mma.js | 1 -
.../main/service/info/metrics/flume/channel_sum.js | 2 +-
.../service/info/metrics/flume/flume_incoming_mma.js | 2 ++
.../service/info/metrics/flume/flume_incoming_sum.js | 2 +-
.../service/info/metrics/flume/flume_outgoing_mma.js | 2 ++
.../service/info/metrics/flume/flume_outgoing_sum.js | 2 +-
7 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/00b24a49/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 91f5170..76025f5 100644
--- a/ambari-web/app/messages.js
+++ b/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',
http://git-wip-us.apache.org/repos/asf/ambari/blob/00b24a49/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 05233a2..365d048 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
@@ -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',
http://git-wip-us.apache.org/repos/asf/ambari/blob/00b24a49/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 bc3491e..0fb0677 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
@@ -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));
http://git-wip-us.apache.org/repos/asf/ambari/blob/00b24a49/ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_mma.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_mma.js b/ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_mma.js
index 82af153..77fce83 100644
--- a/ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_mma.js
+++ b/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 = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/00b24a49/ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_sum.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_sum.js b/ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_sum.js
index ba78d26..973719b 100644
--- a/ambari-web/app/views/main/service/info/metrics/flume/flume_incoming_sum.js
+++ b/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));
http://git-wip-us.apache.org/repos/asf/ambari/blob/00b24a49/ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_mma.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_mma.js b/ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_mma.js
index d0ccdf4..311a472 100644
--- a/ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_mma.js
+++ b/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 = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/00b24a49/ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_sum.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_sum.js b/ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_sum.js
index 34edbd4..50f8be0 100644
--- a/ambari-web/app/views/main/service/info/metrics/flume/flume_outgoing_sum.js
+++ b/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));