diff --git a/src/sql/workbench/contrib/profiler/browser/profiler.contribution.ts b/src/sql/workbench/contrib/profiler/browser/profiler.contribution.ts
index 9ad3ae8f74..a69534ba27 100644
--- a/src/sql/workbench/contrib/profiler/browser/profiler.contribution.ts
+++ b/src/sql/workbench/contrib/profiler/browser/profiler.contribution.ts
@@ -128,6 +128,10 @@ const profilerViewTemplateSchema: IJSONSchema = {
 				{
 					name: 'DatabaseName',
 					eventsMapped: ['database_name']
+				},
+				{
+					name: 'HostName',
+					eventsMapped: ['client_hostname']
 				}
 			]
 		},
@@ -165,6 +169,10 @@ const profilerViewTemplateSchema: IJSONSchema = {
 				{
 					name: 'LoginName',
 					eventsMapped: ['server_principal_name', 'username']
+				},
+				{
+					name: 'HostName',
+					eventsMapped: ['client_hostname']
 				}
 			]
 		},
@@ -226,6 +234,10 @@ const profilerViewTemplateSchema: IJSONSchema = {
 				{
 					name: 'DatabaseName',
 					eventsMapped: ['database_name']
+				},
+				{
+					name: 'HostName',
+					eventsMapped: ['client_hostname']
 				}
 			]
 		},
@@ -255,6 +267,10 @@ const profilerViewTemplateSchema: IJSONSchema = {
 				{
 					name: 'DatabaseName',
 					eventsMapped: ['database_name']
+				},
+				{
+					name: 'HostName',
+					eventsMapped: ['client_hostname']
 				}
 			]
 		}
@@ -280,22 +296,22 @@ const profilerSessionTemplateSchema: IJSONSchema = {
 			createStatement:
 				`CREATE EVENT SESSION [{sessionName}] ON SERVER
 					ADD EVENT sqlserver.attention(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id)
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))),
 					ADD EVENT sqlserver.existing_connection(SET collect_options_text=(1)
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.nt_username,sqlserver.server_principal_name,sqlserver.session_id)),
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.nt_username,sqlserver.server_principal_name,sqlserver.session_id,sqlserver.client_hostname)),
 					ADD EVENT sqlserver.login(SET collect_options_text=(1)
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.nt_username,sqlserver.server_principal_name,sqlserver.session_id)),
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.nt_username,sqlserver.server_principal_name,sqlserver.session_id,sqlserver.client_hostname)),
 					ADD EVENT sqlserver.logout(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.nt_username,sqlserver.server_principal_name,sqlserver.session_id)),
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.nt_username,sqlserver.server_principal_name,sqlserver.session_id,sqlserver.client_hostname)),
 					ADD EVENT sqlserver.rpc_completed(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.database_name,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id)
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.database_name,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))),
 					ADD EVENT sqlserver.sql_batch_completed(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.database_name,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id)
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.database_name,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))),
 					ADD EVENT sqlserver.sql_batch_starting(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.database_name,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id)
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.database_name,sqlserver.nt_username,sqlserver.query_hash,sqlserver.server_principal_name,sqlserver.session_id,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0))))
 					ADD TARGET package0.ring_buffer(SET max_events_limit=(1000))
 					WITH (EVENT_RETENTION_MODE=ALLOW_SINGLE_EVENT_LOSS,MAX_DISPATCH_LATENCY=5 SECONDS,MAX_EVENT_SIZE=0 KB,MEMORY_PARTITION_MODE=PER_CPU,TRACK_CAUSALITY=ON,STARTUP_STATE=OFF)`
@@ -307,22 +323,22 @@ const profilerSessionTemplateSchema: IJSONSchema = {
 			createStatement:
 				`CREATE EVENT SESSION [{sessionName}] ON DATABASE
 					ADD EVENT sqlserver.attention(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.username,sqlserver.query_hash,sqlserver.session_id)
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.username,sqlserver.query_hash,sqlserver.session_id,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))),
 					ADD EVENT sqlserver.existing_connection(SET collect_options_text=(1)
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.username,sqlserver.session_id)),
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.username,sqlserver.session_id,sqlserver.client_hostname)),
 					ADD EVENT sqlserver.login(SET collect_options_text=(1)
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.username,sqlserver.session_id)),
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.username,sqlserver.session_id,sqlserver.client_hostname)),
 					ADD EVENT sqlserver.logout(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.username,sqlserver.session_id)),
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.username,sqlserver.session_id,sqlserver.client_hostname)),
 					ADD EVENT sqlserver.rpc_completed(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.username,sqlserver.query_hash,sqlserver.session_id)
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.username,sqlserver.query_hash,sqlserver.session_id,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))),
 					ADD EVENT sqlserver.sql_batch_completed(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.username,sqlserver.query_hash,sqlserver.session_id)
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.username,sqlserver.query_hash,sqlserver.session_id,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))),
 					ADD EVENT sqlserver.sql_batch_starting(
-						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.username,sqlserver.query_hash,sqlserver.session_id)
+						ACTION(package0.event_sequence,sqlserver.client_app_name,sqlserver.client_pid,sqlserver.database_id,sqlserver.username,sqlserver.query_hash,sqlserver.session_id,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0))))
 					ADD TARGET package0.ring_buffer(SET max_events_limit=(1000))
 					WITH (EVENT_RETENTION_MODE=ALLOW_SINGLE_EVENT_LOSS,MAX_DISPATCH_LATENCY=5 SECONDS,MAX_EVENT_SIZE=0 KB,MEMORY_PARTITION_MODE=PER_CPU,TRACK_CAUSALITY=ON,STARTUP_STATE=OFF)`
@@ -340,10 +356,10 @@ const profilerSessionTemplateSchema: IJSONSchema = {
 					ADD EVENT sqlserver.logout(
 						ACTION(package0.event_sequence,sqlserver.session_id)),
 					ADD EVENT sqlserver.rpc_starting(
-						ACTION(package0.event_sequence,sqlserver.session_id,sqlserver.database_id,sqlserver.database_name)
+						ACTION(package0.event_sequence,sqlserver.session_id,sqlserver.database_id,sqlserver.database_name,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0)))),
 					ADD EVENT sqlserver.sql_batch_starting(
-						ACTION(package0.event_sequence,sqlserver.session_id,sqlserver.database_id,sqlserver.database_name)
+						ACTION(package0.event_sequence,sqlserver.session_id,sqlserver.database_id,sqlserver.database_name,sqlserver.client_hostname)
 						WHERE ([package0].[equal_boolean]([sqlserver].[is_system],(0))))
 					ADD TARGET package0.ring_buffer(SET max_events_limit=(1000))
 					WITH (EVENT_RETENTION_MODE=ALLOW_SINGLE_EVENT_LOSS,MAX_DISPATCH_LATENCY=5 SECONDS,MAX_EVENT_SIZE=0 KB,MEMORY_PARTITION_MODE=PER_CPU,TRACK_CAUSALITY=ON,STARTUP_STATE=OFF)`