diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss index 59f624569dd..01dc9f5b71c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss @@ -739,6 +739,14 @@ div.loggedin-user { } } +.no-border-bottom { + border-bottom: none; +} + +.margin-bottom-20 { + margin-bottom: 20px; +} + .diagnostic-info { pre { margin-bottom: 0; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss index 0bfadb06167..330106c513f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss @@ -20,9 +20,9 @@ @import 'variables.scss'; .yarn-compose-box { - position: fixed; - bottom: 0; - top: 0px; + position: absolute; + top: 50px; + bottom: 40px; right: 0px; background-color: $yarn-panel-bg; border: 1px solid $yarn-border-color; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss index 587df66c1dd..10607af4dc8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss @@ -44,3 +44,11 @@ .top-1 { margin-top: 5px; } + +.top-2 { + margin-top: 10px; +} + +.top-3 { + margin-top: 20px; +} \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs index 7d9aec1f0fc..044b9b1b162 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs @@ -19,30 +19,70 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}}
-
-
-
- Application Attempt -
-
- -
-
-
-
+ +
{{#if model.attempt}}
-
- Attempt Information +
+
+
+

{{model.attempt.id}}

+
{{model.attempt.appMasterContainerId}}
+ {{#if model.attempt.attemptState}} + {{em-table-simple-status-cell class="top-1" content=model.attempt.attemptState}} + {{/if}} + {{#if (or model.attempt.attemptStartedTime model.attempt.validatedFinishedTs)}} +
+ {{#if model.attempt.attemptStartedTime}} +
+ + Started at {{model.attempt.attemptStartedTime}} +
+ {{/if}} + {{#if model.attempt.validatedFinishedTs}} +
+ + Finished at {{model.attempt.validatedFinishedTs}} +
+ {{/if}} +
+ {{/if}} +
+
+
+ AM Host: + {{model.attempt.amNodeId}} +
+ {{#if model.attempt.nodeHttpAddress}} +
+ AM Node WebUI: + + {{model.attempt.nodeHttpAddress}} + +
+ {{/if}} + {{#if model.attempt.logsLink}} +
+ Log: + + {{model.attempt.logsLink}} + +
+ {{/if}} +
+
+ {{#if model.attempt.diagnosticsInfo}} +
+
+ Diagnostic Info for {{model.attempt.id}} +
+
+ 
{{model.attempt.diagnosticsInfo}}
+
+
+ {{/if}}
- {{app-attempt-table attempt=model.attempt}}
{{/if}}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs index daf9549260c..851bf778296 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs @@ -1,56 +1,51 @@ {{! - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. }} -
-
- {{metrics-table metrics=model.metrics type="Service"}} +
+ {{metrics-table metrics=model.metrics type="Service"}} +
+ +{{#if model.configs}} +
+
+
Service Configurations
+
+
+ + + + + + + + + {{#each model.configs as |config|}} + + + + + {{/each}} + +
NameValue
{{config.name}}{{config.value}}
-{{#if model.configs}} -
-
-
-
Service Configurations
-
-
- - - - - - - - - {{#each model.configs as |config|}} - - - - - {{/each}} - -
NameValue
{{config.name}}{{config.value}}
-
-
-
{{else}} -
-
-

No service configurations available!

-
-
-{{/if}} +
+

No service configurations available!

+
+{{/if}} \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs index b11e125a15f..7d024c52c84 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs @@ -36,7 +36,7 @@ {{/if}} {{#if model.app.diagnostics}} -
+
{{#if model.app.isFailed}}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs index 36336ad594d..a837dd89b3b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs @@ -18,26 +18,8 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}} -
-
- -
-
-
- Component -
-
-
    - {{#link-to 'yarn-component-instance.info' tagName="li" class=(if (eq target.currentPath 'yarn-component-instance.info') "active")}} - {{#link-to 'yarn-component-instance.info' componentName instanceName (query-params service=serviceName appid=appId)}}Information{{/link-to}} - {{/link-to}} -
-
-
-
- -
+
+
{{outlet}} -
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs index e7ac57a7cf5..7cf4b1e6936 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs @@ -18,28 +18,21 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}} -
-
- -
-
-
- Component -
-
-
    - {{#link-to 'yarn-component-instances.info' tagName="li" class=(if (eq target.currentPath 'yarn-component-instances.info') "active")}} - {{#link-to 'yarn-component-instances.info' componentName (query-params service=serviceName appid=appId)}}Information{{/link-to}} - {{/link-to}} - {{#link-to 'yarn-component-instances.configs' tagName="li" class=(if (eq target.currentPath 'yarn-component-instances.configs') "active")}} - {{#link-to 'yarn-component-instances.configs' componentName (query-params service=serviceName appid=appId)}}Configurations{{/link-to}} - {{/link-to}} -
-
+
+
+
+
+
    + {{#link-to 'yarn-component-instances.info' tagName="li" class=(if (eq target.currentPath 'yarn-component-instances.info') "active")}} + {{#link-to 'yarn-component-instances.info' componentName (query-params service=serviceName appid=appId)}}Information{{/link-to}} + {{/link-to}} + {{#link-to 'yarn-component-instances.configs' tagName="li" class=(if (eq target.currentPath 'yarn-component-instances.configs') "active")}} + {{#link-to 'yarn-component-instances.configs' componentName (query-params service=serviceName appid=appId)}}Configurations{{/link-to}} + {{/link-to}} +
- -
+
{{outlet}}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs index 87b596e1a0e..5cced1c0f4c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs @@ -60,7 +60,7 @@
-
+
      diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs index 6417910e3b8..97820c9f0e6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs @@ -32,7 +32,10 @@ {{#if model.apps}} {{em-table columns=columns rows=model.apps definition=tableDefinitio}} {{else}} -

      Could not find any applications from this cluster

      +
      +
      +

      Could not find any applications from this cluster

      +
      {{/if}}