diff --git a/echo-notifications/src/main/resources/templates/swabbie/body.ftl b/echo-notifications/src/main/resources/templates/swabbie/body.ftl index 64a8e0b08..a0c253af1 100644 --- a/echo-notifications/src/main/resources/templates/swabbie/body.ftl +++ b/echo-notifications/src/main/resources/templates/swabbie/body.ftl @@ -1,92 +1,87 @@ -Cleanup Notifications - - - - + /* ANDROID CENTER FIX */ + div[style*="margin: 16px 0;"] { margin: 0 !important; } + - +
@@ -106,76 +101,89 @@ - +
- + - - <#assign rawResourceType = notification.additionalContext.configuration.resourceType+"s"> - - <#foreach resource in notification.additionalContext.resources> - - - + +
- ${resource?index + 1} - - - - + <#assign notificationContext = notification.additionalContext> + + <#foreach resourceData in notificationContext.resources> + + + - - + + + <#if resourceData.resource.resourceId != resourceData.resource.name> + + + + + + + + + + + + + + <#if resourceData.resource.createTs??> + + + + + + <#if resourceData.resource.lastSeenInfo??> + + + + + + + + + +
- id -
+ ${resourceData?index + 1} + + + + - - - <#if resource.resourceId != resource.name> - - - - - - <#if resource.createTs??> - - - - - - <#if resource.lastSeenInfo??> - - - - - - - - - -
+ ${notificationContext.resourceType} + - <#assign resourceWebUrl = notification.additionalContext.spinnakerLink+resource.resourceId+"&tab="+rawResourceType> - ${resource.resourceId} -
- name - - ${resource.name} -
- created on - - ${resource.createTs?number_to_date?string("EEE, d MMM yyyy")} -
- last seen - - ${resource.lastSeenInfo.timeSeen?number_to_date?string("EEE, d MMM yyyy")} - ${resource.lastSeenInfo.usedByResourceIdentifier!""} -
- cleanup date - - ${resource.projectedDeletionStamp?number_to_date?string("EEE, d MMM yyyy")} -
- 		- More Info - Opt Out of Delete -
+ ${resourceData.resource.resourceId} +
+ name + + ${resourceData.resource.name} +
+ account + + ${resourceData.account} +
+ region + + ${resourceData.location} +
+ created on + + ${resourceData.resource.createTs?number_to_date?string("EEE, d MMM yyyy")} +
+ last seen + + ${resourceData.resource.lastSeenInfo.timeSeen?number_to_date?string("EEE, d MMM yyyy")} - ${resourceData.resource.lastSeenInfo.usedByResourceIdentifier!""} +
+ cleanup date + + ${resourceData.resource.projectedDeletionStamp?number_to_date?string("EEE, d MMM yyyy")} +
+ 		+ Opt Out of Delete +
@@ -183,7 +191,7 @@
- For questions, reach out to #spinnaker in Slack. + For questions, reach out to #spinnaker in Slack.
diff --git a/echo-notifications/src/main/resources/templates/swabbie/subject.ftl b/echo-notifications/src/main/resources/templates/swabbie/subject.ftl index b2a4963fa..37f401b50 100644 --- a/echo-notifications/src/main/resources/templates/swabbie/subject.ftl +++ b/echo-notifications/src/main/resources/templates/swabbie/subject.ftl @@ -1,7 +1 @@ -[Cleanup] ${notification.additionalContext.application} ${notification.additionalContext.resourceType}s scheduled for deletion for ${notification.additionalContext.resourceOwner} -<#if notification.additionalContext.configuration.account.name != "" && notification.additionalContext.configuration.account.name != "none"> - in ${notification.additionalContext.configuration.account.name?upper_case} - -<#if notification.additionalContext.configuration.location != "" && notification.additionalContext.configuration.location != "none"> - | ${notification.additionalContext.configuration.location?upper_case} - +[Cleanup] ${notification.additionalContext.resourceType}s scheduled for deletion