diff --git a/web/packages/teleport/src/Audit/__snapshots__/Audit.story.test.tsx.snap b/web/packages/teleport/src/Audit/__snapshots__/Audit.story.test.tsx.snap index d39bd45713f25..8800ff70a4e0a 100644 --- a/web/packages/teleport/src/Audit/__snapshots__/Audit.story.test.tsx.snap +++ b/web/packages/teleport/src/Audit/__snapshots__/Audit.story.test.tsx.snap @@ -4155,7 +4155,7 @@ exports[`list of all events 1`] = ` - User [joe] was denied access to Windows desktop [Administrator@100.104.52.89:3389] on [desktopaccess.com] + User [joe] was denied access to Windows desktop [Administrator@desktop-name] on [desktopaccess.com] - Session for Windows desktop [Administrator@100.104.52.89:3389] on [desktopaccess.com] has ended for user [joe] + Session for Windows desktop [Administrator@desktop-name] on [desktopaccess.com] has ended for user [joe] - User [joe] has connected to Windows desktop [Administrator@100.104.52.89:3389] on [desktopaccess.com] + User [joe] has connected to Windows desktop [Administrator@desktop-name] on [desktopaccess.com] { - let message = `User [${user}] has connected to Windows desktop [${windows_user}@${desktop_addr}]`; + format: ({ user, windows_domain, desktop_name, windows_user }) => { + let message = `User [${user}] has connected to Windows desktop [${windows_user}@${desktop_name}]`; if (windows_domain) { message += ` on [${windows_domain}]`; } @@ -1093,8 +1093,8 @@ export const formatters: Formatters = { [eventCodes.DESKTOP_SESSION_STARTED_FAILED]: { type: 'windows.desktop.session.start', desc: 'Windows Desktop Session Denied', - format: ({ user, windows_domain, desktop_addr, windows_user }) => { - let message = `User [${user}] was denied access to Windows desktop [${windows_user}@${desktop_addr}]`; + format: ({ user, windows_domain, desktop_name, windows_user }) => { + let message = `User [${user}] was denied access to Windows desktop [${windows_user}@${desktop_name}]`; if (windows_domain) { message += ` on [${windows_domain}]`; } @@ -1104,8 +1104,8 @@ export const formatters: Formatters = { [eventCodes.DESKTOP_SESSION_ENDED]: { type: 'windows.desktop.session.end', desc: 'Windows Desktop Session Ended', - format: ({ user, windows_domain, desktop_addr, windows_user }) => { - let desktopMessage = `[${windows_user}@${desktop_addr}]`; + format: ({ user, windows_domain, desktop_name, windows_user }) => { + let desktopMessage = `[${windows_user}@${desktop_name}]`; if (windows_domain) { desktopMessage += ` on [${windows_domain}]`; } diff --git a/web/packages/teleport/src/services/audit/types.ts b/web/packages/teleport/src/services/audit/types.ts index eb6c8be02b15b..ea738a1655d01 100644 --- a/web/packages/teleport/src/services/audit/types.ts +++ b/web/packages/teleport/src/services/audit/types.ts @@ -954,6 +954,7 @@ export type RawEvents = { typeof eventCodes.DESKTOP_SESSION_STARTED, { desktop_addr: string; + desktop_name: string; windows_user: string; windows_domain: string; } @@ -962,6 +963,7 @@ export type RawEvents = { typeof eventCodes.DESKTOP_SESSION_STARTED_FAILED, { desktop_addr: string; + desktop_name: string; windows_user: string; windows_domain: string; } @@ -970,6 +972,7 @@ export type RawEvents = { typeof eventCodes.DESKTOP_SESSION_ENDED, { desktop_addr: string; + desktop_name: string; windows_user: string; windows_domain: string; }