瀏覽代碼

AMBARI-4275. YARN ATS: implement Services > YARN changes. (Denys Buzhor via akovalenko)

Aleksandr Kovalenko 11 年之前
父節點
當前提交
bf2bc70b70

+ 21 - 1
ambari-web/app/assets/data/alerts/HDP2/service_alerts.json

@@ -125,6 +125,26 @@
         "status" : "OK",
         "status" : "OK",
         "status_time" : 1389793060,
         "status_time" : 1389793060,
         "output" : "1 CPU, load 19.0% < 200% : OK"
         "output" : "1 CPU, load 19.0% < 200% : OK"
+      },
+      {
+        "description" : "App Timeline Server Web UI",
+        "host_name" : "dev01.hortonworks.com",
+        "last_status" : "WARNING",
+        "last_status_time" : 1389636534,
+        "service_name" : "YARN",
+        "status" : "WARNING",
+        "status_time" : 1389793060,
+        "output" : "1 CPU, load 19.0% < 200% : OK"
+      },
+      {
+        "description" : "App Timeline Server process",
+        "host_name" : "dev01.hortonworks.com",
+        "last_status" : "CRITICAL",
+        "last_status_time" : 1389636534,
+        "service_name" : "HDFS",
+        "status" : "CRITICAL",
+        "status_time" : 1389793060,
+        "output" : "1 CPU, load 19.0% < 200% : OK"
       }
       }
     ],
     ],
     "summary" : {
     "summary" : {
@@ -133,4 +153,4 @@
       "WARNING" : 2
       "WARNING" : 2
     }
     }
   }
   }
-}
+}

+ 9 - 0
ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json

@@ -180,6 +180,15 @@
             "state" : "INSTALLED"
             "state" : "INSTALLED"
           }
           }
         },
         },
+        {
+          "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/APP_TIMELINE_SERVER",
+          "HostRoles" : {
+            "cluster_name" : "perf",
+            "component_name" : "APP_TIMELINE_SERVER",
+            "host_name" : "dev01.hortonworks.com",
+            "state" : "STARTED"
+          }
+        },
         {
         {
           "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/ZOOKEEPER_CLIENT",
           "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/ZOOKEEPER_CLIENT",
           "HostRoles" : {
           "HostRoles" : {

+ 8 - 0
ambari-web/app/assets/data/hosts/HDP2/hosts.json

@@ -260,6 +260,14 @@
             "host_name" : "dev01.hortonworks.com"
             "host_name" : "dev01.hortonworks.com"
           }
           }
         },
         },
+        {
+          "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/APP_TIMELINE_SERVER",
+          "HostRoles" : {
+            "cluster_name" : "c1",
+            "component_name" : "APP_TIMELINE_SERVER",
+            "host_name" : "dev01.hortonworks.com"
+          }
+        },
         {
         {
           "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/ZOOKEEPER_CLIENT",
           "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/ZOOKEEPER_CLIENT",
           "HostRoles" : {
           "HostRoles" : {

+ 1 - 0
ambari-web/app/config.js

@@ -66,6 +66,7 @@ App.supports = {
   highAvailability: true,
   highAvailability: true,
   deleteHost: true,
   deleteHost: true,
   autoRollbackHA: false,
   autoRollbackHA: false,
+  appTimelineServer: false,
   storm: false
   storm: false
 };
 };
 
 

+ 2 - 1
ambari-web/app/mappers/service_metrics_mapper.js

@@ -455,7 +455,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     // Map
     // Map
     var finalJson = this.parseIt(item, finalConfig);
     var finalJson = this.parseIt(item, finalConfig);
     finalJson.quick_links = [ 23, 24, 25, 26 ];
     finalJson.quick_links = [ 23, 24, 25, 26 ];
-
+    if (App.supports.appTimelineServer)
+      finalJson.quick_links.push(33);
     return finalJson;
     return finalJson;
   },
   },
 
 

+ 13 - 0
ambari-web/app/models/quick_links.js

@@ -402,6 +402,19 @@ App.QuickLinks.FIXTURES = [
     regex: portRegex,
     regex: portRegex,
     default_http_port: 8744
     default_http_port: 8744
   },
   },
+  // @todo Add real info about link
+  {
+    id:33,
+    label:'App Timeline Server UI',
+    url:'%@://%@:%@/ats',
+    service_id: 'YARN',
+    template:'%@://%@:%@/ats',
+    http_config: 'yarn.resourcemanager.webapp.address',
+    https_config: 'yarn.resourcemanager.webapp.https.address',
+    site: 'yarn-site',
+    regex: portRegex,
+    default_http_port: 8088
+  },
   {
   {
     id:32,
     id:32,
     label:'Falcon Server UI',
     label:'Falcon Server UI',

+ 2 - 0
ambari-web/app/utils/helper.js

@@ -270,6 +270,8 @@ App.format = {
         return 'MapReduce2 Client';
         return 'MapReduce2 Client';
       case 'YARN_CLIENT':
       case 'YARN_CLIENT':
         return 'YARN Client';
         return 'YARN Client';
+      case 'APP_TIMELINE_SERVER':
+        return 'App Timeline Server';
       case 'JAVA_JCE':
       case 'JAVA_JCE':
         return 'Java JCE';
         return 'Java JCE';
       case 'KERBEROS_SERVER':
       case 'KERBEROS_SERVER':