Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 3 deletions

diff --git a/app/models/clusters/agent.rb b/app/models/clusters/agent.rb
index 98490a13351..8705c0fbec4 100644
--- a/app/models/clusters/agent.rb
+++ b/app/models/clusters/agent.rb
@@ -36,8 +36,8 @@ module Clusters
       requested_project == project
     end
 
-    def active?
-      agent_tokens.where("last_used_at > ?", INACTIVE_AFTER.ago).exists?
+    def connected?
+      agent_tokens.active.where("last_used_at > ?", INACTIVE_AFTER.ago).exists?
     end
   end
 end
diff --git a/app/models/clusters/agent_token.rb b/app/models/clusters/agent_token.rb
index 87dba50cd69..d4f6beb045a 100644
--- a/app/models/clusters/agent_token.rb
+++ b/app/models/clusters/agent_token.rb
@@ -23,13 +23,18 @@ module Clusters
 
     scope :order_last_used_at_desc, -> { order(::Gitlab::Database.nulls_last_order('last_used_at', 'DESC')) }
 
+    enum status: {
+      active: 0,
+      revoked: 1
+    }
+
     def track_usage
       track_values = { last_used_at: Time.current.utc }
 
       cache_attributes(track_values)
 
       if can_update_track_values?
-        log_activity_event!(track_values[:last_used_at]) unless agent.active?
+        log_activity_event!(track_values[:last_used_at]) unless agent.connected?
 
         # Use update_column so updated_at is skipped
         update_columns(track_values)