You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/03/20 21:44:50 UTC
svn commit: r1459041 [18/18] - in /incubator/ambari/branches/branch-1.2: ./
ambari-agent/ ambari-agent/conf/unix/
ambari-agent/src/main/puppet/modules/hdp-ganglia/files/
ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/
ambari-agent/src/main/...
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js Wed Mar 20 20:44:43 2013
@@ -28,19 +28,10 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_JVMThreads = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-jvm-threads",
- title: "JVM Thread Status",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.jvmThreads'),
renderer: 'line',
- url: function () {
- var hdfsService = App.HDFSService.find().objectAt(0);
- var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl(
- this.get('urlPrefix') + "/hosts/{hostName}/host_components/NAMENODE?fields=metrics/jvm/threadsRunnable[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsBlocked[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsWaiting[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsTimedWaiting[{fromSeconds},{toSeconds},{stepSeconds}]",
- {
- hostName: nameNodeHostName
- },
- "/data/services/metrics/hdfs/jvm_threads.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/jvm/threadsRunnable[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsBlocked[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsWaiting[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsTimedWaiting[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/hdfs/jvm_threads.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js Wed Mar 20 20:44:43 2013
@@ -28,20 +28,10 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_RPC = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-rpc",
- title: "RPC",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.rpc'),
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
-
- url: function () {
- var hdfsService = App.HDFSService.find().objectAt(0);
- var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl(
- this.get('urlPrefix') + "/hosts/{hostName}/host_components/NAMENODE?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]",
- {
- hostName: nameNodeHostName
- },
- "/data/services/metrics/hdfs/rpc.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/hdfs/rpc.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js Wed Mar 20 20:44:43 2013
@@ -28,20 +28,11 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_SpaceUtilization = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-space-utilization",
- title: "Total Space Utilization",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
- url: function () {
- var hdfsService = App.HDFSService.find().objectAt(0);
- var nameNodeHostName = hdfsService.get('nameNode').get('hostName');
- return App.formatUrl(
- this.get('urlPrefix') + "/hosts/{hostName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/CapacityRemainingGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityUsedGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityTotalGB[{fromSeconds},{toSeconds},{stepSeconds}]",
- {
- hostName: nameNodeHostName
- },
- "/data/services/metrics/hdfs/space_utilization.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/CapacityRemainingGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityUsedGB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/CapacityTotalGB[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/hdfs/space_utilization.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js Wed Mar 20 20:44:43 2013
@@ -28,20 +28,10 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_GC = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-gc",
- title: "Garbage Collection",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.gc'),
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
-
- url: function () {
- var mrService = App.MapReduceService.find().objectAt(0);
- var jtHostName = mrService.get('jobTracker').get('hostName');
- return App.formatUrl(
- this.get('urlPrefix') + "/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]",
- {
- hostName: jtHostName
- },
- "/data/services/metrics/mapreduce/gc.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/hosts/{jobTrackerNode}/host_components/JOBTRACKER?fields=metrics/jvm/gcTimeMillis[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/mapreduce/gc.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js Wed Mar 20 20:44:43 2013
@@ -28,15 +28,10 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_JobsStatus = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-jobs-status",
- title: "Jobs Status",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus'),
renderer: 'line',
- url: function () {
- return App.formatUrl(
- this.get('urlPrefix') + "/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/jobs_completed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_preparing[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_submitted[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_running[{fromSeconds},{toSeconds},{stepSeconds}]",
- {},
- "/data/services/metrics/mapreduce/jobs_status.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/jobs_completed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_preparing[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_submitted[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_failed[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/jobs_running[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/mapreduce/jobs_status.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js Wed Mar 20 20:44:43 2013
@@ -28,20 +28,11 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_JVMHeap = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-jvm-heap",
- title: "JVM Memory Status",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
- url: function () {
- var mrService = App.MapReduceService.find().objectAt(0);
- var jtHostName = mrService.get('jobTracker').get('hostName');
- return App.formatUrl(
- this.get('urlPrefix') + "/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/memNonHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memNonHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}]",
- {
- hostName: jtHostName
- },
- "/data/services/metrics/mapreduce/jvm_heap.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/hosts/{jobTrackerNode}/host_components/JOBTRACKER?fields=metrics/jvm/memNonHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memNonHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapUsedM[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/memHeapCommittedM[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/mapreduce/jvm_heap.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js Wed Mar 20 20:44:43 2013
@@ -28,19 +28,10 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_JVMThreads = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-jvm-threads",
- title: "JVM Thread Status",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads'),
renderer: 'line',
- url: function () {
- var mrService = App.MapReduceService.find().objectAt(0);
- var jtHostName = mrService.get('jobTracker').get('hostName');
- return App.formatUrl(
- this.get('urlPrefix') + "/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/jvm/threadsRunnable[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsBlocked[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsWaiting[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsTimedWaiting[{fromSeconds},{toSeconds},{stepSeconds}]",
- {
- hostName: jtHostName
- },
- "/data/services/metrics/mapreduce/jvm_threads.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/hosts/{jobTrackerNode}/host_components/JOBTRACKER?fields=metrics/jvm/threadsRunnable[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsBlocked[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsWaiting[{fromSeconds},{toSeconds},{stepSeconds}],metrics/jvm/threadsTimedWaiting[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/mapreduce/jvm_threads.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js Wed Mar 20 20:44:43 2013
@@ -28,15 +28,10 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_MapSlots = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-map-slots",
- title: "Map Slots Utilization",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.mapSlots'),
renderer: 'line',
- url: function () {
- return App.formatUrl(
- this.get('urlPrefix') + "/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_map_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_map_slots[{fromSeconds},{toSeconds},{stepSeconds}]",
- {},
- "/data/services/metrics/mapreduce/map_slots.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_map_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_map_slots[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/mapreduce/map_slots.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js Wed Mar 20 20:44:43 2013
@@ -28,15 +28,10 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_ReduceSlots = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-reduce-slots",
- title: "Reduce Slots Utilization",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.reduceSlots'),
renderer: 'line',
- url: function () {
- return App.formatUrl(
- this.get('urlPrefix') + "/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}]",
- {},
- "/data/services/metrics/mapreduce/reduce_slots.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/occupied_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/reserved_reduce_slots[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/mapreduce/reduce_slots.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js Wed Mar 20 20:44:43 2013
@@ -28,20 +28,10 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_RPC = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-rpc",
- title: "RPC",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.rpc'),
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
-
- url: function () {
- var mrService = App.MapReduceService.find().objectAt(0);
- var jtHostName = mrService.get('jobTracker').get('hostName');
- return App.formatUrl(
- this.get('urlPrefix') + "/hosts/{hostName}/host_components/JOBTRACKER?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]",
- {
- hostName: jtHostName
- },
- "/data/services/metrics/mapreduce/rpc.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/hosts/{jobTrackerNode}/host_components/JOBTRACKER?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/mapreduce/rpc.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js Wed Mar 20 20:44:43 2013
@@ -28,15 +28,10 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_TasksRunningWaiting = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-tasks-running-waiting",
- title: "Tasks (Running/Waiting)",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting'),
renderer: 'line',
- url: function () {
- return App.formatUrl(
- this.get('urlPrefix') + "/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/running_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/running_reduces[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_reduces[{fromSeconds},{toSeconds},{stepSeconds}]",
- {},
- "/data/services/metrics/mapreduce/tasks_running_waiting.json"
- );
- }.property('clusterName').volatile(),
+ sourceUrl: "/services/MAPREDUCE/components/JOBTRACKER?fields=metrics/mapred/jobtracker/running_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/running_reduces[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_maps[{fromSeconds},{toSeconds},{stepSeconds}],metrics/mapred/jobtracker/waiting_reduces[{fromSeconds},{toSeconds},{stepSeconds}]",
+ mockUrl: "/data/services/metrics/mapreduce/tasks_running_waiting.json",
transformToSeries: function (jsonData) {
var seriesArray = [];
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js Wed Mar 20 20:44:43 2013
@@ -91,7 +91,7 @@ App.MainServiceInfoSummaryView = Em.View
if (servers.length > 2) {
result[1].isAnd = true;
result.push({
- 'host': servers.length - 2 + ' more',
+ 'host': Em.I18n.t('services.service.info.summary.serversHostCount').format(servers.length - 2),
'isComma': false,
'isAnd': false
});
@@ -106,7 +106,7 @@ App.MainServiceInfoSummaryView = Em.View
if (service.get("id") == "GANGLIA") {
var monitors = service.get('hostComponents').filterProperty('isMaster', false);
if (monitors.length) {
- result = monitors.length - 1 ? monitors.length + ' hosts running monitor' : '1 host running monitor';
+ result = monitors.length - 1 ? Em.I18n.t('services.service.info.summary.hostsRunningMonitor').format(monitors.length) : Em.I18n.t('services.service.info.summary.hostRunningMonitor');
}
}
return result;
@@ -266,32 +266,32 @@ App.MainServiceInfoSummaryView = Em.View
if (svcName) {
switch (svcName.toLowerCase()) {
case 'hdfs':
- graphs = [ App.ChartServiceMetricsHDFS_SpaceUtilization.extend(),
+ graphs = [ [App.ChartServiceMetricsHDFS_SpaceUtilization.extend(),
App.ChartServiceMetricsHDFS_FileOperations.extend(),
App.ChartServiceMetricsHDFS_BlockStatus.extend(),
- App.ChartServiceMetricsHDFS_IO.extend(),
- App.ChartServiceMetricsHDFS_RPC.extend(),
+ App.ChartServiceMetricsHDFS_IO.extend()],
+ [App.ChartServiceMetricsHDFS_RPC.extend(),
App.ChartServiceMetricsHDFS_GC.extend(),
App.ChartServiceMetricsHDFS_JVMHeap.extend(),
- App.ChartServiceMetricsHDFS_JVMThreads.extend()];
+ App.ChartServiceMetricsHDFS_JVMThreads.extend()]];
break;
case 'mapreduce':
- graphs = [ App.ChartServiceMetricsMapReduce_JobsStatus.extend(),
+ graphs = [ [App.ChartServiceMetricsMapReduce_JobsStatus.extend(),
App.ChartServiceMetricsMapReduce_TasksRunningWaiting.extend(),
App.ChartServiceMetricsMapReduce_MapSlots.extend(),
- App.ChartServiceMetricsMapReduce_ReduceSlots.extend(),
- App.ChartServiceMetricsMapReduce_GC.extend(),
+ App.ChartServiceMetricsMapReduce_ReduceSlots.extend()],
+ [App.ChartServiceMetricsMapReduce_GC.extend(),
App.ChartServiceMetricsMapReduce_RPC.extend(),
App.ChartServiceMetricsMapReduce_JVMHeap.extend(),
- App.ChartServiceMetricsMapReduce_JVMThreads.extend()];
+ App.ChartServiceMetricsMapReduce_JVMThreads.extend()]];
break;
case 'hbase':
- graphs = [ App.ChartServiceMetricsHBASE_ClusterRequests.extend(),
+ graphs = [ [App.ChartServiceMetricsHBASE_ClusterRequests.extend(),
App.ChartServiceMetricsHBASE_RegionServerReadWriteRequests.extend(),
App.ChartServiceMetricsHBASE_RegionServerRegions.extend(),
- App.ChartServiceMetricsHBASE_RegionServerQueueSize.extend(),
- App.ChartServiceMetricsHBASE_HlogSplitTime.extend(),
- App.ChartServiceMetricsHBASE_HlogSplitSize.extend()];
+ App.ChartServiceMetricsHBASE_RegionServerQueueSize.extend()],
+ [App.ChartServiceMetricsHBASE_HlogSplitTime.extend(),
+ App.ChartServiceMetricsHBASE_HlogSplitSize.extend()]];
break;
default:
break;
@@ -394,11 +394,5 @@ App.MainServiceInfoSummaryView = Em.View
});
return names.length ? names.join(', ') : false;
- }.property('clientComponents'),
- hasAlertsBox: function(){
- var services = [
- 'NAGIOS'
- ];
- return -1 === services.indexOf(this.get('controller.content.serviceName'));
- }.property('controller.content.serviceName')
+ }.property('clientComponents')
});
\ No newline at end of file
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/menu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/menu.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/menu.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/menu.js Wed Mar 20 20:44:43 2013
@@ -64,7 +64,7 @@ App.MainServiceMenuView = Em.CollectionV
var allAlerts = App.router.get('clusterController.alerts');
var serviceId = this.get('content.serviceName');
if (serviceId) {
- return allAlerts.filterProperty('serviceType', serviceId).filterProperty('isOk', false).length;
+ return allAlerts.filterProperty('serviceType', serviceId).filterProperty('isOk', false).filterProperty('ignoredForServices', false).length;
}
return 0;
}.property('App.router.clusterController.alerts'),
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/controls_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/controls_view.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/controls_view.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/controls_view.js Wed Mar 20 20:44:43 2013
@@ -34,7 +34,7 @@ App.ServiceConfigPopoverSupport = Ember.
didInsertElement: function () {
if (this.get('isPopoverEnabled') !== 'false') {
this.$().popover({
- title: this.get('serviceConfig.displayName') + '<br><small>' + this.get('serviceConfig.name') + '</small>',
+ title: Em.I18n.t('installer.controls.serviceConfigPopover.title').format(this.get('serviceConfig.displayName'), this.get('serviceConfig.name')),
content: this.get('serviceConfig.description'),
placement: 'right',
trigger: 'hover'
@@ -279,9 +279,9 @@ App.ServiceConfigMultipleHostsDisplay =
otherLength: function () {
var len = this.get('value').length;
if (len > 2) {
- return (len - 1) + ' others';
+ return Em.I18n.t('installer.controls.serviceConfigMultipleHosts.others').format(len - 1);
} else {
- return '1 other';
+ return Em.I18n.t('installer.controls.serviceConfigMultipleHosts.other');
}
}.property('value')
@@ -307,7 +307,7 @@ App.ServiceConfigMasterHostsView = Ember
showHosts: function () {
var serviceConfig = this.get('serviceConfig');
App.ModalPopup.show({
- header: serviceConfig.category + ' Hosts',
+ header: Em.I18n.t('installer.controls.serviceConfigMasterHosts.header').format(serviceConfig.category),
bodyClass: Ember.View.extend({
serviceConfig: serviceConfig,
templateName: require('templates/wizard/master_hosts_popup')
@@ -360,9 +360,8 @@ App.AddSlaveComponentGroupButton = Ember
didInsertElement: function () {
this.$().popover({
- title: 'Add a ' + this.get('slaveComponentName') + ' Group',
- content: 'If you need different settings on certain ' + this.get('slaveComponentName') + 's, you can add a ' + this.get('slaveComponentName') + ' group.<br>' +
- 'All ' + this.get('slaveComponentName') + 's within the same group will have the same set of settings. You can create multiple groups.',
+ title: Em.I18n.t('installer.controls.addSlaveComponentGroupButton.title').format(this.get('slaveComponentName')),
+ content: Em.I18n.t('installer.controls.addSlaveComponentGroupButton.content').format(this.get('slaveComponentName'), this.get('slaveComponentName'), this.get('slaveComponentName')),
placement: 'right',
trigger: 'hover'
});
@@ -453,7 +452,7 @@ App.SlaveComponentChangeGroupNameView =
this.set('error', false);
}.observes('controller.activeGroup'),
errorMessage: function () {
- return this.get('error') ? 'group with this name already exist' : '';
+ return this.get('error') ? Em.I18n.t('installer.controls.slaveComponentChangeGroupName.error') : '';
}.property('error'),
/**
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step6_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step6_view.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step6_view.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step6_view.js Wed Mar 20 20:44:43 2013
@@ -64,7 +64,7 @@ App.WizardStep6HostView = Em.View.extend
});
components = components.join(" /\n");
this.$().popover({
- title: 'master components hosted on ' + this.get('host.hostName'),
+ title: Em.I18n.t('installer.step6.wizardStep6Host.title').format(this.get('host.hostName')),
content: components,
placement: 'right',
trigger: 'hover'
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step8_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step8_view.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step8_view.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step8_view.js Wed Mar 20 20:44:43 2013
@@ -68,6 +68,10 @@ App.WizardStep8View = Em.View.extend({
bodyClass: Ember.View.extend({
templateName: require('templates/wizard/step8_log_popup'),
+ message: function() {
+ return Em.I18n.t('installer.step8.deployPopup.message').format(this.get('ajaxQueueComplete'), this.get('ajaxQueueLength'));
+ }.property('ajaxQueueComplete', 'ajaxQueueLength'),
+
controllerBinding: 'App.router.wizardStep8Controller',
ajaxQueueLength: function() {
Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step9_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step9_view.js?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step9_view.js (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step9_view.js Wed Mar 20 20:44:43 2013
@@ -38,6 +38,10 @@ App.WizardStep9View = Em.View.extend({
return barWidth;
}.property('controller.progress'),
+ progressMessage: function() {
+ return Em.I18n.t('installer.step9.overallProgress').format(this.get('controller.progress'));
+ }.property('controller.progress'),
+
onStatus:function () {
if (this.get('controller.status') === 'info') {
this.set('resultMsg', '');
@@ -218,13 +222,13 @@ App.HostStatusView = Em.View.extend({
}.observes('category', 'tasks'),
categories: [
- Ember.Object.create({value: 'all', label: 'All' }),
- Ember.Object.create({value: 'pending', label: 'Queued / Pending'}),
- Ember.Object.create({value: 'in_progress', label: 'In Progress'}),
- Ember.Object.create({value: 'failed', label: 'Failed' }),
- Ember.Object.create({value: 'completed', label: 'Success' }),
- Ember.Object.create({value: 'aborted', label: 'Cancelled' }),
- Ember.Object.create({value: 'timedout', label: 'Timed Out' })
+ Ember.Object.create({value: 'all', label: Em.I18n.t('installer.step9.hostLog.popup.categories.all') }),
+ Ember.Object.create({value: 'pending', label: Em.I18n.t('installer.step9.hostLog.popup.categories.pending')}),
+ Ember.Object.create({value: 'in_progress', label: Em.I18n.t('installer.step9.hostLog.popup.categories.in_progress')}),
+ Ember.Object.create({value: 'failed', label: Em.I18n.t('installer.step9.hostLog.popup.categories.failed') }),
+ Ember.Object.create({value: 'completed', label: Em.I18n.t('installer.step9.hostLog.popup.categories.completed') }),
+ Ember.Object.create({value: 'aborted', label: Em.I18n.t('installer.step9.hostLog.popup.categories.aborted') }),
+ Ember.Object.create({value: 'timedout', label: Em.I18n.t('installer.step9.hostLog.popup.categories.timedout') })
],
category: null,
@@ -254,7 +258,7 @@ App.HostStatusView = Em.View.extend({
} else if (taskInfo.get('status') == 'failed') {
taskInfo.set('icon', 'icon-exclamation-sign');
} else if (taskInfo.get('status') == 'aborted') {
- taskInfo.set('icon', 'icon-remove');
+ taskInfo.set('icon', 'icon-minus');
} else if (taskInfo.get('status') == 'timedout') {
taskInfo.set('icon', 'icon-time');
}
Modified: incubator/ambari/branches/branch-1.2/ambari-web/config.coffee
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/config.coffee?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/config.coffee (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/config.coffee Wed Mar 20 20:44:43 2013
@@ -51,7 +51,6 @@ exports.config =
'vendor/scripts/jquery.ui.slider.js',
'vendor/scripts/jquery.ui.sortable.js',
'vendor/scripts/jquery.ui.custom-effects.js',
- 'vendor/scripts/jquery.dataTables.js',
'vendor/scripts/jquery.timeago.js',
'vendor/scripts/jquery.ajax-retry.js',
'vendor/scripts/workflow_visualization.js',
Modified: incubator/ambari/branches/branch-1.2/ambari-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/pom.xml?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-web/pom.xml (original)
+++ incubator/ambari/branches/branch-1.2/ambari-web/pom.xml Wed Mar 20 20:44:43 2013
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,11 +27,18 @@
<artifactId>ambari-web</artifactId>
<packaging>pom</packaging>
<name>Ambari Web</name>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<description>Ambari Web</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<build>
<plugins>
- <plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
<version>2.0.1</version>
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh Wed Mar 20 20:44:43 2013
@@ -27,11 +27,11 @@ if [[ -z "${BUILD_DIR}" ]]; then
fi
if [[ -z "${VERSION}" ]]; then
- VERSION="1.2.1.2"
+ VERSION=${VERSION:-1.2.2.3}
fi
if [[ -z "${RELEASE}" ]]; then
- RELEASE="1"
+ RELEASE=${RELEASE:-1}
fi
#rm -rf ${BUILD_DIR}/*
@@ -60,6 +60,9 @@ mkdir -p ${RPM_BUILDDIR}/SRPMS/
cp -f ${BASEDIR}/${PKG_NAME}.spec ${RPM_BUILDDIR}/SPECS/
cp -f ${TAR_DEST} ${RPM_BUILDDIR}/SOURCES/
+echo "${VERSION}" > ${RPM_BUILDDIR}/SOURCES/version.txt
+echo "${RELEASE}" > ${RPM_BUILDDIR}/SOURCES/release.txt
+
cd ${RPM_BUILDDIR}
cmd="rpmbuild --define \"_topdir ${RPM_BUILDDIR}\" \
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_nagios_addon_rpm.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_nagios_addon_rpm.sh?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_nagios_addon_rpm.sh (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_nagios_addon_rpm.sh Wed Mar 20 20:44:43 2013
@@ -27,11 +27,11 @@ if [[ -z "${BUILD_DIR}" ]]; then
fi
if [[ -z "${VERSION}" ]]; then
- VERSION="1.2.1.2"
+ VERSION=${VERSION:-1.2.2.3}
fi
if [[ -z "${RELEASE}" ]]; then
- RELEASE="1"
+ RELEASE=${RELEASE:-1}
fi
#rm -rf ${BUILD_DIR}/*
@@ -60,6 +60,9 @@ mkdir -p ${RPM_BUILDDIR}/SRPMS/
cp -f ${BASEDIR}/${PKG_NAME}.spec ${RPM_BUILDDIR}/SPECS/
cp -f ${TAR_DEST} ${RPM_BUILDDIR}/SOURCES/
+echo "${VERSION}" > ${RPM_BUILDDIR}/SOURCES/version.txt
+echo "${RELEASE}" > ${RPM_BUILDDIR}/SOURCES/release.txt
+
cd ${RPM_BUILDDIR}
cmd="rpmbuild --define \"_topdir ${RPM_BUILDDIR}\" \
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec Wed Mar 20 20:44:43 2013
@@ -22,16 +22,22 @@
# RPM Spec file for Ganglia Add-ons for HDP Monitoring Dashboard
#
+%define name hdp_mon_ganglia_addons
+%define release %(cat %{_sourcedir}/release.txt)
+%define version %(cat %{_sourcedir}/version.txt)
+%define buildroot %{_tmppath}/%{name}-%{version}-buildroot
+
+
Summary: Ganglia Add-ons for HDP Monitoring Dashboard
-Name: hdp_mon_ganglia_addons
-Version: 1.2.1.2
+Name: %{name}
+Version: %{version}
URL: http://hortonworks.com
-Release: 1
+Release: %{release}%{?dist}
License: Apache License, Version 2.0
Vendor: Hortonworks <am...@hortonworks.com>
Group: System Environment/Base
Source: %{name}-%{version}.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Buildroot: %{buildroot}
Requires: gweb >= 2.2
%if 0%{?suse_version}
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec Wed Mar 20 20:44:43 2013
@@ -22,17 +22,23 @@
# RPM Spec file for Nagios Add-ons for HDP Monitoring Dashboard
#
+%define name hdp_mon_nagios_addons
+%define release %(cat %{_sourcedir}/release.txt)
+%define version %(cat %{_sourcedir}/version.txt)
+%define buildroot %{_tmppath}/%{name}-%{version}-buildroot
+
Summary: Nagios Add-ons for HDP Monitoring Dashboard
-Name: hdp_mon_nagios_addons
-Version: 1.2.1.2
+Name: %{name}
+Version: %{version}
URL: http://hortonworks.com
-Release: 1
+Release: %{release}%{?dist}
License: Apache License, Version 2.0
Vendor: Hortonworks <am...@hortonworks.com>
Group: System Environment/Base
Source: %{name}-%{version}.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Buildroot: %{buildroot}
Requires: nagios, nagios-plugins, php >= 5
+
%define nagioshdpscripts_dir %{_prefix}/share/hdp/nagios
%define nagiosplugin_dir %{_libdir}/nagios/plugins
%if 0%{?suse_version}
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_hive_metastore_status.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_hive_metastore_status.sh?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_hive_metastore_status.sh (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_hive_metastore_status.sh Wed Mar 20 20:44:43 2013
@@ -25,8 +25,8 @@ PORT=$2
HCAT_URL=-Dhive.metastore.uris="thrift://$HOST:$PORT"
out=`hcat $HCAT_URL -e "show databases" 2>&1`
if [[ "$?" -ne 0 ]]; then
- echo "CRITICAL: Error accessing hive-metaserver status [$out]";
+ echo "CRITICAL: Error accessing Hive Metastore status [$out]";
exit 2;
fi
-echo "OK: Hive metaserver status OK";
+echo "OK: Hive Metastore status OK";
exit 0;
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_name_dir_status.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_name_dir_status.php?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_name_dir_status.php (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_name_dir_status.php Wed Mar 20 20:44:43 2013
@@ -36,12 +36,12 @@
$json_array = json_decode($json_string, true);
$object = $json_array['beans'][0];
if ($object['NameDirStatuses'] == "") {
- echo "UNKNOWN: Namenode directory status not available via http://<nn_host>:port/jmx url" . "\n";
+ echo "UNKNOWN: NameNode directory status not available via http://<nn_host>:port/jmx url" . "\n";
exit(3);
}
$NameDirStatuses = json_decode($object['NameDirStatuses'], true);
$failed_dir_count = count($NameDirStatuses['failed']);
- $out_msg = "CRITICAL: Offline Namenode directories: ";
+ $out_msg = "CRITICAL: Offline NameNode directories: ";
if ($failed_dir_count > 0) {
foreach ($NameDirStatuses['failed'] as $key => $value) {
$out_msg = $out_msg . $key . ":" . $value . ", ";
@@ -49,7 +49,7 @@
echo $out_msg . "\n";
exit (2);
}
- echo "OK: All Namenode directories are active" . "\n";
+ echo "OK: All NameNode directories are active" . "\n";
exit(0);
/* print usage */
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_oozie_status.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_oozie_status.sh?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_oozie_status.sh (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_oozie_status.sh Wed Mar 20 20:44:43 2013
@@ -20,7 +20,7 @@
#
#
# OOZIE_URL is of the form http://<hostname>:<port>/oozie
-# OOZIE_URL: http://hortonworks-sandbox.localdomain:11000/oozie
+# OOZIE_URL: http://host1.localdomain:11000/oozie
HOST=$1
PORT=$2
JAVA_HOME=$3
@@ -28,8 +28,8 @@ OOZIE_URL="http://$HOST:$PORT/oozie"
export JAVA_HOME=$JAVA_HOME
out=`oozie admin -oozie ${OOZIE_URL} -status 2>&1`
if [[ "$?" -ne 0 ]]; then
- echo "CRITICAL: Error accessing oozie server status [$out]";
+ echo "CRITICAL: Error accessing Oozie Server status [$out]";
exit 2;
fi
-echo "OK: Oozie server status [$out]";
+echo "OK: Oozie Server status [$out]";
exit 0;
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_webui.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_webui.sh?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_webui.sh (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_webui.sh Wed Mar 20 20:44:43 2013
@@ -45,14 +45,14 @@ jobtracker)
namenode)
nnweburl="http://$host:50070"
if [[ `checkurl "$nnweburl"` -ne 0 ]] ; then
- echo "WARNING: NameNode web UI not accessible : $nnweburl";
+ echo "WARNING: NameNode Web UI not accessible : $nnweburl";
exit 1;
fi
;;
jobhistory)
jhweburl="http://$host:51111/jobhistoryhome.jsp"
if [[ `checkurl "$jhweburl"` -ne 0 ]]; then
- echo "WARNING: Jobhistory web UI not accessible : $jhweburl";
+ echo "WARNING: JobHistory Web UI not accessible : $jhweburl";
exit 1;
fi
;;
@@ -60,7 +60,7 @@ hbase)
hbaseweburl="http://$host:60010/master-status"
jhweburl="http://domU-12-31-39-16-DC-FB.compute-1.internal:51111/jobhistoryhome.jsp"
if [[ `checkurl "$hbaseweburl"` -ne 0 ]]; then
- echo "WARNING: Hbase Master web UI not accessible : $hbaseweburl";
+ echo "WARNING: HBase Master Web UI not accessible : $hbaseweburl";
exit 1;
fi
;;
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/sys_logger.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/sys_logger.py?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/sys_logger.py (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/sys_logger.py Wed Mar 20 20:44:43 2013
@@ -21,35 +21,35 @@ severities = {'UP':'OK', 'DOWN':'Critica
'WARNING':'Warning', 'UNKNOWN':'Warning', 'CRITICAL':'Critical'}
# List of services which can result in events at the Degraded severity
-degraded_alert_services = ['HBASEMASTER::HBaseMaster CPU utilization',
- 'HDFS::Namenode RPC Latency',
- 'MAPREDUCE::JobTracker RPC Latency',
- 'JOBTRACKER::Jobtracker CPU utilization']
+degraded_alert_services = ['HBASEMASTER::HBase Master CPU utilization',
+ 'HDFS::NameNode RPC latency',
+ 'MAPREDUCE::JobTracker RPC latency',
+ 'JOBTRACKER::JobTracker CPU utilization']
# List of services which can result in events at the Fatal severity
-fatal_alert_services = ['NAMENODE::Namenode Process down']
+fatal_alert_services = ['NAMENODE::NameNode process down']
# dictionary of service->msg_id mappings
-msg_ids = {'Host::Ping':'host_down', 'HBASEMASTER::HBaseMaster CPU utilization':'master_cpu_utilization',
- 'HDFS::HDFS Capacity utilization':'hdfs_percent_capacity', 'HDFS::Corrupt/Missing blocks':'hdfs_block',
- 'NAMENODE::Namenode Edit logs directory status':'namenode_edit_log_write', 'HDFS::Percent DataNodes down':'datanode_down',
- 'DATANODE::Process down':'datanode_process_down', 'HDFS::Percent DataNodes storage full':'datanodes_percent_storage_full',
- 'NAMENODE::Namenode Process down':'namenode_process_down', 'HDFS::Namenode RPC Latency':'namenode_rpc_latency',
- 'DATANODE::Storage full':'datanodes_storage_full', 'JOBTRACKER::Jobtracker Process down':'jobtracker_process_down',
- 'MAPREDUCE::JobTracker RPC Latency':'jobtracker_rpc_latency', 'MAPREDUCE::Percent TaskTrackers down':'tasktrackers_down',
- 'TASKTRACKER::Process down':'tasktracker_process_down', 'HBASEMASTER::HBaseMaster Process down':'hbasemaster_process_down',
- 'REGIONSERVER::Process down':'regionserver_process_down', 'HBASE::Percent region servers down':'regionservers_down',
- 'HIVE-METASTORE::HIVE-METASTORE status check':'hive_metastore_process_down', 'ZOOKEEPER::Percent zookeeper servers down':'zookeepers_down',
- 'ZKSERVERS::ZKSERVERS Process down':'zookeeper_process_down', 'OOZIE::Oozie status check':'oozie_down',
- 'TEMPLETON::Templeton status check':'templeton_down', 'PUPPET::Puppet agent down':'puppet_down',
- 'NAGIOS::Nagios status log staleness':'nagios_status_log_stale', 'GANGLIA::Ganglia [gmetad] Process down':'ganglia_process_down',
- 'GANGLIA::Ganglia collector [gmond] Process down alert for hbasemaster':'ganglia_collector_process_down',
- 'GANGLIA::Ganglia collector [gmond] Process down alert for jobtracker':'ganglia_collector_process_down',
- 'GANGLIA::Ganglia collector [gmond] Process down alert for namenode':'ganglia_collector_process_down',
- 'GANGLIA::Ganglia collector [gmond] Process down alert for slaves':'ganglia_collector_process_down',
- 'NAMENODE::Secondary Namenode Process down':'secondary_namenode_process_down',
- 'JOBTRACKER::Jobtracker CPU utilization':'jobtracker_cpu_utilization',
- 'HBASEMASTER::HBase Web UI down':'hbase_ui_down', 'NAMENODE::Namenode Web UI down':'namenode_ui_down',
+msg_ids = {'Host::Ping':'host_down', 'HBASEMASTER::HBase Master CPU utilization':'master_cpu_utilization',
+ 'HDFS::HDFS capacity utilization':'hdfs_percent_capacity', 'HDFS::Corrupt/Missing blocks':'hdfs_block',
+ 'NAMENODE::NameNode edit logs directory status':'namenode_edit_log_write', 'HDFS::Percent DataNodes down':'datanode_down',
+ 'DATANODE::DataNode process down':'datanode_process_down', 'HDFS::Percent DataNodes storage full':'datanodes_percent_storage_full',
+ 'NAMENODE::NameNode process down':'namenode_process_down', 'HDFS::NameNode RPC latency':'namenode_rpc_latency',
+ 'DATANODE::DataNode storage full':'datanodes_storage_full', 'JOBTRACKER::JobTracker process down':'jobtracker_process_down',
+ 'MAPREDUCE::JobTracker RPC latency':'jobtracker_rpc_latency', 'MAPREDUCE::Percent TaskTrackers down':'tasktrackers_down',
+ 'TASKTRACKER::TaskTracker process down':'tasktracker_process_down', 'HBASEMASTER::HBase Master process down':'hbasemaster_process_down',
+ 'REGIONSERVER::RegionServer process down':'regionserver_process_down', 'HBASE::Percent RegionServers down':'regionservers_down',
+ 'HIVE-METASTORE::Hive Metastore status check':'hive_metastore_process_down', 'ZOOKEEPER::Percent ZooKeeper Servers down':'zookeepers_down',
+ 'ZOOKEEPER::ZooKeeper Server process down':'zookeeper_process_down', 'OOZIE::Oozie Server status check':'oozie_down',
+ 'WEBHCAT::WebHCat Server status check':'templeton_down', 'PUPPET::Puppet agent down':'puppet_down',
+ 'NAGIOS::Nagios status log staleness':'nagios_status_log_stale', 'GANGLIA::Ganglia [gmetad] process down':'ganglia_process_down',
+ 'GANGLIA::Ganglia Collector [gmond] process down alert for HBase Master':'ganglia_collector_process_down',
+ 'GANGLIA::Ganglia Collector [gmond] process down alert for JobTracker':'ganglia_collector_process_down',
+ 'GANGLIA::Ganglia Collector [gmond] process down alert for NameNode':'ganglia_collector_process_down',
+ 'GANGLIA::Ganglia Collector [gmond] process down alert for slaves':'ganglia_collector_process_down',
+ 'NAMENODE::Secondary NameNode process down':'secondary_namenode_process_down',
+ 'JOBTRACKER::JobTracker CPU utilization':'jobtracker_cpu_utilization',
+ 'HBASEMASTER::HBase Master Web UI down':'hbase_ui_down', 'NAMENODE::NameNode Web UI down':'namenode_ui_down',
'JOBTRACKER::JobHistory Web UI down':'jobhistory_ui_down', 'JOBTRACKER::JobTracker Web UI down':'jobtracker_ui_down'}
Modified: incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php (original)
+++ incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php Wed Mar 20 20:44:43 2013
@@ -91,13 +91,13 @@ function hdp_mon_generate_response( $res
define ("warn", "1");
define ("critical", "2");
- define ("HDFS_SERVICE_CHECK", "NAMENODE::Namenode Process down");
- define ("MAPREDUCE_SERVICE_CHECK", "JOBTRACKER::Jobtracker Process down");
- define ("HBASE_SERVICE_CHECK", "HBASEMASTER::HBaseMaster Process down");
- define ("ZOOKEEPER_SERVICE_CHECK", "ZOOKEEPER::Percent zookeeper servers down");
- define ("HIVE_METASTORE_SERVICE_CHECK", "HIVE-METASTORE::HIVE-METASTORE status check");
- define ("OOZIE_SERVICE_CHECK", "OOZIE::Oozie status check");
- define ("TEMPLETON_SERVICE_CHECK", "TEMPLETON::Templeton status check");
+ define ("HDFS_SERVICE_CHECK", "NAMENODE::NameNode process down");
+ define ("MAPREDUCE_SERVICE_CHECK", "JOBTRACKER::JobTracker process down");
+ define ("HBASE_SERVICE_CHECK", "HBASEMASTER::HBaseMaster process down");
+ define ("ZOOKEEPER_SERVICE_CHECK", "ZOOKEEPER::Percent ZooKeeper Servers down");
+ define ("HIVE_METASTORE_SERVICE_CHECK", "HIVE-METASTORE::Hive Metastore status check");
+ define ("OOZIE_SERVICE_CHECK", "OOZIE::Oozie Server status check");
+ define ("WEBHCAT_SERVICE_CHECK", "WEBHCAT::WebHCat Server status check");
define ("PUPPET_SERVICE_CHECK", "PUPPET::Puppet agent down");
/* If SUSE, status file is under /var/lib/nagios */
@@ -196,10 +196,10 @@ function hdp_mon_generate_response( $res
}
continue;
}
- if (getParameter($object, "service_description") == TEMPLETON_SERVICE_CHECK) {
- $services_object["TEMPLETON"] = getParameter($object, "last_hard_state");
- if ($services_object["TEMPLETON"] >= 1) {
- $services_object["TEMPLETON"] = 1;
+ if (getParameter($object, "service_description") == WEBHCAT_SERVICE_CHECK) {
+ $services_object["WEBHCAT"] = getParameter($object, "last_hard_state");
+ if ($services_object["WEBHCAT"] >= 1) {
+ $services_object["WEBHCAT"] = 1;
}
continue;
}
@@ -301,6 +301,7 @@ function hdp_mon_generate_response( $res
}
$servicestatus['service_type'] = get_service_type($servicestatus['service_description']);
$srv_desc = explode ("::",$servicestatus['service_description'],2);
+
$servicestatus['service_description'] = $srv_desc[1];
}
break;
@@ -362,18 +363,25 @@ function hdp_mon_generate_response( $res
{
$pieces = explode("::", $service_description);
switch ($pieces[0]) {
+ case "DATANODE":
case "NAMENODE":
$pieces[0] = "HDFS";
break;
case "JOBTRACKER":
+ case "TASKTRACKER":
$pieces[0] = "MAPREDUCE";
break;
case "HBASEMASTER":
+ case "REGIONSERVER":
$pieces[0] = "HBASE";
break;
case "HIVE-METASTORE":
$pieces[0] = "HIVE";
break;
+ case "ZKSERVERS":
+ $pieces[0] = "ZOOKEEPER";
+ break;
+ case "NAGIOS":
case "HDFS":
case "MAPREDUCE":
case "HBASE":
Modified: incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/pom.xml?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/pom.xml (original)
+++ incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/pom.xml Wed Mar 20 20:44:43 2013
@@ -20,7 +20,7 @@
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-log4j</artifactId>
<packaging>jar</packaging>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<name>ambari-log4j</name>
<url>http://maven.apache.org</url>
<repositories>
Modified: incubator/ambari/branches/branch-1.2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/pom.xml?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/pom.xml (original)
+++ incubator/ambari/branches/branch-1.2/pom.xml Wed Mar 20 20:44:43 2013
@@ -21,8 +21,11 @@
<artifactId>ambari</artifactId>
<packaging>pom</packaging>
<name>Ambari Main</name>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<description>Ambari</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<pluginRepositories>
<pluginRepository>
<id>maven2-repository.dev.java.net</id>
@@ -66,6 +69,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>