Simplifying usage monitor email format

tstibbs · Oct 14, 2023 · 1d7999b · 1d7999b
1 parent 9a503f5
commit 1d7999b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/aws/environment-setup/src/ip-info.js b/aws/environment-setup/src/ip-info.js
@@ -37,11 +37,13 @@ export async function getIpInfo(ips) {
 					risk = 'medium'
 				}
 				let description = `${entry.country} > ${entry.region} > ${entry.city} (${entry.org})`
+				let shortDescription = `${entry.country} (${entry.org})`
 				return [
 					ip,
 					{
 						risk,
-						description
+						description,
+						shortDescription
 					}
 				]
 			})

diff --git a/aws/environment-setup/src/usage-monitor.js b/aws/environment-setup/src/usage-monitor.js
@@ -166,17 +166,17 @@ function formatResultsForEmail(allResults, ipInfo) {
 				let {count, sourceIp, geoBlocked} = stackResult
 				let ipDescriptor = sourceIp
 				if (sourceIp in ipInfo) {
-					let {description, risk} = ipInfo[sourceIp]
+					let {shortDescription, risk} = ipInfo[sourceIp]
 					risk = `${risk} risk`
 					if (geoBlocked) {
 						risk = `${risk} (${geoBlocked})`
 					}
 					let descriptionRegex = /^([^\(]+\()AS\d+ (.+\))$/
-					let regexMatch = description.match(descriptionRegex)
+					let regexMatch = shortDescription.match(descriptionRegex)
 					if (regexMatch != null) {
-						description = `${regexMatch[1]}${regexMatch[2]}`
+						shortDescription = `${regexMatch[1]}${regexMatch[2]}`
 					}
-					ipDescriptor = `${risk}: ${description}`
+					ipDescriptor = `${risk}: ${shortDescription}`
 				}
 				if (!(ipDescriptor in ipsToCount)) {
 					ipsToCount[ipDescriptor] = 0