AMBARI-17712. Yarn quicklinks have incorrect ports in ambari (alexantonenko)

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"

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"

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"

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,

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,