Add a serf warning notice to healthcheck listings when serf is failing

hashicorp · May 7, 2021 · dd9cf90 · dd9cf90
1 parent 40fd280
commit dd9cf90
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 6 deletions.
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs
@@ -47,6 +47,26 @@ as |route|>
               @filter={{filters}}
             />
           {{/if}}
+          {{#let (find-by "Type" "serf" items) as |serf|}}
+            {{#if (and serf (eq serf.Status "critical"))}}
+              <Notice
+                data-test-critical-serf-notice
+                @type="warning"
+              as |notice|>
+                <notice.Header>
+                  <h2>
+                    {{t "routes.dc.nodes.show.healthchecks.critical-serf-notice.header"}}
+                  </h2>
+                </notice.Header>
+                <notice.Body>
+                  {{t
+                    "routes.dc.nodes.show.healthchecks.critical-serf-notice.body"
+                    htmlSafe=true
+                  }}
+                </notice.Body>
+              </Notice>
+            {{/if}}
+          {{/let}}
           <DataCollection
             @type="health-check"
             @sort={{sort.value}}
@@ -62,9 +82,10 @@ as |route|>
             <collection.Empty>
               <EmptyState>
                 <BlockSlot @name="body">
-                  <p>
-                    This node has no health checks{{#if (gt items.length 0)}} matching that search{{/if}}.
-                  </p>
+                    {{t "routes.dc.nodes.show.healthchecks.empty"
+                      items=items.length
+                      htmlSafe=true
+                    }}
                 </BlockSlot>
               </EmptyState>
               </collection.Empty>

diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs
@@ -44,6 +44,26 @@ as |route|>
         />
       {{/if}}
 
+      {{#let (find-by "Type" "serf" items) as |serf|}}
+        {{#if (and serf (eq serf.Status "critical"))}}
+          <Notice
+            data-test-critical-serf-notice
+            @type="warning"
+          as |notice|>
+            <notice.Header>
+              <h2>
+                {{t "routes.dc.services.instance.healthchecks.critical-serf-notice.header"}}
+              </h2>
+            </notice.Header>
+            <notice.Body>
+              {{t
+                "routes.dc.services.instance.healthchecks.critical-serf-notice.body"
+                htmlSafe=true
+              }}
+            </notice.Body>
+          </Notice>
+        {{/if}}
+      {{/let}}
       <DataCollection
         @type="health-check"
         @sort={{sort.value}}
@@ -59,9 +79,10 @@ as |route|>
         <collection.Empty>
           <EmptyState>
             <BlockSlot @name="body">
-              <p>
-                This instance has no health checks{{#if (gt items.length 0)}} matching that search{{/if}}.
-              </p>
+              {{t "routes.dc.services.instance.healthchecks.empty"
+                items=items.length
+                htmlSafe=true
+              }}
             </BlockSlot>
           </EmptyState>
           </collection.Empty>