浏览代码

AMBARI-3098. Change Ganglia Collector to Ganglia Server on Assign Masters. (xiwang via yusaku)

Yusaku Sako 11 年之前
父节点
当前提交
2adbf83103

+ 7 - 7
ambari-web/app/assets/data/alerts/HDP2/alerts.json

@@ -58,7 +58,7 @@
               "service_type" : "HDFS"
             },
             {
-              "service_description" : "Ganglia Collector [gmond] process down alert for HBase Master",
+              "service_description" : "Ganglia Server [gmond] process down alert for HBase Master",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -74,7 +74,7 @@
               "service_type" : "GANGLIA"
             },
             {
-              "service_description" : "Ganglia Collector [gmond] process down alert for History Server 2",
+              "service_description" : "Ganglia Server [gmond] process down alert for History Server 2",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -90,7 +90,7 @@
               "service_type" : "GANGLIA"
             },
             {
-              "service_description" : "Ganglia Collector [gmond] process down alert for JobTracker",
+              "service_description" : "Ganglia Server [gmond] process down alert for JobTracker",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "4",
               "current_state" : "2",
@@ -106,7 +106,7 @@
               "service_type" : "GANGLIA"
             },
             {
-              "service_description" : "Ganglia Collector [gmond] process down alert for NameNode",
+              "service_description" : "Ganglia Server [gmond] process down alert for NameNode",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -122,7 +122,7 @@
               "service_type" : "GANGLIA"
             },
             {
-              "service_description" : "Ganglia Collector [gmond] process down alert for NodeManager",
+              "service_description" : "Ganglia Server [gmond] process down alert for NodeManager",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -138,7 +138,7 @@
               "service_type" : "GANGLIA"
             },
             {
-              "service_description" : "Ganglia Collector [gmond] process down alert for ResourceManager",
+              "service_description" : "Ganglia Server [gmond] process down alert for ResourceManager",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -154,7 +154,7 @@
               "service_type" : "GANGLIA"
             },
             {
-              "service_description" : "Ganglia Collector [gmond] process down alert for slaves",
+              "service_description" : "Ganglia Server [gmond] process down alert for slaves",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",

+ 6 - 6
ambari-web/app/assets/data/dashboard/HDP2/services.json

@@ -1039,7 +1039,7 @@
                       "service_type" : "HDFS"
                     },
                     {
-                      "service_description" : "Ganglia Collector [gmond] process down alert for HBase Master",
+                      "service_description" : "Ganglia Server [gmond] process down alert for HBase Master",
                       "host_name" : "dev01.hortonworks.com",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1055,7 +1055,7 @@
                       "service_type" : "GANGLIA"
                     },
                     {
-                      "service_description" : "Ganglia Collector [gmond] process down alert for History Server 2",
+                      "service_description" : "Ganglia Server [gmond] process down alert for History Server 2",
                       "host_name" : "dev01.hortonworks.com",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1071,7 +1071,7 @@
                       "service_type" : "GANGLIA"
                     },
                     {
-                      "service_description" : "Ganglia Collector [gmond] process down alert for NameNode",
+                      "service_description" : "Ganglia Server [gmond] process down alert for NameNode",
                       "host_name" : "dev01.hortonworks.com",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1087,7 +1087,7 @@
                       "service_type" : "GANGLIA"
                     },
                     {
-                      "service_description" : "Ganglia Collector [gmond] process down alert for NodeManager",
+                      "service_description" : "Ganglia Server [gmond] process down alert for NodeManager",
                       "host_name" : "dev01.hortonworks.com",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1103,7 +1103,7 @@
                       "service_type" : "GANGLIA"
                     },
                     {
-                      "service_description" : "Ganglia Collector [gmond] process down alert for ResourceManager",
+                      "service_description" : "Ganglia Server [gmond] process down alert for ResourceManager",
                       "host_name" : "dev01.hortonworks.com",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1119,7 +1119,7 @@
                       "service_type" : "GANGLIA"
                     },
                     {
-                      "service_description" : "Ganglia Collector [gmond] process down alert for slaves",
+                      "service_description" : "Ganglia Server [gmond] process down alert for slaves",
                       "host_name" : "dev01.hortonworks.com",
                       "current_attempt" : "1",
                       "current_state" : "0",

+ 1 - 1
ambari-web/app/controllers/wizard/step8_controller.js

@@ -801,7 +801,7 @@ App.WizardStep8Controller = Em.Controller.extend({
   },
 
   loadGangliaServerValue: function (gangliaServer) {
-    var gangliaServerName = this.get('content.masterComponentHosts').findProperty('display_name', 'Ganglia Collector');
+    var gangliaServerName = this.get('content.masterComponentHosts').findProperty('display_name', 'Ganglia Server');
     gangliaServer.set('component_value', gangliaServerName.hostName);
   },
 

+ 1 - 1
ambari-web/app/data/service_components.js

@@ -261,7 +261,7 @@ module.exports = new Ember.Set([
   {
     service_name: 'GANGLIA',
     component_name: 'GANGLIA_SERVER',
-    display_name: 'Ganglia Collector',
+    display_name: 'Ganglia Server',
     isMaster: true,
     isClient: false,
     description: ''