AMBARI-17712. Yarn quicklinks have incorrect ports in ambari (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2cc4fc81 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2cc4fc81 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2cc4fc81 Branch: refs/heads/branch-2.4 Commit: 2cc4fc8121a42e53bddf4445d52a169bd0d4b97f Parents: 952eb6a Author: Alex Antonenko <[email protected]> Authored: Thu Jul 14 17:36:49 2016 +0300 Committer: Alex Antonenko <[email protected]> Committed: Fri Jul 15 09:02:18 2016 +0300 ---------------------------------------------------------------------- .../HDP/2.0.6/services/YARN/quicklinks/quicklinks.json | 12 ++++++------ .../HDP/2.3/services/YARN/quicklinks/quicklinks.json | 12 ++++++------ ambari-server/src/test/resources/parent_quicklinks.json | 12 ++++++------ .../app/assets/data/configurations/quicklinks.json | 12 ++++++------ .../assets/data/configurations/quicklinks_services.json | 12 ++++++------ 5 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4fc81/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/quicklinks/quicklinks.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/quicklinks/quicklinks.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/quicklinks/quicklinks.json index 4d17706..37248d0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/quicklinks/quicklinks.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/quicklinks/quicklinks.json @@ -37,9 +37,9 @@ "component_name": "RESOURCEMANAGER", "url": "%@://%@:%@/logs", "port":{ - "http_property": "yarn.timeline-service.webapp.address", + "http_property": "yarn.resourcemanager.webapp.address", "http_default_port": "8088", - "https_property": "yarn.timeline-service.webapp.https.address", + "https_property": "yarn.resourcemanager.webapp.https.address", "https_default_port": "8090", "regex": "\\w*:(\\d+)", "site": "yarn-site" @@ -52,9 +52,9 @@ "component_name": "RESOURCEMANAGER", "url":"%@://%@:%@/jmx", "port":{ - "http_property": "yarn.timeline-service.webapp.address", + "http_property": "yarn.resourcemanager.webapp.address", "http_default_port": "8088", - "https_property": "yarn.timeline-service.webapp.https.address", + "https_property": "yarn.resourcemanager.webapp.https.address", "https_default_port": "8090", "regex": "\\w*:(\\d+)", "site": "yarn-site" @@ -67,9 +67,9 @@ "component_name": "RESOURCEMANAGER", "url":"%@://%@:%@/stacks", "port":{ - "http_property": "yarn.timeline-service.webapp.address", + "http_property": "yarn.resourcemanager.webapp.address", "http_default_port": "8088", - "https_property": "yarn.timeline-service.webapp.https.address", + "https_property": "yarn.resourcemanager.webapp.https.address", "https_default_port": "8090", "regex": "\\w*:(\\d+)", "site": "yarn-site" http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4fc81/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/quicklinks/quicklinks.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/quicklinks/quicklinks.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/quicklinks/quicklinks.json index 56c54b8..0aca8e3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/quicklinks/quicklinks.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/quicklinks/quicklinks.json @@ -35,9 +35,9 @@ "requires_user_name": "false", "url": "%@://%@:%@/logs", "port":{ - "http_property": "yarn.timeline-service.webapp.address", + "http_property": "yarn.resourcemanager.webapp.address", "http_default_port": "8088", - "https_property": "yarn.timeline-service.webapp.https.address", + "https_property": "yarn.resourcemanager.webapp.https.address", "https_default_port": "8090", "regex": "\\w*:(\\d+)", "site": "yarn-site" @@ -49,9 +49,9 @@ "requires_user_name": "false", "url":"%@://%@:%@/jmx", "port":{ - "http_property": "yarn.timeline-service.webapp.address", + "http_property": "yarn.resourcemanager.webapp.address", "http_default_port": "8088", - "https_property": "yarn.timeline-service.webapp.https.address", + "https_property": "yarn.resourcemanager.webapp.https.address", "https_default_port": "8090", "regex": "\\w*:(\\d+)", "site": "yarn-site" @@ -63,9 +63,9 @@ "requires_user_name": "false", "url":"%@://%@:%@/stacks", "port":{ - "http_property": "yarn.timeline-service.webapp.address", + "http_property": "yarn.resourcemanager.webapp.address", "http_default_port": "8088", - "https_property": "yarn.timeline-service.webapp.https.address", + "https_property": "yarn.resourcemanager.webapp.https.address", "https_default_port": "8090", "regex": "\\w*:(\\d+)", "site": "yarn-site" http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4fc81/ambari-server/src/test/resources/parent_quicklinks.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/parent_quicklinks.json b/ambari-server/src/test/resources/parent_quicklinks.json index 56c54b8..0aca8e3 100644 --- a/ambari-server/src/test/resources/parent_quicklinks.json +++ b/ambari-server/src/test/resources/parent_quicklinks.json @@ -35,9 +35,9 @@ "requires_user_name": "false", "url": "%@://%@:%@/logs", "port":{ - "http_property": "yarn.timeline-service.webapp.address", + "http_property": "yarn.resourcemanager.webapp.address", "http_default_port": "8088", - "https_property": "yarn.timeline-service.webapp.https.address", + "https_property": "yarn.resourcemanager.webapp.https.address", "https_default_port": "8090", "regex": "\\w*:(\\d+)", "site": "yarn-site" @@ -49,9 +49,9 @@ "requires_user_name": "false", "url":"%@://%@:%@/jmx", "port":{ - "http_property": "yarn.timeline-service.webapp.address", + "http_property": "yarn.resourcemanager.webapp.address", "http_default_port": "8088", - "https_property": "yarn.timeline-service.webapp.https.address", + "https_property": "yarn.resourcemanager.webapp.https.address", "https_default_port": "8090", "regex": "\\w*:(\\d+)", "site": "yarn-site" @@ -63,9 +63,9 @@ "requires_user_name": "false", "url":"%@://%@:%@/stacks", "port":{ - "http_property": "yarn.timeline-service.webapp.address", + "http_property": "yarn.resourcemanager.webapp.address", "http_default_port": "8088", - "https_property": "yarn.timeline-service.webapp.https.address", + "https_property": "yarn.resourcemanager.webapp.https.address", "https_default_port": "8090", "regex": "\\w*:(\\d+)", "site": "yarn-site" http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4fc81/ambari-web/app/assets/data/configurations/quicklinks.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/configurations/quicklinks.json b/ambari-web/app/assets/data/configurations/quicklinks.json index 037645c..698c6c0 100644 --- a/ambari-web/app/assets/data/configurations/quicklinks.json +++ b/ambari-web/app/assets/data/configurations/quicklinks.json @@ -48,9 +48,9 @@ "port" : { "regex" : "\\w*:(\\d+)", "site" : "yarn-site", - "http_property" : "yarn.timeline-service.webapp.address", + "http_property" : "yarn.resourcemanager.webapp.address", "http_default_port" : "8088", - "https_property" : "yarn.timeline-service.webapp.https.address", + "https_property" : "yarn.resourcemanager.webapp.https.address", "https_default_port" : "8090" }, "removed" : false, @@ -64,9 +64,9 @@ "port" : { "regex" : "\\w*:(\\d+)", "site" : "yarn-site", - "http_property" : "yarn.timeline-service.webapp.address", + "http_property" : "yarn.resourcemanager.webapp.address", "http_default_port" : "8088", - "https_property" : "yarn.timeline-service.webapp.https.address", + "https_property" : "yarn.resourcemanager.webapp.https.address", "https_default_port" : "8090" }, "removed" : false, @@ -80,9 +80,9 @@ "port" : { "regex" : "\\w*:(\\d+)", "site" : "yarn-site", - "http_property" : "yarn.timeline-service.webapp.address", + "http_property" : "yarn.resourcemanager.webapp.address", "http_default_port" : "8088", - "https_property" : "yarn.timeline-service.webapp.https.address", + "https_property" : "yarn.resourcemanager.webapp.https.address", "https_default_port" : "8090" }, "removed" : false, http://git-wip-us.apache.org/repos/asf/ambari/blob/2cc4fc81/ambari-web/app/assets/data/configurations/quicklinks_services.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/configurations/quicklinks_services.json b/ambari-web/app/assets/data/configurations/quicklinks_services.json index 64ef08b..7a7d5d6 100644 --- a/ambari-web/app/assets/data/configurations/quicklinks_services.json +++ b/ambari-web/app/assets/data/configurations/quicklinks_services.json @@ -58,9 +58,9 @@ "port" : { "regex" : "\\w*:(\\d+)", "site" : "yarn-site", - "http_property" : "yarn.timeline-service.webapp.address", + "http_property" : "yarn.resourcemanager.webapp.address", "http_default_port" : "8088", - "https_property" : "yarn.timeline-service.webapp.https.address", + "https_property" : "yarn.resourcemanager.webapp.https.address", "https_default_port" : "8090" }, "removed" : false, @@ -75,9 +75,9 @@ "port" : { "regex" : "\\w*:(\\d+)", "site" : "yarn-site", - "http_property" : "yarn.timeline-service.webapp.address", + "http_property" : "yarn.resourcemanager.webapp.address", "http_default_port" : "8088", - "https_property" : "yarn.timeline-service.webapp.https.address", + "https_property" : "yarn.resourcemanager.webapp.https.address", "https_default_port" : "8090" }, "removed" : false, @@ -92,9 +92,9 @@ "port" : { "regex" : "\\w*:(\\d+)", "site" : "yarn-site", - "http_property" : "yarn.timeline-service.webapp.address", + "http_property" : "yarn.resourcemanager.webapp.address", "http_default_port" : "8088", - "https_property" : "yarn.timeline-service.webapp.https.address", + "https_property" : "yarn.resourcemanager.webapp.https.address", "https_default_port" : "8090" }, "removed" : false,
