ui: [BACKPORT TO 1.9.x] Hide all metrics for ingress gateway services (#10934)

Author: kaxcode

.changelog/10858.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Hide all metrics for ingress gateway services
+```

ui/packages/consul-ui/app/components/topology-metrics/index.hbs

@@ -24,8 +24,10 @@
       @hasMetricsProvider={{@hasMetricsProvider}}
       @noMetricsReason={{this.noMetricsReason}}
     >
-    {{#if (and @hasMetricsProvider (not-eq @service.Service.Kind 'ingress-gateway'))}}
+    {{#if (and @hasMetricsProvider this.mainNotIngressService (not-eq item.Kind 'ingress-gateway'))}}
+      {{!-- One of the only places in the app where it's acceptable to default to 'default' namespace --}}
       <TopologyMetrics::Stats
+        data-test-topology-metrics-downstream-stats
         @nspace={{or item.Namespace 'default'}}
         @dc={{item.Datacenter}}
         @endpoint='downstream-summary-for-service'
@@ -42,15 +44,15 @@
     <div class="metrics-header">
       {{@service.Service.Service}}
     </div>
-    {{#if @hasMetricsProvider }}
+    {{#if @hasMetricsProvider}}
       <TopologyMetrics::Series
         @nspace={{or @service.Service.Namespace 'default'}}
         @dc={{@dc}}
         @service={{@service.Service.Service}}
         @protocol={{@topology.Protocol}}
         @noMetricsReason={{this.noMetricsReason}}
       />
-      {{#if (not-eq @service.Service.Kind 'ingress-gateway')}}
+      {{#if this.mainNotIngressService}}
       <TopologyMetrics::Stats
         @nspace={{or @service.Service.Namespace 'default'}}
         @dc={{@dc}}
@@ -91,7 +93,8 @@
         @item={{item}}
         @service={{@service.Service}}
       >
-      {{#if (and @hasMetricsProvider (not-eq @service.Service.Kind 'ingress-gateway'))}}
+      {{#if (and @hasMetricsProvider this.mainNotIngressService (not-eq item.Kind 'ingress-gateway'))}}
+        {{!-- One of the only places in the app where it's acceptable to default to 'default' namespace --}}
         <TopologyMetrics::Stats
           @nspace={{or item.Namespace 'default'}}
           @dc={{item.Datacenter}}

ui/packages/consul-ui/app/components/topology-metrics/index.js

@@ -1,6 +1,6 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
+import { action, get } from '@ember/object';
 
 export default class TopologyMetrics extends Component {
   // =attributes
@@ -66,13 +66,19 @@ export default class TopologyMetrics extends Component {
       });
   }
 
+  get mainNotIngressService() {
+    const kind = get(this.args.service.Service, 'Kind') || '';
+
+    return kind !== 'ingress-gateway';
+  }
+
   // =actions
   @action
   calculate() {
     if (this.args.isRemoteDC) {
-      this.noMetricsReason = 'Unable to fetch metrics for a remote datacenter';
+      this.noMetricsReason = 'remote-dc';
     } else if (this.args.service.Service.Kind === 'ingress-gateway') {
-      this.noMetricsReason = 'Unable to fetch metrics for a ingress gateway';
+      this.noMetricsReason = 'ingress-gateway';
     } else {
       this.noMetricsReason = null;
     }

ui/packages/consul-ui/app/components/topology-metrics/status/index.hbs

@@ -1,12 +1,16 @@
-{{#if @noMetricsReason}}
-  <span class="topology-metrics-error">
-    Unable to load metrics
-    <span>
-      <Tooltip>{{@noMetricsReason}}</Tooltip>
-    </span>
+{{#if (or @noMetricsReason @error)}}
+  <span data-test-topology-metrics-status class="topology-metrics-status-error">
+    {{#if (eq @noMetricsReason 'ingress-gateway')}}
+      {{t "components.topology-metrics.status.ingress-gateway"}}
+    {{else if (eq @noMetricsReason 'remote-dc')}}
+      {{t "components.topology-metrics.status.error"}}
+      <span
+        {{tooltip (t "components.topology-metrics.status.remote-dc")}}
+      />
+    {{else if @error}}
+      {{t "components.topology-metrics.status.error"}}
+    {{/if}}
   </span>
-{{else if @error}}
-  <span class="topology-metrics-error">Unable to load metrics</span>
 {{else}}
-  <span class="topology-metrics-loader">Loading Metrics</span>
+  <span class="topology-metrics-status-loader">{{t "components.topology-metrics.status.loading"}}</span>
 {{/if}}

ui/packages/consul-ui/app/components/topology-metrics/status/index.scss

@@ -1,5 +1,5 @@
-.topology-metrics-error,
-.topology-metrics-loader {
+.topology-metrics-status-error,
+.topology-metrics-status-loader {
   font-weight: normal;
   font-size: 0.875rem;
   color: $gray-500;
@@ -13,6 +13,6 @@
   }
 }
 
-span.topology-metrics-loader::after {
+span.topology-metrics-status-loader::after {
   @extend %with-loading-icon, %as-pseudo;
 }

ui/packages/consul-ui/mock-api/v1/internal/ui/service-topology/_

@@ -64,6 +64,9 @@ ${
         const allowed = hasPerms ? false : fake.random.boolean();
         return `
     {
+${(Math.random(1) > 0.3) ? `
+      "Kind": "${fake.helpers.randomize(['mesh-gateway', 'ingress-gateway', 'terminating-gateway', ''])}",
+` : ''}
       "Name": "${item.Name}",
       "Datacenter": "${item.Datacenter}",
       "Namespace": "${item.Namespace}",
@@ -87,6 +90,9 @@ ${
         const allowed = hasPerms ? false : fake.random.boolean();
         return `
     {
+${(Math.random(1) > 0.3) ? `
+      "Kind": "${fake.helpers.randomize(['mesh-gateway', 'ingress-gateway', 'terminating-gateway', ''])}",
+` : ''}
       "Name": "${item.Name}",
       "Datacenter": "${item.Datacenter}",
       "Namespace": "${item.Namespace}",

ui/packages/consul-ui/translations/en-us.yaml

@@ -155,4 +155,9 @@ components:
             name: Precedence
             asc: Ascending
             desc: Descending
-
+  topology-metrics:
+    status:
+      error: Unable to load metrics
+      remote-dc: Unable to fetch metrics for a remote datacenter
+      loading: Loading metrics
+      ingress-gateway: Viewing metrics for Ingress Gateways is not currently supported in the UI.