From 78b704be87e8298b8520d0d4c21e97fe311b070c Mon Sep 17 00:00:00 2001
From: Kenia <19161242+kaxcode@users.noreply.github.com>
Date: Fri, 13 Nov 2020 10:39:00 -0500
Subject: [PATCH] ui: Pass down nspace and dc from Service model down to
 prometheus request (#9175)

* Pass down nspace and dc from Service model down to prometheus request

* Reviewing notes fix-ups

* Fix on dc/nspace to send from upstream/downstream card
---
 .../app/components/topology-metrics/card.hbs     |  6 +++++-
 .../app/components/topology-metrics/index.hbs    | 16 ++++++++++------
 .../components/topology-metrics/series/index.hbs |  2 +-
 .../components/topology-metrics/stats/index.hbs  |  2 +-
 .../app/templates/dc/services/show/topology.hbs  |  2 ++
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ui/packages/consul-ui/app/components/topology-metrics/card.hbs b/ui/packages/consul-ui/app/components/topology-metrics/card.hbs
index 473de730dc..e207b38030 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/card.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/card.hbs
@@ -7,7 +7,7 @@
     {{@item.Name}}
   </p>
   <div class="details">
-  {{#if (and (and nspace (env 'CONSUL_NSPACES_ENABLED')) @type)}}
+  {{#if (and (and @nspace (env 'CONSUL_NSPACES_ENABLED')) @type)}}
     <dl class="nspace">
       <dt>
         <Tooltip>
@@ -47,6 +47,8 @@
   {{#if (and @hasMetricsProvider (not-eq @service.Kind 'ingress-gateway'))}}
     {{#if (eq @type 'upstream')}}
       <TopologyMetrics::Stats
+        @nspace={{@item.Namespace}}
+        @dc={{@item.Datacenter}}
         @endpoint='upstream-summary-for-service'
         @service={{@service.Service}}
         @item={{@item.Name}}
@@ -54,6 +56,8 @@
       />
     {{else}}
       <TopologyMetrics::Stats
+        @nspace={{@item.Namespace}}
+        @dc={{@item.Datacenter}}
         @endpoint='downstream-summary-for-service'
         @service={{@service.Service}}
         @item={{@item.Name}}
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
index 6425c23228..33701e2246 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
@@ -8,7 +8,7 @@
 {{#if (gt @topology.Downstreams.length 0)}}
   <div id="downstream-container">
     <div>
-      <p>{{@topology.Datacenter}}</p>
+      <p>{{@dc}}</p>
       <span>
         <Tooltip>
           Only showing downstreams within the current datacenter for {{@service.Service.Service}}.
@@ -17,9 +17,10 @@
     </div>
   {{#each @topology.Downstreams as |item|}}
     <TopologyMetrics::Card
-      @item={{item}}
+      @nspace={{@nspace}}
+      @dc={{@dc}}
       @service={{@service.Service}}
-      @dc={{@topology.Datacenter}}
+      @item={{item}}
       @hasMetricsProvider={{this.hasMetricsProvider}}
       @noMetricsReason={{this.noMetricsReason}}
     />
@@ -32,16 +33,18 @@
     </div>
     {{#if this.hasMetricsProvider }}
       <TopologyMetrics::Series
+        @nspace={{@nspace}}
+        @dc={{@dc}}
         @service={{@service.Service.Service}}
-        @dc={{@topology.Datacenter}}
         @protocol={{@topology.Protocol}}
         @noMetricsReason={{this.noMetricsReason}}
       />
       {{#if (not-eq @service.Service.Kind 'ingress-gateway')}}
       <TopologyMetrics::Stats
+        @nspace={{@nspace}}
+        @dc={{@dc}}
         @endpoint='summary-for-service'
         @service={{@service.Service.Service}}
-        @dc={{@topology.Datacenter}}
         @protocol={{@topology.Protocol}}
         @noMetricsReason={{this.noMetricsReason}}
       />
@@ -73,9 +76,10 @@
       <p>{{dc}}</p>
     {{#each upstreams as |item|}}
       <TopologyMetrics::Card
+        @nspace={{@nspace}}
+        @dc={{@dc}}
         @item={{item}}
         @service={{@service.Service}}
-        @dc={{@topology.Datacenter}}
         @type='upstream'
         @hasMetricsProvider={{this.hasMetricsProvider}}
         @noMetricsReason={{this.noMetricsReason}}
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs
index dc7af59718..2d32390724 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs
@@ -1,6 +1,6 @@
 {{#unless @noMetricsReason}}
   <DataSource
-    @src={{uri nspace dc 'metrics' 'summary-for-service' @service @protocol}}
+    @src={{uri @nspace @dc 'metrics' 'summary-for-service' @service @protocol}}
     @onchange={{action 'change'}}
     @onerror={{action (mut error) value="error"}}
   />
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/stats/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/stats/index.hbs
index c3eab51064..c36d14112d 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/stats/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/stats/index.hbs
@@ -1,6 +1,6 @@
 {{#unless @noMetricsReason}}
   <DataSource
-    @src={{uri nspace dc 'metrics' @endpoint @service @protocol}}
+    @src={{uri @nspace @dc 'metrics' @endpoint @service @protocol}}
     @onchange={{action 'statsUpdate'}}
     @onerror={{action (mut error) value="error"}}
   />
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
index 4a6fdaa29c..99eb63a47d 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
@@ -5,6 +5,8 @@
   {{/if}}
   {{#if topology}}
     <TopologyMetrics
+      @nspace={{nspace}}
+      @dc={{dc}}
       @service={{items.firstObject}}
       @topology={{topology}}
       @metricsHref={{render-template urls.service (hash