From 56c2ff56e4fc873b8f7383be0532f69fdbbc119c Mon Sep 17 00:00:00 2001
From: Kenia <19161242+kaxcode@users.noreply.github.com>
Date: Mon, 2 Nov 2020 13:38:43 -0500
Subject: [PATCH] ui: Update to not return metrics for ingress gateways (#9081)

---
 .../app/components/topology-metrics/card.hbs  |  6 ++--
 .../app/components/topology-metrics/index.hbs |  6 ++--
 .../app/components/topology-metrics/index.js  |  5 ++-
 .../app/routes/dc/services/show/index.js      | 36 +++++++++----------
 .../app/templates/dc/services/show.hbs        |  2 +-
 5 files changed, 28 insertions(+), 27 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 c04be94fee..fe551d45bf 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/card.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/card.hbs
@@ -45,18 +45,18 @@
     </dl>
 {{/if}}
   </div>
-  {{#if @hasMetricsProvider }}
+  {{#if (and @hasMetricsProvider (not-eq @service.Kind 'ingress-gateway'))}}
     {{#if (eq @type 'upstream')}}
       <TopologyMetrics::Stats
         @endpoint='upstream-summary-for-service'
-        @service={{@service}}
+        @service={{@service.Service}}
         @item={{item.Name}}
         @noMetricsReason={{@noMetricsReason}}
       />
     {{else}}
       <TopologyMetrics::Stats
         @endpoint='downstream-summary-for-service'
-        @service={{@service}}
+        @service={{@service.Service}}
         @item={{item.Name}}
         @noMetricsReason={{@noMetricsReason}}
       />
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 87ebfe9455..9b16546288 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
@@ -13,7 +13,7 @@
     </div>
     <TopologyMetrics::Card
       @items={{@topology.Downstreams}}
-      @service={{@service.Service.Service}}
+      @service={{@service.Service}}
       @dc={{@topology.Datacenter}}
       @hasMetricsProvider={{this.hasMetricsProvider}}
       @noMetricsReason={{this.noMetricsReason}}
@@ -31,6 +31,7 @@
         @protocol={{@topology.Protocol}}
         @noMetricsReason={{this.noMetricsReason}}
       />
+      {{#if (not-eq @service.Service.Kind 'ingress-gateway')}}
       <TopologyMetrics::Stats
         @endpoint='summary-for-service'
         @service={{@service.Service.Service}}
@@ -38,6 +39,7 @@
         @protocol={{@topology.Protocol}}
         @noMetricsReason={{this.noMetricsReason}}
       />
+      {{/if}}
     {{/if}}
     <div class="link">
      {{#if @metricsHref}}
@@ -63,7 +65,7 @@
       <p>{{dc}}</p>
       <TopologyMetrics::Card
         @items={{upstreams}}
-        @service={{@service.Service.Service}}
+        @service={{@service.Service}}
         @dc={{@topology.Datacenter}}
         @type='upstream'
         @hasMetricsProvider={{this.hasMetricsProvider}}
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/index.js b/ui/packages/consul-ui/app/components/topology-metrics/index.js
index e1ae71b621..aeef7647f7 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/index.js
+++ b/ui/packages/consul-ui/app/components/topology-metrics/index.js
@@ -26,7 +26,10 @@ export default class TopologyMetrics extends Component {
     // TODO we can make the configurable even before we have a full solution for
     // multi-DC forwarding for Prometheus so providers that are global for all
     // DCs like an external managed APM can still load in all DCs.
-    if (this.env.var('CONSUL_DATACENTER_LOCAL') != this.args.topology.get('Datacenter')) {
+    if (
+      this.env.var('CONSUL_DATACENTER_LOCAL') !== this.args.topology.get('Datacenter') ||
+      this.args.service.Service.Kind === 'ingress-gateway'
+    ) {
       this.noMetricsReason = 'Unable to fetch metrics for a remote datacenter';
     }
   }
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/index.js b/ui/packages/consul-ui/app/routes/dc/services/show/index.js
index 6d1e6c381f..c7294faa7e 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/index.js
@@ -11,29 +11,25 @@ export default Route.extend({
     // so check the length here.
     let to = 'topology';
     const parentModel = this.modelFor(parent);
-    const hasProxy = get(parentModel, 'proxies');
+    const hasProxy = get(parentModel, 'proxies.length') !== 0;
     const kind = get(parentModel, 'items.firstObject.Service.Kind');
 
-    if (hasProxy.length === 0) {
-      to = 'instances';
-    } else {
-      switch (kind) {
-        case 'ingress-gateway':
-          if (!get(parentModel, 'topology.Datacenter')) {
-            to = 'upstreams';
-          }
-          break;
-        case 'terminating-gateway':
-          to = 'services';
-          break;
-        case 'mesh-gateway':
+    switch (kind) {
+      case 'ingress-gateway':
+        if (!get(parentModel, 'topology.Datacenter')) {
+          to = 'upstreams';
+        }
+        break;
+      case 'terminating-gateway':
+        to = 'services';
+        break;
+      case 'mesh-gateway':
+        to = 'instances';
+        break;
+      default:
+        if (!hasProxy || !get(parentModel, 'topology.Datacenter')) {
           to = 'instances';
-          break;
-        default:
-          if (!get(parentModel, 'topology.Datacenter')) {
-            to = 'instances';
-          }
-      }
+        }
     }
 
     this.replaceWith(`${parent}.${to}`, parentModel);
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show.hbs b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
index 0eb0aacb1f..c5f454158f 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
@@ -29,7 +29,7 @@
     <TabNav @items={{
       compact
           (array
-(if (and topology.Datacenter (gt proxies.length 0))
+(if (and topology.Datacenter (or (gt proxies.length 0) (eq item.Service.Kind 'ingress-gateway')))
             (hash label="Topology" href=(href-to "dc.services.show.topology") selected=(is-href "dc.services.show.topology"))
 '')
 (if (eq item.Service.Kind 'terminating-gateway')