diff --git a/app/models/physical_server.rb b/app/models/physical_server.rb
index 1c03cdcafd5..1ec67ae6162 100644
--- a/app/models/physical_server.rb
+++ b/app/models/physical_server.rb
@@ -2,6 +2,9 @@ class PhysicalServer < ApplicationRecord
   include NewWithTypeStiMixin
   include MiqPolicyMixin
   include TenantIdentityMixin
+  include SupportsFeatureMixin
+  include EventMixin
+
   include_concern 'Operations'
 
   acts_as_miq_taggable
@@ -62,4 +65,8 @@ def my_zone
     ems = ext_management_system
     ems ? ems.my_zone : MiqServer.my_zone
   end
+
+  def event_where_clause(assoc = :ems_events)
+    ["#{events_table_name(assoc)}.physical_server_id = ?", id]
+  end
 end
diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml
index e306fe008b3..076b2186cb8 100644
--- a/db/fixtures/miq_product_features.yml
+++ b/db/fixtures/miq_product_features.yml
@@ -6298,6 +6298,10 @@
       :description: Display Individual Physical Server
       :feature_type: view
       :identifier: physical_server_show
+      :name: Timeline
+      :description: Display Timelines for Physical Servers
+      :feature_type: view
+      :identifier: physical_server_timeline
   - :name: Modify
     :description: Modify Physical Servers
     :feature_type: admin
diff --git a/db/fixtures/miq_user_roles.yml b/db/fixtures/miq_user_roles.yml
index ee9a90f12d2..7b0f7ced29b 100644
--- a/db/fixtures/miq_user_roles.yml
+++ b/db/fixtures/miq_user_roles.yml
@@ -113,6 +113,7 @@
   - ems_physical_infra_show_list
   - ems_physical_infra_tag
   - ems_physical_infra_timeline
+  - physical_server_timeline
   - host_show
   - host_show_list
   - host_perf
@@ -200,6 +201,7 @@
   - ems_physical_infra_show_list
   - ems_physical_infra_tag
   - ems_physical_infra_timeline
+  - physical_server_timeline
   - host_show
   - host_show_list
   - host_perf
@@ -353,6 +355,7 @@
   - ems_physical_infra_show_list
   - ems_physical_infra_tag
   - ems_physical_infra_timeline
+  - physical_server_timeline
   - host_new
   - host_analyze
   - host_compare
@@ -459,6 +462,7 @@
   - ems_physical_infra_show_list
   - ems_physical_infra_tag
   - ems_physical_infra_timeline
+  - physical_server_timeline
   - host_show
   - host_show_list
   - host_perf
@@ -541,6 +545,7 @@
   - ems_physical_infra_show_list
   - ems_physical_infra_tag
   - ems_physical_infra_timeline
+  - physical_server_timeline
   - host_show
   - host_show_list
   - host_perf
@@ -622,6 +627,7 @@
   - ems_physical_infra_show_list
   - ems_physical_infra_tag
   - ems_physical_infra_timeline
+  - physical_server_timeline
   - host_show
   - host_show_list
   - host_perf