Fix for missing physical plan in UI

heron/tools/tracker/src/python/routers/metrics.py

@@ -119,7 +119,7 @@ async def get_metrics( # pylint: disable=too-many-arguments
   )
 
 
-@router.get("/metricstimeline", response_model=metricstimeline.MetricsTimeline)
+@router.get("/metrics/timeline", response_model=metricstimeline.MetricsTimeline)
 async def get_metrics_timeline( # pylint: disable=too-many-arguments
     cluster: str,
     role: Optional[str],
@@ -158,7 +158,7 @@ class MetricsQueryResponse(BaseModel): # pylint: disable=too-few-public-methods
   )
 
 
-@router.get("/metricsquery", response_model=MetricsQueryResponse)
+@router.get("/metrics/query", response_model=MetricsQueryResponse)
 async def get_metrics_query( # pylint: disable=too-many-arguments
     cluster: str,
     role: Optional[str],

heron/tools/ui/resources/static/js/exceptions.js

@@ -170,9 +170,9 @@ var InstanceExceptionLogs = React.createClass({
         }
         if (instanceInfo) {
           var logfile = instanceInfo.logfile;
-          var stmgrId = instanceInfo.stmgrId;
-          var jobUrl = pplan.stmgrs[stmgrId].joburl;
-          var host = "http://" + pplan.stmgrs[stmgrId].host + ":1338";
+          var stmgr_id = instanceInfo.stmgr_id;
+          var jobUrl = pplan.stmgrs[stmgr_id].joburl;
+          var host = "http://" + pplan.stmgrs[stmgr_id].host + ":1338";
           mainLinks = mainLinks.concat([['Logs', logfile], ['Aurora', jobUrl], ['Host', host]]);
         }
       }

heron/tools/ui/resources/static/js/physical-plan.js

@@ -52,7 +52,7 @@
       for (var wk in instances) {
         var worker = instances[wk];
         if (worker.name === comp) {
-          containers[worker.stmgrId].children.push(worker);
+          containers[worker.stmgr_id].children.push(worker);
         }
       }
     }

heron/tools/ui/resources/static/js/plan-controller.js

@@ -45,7 +45,7 @@ function PlanController(baseUrl, cluster, environ, toponame, physicalPlan, logic
     var containers = {}, instances = {};
     d3instances.each(function (d) {
       if (!d3.select(this).classed('fade')) {
-        containers[d.stmgrId] = true;
+        containers[d.stmgr_id] = true;
         instances[d.id] = true;
       }
     });

heron/tools/ui/resources/static/js/topologies.js

@@ -1480,8 +1480,8 @@ var InstanceCounters = React.createClass({
           }
         }
         if (instanceInfo) {
-          var stmgrId = instanceInfo.stmgrId;
-          var container = stmgrId.split("-")[1]
+          var stmgr_id = instanceInfo.stmgr_id;
+          var container = stmgr_id.split("-")[1]
           var topologyParams = this.props.info.cluster + '/' + this.props.info.environ
               + '/' + this.props.info.topology
           var instanceParams = topologyParams + '/' + instanceInfo.id

heron/tools/ui/src/python/main.py

@@ -462,7 +462,7 @@ def pid_snippet(
 ) -> Response:
   """Render a HTML snippet containing topology output of container."""
   physical_plan = tracker.get_physical_plan(cluster, environment, topology)
-  host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgrId"]][
+  host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgr_id"]][
       "host"
   ]
   info = tracker.get_instance_pid(cluster, environment, topology, instance)
@@ -492,7 +492,7 @@ def jstack_snippet(
 ) -> HTMLResponse:
   """Render a HTML snippet containing jstack output of container."""
   physical_plan = tracker.get_physical_plan(cluster, environment, topology)
-  host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgrId"]][
+  host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgr_id"]][
       "host"
   ]
   info = tracker.get_instance_jstack(cluster, environment, topology, instance)
@@ -521,7 +521,7 @@ def jmap_snippet(
 ) -> HTMLResponse:
   """Render a HTML snippet containing jmap output of container."""
   physical_plan = tracker.get_physical_plan(cluster, environment, topology)
-  host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgrId"]][
+  host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgr_id"]][
       "host"
   ]
   info = tracker.run_instance_jmap(cluster, environment, topology, instance)
@@ -558,7 +558,7 @@ def histogram_snippet(
   """Render a HTML snippet containing jmap histogram output of container."""
   # use a function to DRY up these container API methods
   physical_plan = tracker.get_physical_plan(cluster, environment, topology)
-  host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgrId"]][
+  host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgr_id"]][
       "host"
   ]
   info = tracker.get_instance_mem_histogram(