Minor changes pre-release

* extend global services svc table columns
* fix cluster health chip

assets/src/components/cd/clusters/ClusterHealthChip.tsx

@@ -26,16 +26,19 @@ export function ClusterHealth({
 
   return (
     <ClusterHealthChip
+      cluster={cluster}
       pingedAt={cluster.pingedAt}
       size={size}
     />
   )
 }
 
 function ClusterHealthChip({
+  cluster,
   pingedAt,
   size = 'medium',
 }: {
+  cluster?: ClustersRowFragment
   pingedAt?: string | null
   size?: 'small' | 'medium' | 'large'
 }) {
@@ -49,7 +52,8 @@ function ClusterHealthChip({
 
   const pinged = pingedAt !== null
   const healthy =
-    pingedAt && now.clone().subtract(10, 'minutes').isBefore(pingedAt)
+    cluster?.healthy ||
+    (pingedAt && now.clone().subtract(10, 'minutes').isBefore(pingedAt))
 
   return (
     <TooltipTime

assets/src/components/cd/globalServices/details/columns.tsx

@@ -6,6 +6,9 @@ import DecoratedName from '../../services/DecoratedName.tsx'
 import {
   ColCluster,
   ColLastActivity,
+  ColRef,
+  ColRepo,
+  ColErrors,
   ColStatus,
 } from '../../services/ServicesColumns.tsx'
 
@@ -31,4 +34,12 @@ const ColDeployment = columnHelper.accessor(({ node }) => node, {
   },
 })
 
-export const columns = [ColDeployment, ColCluster, ColLastActivity, ColStatus]
+export const columns = [
+  ColDeployment,
+  ColCluster,
+  ColRepo,
+  ColRef,
+  ColLastActivity,
+  ColStatus,
+  ColErrors,
+]

assets/src/graph/cdClusters.graphql

@@ -171,6 +171,7 @@ fragment ClustersRow on Cluster {
   currentVersion
   id
   self
+  healthy
   protect
   name
   handle

lib/console/graphql/deployments/cluster.ex

@@ -302,6 +302,10 @@ defmodule Console.GraphQl.Deployments.Cluster do
     field :settings,        :cloud_settings, description: "the cloud settings for this cluster (for instance its aws region)"
     field :upgrade_plan,    :cluster_upgrade_plan, description: "Checklist of tasks to complete to safely upgrade this cluster"
 
+    field :healthy, :boolean, description: "Whether this cluster was recently pinged", resolve: fn
+      cluster, _, _ -> {:ok, Cluster.healthy?(cluster)}
+    end
+
     field :kas_url, :string, description: "the url of the kas server you can access this cluster from", resolve: fn
       _, _, _ -> {:ok, Console.Deployments.Clusters.kas_proxy_url()}
     end

lib/console/schema/cluster.ex

@@ -144,6 +144,13 @@ defmodule Console.Schema.Cluster do
     timestamps()
   end
 
+  def healthy?(%__MODULE__{pinged_at: nil}), do: false
+  def healthy?(%__MODULE__{pinged_at: pinged}) do
+    Timex.now()
+    |> Timex.shift(minutes: -20)
+    |> Timex.before?(pinged)
+  end
+
   defp upgrade_plan_fields(), do: __MODULE__.UpgradePlan.__schema__(:fields) -- [:id]
 
   def search(query \\ __MODULE__, sq) do

schema/schema.graphql

@@ -4622,6 +4622,9 @@ type Cluster {
   "Checklist of tasks to complete to safely upgrade this cluster"
   upgradePlan: ClusterUpgradePlan
 
+  "Whether this cluster was recently pinged"
+  healthy: Boolean
+
   "the url of the kas server you can access this cluster from"
   kasUrl: String